- Improve buffer management. This change should fix issues on amd64.

- Fix daemonizing part. It now returns the exit status correctly. - Fix *_{pre,post}cmd handling in the rc.d scripts. Plus, wnntouch is now invoked just before running the server process. - Use ${*_WNNMANDIR} in Makefile to use the common patchset in both FreeWnn-server and -lib. - Integrate libtool22 change and regenerate patch files.
author: Hiroki Sato <hrs@FreeBSD.org> 2010-01-02 14:47:20 +0000
committer: Hiroki Sato <hrs@FreeBSD.org> 2010-01-02 14:47:20 +0000
commit: 4b38031b7f2a6cc8fcf3ef57a907f00dcc2b5335 (patch)
tree: fb4d9f6e7af5bc43687100e12721b75ba27087b9 /japanese/FreeWnn-lib
parent: 321eea39e0c70d8678fb84e0cd069981165a96d5 (diff)
download: ports-4b38031b7f2a6cc8fcf3ef57a907f00dcc2b5335.tar.gz
ports-4b38031b7f2a6cc8fcf3ef57a907f00dcc2b5335.zip
48 files changed, 55017 insertions, 7784 deletions
diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index 74a6e49a3812..4beba7e92d17 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	FreeWnn
 PORTVERSION=	1.1.1.a021
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES?=	japanese
 MASTER_SITES=	ftp://ftp.freewnn.org/pub/%SUBDIR%/ \
 		${MASTER_SITE_SOURCEFORGE_JP}
@@ -23,7 +23,9 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf:262 libtool:22
 USE_LDCONFIG=	yes
-MAKE_ARGS=	MANLANG="${MANLANG}" CDEBUGFLAGS="${CFLAGS}"
+MAKE_ARGS=	MANLANG="${MANLANG}" CDEBUGFLAGS="${CFLAGS}" \
+		LIBRARY_WNNMANDIR="3.libwnn" \
+		SERVER_WNNMANDIR=""
 ALL_TARGET=	includes all
 INSTALL_TARGET=	install install.man
 MAKE_JOBS_UNSAFE=	yes
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-conv-cvt_head.h b/japanese/FreeWnn-lib/files/patch-Wnn-conv-cvt_head.h
new file mode 100644
index 000000000000..ee7b13fd158e
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-conv-cvt_head.h
@@ -0,0 +1,31 @@
+Index: Wnn/conv/cvt_head.h
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Wnn/conv/cvt_head.h,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- Wnn/conv/cvt_head.h	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Wnn/conv/cvt_head.h	20 Dec 2008 15:22:37 -0000	1.2
+@@ -52,17 +52,17 @@
+ 
+ #ifdef WNNDEFAULT
+ #  include "wnn_config.h"
+- /* �ޥ���CONVERT_FILENAME������ʤΤ�������ˡ�����ѥ�����ϡ��إå��ե�����
+-    �Υ������ѥ��ˡ�Wnn�Υ��󥯥롼�ɥե�����Τ��꤫�����ꤷ�Ƥ������ȡ� */
++/* �ޥ���CONVERT_FILENAME������ʤΤ�������ˡ�����ѥ�����ϡ��إå��ե�����
++   �Υ������ѥ��ˡ�Wnn�Υ��󥯥롼�ɥե�����Τ��꤫�����ꤷ�Ƥ������ȡ� */
+ #else
+ #  define CONVERT_FILENAME "cvt_key_tbl"
+ #endif
+ 
+ #define div_up(a, b) ((a + b - 1) / b)
+- /* a,b������������a/b���ڤ�夲�������ˤ��� */
++/* a,b������������a/b���ڤ�夲�������ˤ��� */
+ 
+ struct CONVCODE
+ {
+-  int tokey;                    /* �Ѵ����줿������ */
+-  char *fromkey;                /* �Ѵ����륳���� */
++	int tokey;	/* �Ѵ����줿������ */
++	char *fromkey;	/* �Ѵ����륳���� */
+ };
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-conv-cvt_key.c b/japanese/FreeWnn-lib/files/patch-Wnn-conv-cvt_key.c
new file mode 100644
index 000000000000..f7f94e3bd27f
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-conv-cvt_key.c
@@ -0,0 +1,322 @@
+Index: Wnn/conv/cvt_key.c
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Wnn/conv/cvt_key.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- Wnn/conv/cvt_key.c	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Wnn/conv/cvt_key.c	20 Dec 2008 15:22:37 -0000	1.2
+@@ -65,172 +65,165 @@
+ extern struct CONVCODE tbl[];
+ extern int cnv_tbl_cnt;         /* convert table count */
+ 
+-
+- /** int������ h ��ӥåȥ٥����Ȥߤʤ�����i�ӥåȤ�����å����뤤��Ω�Ƥ� */
++/** int������ h ��ӥåȥ٥����Ȥߤʤ�����i�ӥåȤ�����å����뤤��Ω�Ƥ� */
+ #define BITONP(h, i) (h[i / BITSIZ] &  (1 << (i % BITSIZ)))
+ #define BITOFP(h, i) (!BITONP(h, i))
+ #define BIT_UP(h, i) (h[i / BITSIZ] |= (1 << (i % BITSIZ)))
+ #define BITDWN(h, i) (h[i / BITSIZ] &= ~(1 << (i % BITSIZ)))
+ 
+- /** �Ѵ������ɤΥ����å��ȥ������Ѵ� */
++/** �Ѵ������ɤΥ����å��ȥ������Ѵ� */
+ int
+-key_check (inbuf, conv_tbl, tbl_cnt, check_flg)
+-     int inbuf[];               /* ���������ȥ�� */
+-     struct CONVCODE conv_tbl[];        /* �������Ѵ��ơ��֥� */
+-     int tbl_cnt;
+-     int check_flg[];
++key_check (int inbuf[],			/* ���������ȥ�� */
++	   struct CONVCODE conv_tbl[],	/* �������Ѵ��ơ��֥� */
++	   int tbl_cnt,
++	   int check_flg[])
+ {
+-  int dist, base;
+-  char *code_p;
+-  int i;
+-
+-  for (base = 0; inbuf[base] != -1; base++)
+-    {
+-      for (dist = 0; dist < tbl_cnt; dist++)
+-        {
+-          if (BITONP (check_flg, dist) && conv_tbl[dist].fromkey != 0)
+-            {
+-              code_p = conv_tbl[dist].fromkey + base;
+-              if (*code_p == (char) inbuf[base])
+-                {
+-                  if (*(code_p + 1) == (char) 0)
+-                    {
+-                      /* �ޥå����� */
+-                      for (i = 0, base++; (inbuf[i] = inbuf[base]) != -1; i++, base++);
+-                      return (conv_tbl[dist].tokey);
+-                    }
+-                  /* �ޤ��ޥå����Ƥ��ʤ� */
+-                }
+-              else
+-                {
+-                  BITDWN (check_flg, dist);     /* ̵�� */
+-                }
+-            }
+-        }
+-    }
+-
+-  /* �ӥåȥ٥��� check_flg[] ����0��tblcnt�ӥåȤ�Ω�ä��ޤ޻ĤäƤ���
+-     ��Τ����뤫Ĵ�٤롣 */
+-  for (i = 0; i < tbl_cnt / BITSIZ; i++)
+-    {
+-      if (check_flg[i])
+-        return (-1);
+-    }
+-  if ((tbl_cnt %= BITSIZ) && (check_flg[i] & ~(~0 << tbl_cnt)))
+-    return (-1);
+-  /* return -1 �� �ޤ�̤�����ʪ������ */
++	int dist, base;
++	char *code_p;
++	int i;
++
++	for (base = 0; inbuf[base] != -1; base++) {
++		for (dist = 0; dist < tbl_cnt; dist++) {
++			if (BITONP (check_flg, dist) && conv_tbl[dist].fromkey != 0) {
++				code_p = conv_tbl[dist].fromkey + base;
++
++				if (*code_p == (char) inbuf[base]) {
++					if (*(code_p + 1) == (char) 0) {
++						/* �ޥå����� */
++						for (i = 0, base++; (inbuf[i] = inbuf[base]) != -1; i++, base++);
++						return (conv_tbl[dist].tokey);
++					}
++					/* �ޤ��ޥå����Ƥ��ʤ� */
++				} else {
++					/* ̵�� */
++					BITDWN (check_flg, dist);
++				}
++			}
++		}
++	}
++
++	/* �ӥåȥ٥��� check_flg[] ����0��tblcnt�ӥåȤ�Ω�ä��ޤ޻ĤäƤ���
++	   ��Τ����뤫Ĵ�٤롣 */
++
++	for (i = 0; i < tbl_cnt / BITSIZ; i++) {
++		if (check_flg[i])
++			return (-1);
++	}
++
++	if ((tbl_cnt %= BITSIZ) && (check_flg[i] & ~(~0 << tbl_cnt)))
++		return (-1);
++	/* return -1 �� �ޤ�̤�����ʪ������ */
+ 
+-  return (-2);                  /* �Ѵ��оݤȤʤ�ʪ�Ϥʤ� */
++	/* �Ѵ��оݤȤʤ�ʪ�Ϥʤ� */
++	return (-2);
+ }
+ 
+- /** ���ꤵ�줿�Ѵ��ơ��֥�˽��äƥ������Ѵ����롣*/
++/** ���ꤵ�줿�Ѵ��ơ��֥�˽��äƥ������Ѵ����롣*/
+ int
+-convert_key (inkey, conv_tbl, tbl_cnt, matching_flg, in_buf)
+-     int (*inkey) ();           /* �������ϴؿ� */
+-     struct CONVCODE conv_tbl[];        /* �Ѵ��ơ��֥� */
+-     int tbl_cnt;               /* conv_tbl[] �θĿ� */
+-     int matching_flg;          /* �ޥå��󥰤��ʤ��ä����ȥ�󥰤ν�������
+-                                   0 : ���ͤȤ����֤�
+-                                   1 : ���Υ��ȥ�󥰤ϼΤƤ�   */
+-     char *in_buf;
++convert_key (int (*inkey)(),		/* �������ϴؿ� */
++	     struct CONVCODE conv_tbl[],	/* �Ѵ��ơ��֥� */
++	     int tbl_cnt,		/* conv_tbl[] �θĿ� */
++	     int matching_flg,       /* �ޥå��󥰤��ʤ��ä����ȥ�󥰤ν�������
++					0 : ���ͤȤ����֤�
++					1 : ���Υ��ȥ�󥰤ϼΤƤ�   */
++	     char *in_buf)
+ {
+ #define MAX     20              /* �������ϥХåե��κ����� */
+ 
+-  static int inbuf[MAX];        /* �������ϥХåե� */
+-  /* �Хåե��ν�ü�ϡ�-1 �Ǽ�����롣 */
+-
+-  int out_cnt;                  /* ���ϥХåե��ν��ϥ������ */
+-
+-  static int buf_cnt = 0;       /* inbuf �����ϻ��Υ�����   */
+-
+-  int check_flg[CHANGE_MAX];
+-  /* �ӥåȥ٥����Ȥ��ư���졢�ޥå��󥰻����оݤȤʤäƤ���conv_tbl[]
+-     �򼨤���1�λ��оݤȤʤꡢ0�����о� */
+-
+-  int i, c, flg = 0;            /* work */
+-
+-  for (i = 0; i < div_up (tbl_cnt, BITSIZ); check_flg[i++] = ~0);
+-  /* ����check_flg��ӥåȥ٥�����������������0��tbl_cnt �ӥåȤ�Ω�Ƥ롣
+-     â�����ºݤϤ��ξ�����ޤ�Ω�� */
+-
+-  for (;;)
+-    {
+-      if (flg != 0 || buf_cnt == 0)
+-        {
+-          inbuf[buf_cnt] = (*inkey) (); /* ��ʸ������ */
+-          in_buf[buf_cnt] = (char) (inbuf[buf_cnt] & 0xff);
+-          if (inbuf[buf_cnt] == -1)
+-            {
+-              if (buf_cnt > 0)
+-                {
+-                  c = -2;       /* �����ॢ���� */
+-                  goto LABEL;
+-                }
+-              else
+-                {
+-                  continue;
+-                }
+-            }
+-          else
+-            {
+-              inbuf[++buf_cnt] = -1;    /* �����ߥ͡��� */
+-            }
+-        }
+-      flg++;
+-
+-      if (buf_cnt >= MAX - 1)
+-        {
+-          in_buf[0] = '\0';
+-          return (-1);          /* ERROR */
+-        }
+-
+-      c = key_check (inbuf, conv_tbl, tbl_cnt, check_flg);
+-    LABEL:
+-      switch (c)
+-        {
+-        case -1:                /* ̤���� */
+-          continue;
+-
+-        case -2:                /* �Ѵ��оݤǤʤ����Ȥ����ꤷ�� */
+-          buf_cnt--;
+-          out_cnt = 0;
+-          c = inbuf[out_cnt++];
+-          for (i = 0; inbuf[i] != -1; inbuf[i++] = inbuf[out_cnt++]);
+-          if (matching_flg != 0)
+-            {
+-              flg = 0;
+-              continue;
+-            }
+-          in_buf[0] = '\0';
+-          return (c);
+-
+-        default:                /* �Ѵ����줿������ */
+-          in_buf[buf_cnt] = '\0';
+-          buf_cnt = 0;
+-          return (c);
+-        }
+-    }
++        /* �������ϥХåե� */
++	/* �Хåե��ν�ü�ϡ�-1 �Ǽ�����롣 */
++	static int inbuf[MAX];
++
++	/* ���ϥХåե��ν��ϥ������ */
++	int out_cnt;
++	
++	/* inbuf �����ϻ��Υ�����   */
++	static int buf_cnt = 0;
++
++
++	/* �ӥåȥ٥����Ȥ��ư���졢�ޥå��󥰻����оݤȤʤäƤ���conv_tbl[]
++	   �򼨤���1�λ��оݤȤʤꡢ0�����о� */
++	int check_flg[CHANGE_MAX];
++
++	/* work */
++	int i, c, flg = 0;
++
++	for (i = 0; i < div_up (tbl_cnt, BITSIZ); check_flg[i++] = ~0);
++	/* ����check_flg��ӥåȥ٥�����������������0��tbl_cnt �ӥåȤ�Ω�Ƥ롣
++	   â�����ºݤϤ��ξ�����ޤ�Ω�� */
++
++	for (;;) {
++		if (flg != 0 || buf_cnt == 0) {
++			inbuf[buf_cnt] = (*inkey) (); /* ��ʸ������ */
++			in_buf[buf_cnt] = (char) (inbuf[buf_cnt] & 0xff);
++			if (inbuf[buf_cnt] == -1) {
++				if (buf_cnt > 0) {
++					c = -2;
++					/* �����ॢ���� */
++					goto LABEL;
++				} else {
++					continue;
++				}
++			} else {
++				/* �����ߥ͡��� */
++				inbuf[++buf_cnt] = -1;
++			}
++		}
++		flg++;
++
++		if (buf_cnt >= MAX - 1) {
++			in_buf[0] = '\0';
++
++			/* ERROR */
++			return (-1);
++		}
++
++		c = key_check (inbuf, conv_tbl, tbl_cnt, check_flg);
++
++	LABEL:
++		switch (c) {
++		case -1:
++			/* ̤���� */
++			continue;
++
++		case -2:
++			/* �Ѵ��оݤǤʤ����Ȥ����ꤷ�� */
++			buf_cnt--;
++			out_cnt = 0;
++			c = inbuf[out_cnt++];
++			for (i = 0; inbuf[i] != -1; inbuf[i++] = inbuf[out_cnt++]);
++
++			if (matching_flg != 0) {
++				flg = 0;
++				continue;
++			}
++
++			in_buf[0] = '\0';
++			return (c);
++
++		default:
++			/* �Ѵ����줿������ */
++			in_buf[buf_cnt] = '\0';
++			buf_cnt = 0;
++			return (c);
++		}
++	}
+ }
+ 
+  /** �������Ѵ���ȼ���������ϴؿ� */
+ int
+-keyin1 (get_ch, in_buf)
+-     int (*get_ch) ();          /* getchar() ��Ʊ�ͤδؿ� */
+-     char *in_buf;
++keyin1(int (*get_ch)(),          /* getchar() ��Ʊ�ͤδؿ� */
++       char *in_buf)
+ {
+-  int ret;
++	int ret;
+ 
+-  for (;;)
+-    {
+-      if (cnv_tbl_cnt == 0)
+-        {
+-          ret = (*get_ch) ();
+-          if (ret >= 0)
+-            return (ret);
+-        }
+-      else
+-        {
+-          return (convert_key (get_ch, tbl, cnv_tbl_cnt, 0, in_buf));
+-        }
+-    }
++	for (;;) {
++		if (cnv_tbl_cnt == 0) {
++			ret = (*get_ch)();
++			if (ret >= 0)
++				return (ret);
++		} else {
++			return (convert_key(get_ch, tbl, cnv_tbl_cnt, 0, in_buf));
++		}
++	}
+ }
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-conv-cvt_read.c b/japanese/FreeWnn-lib/files/patch-Wnn-conv-cvt_read.c
new file mode 100644
index 000000000000..967d4b5dbd5a
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-conv-cvt_read.c
@@ -0,0 +1,1044 @@
+Index: Wnn/conv/cvt_read.c
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Wnn/conv/cvt_read.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- Wnn/conv/cvt_read.c	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Wnn/conv/cvt_read.c	20 Dec 2008 15:22:37 -0000	1.2
+@@ -67,8 +67,8 @@
+ /*
+ #define NOFILE_NOT_ABORT
+ */
+- /* �����define���Ƥ����ȡ��Ѵ�ɽ��open�Ǥ��ʤ����˥��顼��λ������
+-    ñ���Ѵ��ؿ��������ؿ��ˤʤ롣 */
++/* �����define���Ƥ����ȡ��Ѵ�ɽ��open�Ǥ��ʤ����˥��顼��λ������
++   ñ���Ѵ��ؿ��������ؿ��ˤʤ롣 */
+ 
+ #define is_digit(x) (isascii(x) && isdigit(x))
+ #define is_xdigit(x) (isascii(x) && isxdigit(x))
+@@ -82,14 +82,13 @@
+ 
+ #define ESCCHR  '\033'
+ 
+- /*     convert_key ���Ѵ�ɽ�Υե�����̾�Υǥե���Ȥ򥻥åȡ�
+-    �Ѵ�ɽ��̾������Ū�˻��ꤵ�줿�顢���줬�����ѿ����ͤˤʤ롣 */
++/*     convert_key ���Ѵ�ɽ�Υե�����̾�Υǥե���Ȥ򥻥åȡ�
++       �Ѵ�ɽ��̾������Ū�˻��ꤵ�줿�顢���줬�����ѿ����ͤˤʤ롣 */
+ static char *convert_filename;
+ static char default_cvt_fn[128];
+ 
+ static FILE *convert_hyo;
+ 
+-
+  /** ���顼��å�������ɽ�� */
+ #define errdsp1(mes, conv_fnm)                                          \
+         fprintf(stderr, "%s: %s.\r\n%s = %s\r\n\n",                     \
+@@ -132,11 +131,10 @@ static FILE *convert_hyo;
+ 
+  /** ������c���ܤ˸�������ǰ��� */
+ static void
+-printcode (f, c)
+-     FILE *f;
+-     int c;
++printcode(FILE *f,
++	  int c)
+ {
+-  fprintf (f, (' ' <= c && c < '\177') ? "'%c'" : ((c & ~0xff) ? "0x%X" : "'\\%03o'"), c);
++	fprintf(f, (' ' <= c && c < '\177') ? "'%c'" : ((c & ~0xff) ? "0x%X" : "'\\%03o'"), c);
+ }
+ 
+ /*
+@@ -145,58 +143,58 @@ char    **pterp;
+ {�ѻ�}
+ */
+ 
+- /**    8��10��16�ʥ������ѤΥ���饯����ºݤΥ����ɤ�ľ�������ϤΥ����å���
+-        ���ʤ������Ϥϱѿ����Ȳ��ꤷ�Ƥ���ˡ�*/
++/**    8��10��16�ʥ������ѤΥ���饯����ºݤΥ����ɤ�ľ�������ϤΥ����å���
++       ���ʤ������Ϥϱѿ����Ȳ��ꤷ�Ƥ���ˡ�*/
+ static int
+-charvalue (c)
+-     char c;
++charvalue (char c)
+ {
+-  if (isupper (c))
+-    return (c - 'A' + 10);
+-  if (islower (c))
+-    return (c - 'a' + 10);
+-  return (c - '0');
+-}
++	if (isupper(c))
++		return (c - 'A' + 10);
+ 
++	if (islower(c))
++		return (c - 'a' + 10);
++
++	return (c - '0');
++}
+ 
+ #ifdef TERMCAP
+ char *cvttbl_entry[] = {
+-  "k0", "k1", "k2", "k3", "k4", "k5", "k6", "k7", "k8", "k9",
++	"k0", "k1", "k2", "k3", "k4", "k5", "k6", "k7", "k8", "k9",
+ #ifdef SUPPORT_TWODIGIT_FUNCTIONS
+-  "k;",
+-  "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "FA",
+-  "FB", "FC", "FD", "FE", "FF", "FG", "FH", "FI", "FJ", "FK",
+-  "FL", "FM", "FN", "FO", "FP", "FQ", "FR", "FS", "FT", "FU",
+-  "FV", "FW", "FX", "FY", "FZ", "Fa", "Fb", "Fc", "Fd", "Fe",
+-  "Ff", "Fg", "Fh", "Fi", "Fj", "Fk", "Fl", "Fm", "Fn", "Fo",
+-  "Fp", "Fq", "Fr",
++	"k;",
++	"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "FA",
++	"FB", "FC", "FD", "FE", "FF", "FG", "FH", "FI", "FJ", "FK",
++	"FL", "FM", "FN", "FO", "FP", "FQ", "FR", "FS", "FT", "FU",
++	"FV", "FW", "FX", "FY", "FZ", "Fa", "Fb", "Fc", "Fd", "Fe",
++	"Ff", "Fg", "Fh", "Fi", "Fj", "Fk", "Fl", "Fm", "Fn", "Fo",
++	"Fp", "Fq", "Fr",
+ #endif                          /* SUPPORT_TWODIGIT_FUNCTIONS */
+-  "ku", "kr", "kl", "kd", "kh",
+-  "up", "ri", "le", "do", "ho",
+-  "kb",
+-  "!del",                       /* ���� */
++	"ku", "kr", "kl", "kd", "kh",
++	"up", "ri", "le", "do", "ho",
++	"kb",
++	"!del",                       /* ���� */
+ };
+ #endif /* TERMCAP */
+ #ifdef TERMINFO
+ char *cvttbl_entry[] = {
+-  "kf0", "kf1", "kf2", "kf3", "kf4", "kf5", "kf6", "kf7",
+-  "kf8", "kf9", "kf10",
++	"kf0", "kf1", "kf2", "kf3", "kf4", "kf5", "kf6", "kf7",
++	"kf8", "kf9", "kf10",
+ #ifdef SUPPORT_TWODIGIT_FUNCTIONS
+-  "kf11", "kf12", "kf13", "kf14", "kf15", "kf16", "kf17",
+-  "kf18", "kf19", "kf20", "kf21", "kf22", "kf23", "kf24",
+-  "kf25", "kf26", "kf27", "kf28", "kf29", "kf30", "kf31",
++	"kf11", "kf12", "kf13", "kf14", "kf15", "kf16", "kf17",
++	"kf18", "kf19", "kf20", "kf21", "kf22", "kf23", "kf24",
++	"kf25", "kf26", "kf27", "kf28", "kf29", "kf30", "kf31",
+ #ifndef uniosu
+-  "kf32", "kf33", "kf34", "kf35", "kf36", "kf37", "kf38",
+-  "kf39", "kf40", "kf41", "kf42", "kf43", "kf44", "kf45",
+-  "kf46", "kf47", "kf48", "kf49", "kf50", "kf51", "kf52",
+-  "kf53", "kf54", "kf55", "kf56", "kf57", "kf58", "kf59",
+-  "kf60", "kf61", "kf62", "kf63",
++	"kf32", "kf33", "kf34", "kf35", "kf36", "kf37", "kf38",
++	"kf39", "kf40", "kf41", "kf42", "kf43", "kf44", "kf45",
++	"kf46", "kf47", "kf48", "kf49", "kf50", "kf51", "kf52",
++	"kf53", "kf54", "kf55", "kf56", "kf57", "kf58", "kf59",
++	"kf60", "kf61", "kf62", "kf63",
+ #endif
+ #endif                          /* SUPPORT_TWODIGIT_FUNCTIONS */
+-  "kcuu1", "kcuf1", "kcub1", "kcud1", "khome",
+-  "kbs", "ktbc", "kclr", "kctab", "kdch1", "kdl1",
+-  "krmir", "kel", "ked", "kich1", "kil1",
+-  "kll", "knp", "kpp", "kind", "kri", "khts",
++	"kcuu1", "kcuf1", "kcub1", "kcud1", "khome",
++	"kbs", "ktbc", "kclr", "kctab", "kdch1", "kdl1",
++	"krmir", "kel", "ked", "kich1", "kil1",
++	"kll", "knp", "kpp", "kind", "kri", "khts",
+ };
+ #endif /* TERMINFO */
+ 
+@@ -208,494 +206,496 @@ char tdataarea[AREASIZE];       /* �ǡ��
+ 
+ struct CONVCODE tbl[CVTTBLSIZ];
+ int cnv_tbl_cnt;                /* convert table count */
+- /* �����ϸ��� convert_key.c���static�ѿ����ä� */
++/* �����ϸ��� convert_key.c���static�ѿ����ä� */
+ 
+- /** ����С���ɽ�Υ���ȥ���ʬ��Ȥ롣����������Ĺ��Ķ������0���֤� */
++/** ����С���ɽ�Υ���ȥ���ʬ��Ȥ롣����������Ĺ��Ķ������0���֤� */
+ static int
+-get_entrynm (buf)
+-     char *buf;
++get_entrynm(char *buf)
+ {
+-  int i, c;
++	int i, c;
+ 
+-  for (i = 0; i <= ENTRY_LEN; i++)
+-    {
+-      c = getc (convert_hyo);
+-      if (is_eofsp (c))
+-        {
+-          ungetc (c, convert_hyo);
+-          *buf = '\0';
+-          return (1);
+-        }
+-      else
+-        *buf++ = c;
+-    }
+-  return (0);
++	for (i = 0; i <= ENTRY_LEN; i++) {
++		c = getc(convert_hyo);
++
++		if (is_eofsp(c)) {
++			ungetc(c, convert_hyo);
++			*buf = '\0';
++			return (1);
++		} else
++			*buf++ = c;
++	}
++
++	return (0);
+ }
+ 
+  /** ����ʲ���ʸ��������ˤ�ȤФ��Ƽ���ʸ�����֤� */
+ static int
+-blank_ign_getc (f)
+-     FILE *f;
++blank_ign_getc(FILE *f)
+ {
+-  int c;
++	int c;
++
++	while (c = getc(f),
++	       is_space(c) && c != '\n');
+ 
+-  while (c = getc (f), is_space (c) && c != '\n');
+-  return (c);
++	return (c);
+ }
+ 
+- /** ����������EOF�ˤޤ����Ф������δ֤������ʸ�������ä�����0���֤���*/
++/** ����������EOF�ˤޤ����Ф������δ֤������ʸ�������ä�����0���֤���*/
+ static int
+-linepass (f)
+-     FILE *f;
++linepass(FILE *f)
+ {
+-  int c, flg = 0;
++	int c, flg = 0;
+ 
+-  while (c = getc (f), !is_eofnl (c))
+-    flg = (flg || !is_space (c));
+-  return (flg);
++	while (c = getc(f), !is_eofnl(c))
++		flg = (flg || !is_space(c));
++
++	return (flg);
+ }
+ 
+- /** ����ȥ����륳���ɷ����Υ�����ɽ����ʸ��ʬ��Ȥ롣���顼����������͡�0*/
++/** ����ȥ����륳���ɷ����Υ�����ɽ����ʸ��ʬ��Ȥ롣���顼����������͡�0*/
+ static int
+-get_ctrl (cptr)
+-     int *cptr;
++get_ctrl(int *cptr)
+ {
+-  int c;
++	int c;
++
++	if (!(' ' <= (c = getc(convert_hyo))
++	      && c < '\177'))
++		return (1);
++
++	*cptr = (c == '?' ? '\177' : c & 0x1f);
+ 
+-  if (!(' ' <= (c = getc (convert_hyo)) && c < '\177'))
+-    return (1);
+-  *cptr = (c == '?' ? '\177' : c & 0x1f);
+-  return (0);
++	return (0);
+ }
+ 
+  /** �Хå�����å�������Υ�����ɽ����ʸ��ʬ��Ȥ롣���顼���������0���֤�*/
+ static int
+-get_bcksla (cptr)
+-     int *cptr;
++get_bcksla(int *cptr)
+ {
+-  int c, code = 0, digflg = 0;
++	int c, code = 0, digflg = 0;
+ 
+-  switch (c = getc (convert_hyo))
+-    {
+-    case 'n':
+-      *cptr = '\n';
+-      return (0);
+-    case 't':
+-      *cptr = '\t';
+-      return (0);
+-    case 'b':
+-      *cptr = '\b';
+-      return (0);
+-    case 'r':
+-      *cptr = '\r';
+-      return (0);
+-    case 'f':
+-      *cptr = '\f';
+-      return (0);
+-    case 'e':
+-    case 'E':
+-      *cptr = ESCCHR;
+-      return (0);
+-    case 'o':
+-      while (c = getc (convert_hyo), is_octal (c))
+-        {
+-          code <<= 3;
+-          code += charvalue (c);
+-          digflg = 1;
+-        }
+-      ungetc (c, convert_hyo);
+-      *cptr = code;
+-      return (digflg == 0);
+-    case 'd':
+-      while (c = getc (convert_hyo), is_digit (c))
+-        {
+-          code *= 10;
+-          code += charvalue (c);
+-          digflg = 1;
+-        }
+-      ungetc (c, convert_hyo);
+-      *cptr = code;
+-      return (digflg == 0);
+-    case 'x':
+-      while (c = getc (convert_hyo), is_xdigit (c))
+-        {
+-          code <<= 4;
+-          code += charvalue (c);
+-          digflg = 1;
+-        }
+-      ungetc (c, convert_hyo);
+-      *cptr = code;
+-      return (digflg == 0);
+-    default:
+-      if (is_octal (c))
+-        {
+-          code = charvalue (c);
+-          while (c = getc (convert_hyo), is_octal (c))
+-            {
+-              code <<= 3;
+-              code += charvalue (c);
+-            }
+-          ungetc (c, convert_hyo);
+-          *cptr = code;
+-          return (0);
+-        }
+-      else
+-        {
+-          *cptr = c;
+-          return (0);
+-        }
+-    }
++	switch (c = getc(convert_hyo)) {
++	case 'n':
++		*cptr = '\n';
++		return (0);
++	case 't':
++		*cptr = '\t';
++		return (0);
++	case 'b':
++		*cptr = '\b';
++		return (0);
++	case 'r':
++		*cptr = '\r';
++		return (0);
++	case 'f':
++		*cptr = '\f';
++		return (0);
++	case 'e':
++	case 'E':
++		*cptr = ESCCHR;
++		return (0);
++	case 'o':
++		while (c = getc(convert_hyo), is_octal(c)) {
++			code <<= 3;
++			code += charvalue(c);
++			digflg = 1;
++		}
++		ungetc(c, convert_hyo);
++		*cptr = code;
++		return (digflg == 0);
++	case 'd':
++		while (c = getc(convert_hyo), is_digit(c)) {
++			code *= 10;
++			code += charvalue(c);
++			digflg = 1;
++		}
++
++		ungetc(c, convert_hyo);
++		*cptr = code;
++		return (digflg == 0);
++	case 'x':
++		while (c = getc(convert_hyo), is_xdigit(c)) {
++			code <<= 4;
++			code += charvalue(c);
++			digflg = 1;
++		}
++		ungetc(c, convert_hyo);
++		*cptr = code;
++		return (digflg == 0);
++	default:
++		if (is_octal(c)) {
++			code = charvalue(c);
++			while (c = getc(convert_hyo), is_octal(c)) {
++				code <<= 3;
++				code += charvalue(c);
++			}
++			ungetc(c, convert_hyo);
++			*cptr = code;
++			return (0);
++		} else {
++			*cptr = c;
++			return (0);
++		}
++	}
+ }
+ 
+- /**    ������ɽ����Ȥäơ�cptr�λؤ���ˤ��Υ����ɤ�����롣
+-        ʸˡ���顼ȯ��������0���֤���*/
++/**    ������ɽ����Ȥäơ�cptr�λؤ���ˤ��Υ����ɤ�����롣
++       ʸˡ���顼ȯ��������0���֤���*/
+ static int
+-get_code (cptr)
+-     int *cptr;
++get_code(int *cptr)
+ {
+-  int c;
++	int c;
+ 
+-  switch (c = getc (convert_hyo))
+-    {
+-    case '\\':
+-      return (get_bcksla (cptr));
+-    case '^':
+-      return (get_ctrl (cptr));
+-    default:
+-      *cptr = c;
+-      return (0);
+-    }
++	switch (c = getc(convert_hyo)) {
++	case '\\':
++		return (get_bcksla(cptr));
++	case '^':
++		return (get_ctrl(cptr));
++	default:
++		*cptr = c;
++		return (0);
++	}
+ }
+ 
+ #ifdef TERMCAP
+- /**    tgetstr��Ʊ���δؿ���â��������ȥ�̾��!del�ס�DEL�������Ѵ��򤹤뤿��
+-        ����Ū���ɲä��Ƥ��륨��ȥ�ˤ��Ф��Ƥϡ���ʸ����"\177"���֤���*/
++/**    tgetstr��Ʊ���δؿ���â��������ȥ�̾��!del�ס�DEL�������Ѵ��򤹤뤿��
++       ����Ū���ɲä��Ƥ��륨��ȥ�ˤ��Ф��Ƥϡ���ʸ����"\177"���֤���*/
+ static char *
+-my_tgetstr (name, ptr)
+-     char *name, **ptr;
++my_tgetstr(char *name,
++	   char **ptr)
+ {
+-  extern char *tgetstr ();
+-  static char *del = "\177";
++	extern char *tgetstr ();
++	static char *del = "\177";
+ 
+-  if (strcmp (name, "!del") == 0)
+-    return (del);
+-  return (tgetstr (name, ptr));
++	if (strcmp(name, "!del") == 0)
++		return (del);
++
++	return (tgetstr(name, ptr));
+ }
+ #endif
+ 
+ #ifdef TERMINFO
+- /**    pp1�λؤ��Ƥ��륨�ꥢ��p2�����Ƥ����줿�塢pp1�Υݥ��󥿤�ʤ�Ƥ���*/
++/**    pp1�λؤ��Ƥ��륨�ꥢ��p2�����Ƥ����줿�塢pp1�Υݥ��󥿤�ʤ�Ƥ���*/
+ static char *
+-stradd (pp1, p2)
+-     char **pp1, *p2;
++stradd(char **pp1, char *p2)
+ {
+-  if (p2 != NULL)
+-    {
+-      strcpy (*pp1, p2);
+-      (*pp1) += strlen (p2 = *pp1) + 1;
+-    }
+-  return (p2);
++	if (p2 != NULL) {
++		strcpy(*pp1, p2);
++		(*pp1) += strlen(p2 = *pp1) + 1;
++	}
++
++	return (p2);
+ }
+ #endif
+ 
+  /** termcap/info�����ɤ�������Υǡ��������ѥ��ꥢ�˥��ԡ���*/
+ static void
+-convert_getstrs (flg)
+-     int flg;                   /* verbose�⡼�ɤǵ��������Υե饰�ʺ��νꤽ���������������
+-                                   ��ĥ�����뤫�⤷��ʤ��Τǡ�1��0��Ϳ���Ʋ����������Υե�����
+-                                   ��Ρ�̾����convert_�ǻϤޤ�¾�δؿ��Ǥ�Ʊ���Ǥ��� */
++convert_getstrs(int flg)
++/* verbose�⡼�ɤǵ��������Υե饰�ʺ��νꤽ���������������
++   ��ĥ�����뤫�⤷��ʤ��Τǡ�1��0��Ϳ���Ʋ����������Υե�����
++   ��Ρ�̾����convert_�ǻϤޤ�¾�δؿ��Ǥ�Ʊ���Ǥ��� */
+ {
+-  char *tdataptr;
+-  int i;
++	char *tdataptr;
++	int i;
+ 
+-  tdataptr = tdataarea;
++	tdataptr = tdataarea;
+ 
+ #ifdef TERMCAP
+-  for (i = 0; i < ENTRY_CNT; i++)
+-    keydef_key[i] = my_tgetstr (cvttbl_entry[i], &tdataptr);
++	for (i = 0; i < ENTRY_CNT; i++)
++		keydef_key[i] = my_tgetstr(cvttbl_entry[i], &tdataptr);
+   /* keydef_key[i] ���ͤϡ�NULL����tdataarea���ϰ���Ȥϸ¤�ʤ���
+      "\177"�ʤɤ��ü�ǡ�����ؤ����Ȥ⤢�롣 */
+ 
+-  if (flg)
+-    fprintf (stderr, "convert_key: finished getting TERMCAP.\r\n");
++	if (flg)
++		fprintf (stderr, "convert_key: finished getting TERMCAP.\r\n");
+ #endif
+ 
+ #ifdef TERMINFO
+-  i = 0;
+-  keydef_key[i++] = stradd (&tdataptr, key_f0);
+-  keydef_key[i++] = stradd (&tdataptr, key_f1);
+-  keydef_key[i++] = stradd (&tdataptr, key_f2);
+-  keydef_key[i++] = stradd (&tdataptr, key_f3);
+-  keydef_key[i++] = stradd (&tdataptr, key_f4);
+-  keydef_key[i++] = stradd (&tdataptr, key_f5);
+-  keydef_key[i++] = stradd (&tdataptr, key_f6);
+-  keydef_key[i++] = stradd (&tdataptr, key_f7);
+-  keydef_key[i++] = stradd (&tdataptr, key_f8);
+-  keydef_key[i++] = stradd (&tdataptr, key_f9);
+-  keydef_key[i++] = stradd (&tdataptr, key_f10);
++	i = 0;
++	keydef_key[i++] = stradd(&tdataptr, key_f0);
++	keydef_key[i++] = stradd(&tdataptr, key_f1);
++	keydef_key[i++] = stradd(&tdataptr, key_f2);
++	keydef_key[i++] = stradd(&tdataptr, key_f3);
++	keydef_key[i++] = stradd(&tdataptr, key_f4);
++	keydef_key[i++] = stradd(&tdataptr, key_f5);
++	keydef_key[i++] = stradd(&tdataptr, key_f6);
++	keydef_key[i++] = stradd(&tdataptr, key_f7);
++	keydef_key[i++] = stradd(&tdataptr, key_f8);
++	keydef_key[i++] = stradd(&tdataptr, key_f9);
++	keydef_key[i++] = stradd(&tdataptr, key_f10);
+ #ifdef SUPPORT_TWODIGIT_FUNCTIONS
+-  keydef_key[i++] = stradd (&tdataptr, key_f11);
+-  keydef_key[i++] = stradd (&tdataptr, key_f12);
+-  keydef_key[i++] = stradd (&tdataptr, key_f13);
+-  keydef_key[i++] = stradd (&tdataptr, key_f14);
+-  keydef_key[i++] = stradd (&tdataptr, key_f15);
+-  keydef_key[i++] = stradd (&tdataptr, key_f16);
+-  keydef_key[i++] = stradd (&tdataptr, key_f17);
+-  keydef_key[i++] = stradd (&tdataptr, key_f18);
+-  keydef_key[i++] = stradd (&tdataptr, key_f19);
+-  keydef_key[i++] = stradd (&tdataptr, key_f20);
+-  keydef_key[i++] = stradd (&tdataptr, key_f21);
+-  keydef_key[i++] = stradd (&tdataptr, key_f22);
+-  keydef_key[i++] = stradd (&tdataptr, key_f23);
+-  keydef_key[i++] = stradd (&tdataptr, key_f24);
+-  keydef_key[i++] = stradd (&tdataptr, key_f25);
+-  keydef_key[i++] = stradd (&tdataptr, key_f26);
+-  keydef_key[i++] = stradd (&tdataptr, key_f27);
+-  keydef_key[i++] = stradd (&tdataptr, key_f28);
+-  keydef_key[i++] = stradd (&tdataptr, key_f29);
+-  keydef_key[i++] = stradd (&tdataptr, key_f30);
+-  keydef_key[i++] = stradd (&tdataptr, key_f31);
++	keydef_key[i++] = stradd(&tdataptr, key_f11);
++	keydef_key[i++] = stradd(&tdataptr, key_f12);
++	keydef_key[i++] = stradd(&tdataptr, key_f13);
++	keydef_key[i++] = stradd(&tdataptr, key_f14);
++	keydef_key[i++] = stradd(&tdataptr, key_f15);
++	keydef_key[i++] = stradd(&tdataptr, key_f16);
++	keydef_key[i++] = stradd(&tdataptr, key_f17);
++	keydef_key[i++] = stradd(&tdataptr, key_f18);
++	keydef_key[i++] = stradd(&tdataptr, key_f19);
++	keydef_key[i++] = stradd(&tdataptr, key_f20);
++	keydef_key[i++] = stradd(&tdataptr, key_f21);
++	keydef_key[i++] = stradd(&tdataptr, key_f22);
++	keydef_key[i++] = stradd(&tdataptr, key_f23);
++	keydef_key[i++] = stradd(&tdataptr, key_f24);
++	keydef_key[i++] = stradd(&tdataptr, key_f25);
++	keydef_key[i++] = stradd(&tdataptr, key_f26);
++	keydef_key[i++] = stradd(&tdataptr, key_f27);
++	keydef_key[i++] = stradd(&tdataptr, key_f28);
++	keydef_key[i++] = stradd(&tdataptr, key_f29);
++	keydef_key[i++] = stradd(&tdataptr, key_f30);
++	keydef_key[i++] = stradd(&tdataptr, key_f31);
+ #endif /* SUPPORT_TWODIGIT_FUNCTIONS */
+ /* �ʲ����
+-        "kcuu1", "kcuf1", "kcub1", "kcud1", "khome",
+-        "kbs", "ktbc", "kclr", "kctab", "kdch1", "kdl1",
+-        "krmir", "kel", "ked", "kich1", "kil1",
+-        "kll", "knp", "kpp", "kind", "kri", "khts",
++   "kcuu1", "kcuf1", "kcub1", "kcud1", "khome",
++   "kbs", "ktbc", "kclr", "kctab", "kdch1", "kdl1",
++   "krmir", "kel", "ked", "kich1", "kil1",
++   "kll", "knp", "kpp", "kind", "kri", "khts",
+ */
+-  keydef_key[i++] = stradd (&tdataptr, key_up);
+-  keydef_key[i++] = stradd (&tdataptr, key_right);
+-  keydef_key[i++] = stradd (&tdataptr, key_left);
+-  keydef_key[i++] = stradd (&tdataptr, key_down);
+-  keydef_key[i++] = stradd (&tdataptr, key_home);
+-  keydef_key[i++] = stradd (&tdataptr, key_backspace);
+-  keydef_key[i++] = stradd (&tdataptr, key_catab);
+-  keydef_key[i++] = stradd (&tdataptr, key_clear);
+-  keydef_key[i++] = stradd (&tdataptr, key_ctab);
+-  keydef_key[i++] = stradd (&tdataptr, key_dc);
+-  keydef_key[i++] = stradd (&tdataptr, key_dl);
+-  keydef_key[i++] = stradd (&tdataptr, key_eic);
+-  keydef_key[i++] = stradd (&tdataptr, key_eol);
+-  keydef_key[i++] = stradd (&tdataptr, key_eos);
+-  keydef_key[i++] = stradd (&tdataptr, key_ic);
+-  keydef_key[i++] = stradd (&tdataptr, key_il);
+-  keydef_key[i++] = stradd (&tdataptr, key_ll);
+-  keydef_key[i++] = stradd (&tdataptr, key_npage);
+-  keydef_key[i++] = stradd (&tdataptr, key_ppage);
+-  keydef_key[i++] = stradd (&tdataptr, key_sf);
+-  keydef_key[i++] = stradd (&tdataptr, key_sr);
+-  keydef_key[i++] = stradd (&tdataptr, key_stab);
+-
+-  if (flg)
+-    fprintf (stderr, "convert_key: finished getting TERMINFO.\r\n");
++	keydef_key[i++] = stradd(&tdataptr, key_up);
++	keydef_key[i++] = stradd(&tdataptr, key_right);
++	keydef_key[i++] = stradd(&tdataptr, key_left);
++	keydef_key[i++] = stradd(&tdataptr, key_down);
++	keydef_key[i++] = stradd(&tdataptr, key_home);
++	keydef_key[i++] = stradd(&tdataptr, key_backspace);
++	keydef_key[i++] = stradd(&tdataptr, key_catab);
++	keydef_key[i++] = stradd(&tdataptr, key_clear);
++	keydef_key[i++] = stradd(&tdataptr, key_ctab);
++	keydef_key[i++] = stradd(&tdataptr, key_dc);
++	keydef_key[i++] = stradd(&tdataptr, key_dl);
++	keydef_key[i++] = stradd(&tdataptr, key_eic);
++	keydef_key[i++] = stradd(&tdataptr, key_eol);
++	keydef_key[i++] = stradd(&tdataptr, key_eos);
++	keydef_key[i++] = stradd(&tdataptr, key_ic);
++	keydef_key[i++] = stradd(&tdataptr, key_il);
++	keydef_key[i++] = stradd(&tdataptr, key_ll);
++	keydef_key[i++] = stradd(&tdataptr, key_npage);
++	keydef_key[i++] = stradd(&tdataptr, key_ppage);
++	keydef_key[i++] = stradd(&tdataptr, key_sf);
++	keydef_key[i++] = stradd(&tdataptr, key_sr);
++	keydef_key[i++] = stradd(&tdataptr, key_stab);
++	
++	if (flg)
++		fprintf(stderr, "convert_key: finished getting TERMINFO.\r\n");
+ #endif
+ }
+ 
+- /**    TERMINFO �ξ��� setupterm()��TERMCAP�ξ��� tgetent()�ν�����Ԥä�
+-        �塢������ȯ�����륷�����󥹤Υǡ��������ѤΥ��ꥢ�˥��ԡ����롣
+-        termcap/info�Υǡ����١����������ץ�Ǥ��ʤ��ä�����0���֤���*/
++/**    TERMINFO �ξ��� setupterm()��TERMCAP�ξ��� tgetent()�ν�����Ԥä�
++       �塢������ȯ�����륷�����󥹤Υǡ��������ѤΥ��ꥢ�˥��ԡ����롣
++       termcap/info�Υǡ����١����������ץ�Ǥ��ʤ��ä�����0���֤���*/
+ #ifdef TERMCAP
+ int
+-convert_getterm (termname, flg)
+-     char *termname;
+-     int flg;
+-{
+-  extern int tgetent ();
+-  char tcaparea[AREASIZE];
+-
+-  if (flg)
+-    fprintf (stderr, "convert_key: using TERMCAP entry %s...\r\n", termname);
+-  if (tgetent (tcaparea, termname) <= 0)
+-    {
+-      errdsp2 ("Can't get termcap entry", termname);
+-      return (1);
+-    }
+-  convert_getstrs (flg);
+-  return (0);
++convert_getterm(char *termname,
++		int flg)
++{
++	extern int tgetent ();
++	char tcaparea[AREASIZE];
++
++	if (flg)
++		fprintf(stderr, "convert_key: using TERMCAP entry %s...\r\n",
++			 termname);
++
++	if (tgetent(tcaparea, termname) <= 0) {
++		errdsp2("Can't get termcap entry", termname);
++		return (1);
++	}
++
++	convert_getstrs(flg);
++
++	return (0);
+ }
+ #endif
+ #ifdef TERMINFO
+ int
+-convert_getterm (termname, flg)
+-     char *termname;
+-     int flg;
+-{
+-  int fd, rsl;
+-
+-  if (flg)
+-    fprintf (stderr, "convert_key: using TERMINFO entry %s...\r\n", termname);
+-  fd = open ("/dev/null", O_WRONLY, 0);
+-  setupterm (termname, fd, &rsl);
+-  close (fd);
+-  if (rsl != 1)
+-    {
+-      errdsp2 ("Can't get terminfo entry", termname);
+-      /* ���ΤȤ�resetterm()��ɬ�פ��� */
+-      return (1);
+-    }
+-  convert_getstrs (flg);
+-  resetterm ();
+-  return (0);
++convert_getterm(char *termname,
++		int flg)
++{
++	int fd, rsl;
++
++	if (flg)
++		fprintf (stderr,
++			 "convert_key: using TERMINFO entry %s...\r\n",
++			 termname);
++
++	fd = open("/dev/null", O_WRONLY, 0);
++	setupterm(termname, fd, &rsl);
++	close (fd);
++
++	if (rsl != 1) {
++		errdsp2("Can't get terminfo entry", termname);
++		/* ���ΤȤ�resetterm()��ɬ�פ��� */
++		return (1);
++	}
++
++	convert_getstrs(flg);
++	resetterm();
++	return (0);
+ }
+ #endif
+ 
+- /**    termcap/info�����ä������Υǡ������������ѥ��ꥢ�˼��ޤäƤ����
+-        ���ơ������Ȥä�convert_key�����ν�����򤹤롣���ͤ����ｪλ��0��
+-        ɽ�ɤ߹��߻���Warning��ȯ��������1��Error�򸡽Ф����Ȥ�-1��*/
++/**    termcap/info�����ä������Υǡ������������ѥ��ꥢ�˼��ޤäƤ����
++       ���ơ������Ȥä�convert_key�����ν�����򤹤롣���ͤ����ｪλ��0��
++       ɽ�ɤ߹��߻���Warning��ȯ��������1��Error�򸡽Ф����Ȥ�-1��*/
+ int
+-convert_key_setup (filename, flg)
+-     char *filename;
+-     int flg;
+-{
+-  register int i;
+-  int c, d, cnt = 0, warn_occur = 0, entry_found;
+-  char name[ENTRY_LEN + 1];
+-
+-  int keydef_code[ENTRY_CNT];   /* convert code */
+-
+-  if (CHANGE_MAX < div_up (ENTRY_CNT, BITSIZ))
+-    {
+-      fprintf (stderr, "%s%s%d%s", "Sorry, please set CHANGE_MAX(in file ", "conv/cvt_head.h) larger than ", div_up (ENTRY_CNT, BITSIZ) - 1, ",\r\nand recompile.\r\n");
+-      return (-1);
+-    }
+-
+-  for (i = 0; i < ENTRY_CNT; i++)
+-    keydef_code[i] = -1;
+-  /* code�� -1 �Τޤޤʤ顢convert_keyɽ�˥���ȥ꤬�ʤ����Ȥ򼨤��� */
+-
+-  if (NULL != filename)
+-    convert_filename = filename;
+-  else
+-    {
+-      convert_filename = default_cvt_fn;
++convert_key_setup(char *filename,
++		  int flg)
++{
++	register int i;
++	int c, d, cnt = 0, warn_occur = 0, entry_found;
++	char name[ENTRY_LEN + 1];
++
++	int keydef_code[ENTRY_CNT];   /* convert code */
++
++	if (CHANGE_MAX < div_up (ENTRY_CNT, BITSIZ)) {
++		fprintf (stderr, "%s%s%d%s",
++			 "Sorry, please set CHANGE_MAX(in file ",
++			 "conv/cvt_head.h) larger than ",
++			 div_up (ENTRY_CNT, BITSIZ) - 1,
++			 ",\r\nand recompile.\r\n");
++		return (-1);
++	}
++
++	for (i = 0; i < ENTRY_CNT; i++)
++		keydef_code[i] = -1;
++	/* code�� -1 �Τޤޤʤ顢convert_keyɽ�˥���ȥ꤬�ʤ����Ȥ򼨤��� */
++
++	if (NULL != filename)
++		convert_filename = filename;
++	else {
++		convert_filename = default_cvt_fn;
+ #ifdef  WNNDEFAULT
+-      strcpy (convert_filename, LIBDIR);        /* /usr/local/lib/wnn */
+-      strcat (convert_filename, CONVERT_FILENAME);      /* /cvt_key_tbl */
++		strcpy(convert_filename, LIBDIR);        /* /usr/local/lib/wnn */
++		strcat(convert_filename, CONVERT_FILENAME);      /* /cvt_key_tbl */
+ #else
+-      strcpy (convert_filename, CONVERT_FILENAME);
++		strcpy(convert_filename, CONVERT_FILENAME);
+ #endif /* WNNDEFAULT */
+-    }
+-  if (flg)
+-    fprintf (stderr, "convert_key: using convert_key table %s...\r\n", convert_filename);
+-  if (NULL == (convert_hyo = fopen (convert_filename, "r")))
+-    {
++	}
++
++	if (flg)
++		fprintf (stderr, "convert_key: using convert_key table %s...\r\n",
++			 convert_filename);
++
++	if (NULL == (convert_hyo = fopen(convert_filename, "r"))) {
+ #ifdef NOFILE_NOT_ABORT
+-      warn1 (convert_filename);
+-      cnv_tbl_cnt = 0;
+-      return (1);
++		warn1(convert_filename);
++		cnv_tbl_cnt = 0;
++		return (1);
+ #else
+-      errdsp1 ("Convert-table file is not found", convert_filename);
+-      return (-1);
++		errdsp1("Convert-table file is not found",
++			convert_filename);
++		return (-1);
+ #endif
+-    }
++	}
+ 
+-  /* ɽ������ɤߤ��� */
+-  while (EOF != (d = getc (convert_hyo)))
+-    {
+-      if (d == '#' || d == ';')
+-        {
+-          /* '#'����';'�ǻϤޤ�Ԥ�����Ȥ����ɤ����Ф��� */
+-          linepass (convert_hyo);
+-          continue;
+-        }
+-      ungetc (d, convert_hyo);
+-
+-      d = blank_ign_getc (convert_hyo);
+-      if (is_eofnl (d))
+-        continue;               /* ���� */
+-      else
+-        ungetc (d, convert_hyo);
+-      if (!get_entrynm (name))
+-        {
+-          errdsp1 ("Entry name too long", convert_filename);
+-          fclose (convert_hyo);
+-          return (-1);
+-        }                       /* ����ȥ�̾���ɤ߹������ */
+-
+-      d = blank_ign_getc (convert_hyo);
+-      if (is_eofnl (d))
+-        {
+-          errdsp1 ("Convert code missing", convert_filename);
+-          fclose (convert_hyo);
+-          return (-1);
+-        }
+-      else
+-        ungetc (d, convert_hyo);
+-      if (get_code (&c) != 0 || linepass (convert_hyo) != 0)
+-        {
+-          errdsp1 ("Convert code illegal", convert_filename);
+-          fclose (convert_hyo);
+-          return (-1);
+-        }                       /* �Ѵ������ɤ��ɤ߹������ */
++	/* ɽ������ɤߤ��� */
++	while (EOF != (d = getc(convert_hyo))) {
++		if (d == '#' || d == ';') {
++			/* '#'����';'�ǻϤޤ�Ԥ�����Ȥ����ɤ����Ф��� */
++			linepass(convert_hyo);
++			continue;
++		}
++
++		ungetc(d, convert_hyo);
++
++		d = blank_ign_getc(convert_hyo);
++
++		if (is_eofnl(d))
++			/* ���� */
++			continue;
++		else
++			ungetc(d, convert_hyo);
++
++		if (!get_entrynm(name)) {
++			errdsp1("Entry name too long",
++				convert_filename);
++			fclose(convert_hyo);
++			return (-1);
++		}
++		/* ����ȥ�̾���ɤ߹������ */
++
++		d = blank_ign_getc(convert_hyo);
++
++		if (is_eofnl(d)) {
++			errdsp1("Convert code missing",
++				convert_filename);
++			fclose (convert_hyo);
++			return (-1);
++		} else
++			ungetc(d, convert_hyo);
++
++		if (get_code(&c) != 0
++		    || linepass(convert_hyo) != 0) {
++			errdsp1("Convert code illegal", convert_filename);
++			fclose(convert_hyo);
++			return (-1);
++		}
++		/* �Ѵ������ɤ��ɤ߹������ */
+ #ifdef DEBUG
+-      printf ("%s %d\n", name, c);
++		printf("%s %d\n", name, c);
+ #endif
+-      for (entry_found = i = 0; i < ENTRY_CNT; i++)
+-        {
+-          if (!strcmp (cvttbl_entry[i], name))
+-            {
+-              if (keydef_code[i] != -1)
+-                {
+-                  warn2 (name, convert_filename);
+-                  warn_occur = 1;
+-                }
+-              keydef_code[i] = c;
+-              entry_found = 1;
+-              break;
+-            }
+-        }
+-      if (!entry_found)
+-        {
+-          warn3 (name, convert_filename);
+-          warn_occur = 1;
+-        }
+-    }
+-
+-  /* �ɤߤ�����ǡ�����ơ��֥�˥��å� */
+-  for (i = 0; i < ENTRY_CNT; i++)
+-    {
+-      if (keydef_key[i] != NULL)
+-        {
+-          if (keydef_code[i] != -1 && ((int) strlen (keydef_key[i]) > 1 || *keydef_key[i] != keydef_code[i]))
+-            {
+-              tbl[cnt].fromkey = keydef_key[i];
+-              tbl[cnt++].tokey = keydef_code[i];
+-            }
+-        }
+-      else if (keydef_code[i] != -1)
+-        {
+-          warn4 (cvttbl_entry[i], convert_filename, keydef_code[i]);
+-          warn_occur = 1;
+-        }
+-    }
+-
+-  cnv_tbl_cnt = cnt;
+-  fclose (convert_hyo);
+-  if (flg)
+-    fprintf (stderr, "convert_key: finished setting up.\r\n");
+-  return (warn_occur);
+-}
+-
+- /**    convert_key����������롼����TERMINFO �ξ��� setupterm()��TERMCAP��
+-        ���� tgetent()�򤽤줾�쥳���뤷����˸Ƥ֡����ͤ�convert_key_setup
+-        ���ȡ�*/
++		for (entry_found = i = 0; i < ENTRY_CNT; i++) {
++			if (!strcmp(cvttbl_entry[i], name)) {
++				if (keydef_code[i] != -1) {
++					warn2(name, convert_filename);
++					warn_occur = 1;
++				}
++				keydef_code[i] = c;
++				entry_found = 1;
++				break;
++			}
++		}
++
++		if (!entry_found) {
++			warn3(name, convert_filename);
++			warn_occur = 1;
++		}
++	}
++
++	/* �ɤߤ�����ǡ�����ơ��֥�˥��å� */
++
++	for (i = 0; i < ENTRY_CNT; i++) {
++		if (keydef_key[i] != NULL) {
++			if (keydef_code[i] != -1
++			    && ((int)strlen(keydef_key[i]) > 1
++				|| *keydef_key[i] != keydef_code[i])) {
++				tbl[cnt].fromkey = keydef_key[i];
++				tbl[cnt++].tokey = keydef_code[i];
++			}
++		} else if (keydef_code[i] != -1) {
++			warn4 (cvttbl_entry[i], convert_filename, keydef_code[i]);
++			warn_occur = 1;
++		}
++	}
++
++	cnv_tbl_cnt = cnt;
++	fclose(convert_hyo);
++
++	if (flg)
++		fprintf(stderr, "convert_key: finished setting up.\r\n");
++
++	return (warn_occur);
++}
++
++/**    convert_key����������롼����TERMINFO �ξ��� setupterm()��TERMCAP��
++       ���� tgetent()�򤽤줾�쥳���뤷����˸Ƥ֡����ͤ�convert_key_setup
++       ���ȡ�*/
+ int
+-convert_key_init (filename, flg)
+-     char *filename;
+-     int flg;
++convert_key_init (char *filename,
++		  int flg)
+ {
+-  convert_getstrs (flg);
+-  return (convert_key_setup (filename, flg));
++	convert_getstrs (flg);
++	return (convert_key_setup (filename, flg));
+ }
+ 
+- /**    TERMINFO �ξ��� setupterm()��TERMCAP�ξ��� tgetent()�ޤǴޤ�Ƽ¹�
+-        convert_key����������롼�����֤��ͤ�convert_key_setup���ȡ�â����
+-        termcap/info���ɤ߹��ߤ˼��Ԥ������ϡ�-2���֤롣*/
++/**    TERMINFO �ξ��� setupterm()��TERMCAP�ξ��� tgetent()�ޤǴޤ�Ƽ¹�
++       convert_key����������롼�����֤��ͤ�convert_key_setup���ȡ�â����
++       termcap/info���ɤ߹��ߤ˼��Ԥ������ϡ�-2���֤롣*/
+ int
+-convert_getterm_init (termname, filename, flg)
+-     char *termname, *filename;
+-     int flg;
+-{
+-  if (convert_getterm (termname, flg) != 0)
+-    return (-2);
+-  return (convert_key_setup (filename, flg));
++convert_getterm_init (char *termname,
++		      char *filename,
++		      int flg)
++{
++	if (convert_getterm (termname, flg) != 0)
++		return (-2);
++
++	return (convert_key_setup (filename, flg));
+ }
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-etc-bcopy.c b/japanese/FreeWnn-lib/files/patch-Wnn-etc-bcopy.c
new file mode 100644
index 000000000000..ae2390e172dd
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-etc-bcopy.c
@@ -0,0 +1,81 @@
+Index: Wnn/etc/bcopy.c
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Wnn/etc/bcopy.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- Wnn/etc/bcopy.c	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Wnn/etc/bcopy.c	20 Dec 2008 15:22:40 -0000	1.2
+@@ -38,47 +38,43 @@
+ 
+ #ifndef HAVE_BCOPY
+ void
+-bcopy (b1, b2, length)
+-     unsigned char *b1, *b2;
+-     int length;
++bcopy(unsigned char *b1,
++      unsigned char *b2,
++      int length)
+ {
+-  if (length <= 0)
+-    return;
+-  if (b1 < b2 && b1 + length > b2)
+-    {
+-      b2 += length;
+-      b1 += length;
+-      while (length--)
+-        {
+-          *--b2 = *--b1;
+-        }
+-    }
+-  else
+-    {
+-      memcpy (b2, b1, length);
+-    }
++	if (length <= 0)
++		return;
++
++	if (b1 < b2 && b1 + length > b2) {
++		b2 += length;
++		b1 += length;
++
++		while (length--)
++			*--b2 = *--b1;
++	} else {
++		memcpy (b2, b1, length);
++	}
+ }
+ #endif /* !HAVE_BCOPY */
+ 
+ #ifndef HAVE_BZERO
+ void
+-bzero (b, length)
+-     unsigned char *b;
+-     int length;
++bzero(unsigned char *b,
++      int length)
+ {
+-  memset (b, 0, length);
++	memset (b, 0, length);
+ }
+ #endif /* !HAVE_BZERO */
+ 
+ #ifndef HAVE_BCMP
+ int
+-bcmp (b1, b2, length)
+-     unsigned char *b1;
+-     unsigned char *b2;
+-     int length;
++bcmp(unsigned char *b1,
++     unsigned *b2,
++     int length)
+ {
+-  if (length == 0)
+-    return 0;
+-  return memcmp (b1, b2, length);
++	if (length == 0)
++		return 0;
++
++	return memcmp(b1, b2, length);
+ }
+ #endif /* !HAVE_BCMP */
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-etc-getopt1.c b/japanese/FreeWnn-lib/files/patch-Wnn-etc-getopt1.c
new file mode 100644
index 000000000000..66b9ec067c4d
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-etc-getopt1.c
@@ -0,0 +1,217 @@
+Index: Wnn/etc/getopt1.c
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Wnn/etc/getopt1.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- Wnn/etc/getopt1.c	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Wnn/etc/getopt1.c	20 Dec 2008 15:22:40 -0000	1.2
+@@ -66,14 +66,13 @@
+ #endif
+ 
+ int
+-getopt_long (argc, argv, options, long_options, opt_index)
+-     int argc;
+-     char *const *argv;
+-     const char *options;
+-     const struct option *long_options;
+-     int *opt_index;
++getopt_long(int argc,
++	    char * const *argv,
++	    const char *options,
++	    const struct option *long_options,
++	    int *opt_index)
+ {
+-  return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
++	return _getopt_internal(argc, argv, options, long_options, opt_index, 0);
+ }
+ 
+ /* Like getopt_long, but '-' as well as '--' can indicate a long option.
+@@ -82,14 +81,13 @@ getopt_long (argc, argv, options, long_o
+    instead.  */
+ 
+ int
+-getopt_long_only (argc, argv, options, long_options, opt_index)
+-     int argc;
+-     char *const *argv;
+-     const char *options;
+-     const struct option *long_options;
+-     int *opt_index;
++getopt_long_only(int argc,
++		 char * const *argv,
++		 const char *options,
++		 const struct option *long_options,
++		 int *opt_index)
+ {
+-  return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
++	return _getopt_internal(argc, argv, options, long_options, opt_index, 1);
+ }
+ 
+ 
+@@ -100,91 +98,87 @@ getopt_long_only (argc, argv, options, l
+ #include <stdio.h>
+ 
+ int
+-main (argc, argv)
+-     int argc;
+-     char **argv;
++main(int argc, char **argv)
+ {
+-  int c;
+-  int digit_optind = 0;
++	int c;
++	int digit_optind = 0;
+ 
+-  while (1)
+-    {
+-      int this_option_optind = optind ? optind : 1;
+-      int option_index = 0;
+-      static struct option long_options[] =
+-      {
+-	{"add", 1, 0, 0},
+-	{"append", 0, 0, 0},
+-	{"delete", 1, 0, 0},
+-	{"verbose", 0, 0, 0},
+-	{"create", 0, 0, 0},
+-	{"file", 1, 0, 0},
+-	{0, 0, 0, 0}
+-      };
+-
+-      c = getopt_long (argc, argv, "abc:d:0123456789",
+-		       long_options, &option_index);
+-      if (c == -1)
+-	break;
+-
+-      switch (c)
+-	{
+-	case 0:
+-	  printf ("option %s", long_options[option_index].name);
+-	  if (optarg)
+-	    printf (" with arg %s", optarg);
+-	  printf ("\n");
+-	  break;
+-
+-	case '0':
+-	case '1':
+-	case '2':
+-	case '3':
+-	case '4':
+-	case '5':
+-	case '6':
+-	case '7':
+-	case '8':
+-	case '9':
+-	  if (digit_optind != 0 && digit_optind != this_option_optind)
+-	    printf ("digits occur in two different argv-elements.\n");
+-	  digit_optind = this_option_optind;
+-	  printf ("option %c\n", c);
+-	  break;
+-
+-	case 'a':
+-	  printf ("option a\n");
+-	  break;
+-
+-	case 'b':
+-	  printf ("option b\n");
+-	  break;
+-
+-	case 'c':
+-	  printf ("option c with value `%s'\n", optarg);
+-	  break;
+-
+-	case 'd':
+-	  printf ("option d with value `%s'\n", optarg);
+-	  break;
++	while (1) {
++		int this_option_optind = optind ? optind : 1;
++		int option_index = 0;
++		static struct option long_options[] = {
++			{"add", 1, 0, 0},
++			{"append", 0, 0, 0},
++			{"delete", 1, 0, 0},
++			{"verbose", 0, 0, 0},
++			{"create", 0, 0, 0},
++			{"file", 1, 0, 0},
++			{0, 0, 0, 0}
++		};
++
++		c = getopt_long(argc, argv, "abc:d:0123456789",
++				long_options, &option_index);
++
++		if (c == -1)
++			break;
++
++		switch (c) {
++		case 0:
++			printf ("option %s", long_options[option_index].name);
++			if (optarg)
++				printf (" with arg %s", optarg);
++
++			printf ("\n");
++			break;
++		case '0':
++		case '1':
++		case '2':
++		case '3':
++		case '4':
++		case '5':
++		case '6':
++		case '7':
++		case '8':
++		case '9':
++			if (digit_optind != 0 && digit_optind != this_option_optind)
++				printf ("digits occur in two different argv-elements.\n");
++			digit_optind = this_option_optind;
++			printf ("option %c\n", c);
++			break;
++
++		case 'a':
++			printf ("option a\n");
++			break;
++
++		case 'b':
++			printf ("option b\n");
++			break;
++
++		case 'c':
++			printf ("option c with value `%s'\n", optarg);
++			break;
++
++		case 'd':
++			printf ("option d with value `%s'\n", optarg);
++			break;
++
++		case '?':
++			break;
++
++		default:
++			printf ("?? getopt returned character code 0%o ??\n", c);
++		}
++	}
+ 
+-	case '?':
+-	  break;
++	if (optind < argc) {
++		printf ("non-option ARGV-elements: ");
+ 
+-	default:
+-	  printf ("?? getopt returned character code 0%o ??\n", c);
++		while (optind < argc)
++			printf ("%s ", argv[optind++]);
++		printf ("\n");
+ 	}
+-    }
+-
+-  if (optind < argc)
+-    {
+-      printf ("non-option ARGV-elements: ");
+-      while (optind < argc)
+-	printf ("%s ", argv[optind++]);
+-      printf ("\n");
+-    }
+ 
+-  exit (0);
++	exit(0);
+ }
+ 
+ #endif /* TEST */
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-etc-hindo.c b/japanese/FreeWnn-lib/files/patch-Wnn-etc-hindo.c
new file mode 100644
index 000000000000..8020a4ef0ae1
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-etc-hindo.c
@@ -0,0 +1,128 @@
+Index: Wnn/etc/hindo.c
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Wnn/etc/hindo.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- Wnn/etc/hindo.c	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Wnn/etc/hindo.c	20 Dec 2008 15:22:40 -0000	1.2
+@@ -5,7 +5,7 @@
+ /*
+  * FreeWnn is a network-extensible Kana-to-Kanji conversion system.
+  * This file is part of FreeWnn.
+- * 
++ *
+  * Copyright Kyoto University Research Institute for Mathematical Sciences
+  *                 1987, 1988, 1989, 1990, 1991, 1992
+  * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
+@@ -49,8 +49,8 @@
+         �����٤�b�ΤȤ������٤ι����γ�Ψ�� 1 / ([b��4]��1)
+         â�� b��0�λ��ϡ����ٹ�����Ψ 0
+ 
+-    
+-         a == -1 <==> b == 0x7f = 127; 
++
++         a == -1 <==> b == 0x7f = 127;
+         ���λ������Υ���ȥ꡼�ϡ��Ѵ��˷褷���Ѥ����ʤ�
+         (�����ȥ����Ȥ���Ƥ���)���Ȥ�ɽ����
+                         9/1/89 H.T.
+@@ -58,47 +58,48 @@
+ 
+  /** ����������ʿ�����ؿ���â������<0�λ��Υ��顼�����å��Ϥʤ���0���֤��ˡ�*/
+ static int
+-isqrt (i)
+-     int i;
++isqrt(int i)
+ {
+-  register int a, b;
++	register int a, b;
++
++	if (i <= 0)
++		return (0);
++
++	for (a = i, b = 1; b <<= 1, a >>= 2;);
++
++	while ((a = i / b) < b)
++		b = (b + a) >> 1;
+ 
+-  if (i <= 0)
+-    return (0);
+-  for (a = i, b = 1; b <<= 1, a >>= 2;);
+-  while ((a = i / b) < b)
+-    b = (b + a) >> 1;
+-  return (b);
++	return (b);
+ }
+ 
+  /** ������a��������b */
+ int
+-asshuku (hin)
+-     int hin;
++asshuku(int hin)
+ {
+-  register int c;
++	register int c;
+ 
+-  if (hin == -1)
+-    return (127);
+-  if (hin <= 4)
+-    return (hin);
+-  /* ��Ⱦ������0�����ꤷ�ƤΥ��ԡ��ɥ��åס�motoni1,2�Ǥ�Ʊ�� */
+-
+-  c = (isqrt ((hin <<= 1) + 1) + 1) & ~1;
+-  c += hin / c - 2;
+-  return (c < 126 ? c : 126);
++	if (hin == -1)
++		return (127);
++	if (hin <= 4)
++		return (hin);
++	/* ��Ⱦ������0�����ꤷ�ƤΥ��ԡ��ɥ��åס�motoni1,2�Ǥ�Ʊ�� */
++
++	c = (isqrt((hin <<= 1) + 1) + 1) & ~1;
++	c += hin / c - 2;
++
++	return (c < 126 ? c : 126);
+ }
+ 
+  /** ������b��������(min)a */
+ /*
+ int
+-motoni1(hin)
+-int     hin;
++motoni1(int hin)
+ {
+         register int    c;
+ 
+         if(hin == 127) return(-1);
+-        if(hin <= 4) return(hin); 
++        if(hin <= 4) return(hin);
+         c = hin >> 2;
+         return( (hin - (c << 1)) * (c + 1) );
+ }
+@@ -106,15 +107,17 @@ int     hin;
+ 
+  /** ������b��������(mid)a */
+ int
+-motoni2 (hin)
+-     int hin;
++motoni2(int hin)
+ {
+-  register int c;
++	register int c;
++
++	if (hin == 127)
++		return (-1);
++
++	if (hin <= 4)
++		return (hin);
++
++	c = hin >> 2;
+ 
+-  if (hin == 127)
+-    return (-1);
+-  if (hin <= 4)
+-    return (hin);
+-  c = hin >> 2;
+-  return ((hin - (c << 1)) * (c + 1) + (c >> 1));
++	return ((hin - (c << 1)) * (c + 1) + (c >> 1));
+ }
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-etc-mkdir.c b/japanese/FreeWnn-lib/files/patch-Wnn-etc-mkdir.c
new file mode 100644
index 000000000000..1a0f8c9d76f5
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-etc-mkdir.c
@@ -0,0 +1,58 @@
+Index: Wnn/etc/mkdir.c
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Wnn/etc/mkdir.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- Wnn/etc/mkdir.c	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Wnn/etc/mkdir.c	20 Dec 2008 15:22:40 -0000	1.2
+@@ -5,7 +5,7 @@
+ /*
+  * FreeWnn is a network-extensible Kana-to-Kanji conversion system.
+  * This file is part of FreeWnn.
+- * 
++ *
+  * Copyright Kyoto University Research Institute for Mathematical Sciences
+  *                 1987, 1988, 1989, 1990, 1991, 1992
+  * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
+@@ -57,25 +57,24 @@
+ #endif /* !WIFEXITED */
+ 
+ int
+-mkdir (path, mode)
+-     const char *path;
+-     mode_t mode;
++mkdir(const char *path,
++      mode_t mode)
+ {
+-  const char *args[3];
+-  int status;
++	const char *args[3];
++	int status;
+ 
+-  if (!path)
+-    return -1;
++	if (!path)
++		return -1;
+ 
+-  args[0] = "/bin/mkdir";
+-  args[1] = path;
+-  args[2] = NULL;
+-
+-  if (!fork ())
+-    execv (args[0], args);
+-  else
+-    wait (&status);
++	args[0] = "/bin/mkdir";
++	args[1] = path;
++	args[2] = NULL;
++
++	if (!fork())
++		execv(args[0], args);
++	else
++		wait(&status);
+ 
+-  return !(WIFEXITED (status));
++	return !(WIFEXITED(status));
+ }
+ #endif
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-etc-msg.c b/japanese/FreeWnn-lib/files/patch-Wnn-etc-msg.c
new file mode 100644
index 000000000000..0651740d8fd4
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-etc-msg.c
@@ -0,0 +1,667 @@
+Index: Wnn/etc/msg.c
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Wnn/etc/msg.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- Wnn/etc/msg.c	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Wnn/etc/msg.c	20 Dec 2008 15:22:40 -0000	1.2
+@@ -5,7 +5,7 @@
+ /*
+  * FreeWnn is a network-extensible Kana-to-Kanji conversion system.
+  * This file is part of FreeWnn.
+- * 
++ *
+  * Copyright Kyoto University Research Institute for Mathematical Sciences
+  *                 1987, 1988, 1989, 1990, 1991, 1992
+  * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
+@@ -69,124 +69,116 @@
+ #include "msg.h"
+ 
+ static char *
+-getlang (lang)
+-     char *lang;
++getlang(char *lang)
+ {
+-  static char tmp[32];
+-  char *p;
+-  int i;
++	static char tmp[32];
++	char *p;
++	int i;
+ 
+-  if (lang == NULL || *lang == '\0')
+-    {
++	if (lang == NULL || *lang == '\0') {
+ #ifdef  HAS_SETLOCALE
+-      lang = setlocale (LC_ALL, NULL);
+-      if (lang == NULL || *lang == '\0')
++		lang = setlocale(LC_ALL, NULL);
++		if (lang == NULL || *lang == '\0')
+ #endif
+-        {
+-          lang = getenv ("LC_MESSAGES");
+-          if (lang == NULL || *lang == '\0')
+-            {
+-              lang = getenv ("LANG");
+-              if (lang == NULL || *lang == '\0')
+-                {
+-                  lang = DEF_LANG;
+-                }
+-            }
+-        }
+-    }
+-  for (i = 0, p = lang; *p && *p != '.'; i++, p++)
+-    {
+-      tmp[i] = *p;
+-    }
+-  tmp[i] = '\0';
+-  return (tmp);
+-  /*
+-     return(lang);
+-   */
++		{
++			lang = getenv("LC_MESSAGES");
++			if (lang == NULL || *lang == '\0') {
++				lang = getenv("LANG");
++
++				if (lang == NULL || *lang == '\0') {
++					lang = DEF_LANG;
++				}
++			}
++		}
++	}
++	for (i = 0, p = lang; *p && *p != '.'; i++, p++)
++		tmp[i] = *p;
++
++	tmp[i] = '\0';
++
++	return (tmp);
++	/*
++	  return(lang);
++	*/
+ }
+ 
+ static int
+-_search (id, bd)
+-    int *id;
+-    struct msg_bd *bd;
++_search(int *id,
++	struct msg_bd *bd)
+ {
+-  return (*id - bd->msg_id);
++	return (*id - bd->msg_id);
+ }
+ 
+ static void
+-_escape (op, ip)
+-     register char *op, *ip;
++_escape(register char *op,
++	register char *ip)
+ {
+-  for (; *ip != 0; ip++, op++)
+-    {
+-      if (*ip == '\\')
+-        {
+-          switch (*++ip)
+-            {
+-            case 'n':
+-              *op = '\n';
+-              break;
+-            case 't':
+-              *op = '\t';
+-              break;
+-            case 'b':
+-              *op = '\b';
+-              break;
+-            case 'r':
+-              *op = '\r';
+-              break;
+-            case 'f':
+-              *op = '\f';
+-              break;
+-            case 'v':
+-              *op = '\v';
+-              break;
+-            case '0':
+-              *op = 0;
+-              break;
+-              /*
+-                 case 'a':
+-                 *op = '\a';
+-                 break;
+-                 case 'e':
+-                 case 'E':
+-                 case 'o':
+-                 case 'd':
+-                 case 'x':
+-                 break;
+-               */
+-            default:
+-              *op = *ip;
+-              break;
+-            }
+-        }
+-      else
+-        {
+-          if (*ip == '\n')
+-            {
+-              *op = '\0';
+-            }
+-          else
+-            {
+-              *op = *ip;
+-            }
+-        }
+-    }
+-  *op = 0;
++	for (; *ip != 0; ip++, op++) {
++		if (*ip == '\\') {
++			switch (*++ip) {
++			case 'n':
++				*op = '\n';
++				break;
++			case 't':
++				*op = '\t';
++				break;
++			case 'b':
++				*op = '\b';
++				break;
++			case 'r':
++				*op = '\r';
++				break;
++			case 'f':
++				*op = '\f';
++				break;
++			case 'v':
++				*op = '\v';
++				break;
++			case '0':
++				*op = 0;
++				break;
++				/*
++				  case 'a':
++				  *op = '\a';
++				  break;
++				  case 'e':
++				  case 'E':
++				  case 'o':
++				  case 'd':
++				  case 'x':
++				  break;
++				*/
++			default:
++				*op = *ip;
++				break;
++			}
++		} else {
++			if (*ip == '\n')
++				*op = '\0';
++			else
++				*op = *ip;
++		}
++	}
++	*op = 0;
+ }
+ 
+ static char *
+-get_msg_bd (cd, id)
+-     struct msg_cat *cd;
+-     int id;
++get_msg_bd(struct msg_cat *cd,
++	   int id)
+ {
+-  register struct msg_bd *bd;
+-  if (cd->msg_bd == 0 || cd->msg_cnt == 0)
+-    return (NULL);
+-  bd = (struct msg_bd *) bsearch (&id, cd->msg_bd, cd->msg_cnt, sizeof (struct msg_bd), _search);
+-  if (bd == NULL)
+-    return (NULL);
+-  return (bd->msg);
++	register struct msg_bd *bd;
++
++	if (cd->msg_bd == 0 || cd->msg_cnt == 0)
++		return (NULL);
++
++	bd = (struct msg_bd *)bsearch(&id,
++				      cd->msg_bd,
++				      cd->msg_cnt,
++				      sizeof (struct msg_bd),
++				      _search);
++	if (bd == NULL)
++		return (NULL);
++	return (bd->msg);
+ }
+ 
+ /* expand
+@@ -195,229 +187,236 @@ get_msg_bd (cd, id)
+         %l: the language element from LANG
+         %t: the territory element from LANG
+         %c: the codeset element from LANG
+-        %%: a single % charctor 
++        %%: a single % charctor
+ */
+ static int
+-expand (op, ip, name, lang)
+-     register char *op, *ip, *name, *lang;
++expand (register char *op,
++	register char *ip,
++	register char *name,
++	register char *lang)
+ {
+-  if (!ip || !*ip)
+-    return (-1);
+-  for (; *ip != 0; ip++)
+-    {
+-      if (*ip == '%')
+-        {
+-          switch (*++ip)
+-            {
+-            case 'N':
+-              if (!name || !*name)
+-                return (-1);
+-              strcpy (op, name);
+-              op += strlen (name);
+-              break;
+-            case 'L':
+-              if (!lang || !*lang)
+-                return (-1);
+-              strcpy (op, lang);
+-              op += strlen (lang);
+-              break;
+-              /*
+-                 case 'l':
+-                 strcpy(op, language);
+-                 op += strlen(language);
+-                 break;
+-                 case 't':
+-                 strcpy(op, terr);
+-                 op += strlen(terr);
+-                 break;
+-                 case 'c':
+-                 strcpy(op, code);
+-                 op += strlen(code);
+-                 break;
+-                 case '%':
+-                 strcpy(op, "%");
+-                 op += strlen("%");
+-                 break;
+-               */
+-            default:
+-              break;
+-            }
+-        }
+-      else
+-        {
+-          *op = *ip;
+-          op++;
+-        }
+-    }
+-  *op = '\0';
+-  return (0);
++	if (!ip || !*ip)
++		return (-1);
++
++	for (; *ip != 0; ip++) {
++		if (*ip == '%') {
++			switch (*++ip) {
++			case 'N':
++				if (!name || !*name)
++					return (-1);
++				strcpy(op, name);
++				op += strlen(name);
++				break;
++			case 'L':
++				if (!lang || !*lang)
++					return (-1);
++				strcpy(op, lang);
++				op += strlen(lang);
++				break;
++				/*
++				  case 'l':
++				  strcpy(op, language);
++				  op += strlen(language);
++				  break;
++				  case 't':
++				  strcpy(op, terr);
++				  op += strlen(terr);
++				  break;
++				  case 'c':
++				  strcpy(op, code);
++				  op += strlen(code);
++				  break;
++				  case '%':
++				  strcpy(op, "%");
++				  op += strlen("%");
++				  break;
++				*/
++			default:
++				break;
++			}
++		} else {
++			*op = *ip;
++			op++;
++		}
++	}
++	*op = '\0';
++
++	return (0);
+ }
+ 
+ 
+ struct msg_cat *
+-msg_open (name, nlspath, lang)
+-     char *name;
+-     char *nlspath;
+-     char *lang;
++msg_open (char *name,
++	  char *nlspath,
++	  char *lang)
+ {
+-  struct msg_cat *cd;
++	struct msg_cat *cd;
+ 
+-  char fn[MAXPATHLEN];
+-  FILE *fp;
+-  char data[1024];
+-  char save[1024];
+-  int msg_cnt = 0;
+-  int msg_byte = 0;
+-  register char *dp;
+-  register struct msg_bd *bd;
+-  register char *msg, *l;
+-
+-  l = getlang (lang);
+-  if (name && *name == '/')
+-    {
+-      strcpy (fn, name);
+-    }
+-  else
+-    {
+-      if (expand (fn, nlspath, name, l) == -1)
+-        {
+-          return (NULL);
++	char fn[MAXPATHLEN];
++	FILE *fp;
++	char data[1024];
++	char save[1024];
++	int msg_cnt = 0;
++	int msg_byte = 0;
++	register char *dp;
++	register struct msg_bd *bd;
++	register char *msg, *l;
++
++	l = getlang(lang);
++
++	if (name && *name == '/')
++		strcpy (fn, name);
++	else {
++		if (expand (fn, nlspath, name, l) == -1)
++			return (NULL);
+         }
+-    }
+ 
+-  if (!(cd = (struct msg_cat *) malloc (sizeof (struct msg_cat))))
+-    return (NULL);
++	if (!(cd = (struct msg_cat *) malloc (sizeof (struct msg_cat))))
++		return (NULL);
++
++	strcpy (cd->name, name);
++	strcpy (cd->lang, l);
++	strcpy (cd->nlspath, nlspath);
++	cd->nextp = NULL;
++	cd->msg_cnt = 0;
++
++	if ((fp = fopen (fn, "r")) == NULL) {
++		/* message file not found */
++		cd->msg_bd = 0;
++		return (cd);
++	}
++
++	for (;;) {
++		/* first: count bytes */
++		if (fgets (data, 1024, fp) == NULL)
++			break;
++
++		/* comment */
++		if (*data == '#')
++			continue;
++
++		for (dp = data; *dp && *dp != '\t'; dp++);
++		/* msg_id:message\n */
++
++		if (*dp == '\0')
++			continue;
++
++		dp++;
++		msg_byte += strlen (dp);
++		msg_cnt++;
++	}
++
++	rewind(fp);
++
++	cd->msg_cnt = msg_cnt;
++
++	if (!(bd = cd->msg_bd =
++	      (struct msg_bd *)malloc((sizeof (struct msg_bd)) * msg_cnt + msg_byte + 1))) {
++		fclose(fp);
++		free(cd);
++		return (NULL);
++	}
++
++	msg = (char *) bd + (sizeof (struct msg_bd)) * msg_cnt;
++
++	for (;;) {
++		/* second : get message */
++		if (fgets(data, 1024, fp) == NULL)
++			break;
++
++		if (*data == '#')
++			/* comment */
++			continue;
++
++		for (dp = data; *dp && *dp != '\t'; dp++);
++		/* msg_id:message\n */
++
++		if (*dp == '\0')
++			continue;
++
++		*dp = 0;
++		dp++;
++		bd->msg_id = atoi(data);
++		bd->msg = msg;
++		bd++;
++		_escape(save, dp);
++		strcpy(msg, save);
++		msg += strlen(save);
++		*msg = 0;
++		msg++;
++	}
+ 
+-  strcpy (cd->name, name);
+-  strcpy (cd->lang, l);
+-  strcpy (cd->nlspath, nlspath);
+-  cd->nextp = NULL;
+-  cd->msg_cnt = 0;
+-
+-  if ((fp = fopen (fn, "r")) == NULL)
+-    {
+-      /* message file not found */
+-      cd->msg_bd = 0;
+-      return (cd);
+-    }
+-  for (;;)
+-    {
+-      /* first: count bytes */
+-      if (fgets (data, 1024, fp) == NULL)
+-        break;
+-      if (*data == '#')
+-        continue;               /* comment */
+-      for (dp = data; *dp && *dp != '\t'; dp++);        /* msg_id:message\n */
+-      if (*dp == '\0')
+-        continue;
+-      dp++;
+-      msg_byte += strlen (dp);
+-      msg_cnt++;
+-    }
+-  rewind (fp);
+-
+-  cd->msg_cnt = msg_cnt;
+-  if (!(bd = cd->msg_bd = (struct msg_bd *) malloc ((sizeof (struct msg_bd)) * msg_cnt + msg_byte + 1)))
+-    {
+-      fclose (fp);
+-      free (cd);
+-      return (NULL);
+-    }
+-  msg = (char *) bd + (sizeof (struct msg_bd)) * msg_cnt;
+-
+-  for (;;)
+-    {
+-      /* second : get message */
+-      if (fgets (data, 1024, fp) == NULL)
+-        break;
+-      if (*data == '#')
+-        continue;               /* comment */
+-      for (dp = data; *dp && *dp != '\t'; dp++);        /* msg_id:message\n */
+-      if (*dp == '\0')
+-        continue;
+-      *dp = 0;
+-      dp++;
+-      bd->msg_id = atoi (data);
+-      bd->msg = msg;
+-      bd++;
+-      _escape (save, dp);
+-      strcpy (msg, save);
+-      msg += strlen (save);
+-      *msg = 0;
+-      msg++;
+-    }
+-  fclose (fp);
+-  return (cd);
++	fclose(fp);
++	return (cd);
+ }
+ 
+ char *
+-msg_get (catd, id, msg, lang)
+-     struct msg_cat *catd;
+-     int id;
+-     char *msg;
+-     register char *lang;
++msg_get(struct msg_cat *catd,
++	int id,
++	char *msg,
++	register char *lang)
+ {
+-  register struct msg_cat *cd;
+-  register char *msg_bd;
++	register struct msg_cat *cd;
++	register char *msg_bd;
+ 
+-  if (catd == 0)
+-    goto error;
+-  cd = catd;
+-  if (lang == 0 || *lang == '\0')
+-    {
+-      lang = cd->lang;
+-    }
+-  else
+-    {
+-      for (;; cd = cd->nextp)
+-        {
+-          if (strcmp (lang, cd->lang) == 0)
+-            break;
+-          if (cd->nextp == 0)
+-            {
+-              cd->nextp = msg_open (cd->name, cd->nlspath, lang);
+-              cd = cd->nextp;
+-              break;
+-            }
+-        }
+-    }
++	if (catd == 0)
++		goto error;
++
++	cd = catd;
++
++	if (lang == 0 || *lang == '\0')
++		lang = cd->lang;
++	else {
++		for (;; cd = cd->nextp) {
++			if (strcmp(lang, cd->lang) == 0)
++				break;
++			if (cd->nextp == 0) {
++				cd->nextp = msg_open(cd->name, cd->nlspath, lang);
++				cd = cd->nextp;
++				break;
++			}
++		}
++	}
+ 
+-  if (msg_bd = get_msg_bd (cd, id))
+-    return (msg_bd);
++	if (msg_bd = get_msg_bd(cd, id))
++		return (msg_bd);
+ error:
+-  if (msg != 0 && *msg != '\0')
+-    return (msg);
+-  {
+-    static char ret[128];
+-    sprintf (ret, "mes_id = %d: %s", id, DEF_MSG);
+-    return (ret);
+-  }
++
++	if (msg != 0 && *msg != '\0')
++		return (msg);
++
++	{
++		static char ret[128];
++		sprintf(ret, "mes_id = %d: %s", id, DEF_MSG);
++		return (ret);
++	}
+ }
+ 
+ void
+-msg_close (cd)
+-     register struct msg_cat *cd;
++msg_close(register struct msg_cat *cd)
+ {
+-  if (cd->nextp)
+-    msg_close (cd->nextp);
+-  if (cd->msg_bd)
+-    free (cd->msg_bd);
+-  if (cd)
+-    free (cd);
++	if (cd->nextp)
++		msg_close(cd->nextp);
++
++	if (cd->msg_bd)
++		free(cd->msg_bd);
++
++	if (cd)
++		free(cd);
+ }
+ 
+ #ifdef  not_use
+ /* test */
+-main ()
++main()
+ {
+-  struct msg_cat *cd;
++	struct msg_cat *cd;
+ 
+-  cd = msg_open ("msg", "%L", "ja_JP");
++	cd = msg_open("msg", "%L", "ja_JP");
+ 
+-  printf (msg_get (cd, 5, "message not found\n", "ja_JP"), 555);
+-  printf (msg_get (cd, 6, "message not found\n", "zh_CN"));
+-  printf (msg_get (cd, -1, "", "ja_JP"), 555);
+-  printf (msg_get (cd, 2, "message not found\n", "ja_JP"), "abc");
+-  printf (msg_get (cd, 100, "message not found\n", "zh_CN"), "abc");
++	printf (msg_get(cd, 5, "message not found\n", "ja_JP"), 555);
++	printf (msg_get(cd, 6, "message not found\n", "zh_CN"));
++	printf (msg_get(cd, -1, "", "ja_JP"), 555);
++	printf (msg_get(cd, 2, "message not found\n", "ja_JP"), "abc");
++	printf (msg_get(cd, 100, "message not found\n", "zh_CN"), "abc");
+ }
+ #endif /* not_use */
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-etc-pwd.c b/japanese/FreeWnn-lib/files/patch-Wnn-etc-pwd.c
new file mode 100644
index 000000000000..aa5766df9206
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-etc-pwd.c
@@ -0,0 +1,97 @@
+Index: Wnn/etc/pwd.c
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Wnn/etc/pwd.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- Wnn/etc/pwd.c	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Wnn/etc/pwd.c	20 Dec 2008 15:22:40 -0000	1.2
+@@ -5,7 +5,7 @@
+ /*
+  * FreeWnn is a network-extensible Kana-to-Kanji conversion system.
+  * This file is part of FreeWnn.
+- * 
++ *
+  * Copyright Kyoto University Research Institute for Mathematical Sciences
+  *                 1987, 1988, 1989, 1990, 1991, 1992
+  * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
+@@ -62,41 +62,47 @@ JS_STATIC void new_pwd (char* src, char*
+ JS_STATIC int check_pwd (char* src, char* encd);
+ 
+ JS_STATIC void
+-new_pwd (char* src, char* encd)
++new_pwd(char *src, char *encd)
+ {
+-  int i, x, c;
+-  char xx[3];
+-  char *cr;
+-
+-  if (encd == NULL)
+-    encd = src;
+-  if (strcmp (src, "") == 0)
+-    {
+-      bzero (encd, WNN_PASSWD_LEN);
+-      return;
+-    }
+-  x = time (NULL);
+-  xx[0] = x & 0x3f;
+-  xx[1] = (x & 0x3f00) >> 8;
+-  xx[2] = '\0';                 /* for MD5 (that requires terminator) */
+-  for (i = 0; i < 2; i++)
+-    {
+-      c = xx[i] + '.';
+-      if (c > '9')
+-        c += 7;
+-      if (c > 'Z')
+-        c += 6;
+-      xx[i] = c;
+-    }
+-  cr = crypt (src, xx);
+-  bzero (encd, WNN_PASSWD_LEN);
+-  strncpy (encd, cr, WNN_PASSWD_LEN);
++	int i, x, c;
++	char xx[3];
++	char *cr;
++
++	if (encd == NULL)
++		encd = src;
++
++	if (strcmp (src, "") == 0) {
++		bzero (encd, WNN_PASSWD_LEN);
++		return;
++	}
++
++	x = time (NULL);
++	xx[0] = x & 0x3f;
++	xx[1] = (x & 0x3f00) >> 8;
++
++	/* for MD5 (that requires terminator) */
++	xx[2] = '\0';
++
++	for (i = 0; i < 2; i++) {
++		c = xx[i] + '.';
++		if (c > '9')
++			c += 7;
++		if (c > 'Z')
++			c += 6;
++		xx[i] = c;
++	}
++
++	cr = crypt(src, xx);
++	bzero(encd, WNN_PASSWD_LEN);
++	strncpy(encd, cr, WNN_PASSWD_LEN);
+ }
+ 
+ JS_STATIC int
+-check_pwd (char* src, char* encd)
++check_pwd(char* src, char* encd)
+ {
+-  if (strcmp (encd, "") == 0)
+-    return (1);                 /* No passwd */
+-  return (!strncmp (encd, crypt (src, encd), WNN_PASSWD_LEN));
++	if (strcmp (encd, "") == 0)
++		/* No passwd */
++		return (1);
++
++	return (!strncmp(encd, crypt(src, encd), WNN_PASSWD_LEN));
+ }
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-etc-py_table.c b/japanese/FreeWnn-lib/files/patch-Wnn-etc-py_table.c
new file mode 100644
index 000000000000..70d43dd12da5
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-etc-py_table.c
@@ -0,0 +1,173 @@
+Index: Wnn/etc/py_table.c
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Wnn/etc/py_table.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- Wnn/etc/py_table.c	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Wnn/etc/py_table.c	20 Dec 2008 15:22:40 -0000	1.2
+@@ -5,7 +5,7 @@
+ /*
+  * FreeWnn is a network-extensible Kana-to-Kanji conversion system.
+  * This file is part of FreeWnn.
+- * 
++ *
+  * Copyright Kyoto University Research Institute for Mathematical Sciences
+  *                 1987, 1988, 1989, 1990, 1991, 1992
+  * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
+@@ -39,87 +39,83 @@
+ 
+ /* pyshengmu_tbl[]: ShengMu table of Chinese PinYin */
+ char *py_shengmu_tbl[PY_NUM_SHENGMU] = {
+-
+-  "", "B", "C", "Ch", "D",
+-  "F", "G", "H", "J", "K",
+-  "L", "M", "N", "P", "Q",
+-  "R", "S", "Sh", "T", "W",
+-  "X", "Y", "Z", "Zh"
++	"", "B", "C", "Ch", "D",
++	"F", "G", "H", "J", "K",
++	"L", "M", "N", "P", "Q",
++	"R", "S", "Sh", "T", "W",
++	"X", "Y", "Z", "Zh"
+ };
+ 
+ /* py_yunmu_tbl[]: YunMu table of Chinese ZhuYin */
+ char *py_yunmu_tbl[PY_NUM_YUNMU * 5] = {
+-
+-  "��", "��", "��", "��", "��",
+-  "a��", "����", "����", "����", "����",
+-  "ai��", "��i��", "��i��", "��i��", "��i��",
+-  "an��", "��n��", "��n��", "��n��", "��n��",
+-  "ang��", "��ng��", "��ng��", "��ng��", "��ng��",
+-  "ao��", "��o��", "��o��", "��o��", "��o��",
+-  "e��", "����", "����", "����", "����",
+-  "ei��", "��i��", "��i��", "��i��", "��i��",
+-  "en��", "��n��", "��n��", "��n��", "��n��",
+-  "eng��", "��ng��", "��ng��", "��ng��", "��ng��",
+-  "er��", "��r��", "��r��", "��r��", "��r��",
+-  "i��", "����", "����", "����", "����",
+-  "ia��", "i����", "i����", "i����", "i����",
+-  "ian��", "i��n��", "i��n��", "i��n��", "i��n��",
+-  "iang��", "i��ng��", "i��ng��", "i��ng��", "i��ng��",
+-  "iao��", "i��o��", "i��o��", "i��o��", "i��o��",
+-  "ie��", "i����", "i����", "i����", "i����",
+-  "in��", "��n��", "��n��", "��n��", "��n��",
+-  "ing��", "��ng��", "��ng��", "��ng��", "��ng��",
+-  "iong��", "i��ng��", "i��ng��", "i��ng��", "i��ng��",
+-  "iu��", "i����", "i����", "i����", "i����",
+-  "m��", "m��", "m��", "m��", "m��",
+-  "n��", "n��", "����", "����", "����",
+-  "ng��", "ng��", "ng��", "ng��", "ng��",
+-  "o��", "����", "����", "����", "����",
+-  "ong��", "��ng��", "��ng��", "��ng��", "��ng��",
+-  "ou��", "��u��", "��u��", "��u��", "��u��",
+-  "u��", "����", "����", "����", "����",
+-  "ua��", "u����", "u����", "u����", "u����",
+-  "uai��", "u��i��", "u��i��", "u��i��", "u��i��",
+-  "uan��", "u��n��", "u��n��", "u��n��", "u��n��",
+-  "uang��", "u��ng��", "u��ng��", "u��ng��", "u��ng��",
+-  "ue��", "u����", "u����", "u����", "u����",
+-  "ui��", "u����", "u����", "u����", "u����",
+-  "un��", "��n��", "��n��", "��n��", "��n��",
+-  "uo��", "u����", "u����", "u����", "u����",
+-  "����", "����", "����", "����", "����",
+-  "��e��", "������", "������", "������", "������",
+-  "0��", "1��", "2��", "3��", "4��",    /* for undefinited YunMu  */
++	"��", "��", "��", "��", "��",
++	"a��", "����", "����", "����", "����",
++	"ai��", "��i��", "��i��", "��i��", "��i��",
++	"an��", "��n��", "��n��", "��n��", "��n��",
++	"ang��", "��ng��", "��ng��", "��ng��", "��ng��",
++	"ao��", "��o��", "��o��", "��o��", "��o��",
++	"e��", "����", "����", "����", "����",
++	"ei��", "��i��", "��i��", "��i��", "��i��",
++	"en��", "��n��", "��n��", "��n��", "��n��",
++	"eng��", "��ng��", "��ng��", "��ng��", "��ng��",
++	"er��", "��r��", "��r��", "��r��", "��r��",
++	"i��", "����", "����", "����", "����",
++	"ia��", "i����", "i����", "i����", "i����",
++	"ian��", "i��n��", "i��n��", "i��n��", "i��n��",
++	"iang��", "i��ng��", "i��ng��", "i��ng��", "i��ng��",
++	"iao��", "i��o��", "i��o��", "i��o��", "i��o��",
++	"ie��", "i����", "i����", "i����", "i����",
++	"in��", "��n��", "��n��", "��n��", "��n��",
++	"ing��", "��ng��", "��ng��", "��ng��", "��ng��",
++	"iong��", "i��ng��", "i��ng��", "i��ng��", "i��ng��",
++	"iu��", "i����", "i����", "i����", "i����",
++	"m��", "m��", "m��", "m��", "m��",
++	"n��", "n��", "����", "����", "����",
++	"ng��", "ng��", "ng��", "ng��", "ng��",
++	"o��", "����", "����", "����", "����",
++	"ong��", "��ng��", "��ng��", "��ng��", "��ng��",
++	"ou��", "��u��", "��u��", "��u��", "��u��",
++	"u��", "����", "����", "����", "����",
++	"ua��", "u����", "u����", "u����", "u����",
++	"uai��", "u��i��", "u��i��", "u��i��", "u��i��",
++	"uan��", "u��n��", "u��n��", "u��n��", "u��n��",
++	"uang��", "u��ng��", "u��ng��", "u��ng��", "u��ng��",
++	"ue��", "u����", "u����", "u����", "u����",
++	"ui��", "u����", "u����", "u����", "u����",
++	"un��", "��n��", "��n��", "��n��", "��n��",
++	"uo��", "u����", "u����", "u����", "u����",
++	"����", "����", "����", "����", "����",
++	"��e��", "������", "������", "������", "������",
++	"0��", "1��", "2��", "3��", "4��",    /* for undefinited YunMu  */
+ };
+ 
+-
+ /* pinyin_tbl:  size is NUM_SHENGMU*NUM_YUNMU, including empty ShengMu */
+ /*     and empty YunMu , and undefinited YunMu'-' */
+ 
+ int pinyin_tbl[PY_NUM_SHENGMU * PY_NUM_YUNMU] = {
+-
+-  0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+-  0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+-  0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1,
+-  0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1,
+-  0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1,
+-  0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+-  0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1,
+-  0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1,
+-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1,
+-  0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1,
+-  0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 1,
+-  0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+-  0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1,
+-  0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1,
+-  0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1,
+-  0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1,
+-  0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1,
+-  0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1,
+-  0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1,
+-  0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1,
+-  0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1,
+-  0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1
++	0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++	0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
++	0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1,
++	0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1,
++	0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1,
++	0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
++	0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1,
++	0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1,
++	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1,
++	0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1,
++	0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 1,
++	0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
++	0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1,
++	0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
++	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1,
++	0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1,
++	0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1,
++	0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1,
++	0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1,
++	0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
++	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1,
++	0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1,
++	0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1,
++	0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1
+ };
+ #endif /* CHINESE */
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-etc-revdic.c b/japanese/FreeWnn-lib/files/patch-Wnn-etc-revdic.c
new file mode 100644
index 000000000000..2b9c9cbf49ec
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-etc-revdic.c
@@ -0,0 +1,687 @@
+Index: Wnn/etc/revdic.c
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Wnn/etc/revdic.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- Wnn/etc/revdic.c	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Wnn/etc/revdic.c	20 Dec 2008 15:22:40 -0000	1.2
+@@ -5,7 +5,7 @@
+ /*
+  * FreeWnn is a network-extensible Kana-to-Kanji conversion system.
+  * This file is part of FreeWnn.
+- * 
++ *
+  * Copyright Kyoto University Research Institute for Mathematical Sciences
+  *                 1987, 1988, 1989, 1990, 1991, 1992
+  * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
+@@ -35,13 +35,11 @@
+ #include "jh.h"
+ #include "jdata.h"
+ 
+-
+ #ifndef min
+ #define min(a, b) ((a > b)? b:a)
+ #define max(a, b) ((a < b)? b:a)
+ #endif
+ 
+-
+ /*
+  * rev_ud_hontai(hostart, maxhontai)
+  * rev_ud_table(tary, maxtable)
+@@ -51,96 +49,81 @@
+ 
+ static int tmptmp;
+ 
+-#define rev_int(x) (tmptmp = *(x), *(x) = ((tmptmp >> 24) & 0xff) | \
+-                                      (((tmptmp >> 16) & 0xff) << 8) | \
+-                                      (((tmptmp >> 8) & 0xff) << 16) | \
+-                                      (((tmptmp & 0xff) << 24)))
++#define rev_int(x) (tmptmp = *(x), *(x) = ((tmptmp >> 24) & 0xff) |    \
++		    (((tmptmp >> 16) & 0xff) << 8) |		       \
++		    (((tmptmp >> 8) & 0xff) << 16) |		       \
++		    (((tmptmp & 0xff) << 24)))
+ 
+ #define rev_short(x) (tmptmp = *(x), *(x) = ((tmptmp >> 8) & 0xff) | \
+-                                            ((tmptmp & 0xff) << 8))
++		      ((tmptmp & 0xff) << 8))
+ 
+ #define rev_int_org(x) (tmptmp = *(x), *(x) = ((tmptmp >> 24) & 0xff) | \
+-                                      (((tmptmp >> 16) & 0xff) << 8) | \
+-                                      (((tmptmp >> 8) & 0xff) << 16) | \
+-                                      ((tmptmp & 0xff) << 24), tmptmp)
++			(((tmptmp >> 16) & 0xff) << 8) |		\
++			(((tmptmp >> 8) & 0xff) << 16) |		\
++			((tmptmp & 0xff) << 24), tmptmp)
+ 
+ #define rev_short_org(x) (tmptmp = *(x), *(x) = ((tmptmp >> 8) & 0xff) | \
+-                                            ((tmptmp & 0xff) << 8), tmptmp)
++			  ((tmptmp & 0xff) << 8), tmptmp)
+ 
++void
++rev_ud_hontai(UCHAR *hostart,
++	      int maxhontai,
++	      int match		/* whether the cpu type match the dictionary */
++	)
++{
++	UCHAR *hoend = hostart + maxhontai;
++	struct uind2 *hop, *hop1;
++	int k;
++	int len;
++
++	/* Skip first 4 bytes for some reason. (cf. ujistoud() in atod.c) */
++	for (hop = (struct uind2 *)((int *) hostart + 1); (UCHAR *) hop < hoend;) {
++		rev_int(&(hop->next));
++		rev_int(&(hop->serial));
++		rev_int(&(hop->kanjipter));
++		rev_short(&(hop->kosuu));
++
++		if (match) {
++			len = hop->yomi[0];
++			hop1 = (struct uind2 *)(AL_INT (&(hop->yomi[0]) + 1 + max((len - 4), 0)));
++			rev_short(&(hop->yomi[0]));
++			for (k = 0; k < len - 4; k++)
++				rev_short(&(hop->yomi[k + 1]));
++			hop = hop1;
++		} else {
++			rev_short(&(hop->yomi[0]));
++			len = hop->yomi[0];
++			for (k = 0; k < len - 4; k++)
++				rev_short(&(hop->yomi[k + 1]));
++			hop = (struct uind2 *)(AL_INT (&(hop->yomi[0]) + 1 + max((len - 4), 0)));
++		}
++	}
++}
+ 
++void
++rev_ud_table(struct uind1 *tary,
++	     int maxtable,
++	     int match)
++{
++	int k;
++
++	for (k = 0; k < maxtable; k++) {
++		rev_int(&(tary[k].pter1));
++		rev_int(&(tary[k].pter));
++		rev_int(&(tary[k].yomi1));
++		rev_int(&(tary[k].yomi2));
++	}
++}
+ 
+ void
+-rev_ud_hontai (hostart, maxhontai, match)
+-     UCHAR *hostart;
+-     int maxhontai;
+-     int match;                 /* whether the cpu type match the dictionary */
+-{
+-  UCHAR *hoend = hostart + maxhontai;
+-  struct uind2 *hop, *hop1;
+-  int k;
+-  int len;
+-
+-  /* Skip first 4 bytes for some reason. (cf. ujistoud() in atod.c) */ 
+-  for (hop = (struct uind2 *)((int *) hostart + 1); (UCHAR *) hop < hoend;)
+-    {
+-      rev_int (&(hop->next));
+-      rev_int (&(hop->serial));
+-      rev_int (&(hop->kanjipter));
+-      rev_short (&(hop->kosuu));
+-      if (match)
+-        {
+-          len = hop->yomi[0];
+-          hop1 = (struct uind2 *) (AL_INT (&(hop->yomi[0]) + 1 + max ((len - 4), 0)));
+-          rev_short (&(hop->yomi[0]));
+-          for (k = 0; k < len - 4; k++)
+-            {
+-              rev_short (&(hop->yomi[k + 1]));
+-            }
+-          hop = hop1;
+-        }
+-      else
+-        {
+-          rev_short (&(hop->yomi[0]));
+-          len = hop->yomi[0];
+-          for (k = 0; k < len - 4; k++)
+-            {
+-              rev_short (&(hop->yomi[k + 1]));
+-            }
+-          hop = (struct uind2 *) (AL_INT (&(hop->yomi[0]) + 1 + max ((len - 4), 0)));
+-        }
+-    }
+-}
+-
+-
+-void
+-rev_ud_table (tary, maxtable, match)
+-     struct uind1 *tary;
+-     int maxtable;
+-     int match;
+-{
+-  int k;
+-
+-  for (k = 0; k < maxtable; k++)
+-    {
+-      rev_int (&(tary[k].pter1));
+-      rev_int (&(tary[k].pter));
+-      rev_int (&(tary[k].yomi1));
+-      rev_int (&(tary[k].yomi2));
+-    }
+-}
+-
+-void
+-rev_hinsi (hinsi, maxserial, match)
+-     unsigned short *hinsi;
+-     int maxserial;
+-     int match;
+-{
+-  int k;
+-
+-  for (k = 0; k < maxserial; k++)
+-    {
+-      rev_short (&(hinsi[k]));
+-    }
++rev_hinsi(unsigned short *hinsi,
++	  int maxserial,
++	  int match)
++{
++	int k;
++
++	for (k = 0; k < maxserial; k++)
++		rev_short(&(hinsi[k]));
+ }
+ 
+ /*
+@@ -154,200 +137,183 @@ void travel_next_nodes ();
+ void rev_sd_node ();
+ 
+ void
+-rev_sd_hontai0 (hopter, hostart, match)
+-     UCHAR *hostart;
+-     UCHAR *hopter;
+-     int match;
+-{
+-  if (match)
+-    {
+-      travel_next_nodes (hopter, hostart, match);
+-      rev_sd_node (hopter, hostart, match);
+-    }
+-  else
+-    {
+-      rev_sd_node (hopter, hostart, match);
+-      travel_next_nodes (hopter, hostart, match);
+-    }
+-}
+-
+-void
+-rev_sd_hontai (hostart, match)
+-     UCHAR *hostart;
+-     int match;
+-{
+-  rev_sd_hontai0 (hostart, hostart, match);
+-}
+-
+-void
+-travel_next_nodes (hopter, hostart, match)
+-     UCHAR *hostart, *hopter;
+-     int match;
+-{
+-  int k;
+-  int tsize;
+-  w_char *charst;
+-  w_char *sumst;
+-  int *ptrst;
+-
+-  switch (*(unsigned short *) hopter)
+-    {
+-    case ST_NORMAL:
+-      tsize = *(w_char *) (hopter + 2);
+-      charst = (w_char *) (hopter + 12);
+-      sumst = ((w_char *) charst + tsize + 2);  /* + 2 keeps two zero words */
+-      ptrst = (int *) ((w_char *) sumst + tsize);
+-      for (k = 0; k < tsize; k++)
+-        {
+-          if (ptrst[k] != ENDPTR)
+-            {
+-              rev_sd_hontai0 (hostart + ptrst[k], hostart, match);
+-            }
+-        }
+-      break;
+-    case ST_NOPTER:
+-      break;
+-    case ST_NOENT:
+-      tsize = *(w_char *) (hopter + 2);
+-      charst = (w_char *) (hopter + 4);
+-      ptrst = (int *) AL_INT ((w_char *) charst + tsize);
+-      for (k = 0; k < tsize; k++)
+-        {
+-          rev_sd_hontai0 (hostart + ptrst[k], hostart, match);
+-        }
+-      break;
+-    case ST_SMALL:
+-      rev_sd_hontai0 (hopter + 4, hostart, match);
+-      break;
+-    }
++rev_sd_hontai0(UCHAR *hopter,
++	       UCHAR *hostart,
++	       int match)
++{
++	if (match) {
++		travel_next_nodes(hopter, hostart, match);
++		rev_sd_node(hopter, hostart, match);
++	} else {
++		rev_sd_node(hopter, hostart, match);
++		travel_next_nodes(hopter, hostart, match);
++	}
++}
++
++void
++rev_sd_hontai(UCHAR *hostart,
++	      int match)
++{
++	rev_sd_hontai0(hostart, hostart, match);
++}
++
++void
++travel_next_nodes(UCHAR *hopter,
++		  UCHAR *hostart,
++		  int match)
++{
++	int k;
++	int tsize;
++	w_char *charst;
++	w_char *sumst;
++	int *ptrst;
++
++	switch (*(unsigned short *)hopter) {
++	case ST_NORMAL:
++		tsize = *(w_char *)(hopter + 2);
++		charst = (w_char *)(hopter + 12);
++		sumst = ((w_char *)charst + tsize + 2);  /* + 2 keeps two zero words */
++		ptrst = (int *)((w_char *)sumst + tsize);
++
++		for (k = 0; k < tsize; k++) {
++			if (ptrst[k] != ENDPTR)
++				rev_sd_hontai0(hostart + ptrst[k], hostart, match);
++		}
++		break;
++
++	case ST_NOPTER:
++		break;
++	case ST_NOENT:
++		tsize = *(w_char *)(hopter + 2);
++		charst = (w_char *)(hopter + 4);
++		ptrst = (int *)AL_INT((w_char *)charst + tsize);
++
++		for (k = 0; k < tsize; k++)
++			rev_sd_hontai0(hostart + ptrst[k], hostart, match);
++		break;
++	case ST_SMALL:
++		rev_sd_hontai0(hopter + 4, hostart, match);
++		break;
++	}
+ }
+ 
+ #define rev_if_short(x) (match? rev_short_org(x): rev_short(x))
+ #define rev_if_int(x) (match? rev_int_org(x): rev_int(x))
+ 
+ void
+-rev_sd_node (hopter, hostart, match)
+-     UCHAR *hostart, *hopter;
+-     int match;
+-{
+-  /* whether current state of dict matches the cpu type of the machine */
+-  int k;
+-  int tsize;
+-  w_char *charst;
+-  w_char *sumst;
+-  int *ptrst;
+-  int state;
+-
+-  state = rev_if_short ((unsigned short *) hopter);
+-  switch (state)
+-    {
+-    case ST_NORMAL:
+-    case ST_NOPTER:
+-      tsize = rev_if_short ((w_char *) (hopter + 2));
+-      rev_int ((int *) (hopter + 4));
+-      rev_int ((int *) (hopter + 8));
+-      charst = (w_char *) (hopter + 12);
+-      sumst = ((w_char *) charst + tsize + 2);  /* + 2 keeps two zero words */
+-      ptrst = (int *) ((w_char *) sumst + tsize);
+-      for (k = 0; k < tsize; k++)
+-        {
+-          rev_short (charst + k);
+-          rev_short (sumst + k);
+-        }
+-      if (state == ST_NORMAL)
+-        {
+-          for (k = 0; k < tsize; k++)
+-            {
+-              rev_int (ptrst + k);
+-            }
+-        }
+-      break;
+-    case ST_NOENT:
+-      tsize = rev_if_short ((w_char *) (hopter + 2));
+-      charst = (w_char *) (hopter + 4);
+-      ptrst = (int *) AL_INT ((w_char *) charst + tsize);
+-      for (k = 0; k < tsize; k++)
+-        {
+-          rev_short (charst + k);
+-          rev_int (ptrst + k);
+-        }
+-      break;
+-    case ST_SMALL:
+-      rev_short ((unsigned short *) (hopter + 2));
+-      break;
+-    }
++rev_sd_node(UCHAR *hopter,
++	    UCHAR *hostart,
++	    int match)
++{
++	/* whether current state of dict matches the cpu type of the machine */
++	int k;
++	int tsize;
++	w_char *charst;
++	w_char *sumst;
++	int *ptrst;
++	int state;
++
++	state = rev_if_short((unsigned short *) hopter);
++
++	switch (state) {
++	case ST_NORMAL:
++	case ST_NOPTER:
++		tsize = rev_if_short((w_char *)(hopter + 2));
++		rev_int((int *)(hopter + 4));
++		rev_int((int *)(hopter + 8));
++		charst = (w_char *)(hopter + 12);
++		sumst = ((w_char *)charst + tsize + 2);  /* + 2 keeps two zero words */
++		ptrst = (int *)((w_char *)sumst + tsize);
++
++		for (k = 0; k < tsize; k++) {
++			rev_short(charst + k);
++			rev_short(sumst + k);
++		}
++
++		if (state == ST_NORMAL) {
++			for (k = 0; k < tsize; k++)
++				rev_int (ptrst + k);
++		}
++		break;
++
++	case ST_NOENT:
++		tsize = rev_if_short((w_char *)(hopter + 2));
++		charst = (w_char *)(hopter + 4);
++		ptrst = (int *)AL_INT((w_char *)charst + tsize);
++
++		for (k = 0; k < tsize; k++) {
++			rev_short(charst + k);
++			rev_int(ptrst + k);
++		}
++		break;
++
++	case ST_SMALL:
++		rev_short((unsigned short *)(hopter + 2));
++		break;
++	}
+ }
+ 
+-
+ int
+-little_endian ()
++little_endian()
+ {
+-  int a = 1;
++	int a = 1;
+ #ifdef BYTE_SWAP
+-  return (1);
++	return (1);
+ #else
+-  return (*(char *) &a == 1);
++	return (*(char *) &a == 1);
+ #endif
+ }
+ 
+ void
+-rev_rd_rind1 (ri1, maxri1, match)
+-     struct rind1 *ri1;
+-     int maxri1;
+-     int match;
+-{
+-  int k;
+-
+-  for (k = 0; k < maxri1; k++)
+-    {
+-      rev_int (&(ri1[k].pter1));
+-      rev_int (&(ri1[k].pter));
+-    }
++rev_rd_rind1(struct rind1 *ri1,
++	     int maxri1,
++	     int match)
++{
++	int k;
++
++	for (k = 0; k < maxri1; k++) {
++		rev_int(&(ri1[k].pter1));
++		rev_int(&(ri1[k].pter));
++	}
+ }
+ 
+ void
+-rev_rd_rind2 (ri2, maxri2, match)
+-     struct rind2 *ri2;
+-     int maxri2;
+-     int match;
+-{
+-  int k;
+-
+-  for (k = 0; k < maxri2; k++)
+-    {
+-      rev_int (&(ri2[k].kanjipter));
+-      rev_int (&(ri2[k].next[D_YOMI]));
+-      rev_int (&(ri2[k].next[D_KANJI]));
+-    }
++rev_rd_rind2(struct rind2 *ri2,
++	     int maxri2,
++	     int match)
++{
++	int k;
++
++	for (k = 0; k < maxri2; k++) {
++		rev_int(&(ri2[k].kanjipter));
++		rev_int(&(ri2[k].next[D_YOMI]));
++		rev_int(&(ri2[k].next[D_KANJI]));
++	}
+ }
+ 
+ void rev_w_char ();
+ 
+ void
+-rev_kanji (kpter, maxk, match)
+-     UCHAR *kpter;
+-     int maxk;
+-     int match;
+-{
+-  UCHAR *kend = kpter + maxk;
+-
+-  while (kpter < kend && *kpter)
+-    {
+-      rev_w_char ((w_char *) (kpter + 2), *kpter / 2 - 1);
+-      kpter += *kpter;
+-    }
++rev_kanji(UCHAR *kpter,
++	  int maxk,
++	  int match)
++{
++	UCHAR *kend = kpter + maxk;
++
++	while (kpter < kend && *kpter) {
++		rev_w_char((w_char *)(kpter + 2), *kpter / 2 - 1);
++		kpter += *kpter;
++	}
+ }
+ 
+ void
+-rev_w_char (p, maxp)
+-     w_char *p;
+-     int maxp;
+-{
+-  for (; maxp > 0; maxp--)
+-    {
+-      rev_short (p);
+-      p++;
+-    }
++rev_w_char(w_char *p,
++	   int maxp)
++{
++	for (; maxp > 0; maxp--) {
++		rev_short(p);
++		p++;
++	}
+ }
+ 
+ /*
+@@ -357,87 +323,78 @@ rev_w_char (p, maxp)
+  */
+ 
+ int
+-revdic (jtl, match)
+-     struct JT *jtl;
+-     int match;
+-{
+-  extern int rev_ud (), rev_rd (), rev_sd ();
+-  int syurui = jtl->syurui;
+-
+-  syurui = jtl->syurui & 0xff;
+-
+-  if (syurui == WNN_UD_DICT)
+-    {
+-      if (rev_ud (jtl, match) == -1)
+-        return (-1);
+-    }
+-  else if (syurui == WNN_REV_DICT)
+-    {
+-      if (rev_rd (jtl, match) == -1)
+-        return (-1);
+-    }
+-  else
+-    {
+-      if (rev_sd (jtl, match) == -1)
+-        return (-1);
+-    }
+-  return (0);
++revdic(struct JT *jtl,
++       int match)
++{
++	extern int rev_ud(), rev_rd(), rev_sd();
++	int syurui = jtl->syurui;
++
++	syurui = jtl->syurui & 0xff;
++
++	if (syurui == WNN_UD_DICT) {
++		if (rev_ud (jtl, match) == -1)
++			return (-1);
++	} else if (syurui == WNN_REV_DICT) {
++		if (rev_rd (jtl, match) == -1)
++			return (-1);
++	} else {
++		if (rev_sd (jtl, match) == -1)
++			return (-1);
++	}
++
++	return (0);
+ }
+ 
+ void rev_common ();
+ 
+ int
+-rev_ud (jtl, match)
+-     struct JT *jtl;
+-     int match;
+-{
+-  rev_common (jtl, match);
+-  rev_ud_hontai (jtl->hontai, jtl->maxhontai, match);
+-  rev_ud_table (jtl->table, jtl->maxtable, match);
+-  return (0);
++rev_ud(struct JT *jtl,
++       int match)
++{
++	rev_common(jtl, match);
++	rev_ud_hontai(jtl->hontai, jtl->maxhontai, match);
++	rev_ud_table(jtl->table, jtl->maxtable, match);
++
++	return (0);
+ }
+ 
+ int
+-rev_sd (jtl, match)
+-     struct JT *jtl;
+-     int match;
+-{
+-  rev_common (jtl, match);
+-  rev_sd_hontai (jtl->hontai, match);
+-  return (0);
++rev_sd(struct JT *jtl,
++       int match)
++{
++	rev_common(jtl, match);
++	rev_sd_hontai(jtl->hontai, match);
++	return (0);
+ }
+ 
+ int
+-rev_rd (jtl, match)
+-     struct JT *jtl;
+-     int match;
+-{
+-  rev_common (jtl, match);
+-  rev_rd_rind1 (jtl->ri1[D_YOMI], jtl->maxri1[D_YOMI], match);
+-  rev_rd_rind1 (jtl->ri1[D_KANJI], jtl->maxri1[D_KANJI], match);
+-  rev_rd_rind2 (jtl->ri2, jtl->maxri2, match);
+-  return (0);
++rev_rd(struct JT *jtl,
++       int match)
++{
++	rev_common(jtl, match);
++	rev_rd_rind1(jtl->ri1[D_YOMI], jtl->maxri1[D_YOMI], match);
++	rev_rd_rind1(jtl->ri1[D_KANJI], jtl->maxri1[D_KANJI], match);
++	rev_rd_rind2(jtl->ri2, jtl->maxri2, match);
++	return (0);
+ }
+ 
+ void
+-rev_common (jtl, match)
+-     struct JT *jtl;
+-     int match;
+-{
+-  if (jtl->hinsi)
+-    rev_hinsi (jtl->hinsi, jtl->maxserial, match);
+-  if (jtl->kanji)
+-    rev_kanji (jtl->kanji, jtl->maxkanji, match);
+-  if (jtl->comment)
+-    rev_w_char (jtl->comment, jtl->maxcomment);
+-  if (jtl->hinsi_list)
+-    rev_w_char (jtl->hinsi_list, jtl->maxhinsi_list);
++rev_common(struct JT *jtl,
++	   int match)
++{
++	if (jtl->hinsi)
++		rev_hinsi(jtl->hinsi, jtl->maxserial, match);
++	if (jtl->kanji)
++		rev_kanji(jtl->kanji, jtl->maxkanji, match);
++	if (jtl->comment)
++		rev_w_char(jtl->comment, jtl->maxcomment);
++	if (jtl->hinsi_list)
++		rev_w_char(jtl->hinsi_list, jtl->maxhinsi_list);
+ }
+ 
+ /* rev_short is called from atod.c.... kanapiiii */
+ void
+-rev_short_fun (sp)
+-     w_char *sp;
++rev_short_fun(w_char *sp)
+ {
+-  rev_short (sp);
++	rev_short (sp);
+ }
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-etc-server_env.c b/japanese/FreeWnn-lib/files/patch-Wnn-etc-server_env.c
new file mode 100644
index 000000000000..d8d010fbdb18
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-etc-server_env.c
@@ -0,0 +1,73 @@
+Index: Wnn/etc/server_env.c
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Wnn/etc/server_env.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- Wnn/etc/server_env.c	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Wnn/etc/server_env.c	20 Dec 2008 15:22:40 -0000	1.2
+@@ -5,7 +5,7 @@
+ /*
+  * FreeWnn is a network-extensible Kana-to-Kanji conversion system.
+  * This file is part of FreeWnn.
+- * 
++ *
+  * Copyright Kyoto University Research Institute for Mathematical Sciences
+  *                 1987, 1988, 1989, 1990, 1991, 1992
+  * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
+@@ -44,36 +44,31 @@
+ #include "wnn_config.h"
+ #include "wnn_os.h"
+ 
+-typedef struct _server_env_struct
+-{
+-  char *lang;
+-  char *env;
+-}
+-server_env_struct;
++typedef struct _server_env_struct {
++	char *lang;
++	char *env;
++} server_env_struct;
+ 
+ static server_env_struct server_env[] = {
+-  {WNN_J_LANG, WNN_JSERVER_ENV},
+-  {WNN_C_LANG, WNN_CSERVER_ENV},
+-  {WNN_K_LANG, WNN_KSERVER_ENV},
+-  {WNN_T_LANG, WNN_TSERVER_ENV},
+-  {NULL, NULL}
++	{WNN_J_LANG, WNN_JSERVER_ENV},
++	{WNN_C_LANG, WNN_CSERVER_ENV},
++	{WNN_K_LANG, WNN_KSERVER_ENV},
++	{WNN_T_LANG, WNN_TSERVER_ENV},
++	{NULL, NULL}
+ };
+ 
+ char *
+-get_server_env (lang)
+-     register char *lang;
++get_server_env(register char *lang)
+ {
+-  register server_env_struct *p;
++	register server_env_struct *p;
++
++	if (!lang || !*lang)
++		return (NULL);
+ 
+-  if (!lang || !*lang)
+-    return (NULL);
++	for (p = server_env; p->lang; p++) {
++		if (!strncmp(lang, p->lang, strlen(lang)))
++			return (p->env);
++	}
+ 
+-  for (p = server_env; p->lang; p++)
+-    {
+-      if (!strncmp (lang, p->lang, strlen (lang)))
+-        {
+-          return (p->env);
+-        }
+-    }
+-  return (NULL);
++	return (NULL);
+ }
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-etc-sstrings.c b/japanese/FreeWnn-lib/files/patch-Wnn-etc-sstrings.c
new file mode 100644
index 000000000000..314131336c3b
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-etc-sstrings.c
@@ -0,0 +1,142 @@
+Index: Wnn/etc/sstrings.c
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Wnn/etc/sstrings.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- Wnn/etc/sstrings.c	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Wnn/etc/sstrings.c	20 Dec 2008 15:22:40 -0000	1.2
+@@ -5,7 +5,7 @@
+ /*
+  * FreeWnn is a network-extensible Kana-to-Kanji conversion system.
+  * This file is part of FreeWnn.
+- * 
++ *
+  * Copyright Kyoto University Research Institute for Mathematical Sciences
+  *                 1987, 1988, 1989, 1990, 1991, 1992
+  * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
+@@ -49,77 +49,75 @@ extern int eeuc_to_ieuc ();
+ extern int ieuc_to_eeuc ();
+ 
+ int
+-wnn_sStrcpy (c, w)
+-     register char *c;
+-     register w_char *w;
++wnn_sStrcpy(register char *c,
++	    register w_char *w)
+ {
+-  register int ret;
++	register int ret;
+ 
+-  ret = ieuc_to_eeuc (c, w, -1);
+-  c[ret] = '\0';
+-  return (ret);
+-}
++	ret = ieuc_to_eeuc(c, w, -1);
++	c[ret] = '\0';
+ 
++	return (ret);
++}
+ 
+ int
+-wnn_Sstrcpy (w, c)
+-     w_char *w;
+-     unsigned char *c;
++wnn_Sstrcpy(w_char *w,
++	    unsigned char *c)
+ {
+-  register int ret;
++	register int ret;
+ 
+-  ret = eeuc_to_ieuc (w, c, -1) / sizeof (w_char);
+-  w[ret] = (w_char) 0;
+-  return (ret);
++	ret = eeuc_to_ieuc(w, c, -1) / sizeof(w_char);
++	w[ret] = (w_char)0;
++
++	return (ret);
+ }
+ 
+ #ifdef nodef
+ char *
+-wnn_Stos (c)
+-     w_char *c;
++wnn_Stos(cw_char *c)
+ {
+-  char *c1 = (char *) c;
+-  for (; *c; c++)
+-    {
+-      if (ASCIIP (*c))
+-        {
+-          *c1++ = *c;
+-        }
+-      else
+-        {
+-          *c1++ = (*c << 8);
+-          *c1++ = *c;
+-        }
+-    }
+-  return ((char *) c);
++	char *c1 = (char *)c;
++
++	for (; *c; c++) {
++		if (ASCIIP(*c))
++			*c1++ = *c;
++		else {
++			*c1++ = (*c << 8);
++			*c1++ = *c;
++		}
++	}
++
++	return ((char *) c);
+ }
+ #endif
+ 
+ char *
+-wnn_sStrncpy (s1, s2, n)
+-     register char *s1;
+-     register w_char *s2;
+-     register int n;
++wnn_sStrncpy(register char *s1,
++	     register char *s2,
++	     register int n)
+ {
+-  eeuc_to_ieuc (s1, s2, n / sizeof (w_char));
+-  return s1;
++	eeuc_to_ieuc(s1, s2, n / sizeof(w_char));
++
++	return s1;
+ }
+ 
+ #ifdef CHINESE
+ int
+-wnn_Sstrcat (w, c)
+-     w_char *w;
+-     unsigned char *c;
++wnn_Sstrcat(w_char *w,
++	    unsigned char *c)
+ {
+-  w_char *w0 = w;
+-  register int ret;
++	w_char *w0 = w;
++	register int ret;
++
++	if (!c || !*c)
++		return (0);
++
++	for (; *w; w++);
++
++	ret = eeuc_to_ieuc(w, c, strlen (c)) / sizeof(w_char);
++	w[ret] = (w_char)0;
++	ret += (w - w0);
+ 
+-  if (!c || !*c)
+-    return (0);
+-  for (; *w; w++);
+-  ret = eeuc_to_ieuc (w, c, strlen (c)) / sizeof (w_char);
+-  w[ret] = (w_char) 0;
+-  ret += (w - w0);
+-  return (ret);
++	return (ret);
+ }
+ #endif
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-include-wnn_os.h b/japanese/FreeWnn-lib/files/patch-Wnn-include-wnn_os.h
index 6999dc97c311..f37d7f0fc536 100644
--- a/japanese/FreeWnn-lib/files/patch-Wnn-include-wnn_os.h
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-include-wnn_os.h
@@ -3,10 +3,10 @@ Index: Wnn/include/wnn_os.h
 RCS file: /home/cvs/private/hrs/freewnn/Wnn/include/wnn_os.h,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
+diff -u -p -r1.1.1.1 -r1.2
 --- Wnn/include/wnn_os.h	20 Dec 2008 07:13:30 -0000	1.1.1.1
 +++ Wnn/include/wnn_os.h	2 Jan 2009 21:09:34 -0000	1.2
-@@ -154,4 +154,5 @@
+@@ -154,4 +154,5 @@ int euksc_to_ksc (unsigned char *ksc,
  		  unsigned char *euksc,
  		  int eusiz);		/* xutoj.c */
  
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-jd-jserverrc b/japanese/FreeWnn-lib/files/patch-Wnn-jd-jserverrc
index 734d3da3bb0e..ed41002027a3 100644
--- a/japanese/FreeWnn-lib/files/patch-Wnn-jd-jserverrc
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-jd-jserverrc
@@ -3,7 +3,7 @@ Index: Wnn/jd/jserverrc
 RCS file: /home/cvs/private/hrs/freewnn/Wnn/jd/jserverrc,v
 retrieving revision 1.1.1.1
 retrieving revision 1.3
-diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.3
+diff -u -p -r1.1.1.1 -r1.3
 --- Wnn/jd/jserverrc	20 Dec 2008 07:13:30 -0000	1.1.1.1
 +++ Wnn/jd/jserverrc	2 Jan 2009 21:56:36 -0000	1.3
 @@ -29,6 +29,9 @@
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-jd-serverdefs b/japanese/FreeWnn-lib/files/patch-Wnn-jd-serverdefs
index 0ec577e0e87c..762177af4085 100644
--- a/japanese/FreeWnn-lib/files/patch-Wnn-jd-serverdefs
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-jd-serverdefs
@@ -3,7 +3,7 @@ Index: Wnn/jd/serverdefs
 RCS file: /home/cvs/private/hrs/freewnn/Wnn/jd/serverdefs,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
+diff -u -p -r1.1.1.1 -r1.2
 --- Wnn/jd/serverdefs	20 Dec 2008 07:13:30 -0000	1.1.1.1
 +++ Wnn/jd/serverdefs	20 Dec 2008 07:23:09 -0000	1.2
 @@ -30,12 +30,12 @@
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-jlib-Makefile.in b/japanese/FreeWnn-lib/files/patch-Wnn-jlib-Makefile.in
index 392a5a2b8cbd..a353cf75bc2f 100644
--- a/japanese/FreeWnn-lib/files/patch-Wnn-jlib-Makefile.in
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-jlib-Makefile.in
@@ -3,10 +3,10 @@ Index: Wnn/jlib/Makefile.in
 RCS file: /home/cvs/private/hrs/freewnn/Wnn/jlib/Makefile.in,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
+diff -u -p -r1.1.1.1 -r1.2
 --- Wnn/jlib/Makefile.in	20 Dec 2008 07:13:30 -0000	1.1.1.1
 +++ Wnn/jlib/Makefile.in	2 Jan 2009 21:09:34 -0000	1.2
-@@ -62,13 +62,15 @@
+@@ -62,13 +62,15 @@ SRC8= $(WNNETCSRC)/bcopy.c
  OBJ8= bcopy.o
  SRC9= $(WNNETCSRC)/mkdir.c
  OBJ9= mkdir.o
@@ -24,7 +24,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  SRCS= $(SRC1) $(LOCAL_ETCSRCS)
  OBJS= $(OBJ1) $(LOCAL_ETCOBJS) $(LOCAL_RKOBJS)
  
-@@ -137,6 +139,9 @@
+@@ -137,6 +139,9 @@ $(OBJ8) : $(SRC8)
  $(OBJ9) : $(SRC9)
  	$(LT_CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
  
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-jlib-js.c b/japanese/FreeWnn-lib/files/patch-Wnn-jlib-js.c
index 681038ceaeeb..d6bf4c787f04 100644
--- a/japanese/FreeWnn-lib/files/patch-Wnn-jlib-js.c
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-jlib-js.c
@@ -2,12 +2,25 @@ Index: Wnn/jlib/js.c
 ===================================================================
 RCS file: /home/cvs/private/hrs/freewnn/Wnn/jlib/js.c,v
 retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
+retrieving revision 1.3
+diff -u -p -r1.1.1.1 -r1.3
 --- Wnn/jlib/js.c	20 Dec 2008 07:13:30 -0000	1.1.1.1
-+++ Wnn/jlib/js.c	2 Jan 2009 21:55:55 -0000	1.2
-@@ -132,9 +132,7 @@
++++ Wnn/jlib/js.c	2 Jan 2010 11:51:21 -0000	1.3
+@@ -110,8 +110,7 @@ static WNN_JSERVER_ID *current_js = NULL
+ 
+ /*      Packet Buffers          */
+ static unsigned char snd_buf[S_BUF_SIZ];        /** ���� **/
+-static int sbp = 0;                     /** �����Хåե����ݥ��󥿡� **/
+-static int rbc = -1;                    /** �����Хåե����ݥ��󥿡� **/
++static unsigned char *sbp = snd_buf;
+ 
+ #if defined(EAGAIN)
+ # if defined(EWOULDBLOCK)
+@@ -130,11 +129,10 @@ static int rbc = -1;                    
+ static void connect_timeout ();
+ static int _get_server_name ();
  static int writen ();
++static int rcv_flush();
  static char *get_unixdomain_of_serv_defs (), *get_service_of_serv_defs ();
  static int get_port_num_of_serv_defs ();
 -#if DEBUG
@@ -16,35 +29,132 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  
  /*********      V4      *****************/
  /***
-@@ -248,145 +246,107 @@
-      register int timeout;
+@@ -192,471 +190,506 @@ daemon_dead ()
+                         (cd�Ȥ����Τϥ��ߥ�˥��������ǥХ�����̾��)
+ **/
+ static int
+-cd_open_un (lang)
+-     register char *lang;
++cd_open_un(const char *lang)
  {
-   int sd;
--#ifdef INET6
+-#ifdef AF_UNIX
+-  int sd;
+-  struct sockaddr_un saddr;             /** �����å� **/
+-  char *sock_name = NULL;
+-  saddr.sun_family = AF_UNIX;
+-
+-  /* find socket name from table by lang */
+-  if (lang && *lang)
+-    {
+-      if ((sock_name = get_unixdomain_of_serv_defs (lang)) == NULL)
+-        {
+-          sock_name = sockname;
+-        }
+-    }
+-  else
+-    {
+-      sock_name = sockname;     /* Jserver */
+-    }
+-  strcpy (saddr.sun_path, sock_name);
++#if !defined(AF_UNIX)
++	return -1;
++#else
++	int sd;
++	struct sockaddr_un saddr;
++	char *sock_name = NULL;
++	saddr.sun_family = AF_UNIX;
 +
-   struct addrinfo hints, *res, *res0;
-+	struct sockaddr sa;
-+	char sbuf[NI_MAXSERV];
++	/* find socket name from table by lang */
++	if (lang && *lang) {
++		if ((sock_name = get_unixdomain_of_serv_defs(lang)) == NULL)
++			sock_name = sockname;
++	} else
++		sock_name = sockname;	/* Jserver */
++	strcpy (saddr.sun_path, sock_name);
+ 
+-  if ((sd = socket (AF_UNIX, SOCK_STREAM, 0)) == ERROR)
+-    {
++	if ((sd = socket(AF_UNIX, SOCK_STREAM, 0)) == ERROR) {
+ #if DEBUG
+-      xerror ("jslib:Can't create unix domain socket.\n");
+-#endif
+-      return -1;
+-    }
++		xerror ("jslib:Can't create unix domain socket.\n");
++#endif /* DEBUG */
++		return -1;
++	}
+ 
+ #if !defined(SUN_LEN)
+ # define SUN_LEN(su) (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
+-#endif
+-  if (connect (sd, (struct sockaddr *) &saddr, SUN_LEN (&saddr)) == ERROR)
+-    {
+-
++#endif /* !defined(SUN_LEN) */
++	if (connect(sd, (struct sockaddr *)&saddr, SUN_LEN(&saddr)) == ERROR) {
+ #if DEBUG
+-      xerror ("jslib:Can't connect unix domain socket.\n");
+-#endif
+-      close (sd);
+-      return -1;
+-    }
+-  return sd;
+-#else
+-  return -1;
++		xerror ("jslib:Can't connect unix domain socket.\n");
++#endif /* DEBUG */
++		close (sd);
++		return -1;
++	}
 +
-   int error;
++	return sd;
+ #endif
+ }
+ 
+ static int
+-cd_open_in (server, lang, timeout)
+-     register char *server;
+-     register char *lang;
+-     register int timeout;
+-{
+-  int sd;
+-#ifdef INET6
+-  struct addrinfo hints, *res, *res0;
+-  int error;
 -  char sport[6];
 -#else
 -  struct sockaddr_in saddr_in;                  /** �����å� **/
 -  register struct hostent *hp;
 -#endif
-+
-   struct servent *sp = NULL;
-   int serverNO, port_num;
-   int ret;
+-  struct servent *sp = NULL;
+-  int serverNO, port_num;
+-  int ret;
 -  char pserver[64];
 -  char sserver[64];
+-  char *serv_name = NULL;
+-
+-  serverNO = _get_server_name (server, pserver);
++cd_open_in(const char *server,
++	   const char *lang,
++	   const int timeout)
++{
++	int sd;
++
++	struct addrinfo hints, *res, *res0;
++	struct sockaddr sa;
++	char sbuf[NI_MAXSERV];
++
++	int error;
++
++	struct servent *sp = NULL;
++	int serverNO, port_num;
++	int ret;
 +	char pserver[NI_MAXHOST];
 +	char sserver[NI_MAXHOST];
-   char *serv_name = NULL;
++	char *serv_name = NULL;
  
-   serverNO = _get_server_name (server, pserver);
- 
-   /* find service name from table by lang */
+-  /* find service name from table by lang */
 -  if (lang && *lang)
 -    {
 -      if ((serv_name = get_service_of_serv_defs (lang)) == NULL)
@@ -62,61 +172,41 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -        serv_name = SERVERNAME;
 -*/
 -      strcpy (sserver, SERVERNAME);
-+	if (lang && *lang) {
-+		if ((serv_name = get_service_of_serv_defs (lang)) == NULL) {
-+			strncpy (sserver, SERVERNAME, sizeof(sserver) - 1);
-+			sserver[sizeof(sserver) - 1] = '\0';
-+		} else {
-+			strncpy (sserver, serv_name, sizeof(sserver) - 1);
-+			sserver[sizeof(sserver) - 1] = '\0';
-     }
+-    }
 -/*
 -    if ((sp = getservbyname(serv_name,"tcp")) != NULL) {
 -*/
 -  if ((sp = getservbyname (sserver, "tcp")) != NULL)
 -    {
 -      serverNO += ntohs (sp->s_port);
-+	} else {
-+		strncpy (sserver, SERVERNAME, sizeof(sserver) - 1);
-+		sserver[sizeof(sserver) - 1] = '\0';
-     }
+-    }
 -  else
 -    {
-+
-+	memset(&sa, 0, sizeof(struct sockaddr));
-+	error = getnameinfo(&sa, sa.sa_len, NULL, 0, sbuf, sizeof(sbuf), NI_NUMERICSERV);
-+	if (!error) {
-+		serverNO += atoi(sbuf);
-+	} else {
-       if ((port_num = get_port_num_of_serv_defs (lang)) == -1)
+-      if ((port_num = get_port_num_of_serv_defs (lang)) == -1)
 -        {
-           serverNO += WNN_PORT_IN;
+-          serverNO += WNN_PORT_IN;
 -        }
-       else
+-      else
 -        {
-           serverNO += port_num;
-         }
+-          serverNO += port_num;
+-        }
 -    }
 -#ifdef INET6
-+
-   memset(&hints, 0, sizeof(hints));
-   hints.ai_family = PF_UNSPEC;
-   hints.ai_socktype = SOCK_STREAM;
+-  memset(&hints, 0, sizeof(hints));
+-  hints.ai_family = PF_UNSPEC;
+-  hints.ai_socktype = SOCK_STREAM;
 -  sprintf(sport, "%d", serverNO);
 -  error = getaddrinfo(pserver, sport, &hints, &res0);
 -  if (error)
 -    {
--#if DEBUG
-+	sprintf(sbuf, "%d", serverNO);
-+
-+	error = getaddrinfo(pserver, sbuf, &hints, &res0);
-+	if (error) {
-       xerror (gai_strerror(error));
--#endif
-       return -1;
-     }
-+
-   for (res = res0; res ; res = res->ai_next) {
+ #if DEBUG
+-      xerror (gai_strerror(error));
++	fprintf(stderr, "cd_open_in: Enter: server=%s, lang=%s\n",
++		server, lang);
+ #endif
+-      return -1;
+-    }
+-  for (res = res0; res ; res = res->ai_next) {
 -    if (res->ai_family == AF_INET || res->ai_family == AF_INET6){
 -      if ((sd = socket(res->ai_family, res->ai_socktype, res->ai_protocol)) != ERROR){
 -#else
@@ -130,110 +220,684 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -  saddr_in.sin_port = htons (serverNO);
 -  if ((sd = socket (AF_INET, SOCK_STREAM, 0)) == ERROR)
 -    {
--#if DEBUG
++	serverNO = _get_server_name(server, pserver);
+ #if DEBUG
 -      xerror ("jslib:Can't create inet socket.\n");
--#endif
++	fprintf(stderr, "cd_open_in: serverNO=%d\n", serverNO);
+ #endif
 -      return -1;
 -    }
-+		switch (res->ai_family) {
-+		case AF_INET:
-+#ifdef INET6
-+		case AF_INET6:
++	/* find service name from table by lang */
++	if (lang && *lang) {
++		if ((serv_name = get_service_of_serv_defs (lang)) == NULL) {
++			strncpy (sserver, SERVERNAME, sizeof(sserver) - 1);
++			sserver[sizeof(sserver) - 1] = '\0';
++		} else {
++			strncpy (sserver, serv_name, sizeof(sserver) - 1);
++			sserver[sizeof(sserver) - 1] = '\0';
++		}
++	} else {
++		strncpy (sserver, SERVERNAME, sizeof(sserver) - 1);
++		sserver[sizeof(sserver) - 1] = '\0';
++	}
++
++	memset(&sa, 0, sizeof(struct sockaddr));
++	error = getnameinfo(&sa, sa.sa_len,
++		    NULL, 0, sbuf, sizeof(sbuf), NI_NUMERICSERV);
++	if (!error) {
++		serverNO += atoi(sbuf);
++	} else {
++		if ((port_num = get_port_num_of_serv_defs (lang)) == -1)
++			serverNO += WNN_PORT_IN;
++		else
++			serverNO += port_num;
++        }
++#if DEBUG
++	fprintf(stderr, "cd_open_in: fixed serverNO=%d\n", serverNO);
  #endif
 -
 -  if (timeout != 0 && timeout > 0)
 -    {
-+			if ((sd = socket(res->ai_family, res->ai_socktype, res->ai_protocol)) != ERROR){
-+				if (timeout != 0 && timeout > 0) {
-       signal (SIGALRM, connect_timeout);
-       alarm (timeout);
-     }
--#ifdef INET6
+-      signal (SIGALRM, connect_timeout);
+-      alarm (timeout);
+-    }
++	memset(&hints, 0, sizeof(hints));
++	hints.ai_family = PF_UNSPEC;
++	hints.ai_socktype = SOCK_STREAM;
++	sprintf(sbuf, "%d", serverNO);
 +
-   ret = connect (sd, res->ai_addr, res->ai_addrlen);
++	error = getaddrinfo(pserver, sbuf, &hints, &res0);
++	if (error) {
++		xerror(gai_strerror(error));
++		return -1;
++	}
++
++	for (res = res0; res ; res = res->ai_next) {
++		switch (res->ai_family) {
++		case AF_INET:
+ #ifdef INET6
+-  ret = connect (sd, res->ai_addr, res->ai_addrlen);
 -#else
 -  ret = connect (sd, (struct sockaddr *) &saddr_in, sizeof (saddr_in));
--#endif
++		case AF_INET6:
+ #endif
 -  if (timeout != 0 && timeout > 0)
 -    {
-+
-+				if (timeout != 0 && timeout > 0) {
-       alarm (0);
-       signal (SIGALRM, SIG_IGN);
-     }
+-      alarm (0);
+-      signal (SIGALRM, SIG_IGN);
+-    }
 -  if (ret == ERROR)
 -    {
 -#if DEBUG
--#ifdef INET6
++			sd = socket(res->ai_family,
++				    res->ai_socktype,
++				    res->ai_protocol);
 +
-+				if (ret == ERROR) {
-       if (res->ai_family == AF_INET)
- 	xerror ("jslib:Can't connect inet socket.\n");
-+#ifdef INET6
-       else if (res->ai_family == AF_INET6)
- 	xerror ("jslib:Can't connect inet6 socket.\n");
++			if (sd == ERROR) {
++				switch (res->ai_family) {
++				case AF_INET:
++					xerror ("jslib:Can't create inet socket.\n");
+ #ifdef INET6
+-      if (res->ai_family == AF_INET)
+-	xerror ("jslib:Can't connect inet socket.\n");
+-      else if (res->ai_family == AF_INET6)
+-	xerror ("jslib:Can't connect inet6 socket.\n");
 -#else
 -      xerror ("jslib:Can't connect inet socket.\n");
 -#endif
++				case AF_INET6:
++					xerror ("jslib:Can't create inet6 socket.\n");
  #endif
++				default:
++					xerror("jslib:Cannot create socket.  Unknown socket type.\n");
++				}
++				
++				break;
++			}
++			if (timeout) {
++				signal(SIGALRM, connect_timeout);
++				alarm(timeout);
++			}
++			ret = connect(sd,
++				      res->ai_addr,
++				      res->ai_addrlen);
++			if (timeout) {
++				alarm(0);
++				signal(SIGALRM, SIG_IGN);
++			}
++			if (ret == ERROR) {
++				switch (res->ai_family) {
++				case AF_INET:
++					fprintf(stderr, "jslib:Can't connect inet socket. (sd=%d)\n", sd);
++					break;
++#ifdef INET6
++				case AF_INET6:
++					fprintf(stderr, "jslib:Can't connect inet6 socket. (sd=%d)\n", sd);
++					break;
++#endif
++				default:
++					xerror("jslib:Cannot connect.  Unknown socket type.\n");
++					break;
++				}
  #ifdef HAVE_CLOSESOCKET
-       closesocket (sd);
+-      closesocket (sd);
++				closesocket(sd);
  #else
-       close (sd);
+-      close (sd);
++				close(sd);
  #endif
 -#ifdef INET6
 -	  sd = ERROR;
 -	} else
 -	  break;
-+					freeaddrinfo(res0);
-+					return(-1);
-+				}
-       } else {
--#if DEBUG
-       if (res->ai_family == AF_INET)
- 	xerror ("jslib:Can't create inet socket.\n");
-+#ifdef INET6
-       else if (res->ai_family == AF_INET6)
- 	xerror ("jslib:Can't create inet6 socket.\n");
- #endif
-       }
-+			break;
-+		default:
-+			break;
-     }
-   }
-+
-   freeaddrinfo(res0);
--  if (sd == ERROR) {
+-      } else {
++				sd = ERROR;
++			}
+ #if DEBUG
+-      if (res->ai_family == AF_INET)
+-	xerror ("jslib:Can't create inet socket.\n");
+-      else if (res->ai_family == AF_INET6)
+-	xerror ("jslib:Can't create inet6 socket.\n");
 -#endif
+-      }
+-    }
+-  }
+-  freeaddrinfo(res0);
+-  if (sd == ERROR) {
++			fprintf(stderr, "connect: sd=%d\n", sd);
+ #endif
 -      return -1;
 -    }
-   return sd;
+-  return sd;
++			freeaddrinfo(res0);
++			return sd;
++		}
++	}
++	freeaddrinfo(res0);
++	return sd;
+ }
+ 
+ static void
+-connect_timeout ()
++connect_timeout()
+ {
  }
  
-@@ -408,7 +368,7 @@
-   if (server[0] == '[') {
-     p = strchr(server++, ']');
-     if (p) {
+ /* get server name and return serverNo */
+ static int
+-_get_server_name (server, pserver)
+-     char *server;
+-     char *pserver;
++_get_server_name(char *server,
++		 char *pserver)
+ {
+-  register char *p;
++	char *p;
+ #ifdef INET6
+-  int len;
++	int len;
+ 
+-  if (server[0] == '[') {
+-    p = strchr(server++, ']');
+-    if (p) {
 -      len = p-server<64-1?p-server:64-1;
-+      len = p-server < NI_MAXHOST - 1 ? p-server : NI_MAXHOST - 1;
-       strncpy(pserver, server, len);
-       pserver[len] = '\0';
-     } else
-@@ -416,9 +376,9 @@
-   } else {
+-      strncpy(pserver, server, len);
+-      pserver[len] = '\0';
+-    } else
+-      pserver[0] = '\0';
+-  } else {
++	if (server[0] == '[') {
++		p = strchr(server++, ']');
++		if (p) {
++			len = p-server < NI_MAXHOST - 1 ? p-server : NI_MAXHOST - 1;
++			strncpy(pserver, server, len);
++			pserver[len] = '\0';
++		} else
++			pserver[0] = '\0';
++	} else {
  #endif
    /* Workaround for pserver buffer overrun : Nov 11,1999 by T.Aono */
 -  /* assumes pserver[64]. variable length string is not supported. */
 -  strncpy(pserver, server, 64-1);
 -  pserver[64-1] = '\0';
+-  p = pserver;
 +  /* assumes pserver[NI_MAXHOST]. variable length string is not supported. */
-+  strncpy(pserver, server, NI_MAXHOST - 1);
-+  pserver[NI_MAXHOST - 1] = '\0';
-   p = pserver;
++		strncpy(pserver, server, NI_MAXHOST - 1);
++		pserver[NI_MAXHOST - 1] = '\0';
++		p = pserver;
  #ifdef INET6
-   }
-@@ -687,7 +647,6 @@
+-  }
++	}
+ #endif
+-  for (; *p && *p != ':'; p++);
+-  if (!*p)
+-    return (0);                 /* does not have a colon */
+-  *p = 0;
+-  return (atoi (++p));
++
++	for (; *p && *p != ':'; p++);
++	if (!*p) /* does not have a colon */	
++		return (0);
++	*p = 0;
++	return (atoi (++p));
+ }
+ 
+ /*      Packet SND/RCV subroutines      */
+ static void put4com ();
+ 
+-/**     �ѥ��åȤΥإå���������        **/
++/* send packet header */
+ static void
+-snd_head (cmd)
+-     int cmd;   /** cmd=���ޥ�� **/
++snd_head(int cmd)
+ {
+-  sbp = 0;
+-  put4com (cmd);
+-  rbc = -1;
++	sbp = snd_buf;
++	put4com(cmd);
++	rcv_flush();
+ }
+ 
+-/**     �ѥ��åȤΥإå���������        **/
++/* send environment header */
+ static int
+-snd_env_head (env, cmd)
+-     register struct wnn_env *env;
+-     int cmd;   /** cmd=���ޥ�� **/
++snd_env_head (struct wnn_env *env,
++	      int cmd)
+ {
+-  snd_head (cmd);
+-  put4com (env->env_id);
+-  return 0;
++	snd_head(cmd);
++	put4com(env->env_id);
++	return 0;
+ }
+ 
+-/**     �ѥ��åȤΥإå���������        **/
++/* send server header */
+ static int
+-snd_server_head (server, cmd)
+-     register WNN_JSERVER_ID *server;
+-     int cmd;   /** cmd=���ޥ�� **/
++snd_server_head(WNN_JSERVER_ID *server,
++		int cmd)
+ {
+-  snd_head (cmd);
+-  return 0;
++	snd_head(cmd);
++	return 0;
+ }
+ 
+-/**     �����Хåե���ե�å��夹��    **/
++/* flush send buffer */
+ static int
+-snd_flush ()
++snd_flush()
+ {
+-  if (sbp == 0)
+-    return (-1);
+-  writen (sbp);
+-  sbp = 0;
+-  return (0);
++	/* empty buffer; no need to flush */
++	if (sbp == snd_buf)
++		return 0;
++
++	writen(sbp);
++	return 0;
+ }
+ 
++/* send data */
+ static int
+-writen (n)
+-     int n;
++writen(unsigned char *sp)
+ {
+-  int cc, x;
+-  for (cc = 0; cc < n;)
+-    {
+-      errno = 0;
++	unsigned char *bp = snd_buf;
++	int n;
++	size_t total = sp - bp;
++
++	while (bp < sp && bp <= snd_buf + sizeof(snd_buf)) {
++#if DEBUG_IO
++		fprintf(stderr,
++			"writen: loop: sp - bp = %d\n", sp - bp);
++#endif
+ #ifdef HAVE_SEND
+-      x = send (current_sd, &snd_buf[cc], n - cc, 0);
++		n = send(current_sd, bp, sp - bp, 0);
+ #else
+-      x = write (current_sd, &snd_buf[cc], n - cc);
++		n = write(current_sd, bp, sp - bp);
+ #endif
+-      if (x < 0)
+-        {
+-          if (ERRNO_CHECK (errno) || errno == EINTR)
+-            {
+-              continue;
+-            }
+-          else
+-            {
+-              daemon_dead ();
+-              return -1;
+-            }
+-        }
+-      cc += x;
+-    }
+-#if DEBUG
+-  fprintf (stderr, "jslib:writen=%d\n", x);
+-/*      dmp(snd_buf,x); */
++		if (n < 0) {
++			if (ERRNO_CHECK (errno) || errno == EINTR) {
++				continue;
++			} else {
++#if DEBUG_IO
++				fprintf(stderr,
++					"writen: failed. errno=%d\n", errno);
++#endif
++				daemon_dead();
++				return -1;
++			}
++		}
++		bp += n;
++	}
++	sbp = snd_buf;
++#if DEBUG_IO
++	fprintf (stderr, "jslib:writen=%d\n", total);
+ #endif
+-  return (0);
++	return 0;
+ }
+ 
+-/**     �����Ф�1�Х�������     **/
++/* send one byte to server */
+ static void
+-put1com (c)
+-     int c;
++put1com(int c)
+ {
+-  snd_buf[sbp++] = c;
+-  if (sbp >= S_BUF_SIZ)
+-    {
+-      writen (S_BUF_SIZ);
+-      sbp = 0;
+-    }
++	unsigned int data = c & 0xff;
++
++#if DEBUG_IO
++	fprintf(stderr, "put1com: [%02x]\n", data);
++#endif
++	
++	/* flush buffer if full */
++	if (sbp - snd_buf >= S_BUF_SIZ) {
++		writen(sbp);
++	}
++	*(sbp++) = data;
+ }
+ 
+-/**     �����Ф�2�Х�������     **/
++/* send two bytes */
+ static void
+-put2com (c)
+-     int c;
++put2com(int c)
+ {
+-  put1com (c >> (8 * 1));
+-  put1com (c);
++	unsigned int data = c & 0xffff;
++#if DEBUG_IO
++	fprintf(stderr, "put2com: [%04x]\n", data);
++#endif
++	put1com(data >> (8 * 1));
++	put1com(data);
+ }
+ 
+-/**     �����Ф�4�Х�������     **/
++/* send four bytes */
+ static void
+-put4com (c)
+-     int c;
++put4com(int c)
+ {
+-  put1com (c >> (8 * 3));
+-  put1com (c >> (8 * 2));
+-  put1com (c >> (8 * 1));
+-  put1com (c);
++	unsigned int data = c & 0xffffffff;
++#if DEBUG_IO
++	fprintf(stderr, "put4com: [%08x]\n", data);
++#endif
++	put1com(data >> (8 * 3));
++	put1com(data >> (8 * 2));
++	put1com(data >> (8 * 1));
++	put1com(data);
+ }
+ 
+-/**     �����Ф�ʸ���������    **/
++/* send w_char string */
+ static void
+-putwscom (p)
+-     register w_char *p;
++putwscom(w_char *p)
+ {
+-  if (p == NULL)
+-    {
+-      put2com (0);
+-      return;
+-    }
+-  while (*p)
+-    put2com (*p++);
+-  put2com (0);
++	if (p == NULL) {
++		put2com(0x0000);
++		return;
++	}
++
++#if DEBUG_IO
++	fprintf(stderr, "putwscom: [%s]\n", p);
++#endif
++	while(*p)
++		put2com (*p++);
++	put2com(0x0000);
+ }
+ 
+-/**     �����Ф�ʸ���������    **/
++/* send string */
+ static void
+-putscom (p)
+-     register char *p;
++putscom(unsigned char *p)
+ {
+-  if (p == NULL)
+-    {
+-      put1com (0);
+-      return;
+-    }
+-  while (*p)
+-    put1com (*p++);
+-  put1com (0);
+-}
++	if (p == NULL) {
++		put1com(0x00);
++		return;
++	}
++#if DEBUG_IO
++	fprintf(stderr, "putscom: [%s]\n", p);
++#endif
++	while (*p)
++		put1com(*p++);
++	put1com(0);
++}
++
++static unsigned char rcv_buf[R_BUF_SIZ];
++static unsigned char *rbp = rcv_buf;
++static unsigned char *rp = rcv_buf;
+ 
+-/**     �����Ф���1�Х��ȼ����� **/
+ static int
+-get1com ()
++rcv_flush()
+ {
+-  static int rbp;
+-  static unsigned char rcv_buf[R_BUF_SIZ];      /** ���� **/
+-  if (rbc <= 0)
+-    {
+-      while (1)
+-        {
+-          errno = 0;
+-#ifdef HAVE_RECV
+-          rbc = recv (current_sd, rcv_buf, R_BUF_SIZ, 0);
+-#else
+-          rbc = read (current_sd, rcv_buf, R_BUF_SIZ);
+-#endif
+-          if (rbc <= 0)
+-            {
+-              if (ERRNO_CHECK (errno))
+-                {
+-                  continue;
+-                }
+-              else if (rbc == 0)
+-                {
+-                  daemon_dead ();
+-                  return -1;
+-                }
+-              else
+-                {               /* cc == -1 */
+-                  if (errno != EINTR)
+-                    {
+-                      daemon_dead ();
+-                      return -1;
+-                    }
+-                  continue;
+-                }
+-            }
+-          rbp = 0;
+-#if DEBUG
+-          fprintf (stderr, "jslib:read:rbc=%d\n", rbc);
+-/*      dmp(rcv_buf,rbc); */
++#if DEBUG_IO
++	fprintf(stderr, "rcv_flush\n");
+ #endif
+-          break;
+-        }
+-    }
+-  rbc--;
+-  return rcv_buf[rbp++] & 0xFF;
++	rbp = rp = &rcv_buf[0];
++	return 0;
+ }
+ 
+-/**     �����Ф���2�Х��ȼ����� **/
+-static int
+-get2com ()
++static unsigned int
++get1com()
+ {
+-  register int h;
+-  h = get1com ();
+-  return (h << 8) | get1com ();
+-}
++	int n;
+ 
+-/**     �����Ф���4�Х��ȼ����� **/
+-static int
+-get4com ()
+-{
+-  register int h1, h2, h3;
+-  h1 = get1com () << 24;
+-  h2 = get1com () << 16;
+-  h3 = get1com () << 8;
+-  return h1 | h2 | h3 | get1com ();
++#if DEBUG_IO
++	fprintf(stderr, "get1com: Enter\n");
++#endif
++	if (rp == rbp) {
++		/* rp == rbp case; no data in rcv_buf */
++
++		rbp = rp = rcv_buf;
++
++		while (rbp == rp) {
++			errno = 0;
++#ifdef HAVE_RECV
++			n = recv(current_sd, rcv_buf, sizeof(rcv_buf), 0);
++#else
++			n = read(current_sd, rcv_buf, sizeof(rcv_buf));
++#endif
++#if DEBUG_IO
++			fprintf(stderr, "recvloop: n=%d\n", n);
++#endif
++			if (n == 0) {
++				if (ERRNO_CHECK(errno)) {
++					continue;
++				} else {
++					daemon_dead();
++					return -1;
++				}
++			}
++			if (n < 0) {
++				if (ERRNO_CHECK(errno) || errno == EINTR) {
++					continue;
++				} else {
++					daemon_dead();
++					return -1;
++				}
++			}
++			rp += n;
++		}
++#if DEBUG_IO
++		fprintf (stderr, "jslib:read:rp - rbp =%d\n", rp - rbp);
++#endif
++	}
++
++#if DEBUG_IO
++	fprintf(stderr, "get1com: data [%02x]\n", *rbp & 0xff);
++	
++	fprintf(stderr, "rcv_buf: ");
++	{
++		int i;
++		for (i=0; i < rp - rbp; i++) {
++			fprintf(stderr, "[%02x]", *(rbp + i));
++		}
++		fprintf(stderr, "\n");
++	}
++#endif
++	return (*(rbp++) & 0xff);
++}
++
++/* get two bytes */
++static unsigned int
++get2com()
++{
++	unsigned int h;
++#if DEBUG_IO
++	fprintf(stderr, "get2com: Enter\n");
++#endif
++	h  = get1com() << 8;
++	h |= get1com();
++
++#if DEBUG_IO
++	fprintf(stderr, "get2com: [%04x]\n", h);
++#endif
++	return h;
++}
++
++/* get four bytes */
++static unsigned int
++get4com()
++{
++	unsigned int h;
++#if DEBUG_IO
++	fprintf(stderr, "get4com: Enter\n");
++#endif
++	h  = get1com() << 24;
++	h |= get1com() << 16;
++	h |= get1com() << 8;
++	h |= get1com();
++#if DEBUG_IO
++	fprintf(stderr, "get4com: [%08x]\n", h);
++#endif
++	return h;
+ }
+ 
+-/**     �����Ф�ʸ���������    **/
++/* get string */
+ static void
+-getscom (p)
+-     register char *p;
++getscom(unsigned char *p)
+ {
+-  while (*p++ = get1com ())
+-    ;
++	unsigned char *bp = p;
++	while (*p++ = get1com())
++		;
++#if DEBUG_IO
++	fprintf(stderr, "getscom: [%s]\n", bp);
++#endif
+ }
+ 
+-/**     �����Ф�ʸ���������    **/
++/* get wstring */
+ static void
+-getwscom (p)
+-     w_char register *p;
++getwscom(w_char *p)
+ {
+-  while (*p++ = get2com ())
+-    ;
++	while (*p++ = get2com ())
++		;
+ }
+ 
+ #ifdef nodef
+@@ -687,7 +720,6 @@ Strcpy (s1, s2)
  
  
  /*      Debug Subroutines       */
@@ -241,7 +905,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  void
  xerror (s)
       char *s;
-@@ -716,8 +675,6 @@
+@@ -716,8 +748,6 @@ dmp (p, c)
      }
  }
  
@@ -250,3 +914,219 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  /*      get login name form /etc/passwd file    */
  static char *
  getlogname ()
+@@ -741,87 +771,104 @@ getlogname ()
+ 
+ /**       jserver ����³���롣jserver_id ���֤���       **/
+ WNN_JSERVER_ID *
+-js_open_lang (server, lang, timeout)
+-     register char *server, *lang;
+-     register int timeout;
+-{
+-  char *new_js;
+-  char host[WNN_HOSTLEN], user[WNN_ENVNAME_LEN];
+-  int x;
++js_open_lang (char *server,
++	      char *lang,
++	      int timeout)
++{
++	char *new_js;
++	char host[WNN_HOSTLEN];
++	char user[WNN_ENVNAME_LEN];
++	int x;
++
++	if (wnn_msg_cat == NULL) {
++		char nlspath[MAXPATHLEN];
++		strcpy (nlspath, LIBDIR);
++		strcat (nlspath, "/%L/%N");
++		wnn_msg_cat = msg_open ("libwnn.msg", nlspath, lang);
++		if (wnn_msg_cat == NULL) {
++			fprintf (stderr,
++				 "libwnn: Cannot open message file for libwnn.a\n");
++		}
++	}
++
++	if (!(new_js = (char *) malloc (sizeof (WNN_JSERVER_ID)))) {
++		wnn_errorno = WNN_ALLOC_FAIL;
++		return NULL;
++	}
++
++	current_js = (WNN_JSERVER_ID *) new_js;
++	if (server == NULL) {
++		current_js->js_name[0] = '\0';
++	} else {
++		strncpy(current_js->js_name, server, sizeof (current_js->js_name) - 1);
++		current_js->js_name[sizeof (current_js->js_name) - 1] = '\0';
++	}
+ 
+-  if (wnn_msg_cat == NULL)
+-    {
+-      char nlspath[MAXPATHLEN];
+-      strcpy (nlspath, LIBDIR);
+-      strcat (nlspath, "/%L/%N");
+-      wnn_msg_cat = msg_open ("libwnn.msg", nlspath, lang);
+-      if (wnn_msg_cat == NULL)
+-        {
+-          fprintf (stderr, "libwnn: Cannot open message file for libwnn.a\n");
+-        }
+-    }
+-  sbp = 0;                      /* init sndBufPointer */
+-  if (!(new_js = (char *) malloc (sizeof (WNN_JSERVER_ID))))
+-    {
+-      wnn_errorno = WNN_ALLOC_FAIL;
+-      return NULL;
+-    }
+-  current_js = (WNN_JSERVER_ID *) new_js;
+-  if (server == NULL)
+-    {
+-      current_js->js_name[0] = '\0';
+-    }
+-  else
+-    {
+-      strncpy (current_js->js_name, server, sizeof (current_js->js_name) - 1);
+-      current_js->js_name[sizeof (current_js->js_name) - 1] = '\0';
+-    }
+-  current_js->js_dead = 0;
+-  current_js->js_dead_env_flg = 0;
++	current_js->js_dead = 0;
++	current_js->js_dead_env_flg = 0;
+ /*
+  if(user == NULL || 0==strcmp(user,""))
+ */
+-  strncpy (user, getlogname (), WNN_ENVNAME_LEN);
+-  user[WNN_ENVNAME_LEN - 1] = '\0';     /* truncate by WNN_ENVNAME_LEN */
+-  if (server == NULL || 0 == strcmp (server, "") || 0 == strcmp (server, "unix"))
+-    {
+-      strcpy (host, "unix");
+-      if ((current_sd = cd_open_un (lang)) == -1)
+-        {
+-          wnn_errorno = WNN_SOCK_OPEN_FAIL;
+-          free ((char *) current_js);
+-          current_js = NULL;
+-          return NULL;
+-        }
+-    }
+-  else
+-    {
+-      gethostname (host, WNN_HOSTLEN);
+-      host[WNN_HOSTLEN - 1] = '\0';     /* truncate by WNN_HOSTLEN */
+-      if ((current_sd = cd_open_in (server, lang, timeout)) == -1)
+-        {
+-          wnn_errorno = WNN_SOCK_OPEN_FAIL;
+-          free ((char *) current_js);
+-          current_js = NULL;
+-          return NULL;
+-        }
+-    }
+-  current_js->sd = current_sd;
+-  handler_of_jserver_dead (NULL);
+-  snd_head (JS_OPEN);
+-  put4com (JLIB_VERSION);       /* H.T. */
+-  putscom (host);
+-  putscom (user);
+-  snd_flush ();
+-  if (get4com () == -1)
+-    {
+-      x = wnn_errorno = get4com ();
+-      js_close (current_js);    /* H.T. */
+-      current_js = NULL;
+-      wnn_errorno = x;
+-      return NULL;
+-    }
+-  return current_js;
++	strncpy(user, getlogname (), WNN_ENVNAME_LEN);
++	user[WNN_ENVNAME_LEN - 1] = '\0';     /* truncate by WNN_ENVNAME_LEN */
++
++#if DEBUG
++	fprintf(stderr, "js_open_lang: server: %s\n", server);
++#endif
++	if (server == NULL
++	    || 0 == strcmp(server, "")
++	    || 0 == strcmp(server, "unix")) {
++		strcpy(host, "unix");
++		if ((current_sd = cd_open_un(lang)) == -1) {
++			wnn_errorno = WNN_SOCK_OPEN_FAIL;
++			free ((char *) current_js);
++			current_js = NULL;
++			return NULL;
++		}
++	} else {
++		gethostname (host, WNN_HOSTLEN);
++		host[WNN_HOSTLEN - 1] = '\0';     /* truncate by WNN_HOSTLEN */
++#if DEBUG
++		fprintf(stderr, "js_open_lang: before cd_open_in\n");
++#endif
++		if ((current_sd = cd_open_in(server, lang, timeout)) == -1) {
++			wnn_errorno = WNN_SOCK_OPEN_FAIL;
++			free((char *)current_js);
++			current_js = NULL;
++#if DEBUG
++			fprintf(stderr, "js_open_lang: cd_open_in failed\n");
++#endif
++			return NULL;
++		}
++#if DEBUG
++		fprintf(stderr, "js_open_lang: after cd_open_in\n");
++#endif
++	}
++
++#if DEBUG
++	fprintf(stderr, "current_sd=%d\n", current_sd);
++#endif
++	current_js->sd = current_sd;
++	handler_of_jserver_dead (NULL);
++	snd_head(JS_OPEN);
++	put4com(JLIB_VERSION);       /* H.T. */
++	putscom(host);
++	putscom(user);
++	snd_flush();
++
++#if DEBUG
++	fprintf(stderr, "cd_open_in: before get4com\n");
++#endif
++
++	if (get4com() == -1) {
++		x = wnn_errorno = get4com ();
++		js_close(current_js);    /* H.T. */
++		current_js = NULL;
++		wnn_errorno = x;
++		return NULL;
++	}
++
++	return current_js;
+ }
+ 
+ 
+@@ -2988,29 +3035,25 @@ get_serv_defs (lang, cnt)
+ }
+ 
+ char *
+-_wnn_get_machine_of_serv_defs (lang)
+-     char *lang;
++_wnn_get_machine_of_serv_defs(char *lang)
+ {
+   return (get_serv_defs (lang, MACHINE_NAME));
+ }
+ 
+ static char *
+-get_unixdomain_of_serv_defs (lang)
+-     char *lang;
++get_unixdomain_of_serv_defs(char *lang)
+ {
+   return (get_serv_defs (lang, UNIXDOMAIN_NAME));
+ }
+ 
+ static char *
+-get_service_of_serv_defs (lang)
+-     char *lang;
++get_service_of_serv_defs(char *lang)
+ {
+   return (get_serv_defs (lang, SERVICE_NAME));
+ }
+ 
+ static int
+-get_port_num_of_serv_defs (lang)
+-     char *lang;
++get_port_num_of_serv_defs(char *lang)
+ {
+   char *port_char;
+ 
diff --git a/japanese/FreeWnn-lib/files/patch-libtool22 b/japanese/FreeWnn-lib/files/patch-Wnn-jlib.V3-Makefile.in
index dd599aa14b20..bc84fd9dc078 100644
--- a/japanese/FreeWnn-lib/files/patch-libtool22
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-jlib.V3-Makefile.in
@@ -1,17 +1,12 @@
---- Wnn/romkan/Makefile.in.orig	2009-07-12 22:17:42.000000000 -0500
-+++ Wnn/romkan/Makefile.in	2009-07-12 22:18:01.000000000 -0500
-@@ -46,7 +46,7 @@
- 
- .c.o:
- 	$(RM) $@
--	$(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $<
-+	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(_NOOP_) $<
- 
- clean::
- 	$(RM) -r .libs
---- Wnn/jlib.V3/Makefile.in.orig	2009-07-12 22:19:13.000000000 -0500
-+++ Wnn/jlib.V3/Makefile.in	2009-07-12 22:21:06.000000000 -0500
-@@ -71,12 +71,12 @@
+Index: Wnn/jlib.V3/Makefile.in
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Wnn/jlib.V3/Makefile.in,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- Wnn/jlib.V3/Makefile.in	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Wnn/jlib.V3/Makefile.in	2 Jan 2010 12:10:14 -0000	1.2
+@@ -71,12 +71,12 @@ includes::
  
  .c.o:
  	$(RM) $@
@@ -26,7 +21,7 @@
  
  lintlib:: llib-ljd.ln
  
-@@ -87,7 +87,7 @@
+@@ -87,7 +87,7 @@ llib-ljd.ln: $(SRCS) $(EXTRALIBRARYDEPS)
  install:: libjd.la
  	@if [ -d $(DESTDIR)$(WNNLIBDIR) ]; then set +x; \
  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(WNNLIBDIR)); fi
@@ -35,7 +30,7 @@
  
  install:: jlib.h
  	@if [ -d $(DESTDIR)$(JWNNINCDIR) ]; then set +x; \
-@@ -109,13 +109,13 @@
+@@ -109,13 +109,13 @@ $(WNNJLIB)::
  	done
  
  $(OBJ2) : $(SRC2)
@@ -52,25 +47,3 @@
  
  depend:: .depend
  
---- kWnn/romkan/Makefile.in.orig	2009-07-12 22:26:37.000000000 -0500
-+++ kWnn/romkan/Makefile.in	2009-07-12 22:26:55.000000000 -0500
-@@ -48,7 +48,7 @@
- 
- .c.o:
- 	$(RM) $@
--	$(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $<
-+	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(_NOOP_) $<
- 
- clean::
- 	$(RM) -r .libs
---- cWnn/romkan/Makefile.in.orig	2009-07-12 22:29:35.000000000 -0500
-+++ cWnn/romkan/Makefile.in	2009-07-12 22:29:49.000000000 -0500
-@@ -48,7 +48,7 @@
- 
- .c.o:
- 	$(RM) $@
--	$(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $<
-+	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(_NOOP_) $<
- 
- clean::
- 	$(RM) -r .libs
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-jserver-Makefile.in b/japanese/FreeWnn-lib/files/patch-Wnn-jserver-Makefile.in
new file mode 100644
index 000000000000..61bb2c883e6d
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-jserver-Makefile.in
@@ -0,0 +1,36 @@
+Index: Wnn/jserver/Makefile.in
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Wnn/jserver/Makefile.in,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- Wnn/jserver/Makefile.in	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Wnn/jserver/Makefile.in	2 Jan 2009 21:09:34 -0000	1.2
+@@ -80,13 +80,15 @@ SRC20= $(WNNETCSRC)/getopt.c
+ OBJ20= getopt.o
+ SRC21= $(WNNETCSRC)/getopt1.c
+ OBJ21= getopt1.o
++SRC22= $(WNNETCSRC)/fake-rfc2553.c
++OBJ22= fake-rfc2553.o
+ OBJSUPPORT = @JS_SUPPORTOBJS@
+ SRCS= $(SRC0) $(SRC1) $(SRC3) $(SRC4) $(SRC5) $(SRC6) $(SRC7) $(SRCGETHINSI) \
+-    $(SRC9) $(SRC10) $(SRC11) $(SRC12) $(SRC13) $(SRC14) $(SRC20) $(SRC21)
++    $(SRC9) $(SRC10) $(SRC11) $(SRC12) $(SRC13) $(SRC14) $(SRC20) $(SRC21) $(SRC22)
+ 
+ OBJS= $(OBJ0) $(OBJ1) $(OBJ3) $(OBJ4) $(OBJ5) $(OBJ6) $(OBJ7) $(OBJGETHINSI) \
+     $(OBJ9) $(OBJ10) $(OBJ11) $(OBJ12) $(OBJ13) $(OBJ14) $(OBJSUPPORT) \
+-    $(OBJ20) $(OBJ21)
++    $(OBJ20) $(OBJ21) $(OBJ22)
+ 
+ all:: jserver
+ 
+@@ -151,6 +153,9 @@ $(OBJ20) : $(SRC20) $(WNNINCLUDESRC)/get
+ $(OBJ21) : $(SRC21) $(WNNINCLUDESRC)/getopt.h
+ 	$(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c
+ 
++$(OBJ22) : $(SRC22)
++	$(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c
++
+ vasprintf.o : $(WNNETCSRC)/vasprintf.c
+ 	$(CC) -c $(CFLAGS) $? 
+ 
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-jserver-de.c b/japanese/FreeWnn-lib/files/patch-Wnn-jserver-de.c
new file mode 100644
index 000000000000..5685e7a0b411
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-jserver-de.c
@@ -0,0 +1,2005 @@
+Index: Wnn/jserver/de.c
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Wnn/jserver/de.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.7
+diff -u -p -r1.1.1.1 -r1.7
+--- Wnn/jserver/de.c	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Wnn/jserver/de.c	2 Jan 2010 14:05:14 -0000	1.7
+@@ -1,7 +1,7 @@
+ /*
+  * FreeWnn is a network-extensible Kana-to-Kanji conversion system.
+  * This file is part of FreeWnn.
+- * 
++ *
+  * Copyright Kyoto University Research Institute for Mathematical Sciences
+  *                 1987, 1988, 1989, 1990, 1991, 1992
+  * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
+@@ -102,54 +102,35 @@ static char rcs_id[] = "$Id: de.c,v 1.36
+ #endif
+ 
+ #ifndef INET6
+-#  define OPTIONARGS  "Df:s:h:N:p:vu4"
++#  define OPTIONARGS  "a:Df:s:h:N:p:vu4"
+ #else
+-#  define OPTIONARGS  "Df:s:h:N:p:vu46"
++#  define OPTIONARGS  "a:Df:s:h:N:p:vu46"
+ #endif /* INET6 */
+ 
+ /*      Accept Socket   */
+-#ifdef INET6
+-#define MAX_ACCEPTS     3
+-#else
+-#define MAX_ACCEPTS     2
+-#endif
+-#define UNIX_ACPT       0
+-#define INET_ACPT       1
+-#ifdef INET6
+-#define INET6_ACPT      2
+-#endif
++#define MAX_ACCEPTS     256
+ 
+-#define PROTO_ALL	0x1
+ #define PROTO_UN	0x2
+ #define PROTO_INET	0x4
+-#ifdef INET6
+ #define PROTO_INET6	0x8
+-#endif
+-static int listen_proto = PROTO_ALL;
++#define PROTO_ALL	(PROTO_UN|PROTO_INET|PROTO_INET6)
++static int listen_proto;
+ 
+ jmp_buf client_dead;
+ 
+ static int port;
+-static int serverNO = 0;
++static int serverNO;
+ 
+-struct cmblk
+-{
+-  int sd;                       /** �����åȤ�fd        **/
++struct cmblk {
++	int domain;
++	int sd;		/* socket fd */
+ };
+-#define COMS_BLOCK      struct  cmblk
+ 
+-static COMS_BLOCK *cblk;
+-                /** ���饤����Ȥ��ȤΥ����åȤ��������ơ��֥� **/
+-
+-static COMS_BLOCK accept_blk[MAX_ACCEPTS];      /*accept sock blocks */
+-
+-
+-/*      Communication Buffers           */
+-static char snd_buf[R_BUF_SIZ];         /** �����Хåե� **/
+-static int sbp;                         /** �����Хåե��ݥ��� **/
+-
+-static int rbc;                         /** �����Хåե�counter **/
+-static char rcv_buf[S_BUF_SIZ];         /** �����Хåե� **/
++/** ���饤����Ȥ��ȤΥ����åȤ��������ơ��֥� **/
++static struct cmblk *cblk;
++/*accept sock blocks */
++static struct cmblk accept_blk[MAX_ACCEPTS];
++static int bindex;
+ 
+ #if defined(EAGAIN)
+ # if defined(EWOULDBLOCK)
+@@ -167,7 +148,6 @@ static char rcv_buf[S_BUF_SIZ];         
+ 
+ /*      Client Table    */
+ int clientp;            /** cblk��ͭ���ʥǡ����κǸ�򺹤��Ƥ��� **/
+-
+ int cur_clp;            /** ���ߤΥ��饤����Ȥ��ֹ� **/
+ 
+ static fd_set *all_socks;	/** �ӥåȥѥ�����
+@@ -181,27 +161,24 @@ struct msg_cat *wnn_msg_cat;
+ struct msg_cat *js_msg_cat;
+ 
+ /* function prototypes */
+-static void daemon_main (void);
+-static void socket_disc_init (void);
+-static void sel_all (void);
+-static int  get_client (void);
+-static void new_client (void);
+-static void daemon_init (void);
+-static void daemon_fin_un (int);
+-static void daemon_fin_in (int);
+-static int  rcv_1_client (int);
+-static void snd_1_client (int, int);
+-static void socket_init_un (void);
+-static void socket_init_in (void);
+-static int  socket_accept_un (void);
+-static int  socket_accept_in (int);
+-static void xerror (char*);
+-static void get_options (int, char **);
+-static void usage (void);
+-static void print_version (void);
+-#ifdef DEBUG
+-static void dmp (char*, int);
+-#endif
++static void daemon_main(void);
++static void socket_disc_init(void);
++static int sel_all(void);
++static int  get_client(void);
++static void new_client(void);
++static void daemon_init(void);
++static void daemon_fin_un(int);
++static void daemon_fin_in(int);
++static int  rcv_1_client(int);
++static void snd_1_client(int, int);
++static void socket_init_un(int *);
++static void socket_init_in(int *);
++static int  socket_accept(int);
++static void xerror(char*);
++static void get_options(int, char **);
++static void usage(void);
++static void print_version(void);
++static void dmp(char*, int);
+ 
+ static char cmd_name[16];
+ 
+@@ -214,154 +191,136 @@ int deny_severity;
+ 
+ /* No arguments are used. Only options. */
+ int
+-main (int argc, char *argv[])
++main(int argc, char *argv[])
+ {
+-  int tmpttyfd;
+-  char *cswidth_name;
+-  extern char *get_cswidth_name ();
+-  extern void set_cswidth ();
+-
+-  char nlspath[64];
+-
+-  strcpy (cmd_name, WNN_DAEMON_NAME);
+-  strcpy (lang_dir, LANG_NAME);
+-  strcpy (nlspath, LIBDIR);
+-  strcat (nlspath, "/%L/%N");
+-  js_msg_cat = msg_open (MESSAGE_FILE, nlspath, lang_dir);
+-  wnn_msg_cat = msg_open ("libwnn.msg", nlspath, lang_dir);
+-  if (wnn_msg_cat == NULL)
+-    {
+-      log_err ("cannot open message file libwnn.msg.");
+-    }
+-  if (cswidth_name = get_cswidth_name (LANG_NAME))
+-    set_cswidth (create_cswidth (cswidth_name));
++	int tmpttyfd;
++	pid_t pid;
++	int fd;
++	char *cswidth_name;
++	extern char *get_cswidth_name ();
++	extern void set_cswidth ();
++
++	char nlspath[64];
++
++	strcpy(cmd_name, WNN_DAEMON_NAME);
++	strcpy(lang_dir, LANG_NAME);
++	strcpy(nlspath, LIBDIR);
++	strcat(nlspath, "/%L/%N");
++	js_msg_cat = msg_open (MESSAGE_FILE, nlspath, lang_dir);
++	wnn_msg_cat = msg_open ("libwnn.msg", nlspath, lang_dir);
+ 
+-  port = -1;
+-  /* option default */
+-  option_flag = (OPT_FORK & ~OPT_VERBOSE);
+-
+-  setuid (geteuid ());
+-  get_options (argc, argv);
+-  print_version();
+-  log_debug("invoked as %s.", argv[0]);
+-  if (option_flag & OPT_FORK)
+-    {
+-      if (fork ())
+-	{
+-	  signal (SIGCHLD, _exit);
+-	  signal (SIGHUP, SIG_IGN);
+-	  signal (SIGINT, SIG_IGN);
+-	  signal (SIGQUIT, SIG_IGN);
+-#ifdef  SIGTSTP
+-	  signal (SIGTSTP, SIG_IGN);
+-#endif
+-	  signal (SIGTERM, _exit);
+-	  pause ();
++	if (wnn_msg_cat == NULL) {
++		log_err ("cannot open message file libwnn.msg.");
+ 	}
+-    }
++	if (cswidth_name = get_cswidth_name (LANG_NAME))
++		set_cswidth (create_cswidth (cswidth_name));
+ 
++	port = -1;
++	/* option default */
++	option_flag = (OPT_FORK & ~OPT_VERBOSE);
++
++	setuid(geteuid());
++	get_options (argc, argv);
++	print_version();
++	log_debug("invoked as %s.", argv[0]);
+ #if defined(HAVE_LIBWRAP)
+-  allow_severity = LOG_INFO;
+-  deny_severity = LOG_WARNING;
+-  /*  hosts_access_verbose = 2; */
++	allow_severity = LOG_INFO;
++	deny_severity = LOG_WARNING;
++	/*  hosts_access_verbose = 2; */
+ #endif /* HAVE_LIBWRAP */
+ 
+-  signal (SIGHUP, signal_hand);
+-  signal (SIGINT, signal_hand);
+-  signal (SIGQUIT, signal_hand);
+-  signal (SIGTERM, terminate_hand);
+-  if (option_flag & OPT_FORK)
+-    {
+-#ifdef  SIGTSTP
+-      signal (SIGTSTP, SIG_IGN);
++	signal(SIGHUP, signal_hand);
++	signal(SIGQUIT, signal_hand);
++	signal(SIGTERM, terminate_hand);
++	if (option_flag & OPT_FORK) {
++		/* when -D is not specified, accept SIGINT */
++		signal(SIGINT, signal_hand);
++#ifdef	SIGTSTP
++		signal(SIGTSTP, SIG_IGN);
+ #endif /* SIGTSTP */
+-    }
+-  read_default ();
+-  daemon_init ();
+-
+-  env_init ();
+-  if (file_init () == NULL)
+-    {
+-      exit (1);
+-    }
+-  dic_init ();
+-  if (NULL == get_kaiseki_area (LENGTHCONV + 1))    /* �Ѵ���ǽʸ���� */
+-    {
+-      log_err ("get_kaiseki_area failed.");
+-      exit (1);
+-    }
+-  init_work_areas ();
+-  init_jmt ();
+-
+-  read_default_files ();
+-
+-  if (option_flag & OPT_FORK)
+-    {
+-      /* End of initialization, kill parent */
+-      kill (getppid (), SIGTERM);
+-      fclose (stdin);
+-      fclose (stdout);
+-      if (!(option_flag & OPT_VERBOSE))
+-	{
+-#if !(defined(BSD) && (BSD >= 199306))  /* !4.4BSD-Lite by Taoka */
+-	  fclose (stderr);
+-#else /* 4.4BSD-Lite */
+-	  int fd = open ("/dev/null", O_WRONLY);
+-	  if (fd < 0)
+-	    {
+-	      xerror ("Cannot open /dev/null");
+-	    }
+-	  dup2 (fd, 2);
+-	  close (fd);
+-#endif /* 4.4BSD-Lite */
+ 	}
+-
++	read_default();
++	daemon_init();
++	env_init();
++	if (file_init() == 0)
++		exit (1);
++	dic_init();
++	if (0 == get_kaiseki_area (LENGTHCONV + 1)) {
++		/* �Ѵ���ǽʸ���� */
++		log_err ("get_kaiseki_area failed.");
++		exit (1);
++	}
++	init_work_areas();
++	init_jmt();
++	read_default_files();
++	if (option_flag & OPT_FORK) {
++		pid = fork();
++		if (pid == -1) {
++			log_err ("cannot fork.");
++			exit(1);
++		}
++		if (pid > 0)
++			_exit(0);
++		setsid();
++		pid = fork();
++		if (pid == -1) {
++			log_err ("cannot fork.");
++			exit(1);
++		}
++		if (pid > 0)
++			_exit(0);
++		chdir("/");
++		umask(0);
++		close(STDIN_FILENO);
++		close(STDOUT_FILENO);
++		if (!(option_flag & OPT_VERBOSE)) {
++			close(STDERR_FILENO);
++			fd = open("/dev/null", O_WRONLY);
++			if (fd < 0) {
++				xerror ("Cannot open /dev/null");
++			}
++			dup2(fd, STDERR_FILENO);
++			close(fd);
++		}
+ #ifdef SETPGRP_VOID
+-      setpgrp ();
++		setpgrp();
+ #else /* !SETPGRP_VOID */
+ # if !defined(TIOCNOTTY) && defined(SVR4)
+ #  define TIOCNOTTY     _IO('t', 113)
+ # endif /* !defined(TIOCNOTTY) && defined(SVR4) */
+ #ifndef HITACHI
+-      if ((tmpttyfd = open ("/dev/tty", O_RDWR)) >= 0)
+-	{
+-	  ioctl (tmpttyfd, TIOCNOTTY, 0);
+-	  close (tmpttyfd);
+-	}
++		if ((tmpttyfd = open("/dev/tty", O_RDWR)) >= 0) {
++			ioctl(tmpttyfd, TIOCNOTTY, 0);
++			close(tmpttyfd);
++		}
+ #endif /* HITACHI */
+ #endif /* SETPGRP_VOID */
+-    }
+-
+-  daemon_main ();
+-
+-  daemon_fin ();
+-  return (0);	/* it is not reached. only for avoiding compiler warning. */
++	}
++	daemon_main();
++	daemon_fin();
++	return(0);	/* NOTREACHED */
+ }
+ 
+ static void
+ daemon_main (void)
+ {
+-  for (;;)
+-    {
+-      c_c = NULL;	/* Added for logging: server section */
+-      sel_all ();
+-      new_client ();
+-      for (;;)
+-        {
+-          if (get_client () == -1)
+-            break;
+-          c_c = &client[cur_clp];
+-          rbc = 0;
+-          sbp = 0;
++	for (;;) {
++		c_c = NULL;	/* Added for logging: server section */
++		sel_all();
++		new_client();
++
++		for (;;) {
++			if (get_client () == -1)
++				break;
++			c_c = &client[cur_clp];
+ /*      if(rcv_1_client(cur_clp) == 0){ del_client(); continue; }       */
+-          if (setjmp (client_dead))
+-            {
+-              del_client ();
+-              continue;
+-            }
+-          do_command (c_c);
+-        }
+-    }
++			if (setjmp(client_dead)) {
++				del_client ();
++				continue;
++			}
++			do_command(c_c);
++		}
++	}
+ }
+ 
+ /*
+@@ -370,39 +329,36 @@ daemon_main (void)
+ static void
+ socket_disc_init (void)
+ {
+-  if (WNN_NFD <= FD_SETSIZE)
+-    {
+-      nofile = WNN_NFD;
+-    }
+-  else
+-    {
+-      nofile = FD_SETSIZE;
+-    }
+-  all_socks = (fd_set *) malloc (sizeof (fd_set));
+-  FD_ZERO (all_socks);
+-  ready_socks = (fd_set *) malloc (sizeof (fd_set));
+-  dummy1_socks = (fd_set *) malloc (sizeof (fd_set));
+-  dummy2_socks = (fd_set *) malloc (sizeof (fd_set));
++	nofile = MIN(WNN_NFD, FD_SETSIZE);
++
++	all_socks = (fd_set *)malloc(sizeof(fd_set));
++	ready_socks = (fd_set *)malloc(sizeof(fd_set));
++	dummy1_socks = (fd_set *)malloc(sizeof(fd_set));
++	dummy2_socks = (fd_set *)malloc(sizeof(fd_set));
++	FD_ZERO(all_socks);
++	FD_ZERO(ready_socks);
++	FD_ZERO(dummy1_socks);
++	FD_ZERO(dummy2_socks);
+ }
+ 
+ /**     ���ƤΥ����åȤˤĤ����Ԥ�      **/
+-static void
+-sel_all (void)
++static int
++sel_all(void)
+ {
+-  memcpy (ready_socks, all_socks, sizeof (fd_set));
+-  bzero (dummy1_socks, sizeof (fd_set));
+-  bzero (dummy2_socks, sizeof (fd_set));
++	int ns = 0;
++	memcpy(ready_socks, all_socks, sizeof(fd_set));
++	FD_ZERO(dummy1_socks);
++	FD_ZERO(dummy2_socks);
+ 
+ top:
+-  errno = 0;
+-  if ((no_of_ready_socks = select (nofile, ready_socks, dummy1_socks, dummy2_socks, NULL)) == -1)
+-    {
+-      if (errno == EINTR)
+-        goto top;
+-      xerror ("select error");
+-    }
++	errno = 0;
++	if ((no_of_ready_socks = select(nofile, ready_socks, dummy1_socks, dummy2_socks, NULL)) == -1) {
++		if (errno == EINTR)
++			goto top;
++		xerror ("select error");
++	}
+ #ifdef DEBUG
+-  log_debug ("select OK, ready_socks[0]=%02X, n-r-s=%x\n", ready_socks[0], no_of_ready_socks);
++	log_debug ("select OK, ready_socks[0]=%02X, n-r-s=%x\n", ready_socks[0], no_of_ready_socks);
+ #endif
+ }
+ 
+@@ -412,142 +368,136 @@ top:
+ static int
+ get_client (void)
+ {
+-  int i;
+-
+-  if (no_of_ready_socks == 0)
+-    return -1;                  /* no client waits service */
+-
+-  for (i = cur_clp;;)
+-    {
+-      if (no_of_ready_socks == 0)
+-        return -1;
+-      i++;
+-      if (i >= clientp)
+-        i = 0;
+-      if (FD_ISSET (cblk[i].sd, ready_socks))
+-        {
+-	  FD_CLR (cblk[i].sd, ready_socks);
+-          no_of_ready_socks--;
+-          return cur_clp = i;
+-        }
+-    }
++	int i;
++	
++	if (no_of_ready_socks == 0)
++		return -1;                  /* no client waits service */
++	
++	for (i = cur_clp;;)
++	{
++		if (no_of_ready_socks == 0)
++			return -1;
++		i++;
++		if (i >= clientp)
++			i = 0;
++		if (FD_ISSET(cblk[i].sd, ready_socks)) {
++			FD_CLR(cblk[i].sd, ready_socks);
++			no_of_ready_socks--;
++			return (cur_clp = i);
++		}
++	}
+ }
+ 
+ /**     ���������饤����Ȥ���뤫�ݤ���Ĵ�٤�
+         �錄����cblk����Ͽ����        **/
+ static void
+-new_client (void)               /* NewClient */
++new_client(void)
+ {
+-  int sd;
+-  int full, i;
+-  FILE *f[3];
+-  char gomi[1024];
++	int sd = -1;
++	int full, i;
++	FILE *f[3];
++	char gomi[1024];
+ #ifdef  HAVE_LIBWRAP
+-  int is_internet_socket;
+-  struct request_info tcpd_request;
++	int is_internet_socket;
++	struct request_info tcpd_request;
+ #endif /* HAVE_LIBWRAP */
+-#ifdef  AF_UNIX
+-  if ((serverNO == 0) &&
+-      (FD_ISSET (accept_blk[UNIX_ACPT].sd, ready_socks)))
+-    {
+-      FD_CLR (accept_blk[UNIX_ACPT].sd, ready_socks);
+-      no_of_ready_socks--;
+-      sd = socket_accept_un ();
++
++	log_debug("new client called");
++
++	for (i = 0; i < bindex && !FD_ISSET(accept_blk[i].sd, ready_socks); i++)
++		;
++
++	if (i == bindex)
++		return;
++
++	FD_CLR(accept_blk[i].sd, ready_socks);
++	no_of_ready_socks--;
++	log_debug("new client: FDISSET(%d/%d) true, domain=%d",
++		  i, bindex, accept_blk[i].domain);
++	
++	switch (accept_blk[i].domain) {
++#ifdef AF_UNIX
++	case AF_UNIX:
++		sd = socket_accept(i);
+ #ifdef  HAVE_LIBWRAP
+-      is_internet_socket = 0;
+-#endif
+-    }
+-  else
++		is_internet_socket = 0;
++#endif /* HAVE_LIBWRAP */
++		break;
+ #endif
+ #ifdef INET6
+-  if (FD_ISSET (accept_blk[INET6_ACPT].sd, ready_socks))
+-    {
+-      FD_CLR (accept_blk[INET6_ACPT].sd, ready_socks);
+-      no_of_ready_socks--;
+-      sd = socket_accept_in (accept_blk[INET6_ACPT].sd);
+-#ifdef  HAVE_LIBWRAP
+-      is_internet_socket = 1;
+-#endif
+-    }
+-  else
++	case AF_INET6:
+ #endif
+-  if (FD_ISSET (accept_blk[INET_ACPT].sd, ready_socks))
+-    {
+-      FD_CLR (accept_blk[INET_ACPT].sd, ready_socks);
+-      no_of_ready_socks--;
+-      sd = socket_accept_in (accept_blk[INET_ACPT].sd);
++	case AF_INET:
++		sd = socket_accept(i);
+ #ifdef  HAVE_LIBWRAP
+-      is_internet_socket = 1;
+-#endif
+-    }
+-  else
+-    {
+-      return;
+-    }
+-  log_debug ("new client: sd = %d", sd);
+-  /* reserve 2 fd */
+-  for (full = i = 0; i < 2; i++)
+-    {
+-      if (NULL == (f[i] = fopen ("/dev/null", "r")))
+-        {
+-          full = 1;
+-        }
+-    }
+-  for (i = 0; i < 2; i++)
+-    {
+-      if (NULL != f[i])
+-        fclose (f[i]);
+-    }
+-
+-  if (full || sd >= nofile || clientp >= max_client)
+-    {
+-      log_err ("no more client.");
++		is_internet_socket = 1;
++#endif /* HAVE_LIBWRAP */
++		break;
++	default:
++		return;
++	}
++	
++	log_debug("new client: sd = %d (type=%d)",
++		  sd, accept_blk[i].domain);
++	
++	/* reserve 2 fd */
++	for (full = i = 0; i < 2; i++) {
++		if (NULL == (f[i] = fopen ("/dev/null", "r"))) {
++			full = 1;
++		}
++	}
++	
++	for (i = 0; i < 2; i++) {
++		if (NULL != f[i])
++			fclose (f[i]);
++	}
++	
++	if (full || sd >= nofile || clientp >= max_client) {
++		log_err("no more client.");
+ #ifdef HAVE_RECV
+-      recv (sd, gomi, 1024, 0);
++		recv(sd, gomi, 1024, 0);
+ #else
+-      read (sd, gomi, 1024);
++		read(sd, gomi, 1024);
+ #endif
+-      shutdown (sd, 2);
++		shutdown(sd, 2);
+ #ifdef HAVE_CLOSESOCKET
+-      closesocket (sd);
++		closesocket(sd);
+ #else
+-      close (sd);
++		close(sd);
+ #endif
+-      return;
+-    }
+-
++		return;
++	}
++	
+ #ifdef HAVE_LIBWRAP
+-  if (is_internet_socket) {
+-    request_init (&tcpd_request,RQ_DAEMON, WNN_DAEMON_NAME,
+-		  RQ_FILE, sd, NULL);
+-    fromhost (&tcpd_request);
+-    if (!hosts_access (&tcpd_request))
+-      {
+-	log_err ("reject client."); /* should be log_info? */
+-				    /* should we log IP address / hostname? */
++	if (is_internet_socket) {
++		request_init (&tcpd_request,RQ_DAEMON, WNN_DAEMON_NAME,
++			      RQ_FILE, sd, NULL);
++		fromhost (&tcpd_request);
++		if (!hosts_access (&tcpd_request)) {
++			log_err ("reject client."); /* should be log_info? */
++			/* should we log IP address / hostname? */
+ #ifdef HAVE_RECV
+-	recv (sd, gomi, 1024, 0);
++			recv(sd, gomi, 1024, 0);
+ #else
+-	read (sd, gomi, 1024);
++			read(sd, gomi, 1024);
+ #endif
+-	shutdown (sd, 2);
++			shutdown(sd, 2);
+ #ifdef HAVE_CLOSESOCKET
+-	closesocket (sd);
++			closesocket(sd);
+ #else
+-	close (sd);
++			close(sd);
+ #endif
+-	return;
+-      }
+-  }
++			return;
++		}
++	}
+ #endif /*  HAVE_LIBWRAP */
+-
+-  cblk[clientp].sd = sd;
+-  FD_SET (sd, all_socks);
+-  for (i = 0; i < WNN_MAX_ENV_OF_A_CLIENT; i++)
+-    {
+-      (client[clientp].env)[i] = -1;
+-    }
+-  clientp++;
++	
++	cblk[clientp].sd = sd;
++	FD_SET(sd, all_socks);
++	for (i = 0; i < WNN_MAX_ENV_OF_A_CLIENT; i++) {
++		(client[clientp].env)[i] = -1;
++	}
++	clientp++;
+ }
+ 
+ /**     ���饤����Ȥ�cblk����������  **/
+@@ -555,746 +505,724 @@ new_client (void)               /* NewCl
+ void
+ del_client (void)
+ {
+-  disconnect_all_env_of_client ();
+-  FD_CLR (cblk[cur_clp].sd, all_socks);
++	disconnect_all_env_of_client ();
++	FD_CLR(cblk[cur_clp].sd, all_socks);
+ #ifdef HAVE_CLOSESOCKET
+-  closesocket (cblk[cur_clp].sd);
++	closesocket(cblk[cur_clp].sd);
+ #else
+-  close (cblk[cur_clp].sd);
++	close(cblk[cur_clp].sd);
+ #endif
+   /* logging here because c_c (used in log_debug) will be broken after
+      following section */
+-  log_debug("Delete Client: cur_clp = %d\n", cur_clp);
+-  cblk[cur_clp] = cblk[clientp - 1];
+-  client[cur_clp] = client[clientp - 1];
+-  /* Clear host/user name with zero - needed for logging */
+-  client[clientp - 1].user_name[0] = '\0';	/* Should we use bzero()? */
+-  client[clientp - 1].host_name[0] = '\0';
+-  clientp--;
+-}
++	log_debug("Delete Client: cur_clp = %d\n", cur_clp);
++	cblk[cur_clp] = cblk[clientp - 1];
++	client[cur_clp] = client[clientp - 1];
++	/* Clear host/user name with zero - needed for logging */
++
++	/* Should we use bzero()? */
++	client[clientp - 1].user_name[0] = '\0';
+ 
++	client[clientp - 1].host_name[0] = '\0';
++	clientp--;
++}
+ 
+ /**     �����Ф򥤥˥���饤������      **/
+ static void
+-daemon_init (void)               /* initialize Daemon */
++daemon_init(void)               /* initialize Daemon */
+ {
+-  /*
+-  signal (SIGHUP, SIG_IGN);
+-  signal (SIGINT, SIG_IGN);
+-  signal (SIGQUIT, SIG_IGN);
+-  */
++	/*
++	  signal (SIGHUP, SIG_IGN);
++	  signal (SIGINT, SIG_IGN);
++	  signal (SIGQUIT, SIG_IGN);
++	*/
+ 
++	if ((cblk = (struct cmblk *)malloc(max_client * sizeof(struct cmblk))) == NULL) {
++		xerror ("daemon_init: ");
++	}
++
++	if ((client = (CLIENT *)malloc(max_client * sizeof (CLIENT))) == NULL) {
++		xerror ("daemon_init: ");
++	}
++
++	SDRAND(time(NULL));
++	clientp = 0;                  /* V3.0 */
++	cur_clp = 0;                  /* V3.0 */
++	socket_disc_init();
+ 
+-  if ((cblk = (COMS_BLOCK *) malloc (max_client * sizeof (COMS_BLOCK))) == NULL)
+-    {
+-      xerror ("daemon_init: ");
+-    }
+-  if ((client = (CLIENT *) malloc (max_client * sizeof (CLIENT))) == NULL)
+-    {
+-      xerror ("daemon_init: ");
+-    }
+-  SDRAND (time (NULL));
+-  clientp = 0;                  /* V3.0 */
+-  cur_clp = 0;                  /* V3.0 */
+-  socket_disc_init ();
+-#ifdef INET6
+-  if (listen_proto&(PROTO_ALL|PROTO_INET|PROTO_INET6))
+-      socket_init_in ();
+-#else
+-  if (listen_proto&(PROTO_ALL|PROTO_INET))
+-      socket_init_in ();
+-#endif
+ #ifdef  AF_UNIX
+-  if (listen_proto&(PROTO_ALL|PROTO_UN))
+-      socket_init_un ();
+-#endif /* AF_UNIX */
++	if (listen_proto & PROTO_UN)
++		socket_init_un(&bindex);
++#endif
++	if (listen_proto & (PROTO_INET|PROTO_INET6))
++		socket_init_in(&bindex);
+ }
+ 
+ /**     �����Ф򽪤��  **/
+-#ifdef  AF_UNIX
++#ifdef AF_UNIX
+ static void
+-daemon_fin_un (int sock_d_un)
++daemon_fin_un(int sock_d_un)
+ {
+-  int trueFlag = 1;
+-  struct sockaddr_un addr_un;
+-  socklen_t addrlen;
++	int trueFlag = 1;
++	struct sockaddr_un addr_un;
++	socklen_t addrlen;
+ 
+-  if (serverNO == 0)
+-    {
+ #ifndef SOLARIS
+ #if defined(FIONBIO)
+-      ioctl (sock_d_un, FIONBIO, &trueFlag);
++	ioctl (sock_d_un, FIONBIO, &trueFlag);
+ #endif
+ #else /* !SOLARIS */
+-      fcntl (sock_d_un, F_SETFL, F_UNLCK);
++	fcntl (sock_d_un, F_SETFL, F_UNLCK);
+ #endif /* !SOLARIS */
+-      for (;;)
+-        {
+-          addrlen = sizeof (addr_un);
+-          if (accept (sock_d_un, (struct sockaddr *) &addr_un, &addrlen) < 0)
+-            break;
+-          /* EWOULDBLOCK EXPECTED, but we don't check */
++	for (;;) {
++		addrlen = sizeof (addr_un);
++		if (accept(sock_d_un,
++			   (struct sockaddr *)&addr_un,
++			   &addrlen) < 0)
++			break;
++		/* EWOULDBLOCK EXPECTED, but we don't check */
+         }
+-      shutdown (sock_d_un, 2);
+-      close (sock_d_un);
+-    }
++	shutdown (sock_d_un, 2);
++	close (sock_d_un);
+ }
+ #endif /* AF_UNIX */
+ 
+ static void
+-daemon_fin_in (int sock_d_in)
++daemon_fin_in(int sock_d_in)
+ {
+-  int trueFlag = 1;
+-  struct sockaddr_in addr_in;
+-  socklen_t addrlen;
++	int trueFlag = 1;
++	struct sockaddr_in addr_in;
++	socklen_t addrlen;
+ #ifdef USE_SETSOCKOPT
+-  int on = ~0;
++	int on = ~0;
+ #endif
+ 
+ #ifndef SOLARIS
+ #ifdef USE_SETSOCKOPT
+-  setsockopt (sock_d_in, SOL_SOCKET, SO_NONBLOCK, &on, sizeof (int));
++	setsockopt(sock_d_in, SOL_SOCKET, SO_NONBLOCK, &on, sizeof(int));
+ #else
+ #if defined(FIONBIO)
+-  ioctl (sock_d_in, FIONBIO, &trueFlag);
++	ioctl(sock_d_in, FIONBIO, &trueFlag);
+ #endif
+ #endif /* USE_SETSOCKOPT */
+ #else /* !SOLARIS */
+-  fcntl (sock_d_in, F_SETFL, F_UNLCK);
++	fcntl(sock_d_in, F_SETFL, F_UNLCK);
+ #endif /* !SOLARIS */
+-  for (;;)
+-    {
+-      addrlen = sizeof (addr_in);
+-      if (accept (sock_d_in, (struct sockaddr *) &addr_in, &addrlen) < 0)
+-        break;
+-      /* EWOULDBLOCK EXPECTED, but we don't check */
+-    }
+-  shutdown (sock_d_in, 2);
++	for (;;) {
++		addrlen = sizeof(addr_in);
++		if (accept(sock_d_in,
++			   (struct sockaddr *)&addr_in,
++			   &addrlen) < 0)
++			break;
++		/* EWOULDBLOCK EXPECTED, but we don't check */
++	}
++	shutdown (sock_d_in, 2);
+ #ifdef HAVE_CLOSESOCKET
+-  closesocket (sock_d_in);
++	closesocket (sock_d_in);
+ #else
+-  close (sock_d_in);
++	close (sock_d_in);
+ #endif
+ }
+ 
+ void
+ daemon_fin (void)
+ {
+-  int fd;
+-#ifdef  AF_UNIX
+-  int sock_d_un = accept_blk[UNIX_ACPT].sd;
+-#endif /* AF_UNIX */
+-  int sock_d_in = accept_blk[INET_ACPT].sd;
+-#ifdef INET6
+-  int sock_d_in6 = accept_blk[INET6_ACPT].sd;
+-#endif
++	int i;
++	int fd;
+ 
+-  /*
+-     accept all pending connection from new clients,
+-     avoiding kernel hangup.
+-   */
++	for (i = 0; i < bindex; i++) {
++		if (FD_ISSET(accept_blk[i].sd, all_socks)) {
++			switch (accept_blk[i].domain) {
+ #ifdef  AF_UNIX
+-  daemon_fin_un (sock_d_un);
+-#endif
+-  daemon_fin_in (sock_d_in);
++			case AF_UNIX:
++				if (listen_proto & PROTO_UN)
++					daemon_fin_un(accept_blk[i].sd);
++				break;
++#endif
++			case AF_INET:
++				if (listen_proto & PROTO_INET)
++					daemon_fin_in(accept_blk[i].sd);
++				break;
+ #ifdef INET6
+-  daemon_fin_in (sock_d_in6);
+-#endif
++			case AF_INET6:
++				if (listen_proto & PROTO_INET6)
++					daemon_fin_in(accept_blk[i].sd);
++				break;
++#endif
++			default:
++				break;
++			}
++		}
++	}
+ 
+-  for (fd = nofile - 1; fd >= 0; fd--)
+-    {
+-      if ((fd != sock_d_in) &&
+-#ifdef INET6
+-          (fd != sock_d_in6) &&
+-#endif
+-#ifdef AF_UNIX
+-          (fd != sock_d_un) &&
+-#endif /* AF_UNIX */
+-          FD_ISSET (fd, all_socks))
+-        {
+-          shutdown (fd, 2);
++	for (fd = nofile - 1; fd >= 0; fd--) {
++		if (FD_ISSET(fd, all_socks)) {
++			shutdown (fd, 2);
+ #ifdef HAVE_CLOSESOCKET
+-          closesocket (fd);
++			closesocket (fd);
+ #else
+-          close (fd);
++			close (fd);
+ #endif
+-        }
+-    }
++		}
++	}
+ }
+ 
+-/*------*/
++static unsigned char snd_buf[S_BUF_SIZ];         /** �����Хåե� **/
++static unsigned char *sp = snd_buf;
++
++static unsigned char rcv_buf[R_BUF_SIZ];         /** �����Хåե� **/
++static unsigned char *rbp = rcv_buf;
++static unsigned char *rp = rcv_buf;
+ 
+-/**     **/
+ char *
+-gets_cur (char *buffer, size_t buffer_size)
++gets_cur(char *buffer, size_t buffer_size)
+ {
+-  char *b;
++	char *b;
+ 
+-  if (!buffer || !buffer_size)
+-    return NULL;
++	if (!buffer || !buffer_size)
++		return NULL;
+ 
+-  b = buffer;
++	b = buffer;
+ 
+-  while (--buffer_size && (*b = getc_cur ()) != '\0')
+-    b++;
++	while (--buffer_size && (*b = getc_cur()) != '\0')
++		b++;
+ 
+-  if (!buffer_size)
+-    {
+-      *b = '\0';
+-      while (getc_cur () != '\0')
+-        ;
+-    }
++	if (!buffer_size) {
++		*b = '\0';
++		while (getc_cur() != '\0')
++			;
++	}
+ 
+-  return buffer;
++	return buffer;
+ }
+ 
+ /**     **/
+ w_char *
+-getws_cur (w_char *buffer, size_t buffer_size)
++getws_cur(w_char *buffer, size_t buffer_size)
+ {
+-  w_char *b;
++	w_char *b;
+ 
+-  if (!buffer || !buffer_size)
+-    return NULL;
++	if (!buffer || !buffer_size)
++		return NULL;
+ 
+-  b = buffer;
++	b = buffer;
+ 
+-  while (--buffer_size && (*b = get2_cur ()) != 0)
+-    b++;
++	while (--buffer_size && (*b = get2_cur ()) != 0)
++		b++;
+ 
+-  if (!buffer_size)
+-    {
+-      *b = 0;
+-      while (getc_cur () != 0)
+-        ;
+-    }
+-
+-  return buffer;
++	if (!buffer_size) {
++		*b = 0;
++		while (getc_cur () != 0)
++			;
++	}
++	return buffer;
+ }
+ 
+ /**     �����ȡ����饤����Ȥ���2�Х��ȼ��   **/
+ int
+ get2_cur (void)
+ {
+-  int x;
+-  x = getc_cur ();
+-  return (x << 8) | getc_cur ();
++	int h;
++	h  = getc_cur () << 8;
++	h |= getc_cur ();
++	return h;
+ }
+ 
+ /**     �����ȡ����饤����Ȥ���4�Х��ȼ��   **/
+ int
+ get4_cur (void)
+ {
+-  int x1, x2, x3;
+-  x1 = getc_cur ();
+-  x2 = getc_cur ();
+-  x3 = getc_cur ();
+-  return (x1 << (8 * 3)) | (x2 << (8 * 2)) | (x3 << (8 * 1)) | getc_cur ();
++	int h;
++	h  = getc_cur() << (8*3);
++	h |= getc_cur() << (8*2);
++	h |= getc_cur() << (8*1);
++	h |= getc_cur() << (8*0);
++	return h;
+ }
+ 
+ /**     �����ȡ����饤����Ȥ���1�Х��ȼ��   **/
+ int
+-getc_cur (void)
++getc_cur(void)
+ {
+-  static int rbp;
+-  if (rbc <= 0)
+-    {
+-      rbc = rcv_1_client (cur_clp);
+-      rbp = 0;
+-    }
+-  rbc--;
+-  return rcv_buf[rbp++] & 0xFF;
++#if DEBUG_IO
++	fprintf(stderr, "getc_cur: Enter\n");
++#endif
++	if (rp == rbp) {
++		rcv_1_client(cur_clp);
++	}
++#if DEBUG_IO
++	fprintf(stderr, "getc_cur: [%02x]\n", *rbp & 0xff);
++#endif
++	return *(rbp++) & 0xff;
+ }
+ 
+ /**     ���饤����Ȥ���1�ѥ��åȼ��   **/
+ static int
+-rcv_1_client (int clp)		/* clp=���饤������ֹ� */
++rcv_1_client(int clp)		/* clp=���饤������ֹ� */
+ {
+-  int cc = 0;
+-  while (cc <= 0)
+-    {
+-      errno = 0;
++	int n = 0;
++
++	if (rbp == rp) {
++		rbp = rp = &rcv_buf[0];
++	}
++
++	while (rbp == rp) {
++		errno = 0;
+ #ifdef HAVE_RECV
+-      cc = recv (cblk[clp].sd, rcv_buf, S_BUF_SIZ, 0);
++		n = recv(cblk[clp].sd, rcv_buf, sizeof(rcv_buf), 0);
+ #else
+-      cc = read (cblk[clp].sd, rcv_buf, S_BUF_SIZ);
++		n = read(cblk[clp].sd, rcv_buf, sizeof(rcv_buf));
+ #endif
+-      if (cc <= 0)
+-        {
+-          if (ERRNO_CHECK (errno))
+-            {
+-              continue;
+-            }
+-          else if (cc == 0)
+-            {                   /* client dead */
+-              longjmp (client_dead, 666);
+-            }
+-          else
+-            {                   /* cc == -1 */
+-              if (errno != EINTR)
+-                longjmp (client_dead, 666);
+-              continue;
+-            }
+-        }
+-    }
+-#ifdef DEBUG
+-  log_debug ("rcv: clp = %d, sd = %d, cc = %d", clp, cblk[clp].sd, cc);
+-  dmp (rcv_buf, cc);
++		if (n <= 0) {
++			if (ERRNO_CHECK (errno)) {
++				continue;
++			} else if (n == 0) {
++				/* client dead */
++				longjmp(client_dead, 666);
++			} else  {
++				/* n == -1 */
++				if (errno != EINTR)
++					longjmp (client_dead, 666);
++				continue;
++			}
++		}
++		rp += n;
++		log_debug ("rcv: clp=%d, sd=%d, n=%d\n", clp, cblk[clp].sd, n);
++#if DEBUG_IO
++		dmp(rbp, rp - rbp);
+ #endif
+-  return cc;
++	}
++
++	return n;
+ }
+ 
+ /**     ���饤����Ȥ�1�ѥ��å�����     **/
+ static void
+-snd_1_client (int clp,	/* clp: ���饤������ֹ� */
+-	      int n	/* n : number of bytes to send */ )
++snd_1_client(int clp, int dummy)
+ {
+-  int cc, x;
+-#ifdef  DEBUG
+-  log_debug ("snd: clp = %d, sd = %d", clp, cblk[clp].sd);
+-  dmp (snd_buf, n);
++	unsigned char *bp = snd_buf;
++	int n;
++	size_t total = sp - bp;
++
++#if DEBUG_IO
++	fprintf(stderr, "snd: clp=%d, sd=%d\n", clp, cblk[clp].sd);
++	dmp(snd_buf, sp - bp);
+ #endif
+-  for (cc = 0; cc < n;)
+-    {
+-      errno = 0;
++
++	while (0 < sp - bp && sp <= snd_buf + sizeof(snd_buf)) {
++		errno =0;
+ #ifdef HAVE_SEND
+-      x = send (cblk[clp].sd, &snd_buf[cc], n - cc, 0);
++		n = send(cblk[clp].sd, bp, sp - bp, 0);
+ #else
+-      x = write (cblk[clp].sd, &snd_buf[cc], n - cc);
++		n = write(cblk[clp].sd, bp, sp - bp);
+ #endif
+-      if (x < 0)
+-        {
+-          if (ERRNO_CHECK (errno) || errno == EINTR)
+-            {
+-              errno = 0;
+-              continue;
+-            }
+-          else
+-            {                   /* client dead */
+-              longjmp (client_dead, 666);
+-            }
+-        }
+-      cc += x;
+-    }
++		if (n < 0) {
++			if (ERRNO_CHECK (errno) || errno == EINTR) {
++				continue;
++			} else {
++				/* client dead */
++				longjmp (client_dead, 666);
++			}
++		}
++		bp += n;
++	}
++	sp = snd_buf;
+ }
+ 
+-/**     **/
+ void
+-puts_cur (char *p)
++puts_cur(char *p)
+ {
+-  int c;
+-  while (c = *p++)
+-    putc_cur (c);
+-  putc_cur (0);
++	int c;
++	while(c = *p++)
++		putc_cur(c);
++	putc_cur(0x00);
+ }
+ 
+-/**     **/
+ void
+-puts_n_cur (char *p, int n)
++puts_n_cur(char *p, int n)
+ {
+-  int c;
+-  while ((c = *p++) && --n >= 0)
+-    putc_cur (c);
+-  putc_cur (0);
++	int c;
++	while ((c = *p++) && --n >= 0)
++		putc_cur(c);
++	putc_cur(0x00);
+ }
+ 
+-/**     **/
+ void
+-putws_cur (w_char *p)
++putws_cur(w_char *p)
+ {
+-  int c;
+-  while (c = *p++)
+-    put2_cur (c);
+-  put2_cur (0);
++	int c;
++	while (c = *p++)
++		put2_cur(c);
++	put2_cur(0x0000);
+ }
+ 
+-/**     **/
+ void
+-putnws_cur (w_char *p, int n)
++putnws_cur(w_char *p, int n)
+ {
+-  int c;
+-  for (; n > 0; n--)
+-    {
+-      if ((c = *p++) == 0)
+-        break;
+-      put2_cur (c);
+-    }
+-  put2_cur (0);
++	unsigned int c;
++	for (; n > 0; n--) {
++		if ((c = *p++) == 0)
++			break;
++		put2_cur(c);
++	}
++	put2_cur(0x0000);
+ }
+ 
+-/**     �����ȡ����饤����Ȥ�2�Х�������     **/
+ void
+-put2_cur (int c)
++put2_cur(int c)
+ {
+-  putc_cur (c >> (8 * 1));
+-  putc_cur (c);
++	putc_cur(c >> (8 * 1));
++	putc_cur(c);
+ }
+ 
+-/**     �����ȡ����饤����Ȥ�4�Х�������     **/
+ void
+-put4_cur (int c)
++put4_cur(int c)
+ {
+-  putc_cur (c >> (8 * 3));
+-  putc_cur (c >> (8 * 2));
+-  putc_cur (c >> (8 * 1));
+-  putc_cur (c);
++	putc_cur(c >> (8 * 3));
++	putc_cur(c >> (8 * 2));
++	putc_cur(c >> (8 * 1));
++	putc_cur(c);
+ }
+ 
+-/**     �����ȡ����饤����Ȥ�1�Х�������     **/
+ void
+-putc_cur (int c)
++putc_cur(int c)
+ {
+-  snd_buf[sbp++] = c;
+-  if (sbp >= R_BUF_SIZ)
+-    {
+-      snd_1_client (cur_clp, R_BUF_SIZ);
+-      sbp = 0;
+-    }
++#if DEBUG_IO
++	fprintf(stderr, "putc_cur: Enter\n");
++#endif
++	if (snd_buf + sizeof(snd_buf) <= sp)
++		putc_purge();
++
++#if DEBUG_IO
++	fprintf(stderr, "putc_cur: [%02x]\n", c & 0xff);
++#endif
++	*(sp++) = c & 0xff;
+ }
+ 
+-/**     �����ȡ����饤����Ȥ������Хåե���ե�å��夹��    **/
++/* flush send buffer */
+ void
+-putc_purge (void)
++putc_purge(void)
+ {
+-  if (sbp != 0)
+-    {
+-      snd_1_client (cur_clp, sbp);
+-      sbp = 0;
+-    }
++	if (snd_buf < sp) {
++		snd_1_client(cur_clp, 0);
++	}
+ }
+ 
+-/*-----*/
+-
+-/**     �����åȤΥ��˥���饤��        **/
++/* initialize sockets */
+ #ifdef  AF_UNIX
++#if !defined(SUN_LEN)
++# define SUN_LEN(su) (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
++#endif
++
+ static void
+-socket_init_un (void)
++socket_init_un(int *index)
+ {
+-  struct sockaddr_un saddr_un;
+-  int sock_d_un;
+-  if (serverNO == 0)
+-    {
+-      saddr_un.sun_family = AF_UNIX;
+-      unlink (sockname);
+-      strcpy (saddr_un.sun_path, sockname);
+-      if ((sock_d_un = socket (AF_UNIX, SOCK_STREAM, 0)) == ERROR)
+-        {
+-          xerror ("could not create unix domain socket");
+-        }
+-      if (bind (sock_d_un, (struct sockaddr *) &saddr_un, strlen (saddr_un.sun_path) + 2) == ERROR)
+-        {
+-          shutdown (sock_d_un, 2);
+-          xerror ("could not bind unix domain socket");
++	struct sockaddr_un saddr_un;
++	int sock_d_un;
++
++	saddr_un.sun_family = AF_UNIX;
++	strncpy(saddr_un.sun_path, sockname, sizeof(saddr_un.sun_path) - 1);
++	saddr_un.sun_path[sizeof(saddr_un.sun_path) - 1] = '\0';
++
++	unlink(saddr_un.sun_path);
++
++	if ((sock_d_un = socket(saddr_un.sun_family, SOCK_STREAM, 0)) == ERROR)
++		xerror("could not create unix domain socket");
++
++	if (bind(sock_d_un,
++		 (struct sockaddr *)&saddr_un,
++		 SUN_LEN(&saddr_un)) == ERROR) {
++		shutdown (sock_d_un, 2);
++		xerror("could not bind unix domain socket");
+         }
+-      if (listen (sock_d_un, 5) == ERROR)
+-        {
+-          shutdown (sock_d_un, 2);
+-          xerror ("could not listen unix domain socket");
++
++	if (listen(sock_d_un, 5) == ERROR) {
++		shutdown (sock_d_un, 2);
++		xerror("could not listen unix domain socket");
+         }
+-      chmod (sockname, 0777);
+-      signal (SIGPIPE, SIG_IGN);
+-#ifdef DEBUG
+-      log_debug ("sock_d_un = %d", sock_d_un);
+-#endif
+-      accept_blk[UNIX_ACPT].sd = sock_d_un;
+-      FD_SET (sock_d_un, all_socks);
+-    }
++
++	chmod(sockname, 0777);
++	signal(SIGPIPE, SIG_IGN);
++	log_debug("sock_d_un = %d (bindex=%d)", sock_d_un, *index);
++	accept_blk[(*index)].sd = sock_d_un;
++	accept_blk[(*index)].domain = saddr_un.sun_family;
++	(*index)++;
++	FD_SET (sock_d_un, all_socks);
+ }
+ #endif /* AF_UNIX */
+ 
+ /*      Inet V3.0 */
+ static void
+-socket_init_in (void)
++socket_init_in(int *index)
+ {
++	int i;
+ #ifndef SOLARIS
+-  int on = 1;
++	int on = 1;
+ #else /* SOLARIS */
+-  int on = 0;
++	int on = 0;
+ #endif /* SOLARIS */
+-  struct servent *sp;
++
++	struct servent *sp;
+ #if !defined(SO_DONTLINGER) && defined(SO_LINGER)
+-  struct linger linger;
++	struct linger linger;
+ #endif
+-#ifdef INET6
+-  struct addrinfo hints, *res, *res0;
+-  int error;
+-  char sport[6];
+-#else
+-  struct sockaddr_in saddr_in;
+-#endif
+-  int sock_d_in;
+-
+-  if (port < 0)
+-    {
+-      if ((sp = getservbyname (SERVERNAME, "tcp")) == NULL)
+-        {
+-          port = WNN_PORT_IN;
+-        }
+-      else
+-        {
+-          port = ntohs (sp->s_port);
+-        }
+-    }
++	struct addrinfo hints, *res, *res0;
++	struct sockaddr sa;
++	int error;
++	char hbuf[NI_MAXHOST];
++	char sbuf[NI_MAXSERV];
++	int sock_d_in;
++
++	memset(&sa, 0, sizeof(struct sockaddr));
++	if (port < 0) {
++		strncpy(sbuf, SERVERNAME, sizeof(sbuf) - 1);
++		sbuf[sizeof(sbuf) - 1] = '\0';
++		error = getnameinfo(&sa,
++				    sa.sa_len,
++				    NULL,
++				    0,
++				    sbuf,
++				    sizeof(sbuf),
++				    NI_NUMERICSERV);
++		if (error)
++			sprintf(sbuf, "%d", WNN_PORT_IN);
++	} else {
++		sprintf(sbuf, "%d", port);
++	}
+ 
+-  port += serverNO;
++	port += serverNO;
+ 
+-#if DEBUG
+-  log_debug ("port=%x", port);
+-#endif
+-#ifdef INET6
+-  memset(&hints, 0, sizeof(hints));
+-  if (listen_proto&PROTO_INET && !(listen_proto&PROTO_INET6))
+-      hints.ai_family = PF_INET;
+-  else if (listen_proto&PROTO_INET6 && !(listen_proto&PROTO_INET))
+-      hints.ai_family = PF_INET6;
+-  else
+-      hints.ai_family = PF_UNSPEC;
+-  hints.ai_socktype = SOCK_STREAM;
+-  hints.ai_flags = AI_PASSIVE;
+-  sprintf(sport, "%d", port);
+-  error = getaddrinfo(NULL, sport, &hints, &res0);
+-  if (error)
+-    {
+-      xerror (gai_strerror(error));
+-    }
+-  for (res = res0; res; res = res->ai_next) {
+-    if (res->ai_family == AF_INET || res->ai_family == AF_INET6){
+-      if ((sock_d_in = socket (res->ai_family, res->ai_socktype, res->ai_protocol)) == ERROR)
+-#else
+-  saddr_in.sin_family = AF_INET;
+-  saddr_in.sin_port = htons (port);
+-  saddr_in.sin_addr.s_addr = htonl (INADDR_ANY);
+-  if ((sock_d_in = socket (AF_INET, SOCK_STREAM, 0)) == ERROR)
+-#endif
+-    {
++	memset(&hints, 0, sizeof(hints));
++	if (listen_proto & PROTO_INET
++	    || listen_proto & PROTO_INET6)
++		hints.ai_family = PF_UNSPEC;
++	hints.ai_socktype = SOCK_STREAM;
++	hints.ai_flags = AI_PASSIVE;
++
++	for (i = 0; i < MAXLISTENADDR && listenaddr[i][0] != '\0'; i++) {
++		log_debug("getaddrinfo: try %s",listenaddr[i]);
++
++		if (error = getaddrinfo(listenaddr[i], sbuf, &hints, &res0))
++			xerror((char *)gai_strerror(error));
++
++		for (res = res0; res; res = res->ai_next) {
++			log_debug("socket: try %s : %s (type=%d)",
++				  listenaddr[i], sbuf, res->ai_family);
++
++			switch (res->ai_family) {
++			case AF_INET:
++				if (!(listen_proto & PROTO_INET)) {
++					log_debug("socket: ignore %s\n", listenaddr[i]);
++					continue;
++				}
++				sock_d_in = socket(res->ai_family,
++						   res->ai_socktype,
++						   res->ai_protocol);
++				if (sock_d_in == -1)
++					xerror("could not create inet socket");
++				break;
+ #ifdef INET6
+-      if (res->ai_family == AF_INET6)
+-        xerror ("could not create inet6 socket");
+-      else if (res->ai_family == AF_INET)
++			case AF_INET6:
++				if (!(listen_proto & PROTO_INET6)) {
++					log_debug("socket: ignore %s\n", listenaddr[i]);
++					continue;
++				}
++				sock_d_in = socket(res->ai_family,
++						   res->ai_socktype,
++						   res->ai_protocol);
++				if (sock_d_in == -1)
++					xerror("could not create inet6 socket");
++#ifdef IPV6_V6ONLY
++				setsockopt(sock_d_in, IPPROTO_IPV6, IPV6_V6ONLY, NULL, 0);
+ #endif
+-      xerror ("could not create inet socket");
+-    }
+-  setsockopt (sock_d_in, SOL_SOCKET, SO_REUSEADDR, (char *) &on, sizeof (int));
++#endif /* INET6 */
++			}
++			setsockopt (sock_d_in, SOL_SOCKET, SO_REUSEADDR, (char *) &on, sizeof (int));
+ #ifdef SO_DONTLINGER
+-  setsockopt (sock_d_in, SOL_SOCKET, SO_DONTLINGER, (char *) 0, 0);
++			setsockopt (sock_d_in, SOL_SOCKET, SO_DONTLINGER, (char *) 0, 0);
+ #else
+ # ifdef SO_LINGER
+-  linger.l_onoff = 0;
+-  linger.l_linger = 0;
+-  setsockopt (sock_d_in, SOL_SOCKET, SO_LINGER, (char *) &linger, sizeof linger);
++			linger.l_onoff = 0;
++			linger.l_linger = 0;
++			setsockopt(sock_d_in, SOL_SOCKET, SO_LINGER, (char *) &linger, sizeof linger);
+ # endif /* SO_LINGER */
+ #endif /* SO_DONTLINGER */
+ 
+-#ifdef INET6
+-  if (bind (sock_d_in, res->ai_addr, res->ai_addrlen) == ERROR)
+-#else
+-  if (bind (sock_d_in, (struct sockaddr *) &saddr_in, sizeof (saddr_in)) == ERROR)
+-#endif
+-    {
+-      shutdown (sock_d_in, 2);
+-#ifdef INET6
+-      if (res->ai_family == AF_INET6)
+-        xerror ("can't bind inet6 socket");
+-      else if (res->ai_family == AF_INET)
+-#endif
+-      xerror ("can't bind inet socket");
+-    }
+-  if (listen (sock_d_in, 5) == ERROR)
+-    {
+-      shutdown (sock_d_in, 2);
+-#ifdef INET6
+-      if (res->ai_family == AF_INET6)
+-        xerror ("can't listen inet6 socket");
+-      else if (res->ai_family == AF_INET)
+-#endif
+-      xerror ("can't listen inet socket");
+-    }
+-#if DEBUG
+-  log_debug ("sock_d_in = %d", sock_d_in);
+-#endif
+-  FD_SET (sock_d_in, all_socks);
+-#ifdef INET6
+-      if (res->ai_family == AF_INET)
+-	accept_blk[INET_ACPT].sd = sock_d_in;
+-      else if (res->ai_family == AF_INET6)
+-	accept_blk[INET6_ACPT].sd = sock_d_in;
+-    }
+-  }
+-  freeaddrinfo(res0);
+-#else
+-  accept_blk[INET_ACPT].sd = sock_d_in;
+-#endif
++			if (bind(sock_d_in, res->ai_addr, res->ai_addrlen) == ERROR) {
++				shutdown (sock_d_in, 2);
++				xerror("could not bind inet/inet6 socket");
++			}
++
++			if (listen(sock_d_in, 5) == ERROR) {
++				shutdown (sock_d_in, 2);
++				xerror("could not listen inet/inet6 socket");
++			}
++
++			log_debug("sock_d_in = %d (bindex=%d)",
++				  sock_d_in, *index);
++			FD_SET(sock_d_in, all_socks);
++			accept_blk[(*index)].sd = sock_d_in;
++			accept_blk[(*index)].domain = res->ai_family;
++			(*index)++;
++		}
++	}
++	freeaddrinfo(res0);
+ }
+ 
+-
+ /**     accept new client socket        **/
+-#ifdef  AF_UNIX
+ static int
+-socket_accept_un (void)
++socket_accept(int index)
+ {
+-  struct sockaddr_un addr;
+-  socklen_t addrlen;
+-
+-  addrlen = sizeof (addr);
+-  return accept (accept_blk[UNIX_ACPT].sd, (struct sockaddr *) &addr, &addrlen);
+-}
+-#endif /* AF_UNIX */
+-
+-static int
+-socket_accept_in (int fd)
+-{
+-  struct sockaddr_in addr;
+-  socklen_t addrlen;
+-
+-  addrlen = sizeof (addr);
+-  return accept (fd, (struct sockaddr *) &addr, &addrlen);
++	return accept(accept_blk[index].sd, NULL, NULL);
+ }
+ 
+ static void
+-xerror (char *s)
++xerror(char *s)
+ {
+-  log_err ("%s (%s).", s, strerror(errno));
+-  exit (1);
++	log_err ("%s (%s).", s, strerror(errno));
++	exit (1);
+ }
+ 
+-#if DEBUG
+ static void
+-dmp (char *p, int n)
++dmp(char *p, int n)
+ {
+-  int i, j;
++	int i, j;
+ 
+-  for (i = 0; i < n; i += 16)
+-    {
+-      for (j = 0; j < 16; j++)
+-        {
+-          fprintf (stderr, "%02x ", p[i + j] & 0xFF);
+-        }
+-      fprintf (stderr, "n=%d\n", n);
+-    }
++	for (i = 0; i < n; i += 16) {
++		for (j = 0; j < 16; j++) {
++			fprintf (stderr, "%02x ", p[i + j] & 0xFF);
++		}
++		fprintf (stderr, "n=%d\n", n);
++	}
+ }
+-#endif
+ 
+ static void
+-get_options (int argc, char **argv)
++get_options(int argc, char **argv)
+ {
+-  int c;
+-  int digit_optind = 0;
+-
+-  strcpy (jserverrcfile, LIBDIR);       /* usr/local/lib/wnn */
+-  strcat (jserverrcfile, SERVER_INIT_FILE);     /* ja_JP/jserverrc */
++	int c;
++	int digit_optind = 0;
++	int lindex = 0;
+ 
+-  while (1)
+-    {
+-      int this_option_optind = optind ? optind : 1;
+-      int option_index = 0;
+-      static struct option long_options[] =
+-      {
+-	{"baseport",	1, NULL, 'p'},
+-	{"inet",	0, NULL, '4'},
+-	{"inet6",	0, NULL, '6'},
+-	{"jserverrc",	1, NULL, 'f'},
+-	{"version",	0, NULL, 'v'},
+-	{0, 0, 0, 0}
+-      };
+-
+-      c = getopt_long (argc, argv, OPTIONARGS,
+-		       long_options, &option_index);
+-      if (c == -1)
+-        break;
++	strcpy (jserverrcfile, LIBDIR);       /* usr/local/lib/wnn */
++	strcat (jserverrcfile, SERVER_INIT_FILE);     /* ja_JP/jserverrc */
+ 
+-      switch (c)
++	while (1)
+ 	{
+-	case 'D': /* do not detach, not a daemon */
+-	  option_flag &= ~OPT_FORK;
+-	  break;
+-
+-        case 'f': /* --jserverrc FILENAME */
+-          strcpy (jserverrcfile, optarg);
+-          break;
+-
+-        case 's':
+-	  /* should nuke noisy someday */
+-          noisy = 1; option_flag |= OPT_VERBOSE;
+-          if (strcmp ("-", optarg) != 0)
+-            {
+-	      /** maybe FILE wnnerr = stderr; or wnnerr = open(optarg...) is better? or freopen is normal method? */
+-	      /** take a look at daemon(3) */
+-              if (freopen (optarg, "a", stderr) == NULL)
+-                {
+-		  /** fprintf to stderr? */
+-                  printf ("Error in opening scriptfile %s.\n", optarg);
+-                  exit (1);
+-                }
+-            }
+-          log_debug ("script started");
+-          break;
+-
+-        case 'h':
+-	  /* var hinsi_file_name polluted */
+-          hinsi_file_name = optarg; 
+-          break;
+-
+-        case 'N':
+-          serverNO = atoi (optarg);
+-	  /* error handling needed */
+-          break;
+-
+-        case 'p':
+-          port = atoi (optarg);
+-	  /* error handling needed */
+-          break;
+-
+-        case 'v':
+-          print_version();
+-          usage();
+-	  break;
+-
+-        case 'u':
+-	  listen_proto &= ~PROTO_ALL;
+-	  listen_proto |= PROTO_UN;
+-	  break;
+-
+-        case '4':
+-	  listen_proto &= ~PROTO_ALL;
+-	  listen_proto |= PROTO_INET;
+-	  break;
++		int this_option_optind = optind ? optind : 1;
++		int option_index = 0;
++		static struct option long_options[] =
++			{
++				{"baseport",	1, NULL, 'p'},
++				{"inet",	0, NULL, '4'},
++				{"inet6",	0, NULL, '6'},
++				{"jserverrc",	1, NULL, 'f'},
++				{"listenaddr",	1, NULL, 'a'},
++				{"unix",	0, NULL, 'u'},
++				{"version",	0, NULL, 'v'},
++				{0, 0, 0, 0}
++			};
++
++		c = getopt_long (argc, argv, OPTIONARGS,
++				 long_options, &option_index);
++		if (c == -1)
++			break;
++
++		switch (c)
++		{
++		case 'D': /* do not detach, not a daemon */
++			option_flag &= ~OPT_FORK;
++			break;
++
++		case 'f': /* --jserverrc FILENAME */
++			strncpy(jserverrcfile, optarg, sizeof(jserverrcfile) - 1);
++			jserverrcfile[sizeof(jserverrcfile) - 1] = '\0';
++			break;
++
++		case 'a': /* --listenaddr ADDR */
++			strncpy(listenaddr[lindex], optarg, NI_MAXHOST - 1);
++			listenaddr[lindex][NI_MAXHOST - 1] = '\0';
++			lindex++;
++			break;
++
++		case 's':
++			/* should nuke noisy someday */
++			noisy = 1; option_flag |= OPT_VERBOSE;
++			if (strcmp ("-", optarg) != 0)
++			{
++				/** maybe FILE wnnerr = stderr; or wnnerr = open(optarg...) is better? or freopen is normal method? */
++				/** take a look at daemon(3) */
++				if (freopen (optarg, "a", stderr) == NULL)
++				{
++					/** fprintf to stderr? */
++					printf ("Error in opening scriptfile %s.\n", optarg);
++					exit (1);
++				}
++			}
++			log_debug ("script started");
++			break;
++
++		case 'h':
++			/* var hinsi_file_name polluted */
++			hinsi_file_name = optarg;
++			break;
++
++		case 'N':
++			serverNO = atoi (optarg);
++			/* error handling needed */
++			break;
++
++		case 'p':
++			port = atoi (optarg);
++			/* error handling needed */
++			break;
++
++		case 'v':
++			print_version();
++			usage();
++			break;
++
++		case 'u':
++			listen_proto |= PROTO_UN;
++			break;
++
++		case '4':
++			listen_proto |= PROTO_INET;
++			break;
+ 
+ #ifdef INET6
+-        case '6':
+-	  listen_proto &= ~PROTO_ALL;
+-	  listen_proto |= PROTO_INET6;
+-          break;
++		case '6':
++			listen_proto |= PROTO_INET6;
++			break;
+ #endif /* INET6 */
+-
+-        default:
+-          print_version();
+-	  usage();
+-	  break;
++		default:
++			print_version();
++			usage();
++			break;
++		}
++	}
++	if (!listen_proto) {
++		listen_proto = PROTO_ALL;
+ 	}
+-    }
+ }
+ 
+ 
+-/*
+-*/
+ void
+ js_who (void)
+ {
+-  int i, j;
++	int i, j;
+ 
+-  put4_cur (clientp);
+-  for (i = 0; i < clientp; i++)
+-    {
+-      put4_cur (cblk[i].sd);
+-      puts_cur (client[i].user_name);
+-      puts_cur (client[i].host_name);
+-      for (j = 0; j < WNN_MAX_ENV_OF_A_CLIENT; j++)
+-        {
+-          put4_cur ((client[i].env)[j]);
+-        }
++	put4_cur (clientp);
++	for (i = 0; i < clientp; i++)
++	{
++		put4_cur (cblk[i].sd);
++		puts_cur (client[i].user_name);
++		puts_cur (client[i].host_name);
++		for (j = 0; j < WNN_MAX_ENV_OF_A_CLIENT; j++)
++		{
++			put4_cur ((client[i].env)[j]);
++		}
+ 
+-    }
+-  putc_purge ();
++	}
++	putc_purge();
+ }
+ 
+ void
+@@ -1302,25 +1230,25 @@ js_kill (void)
+ {
+   if (clientp == 1)
+     {
+-      put4_cur (0);
+-      putc_purge ();
++	    put4_cur(0x00000000);
++      putc_purge();
+       terminate_hand ();
+     }
+   else
+     {
+       put4_cur (clientp - 1);
+-      putc_purge ();
++      putc_purge();
+     }
+ }
+ 
+ void
+ usage (void)
+ {
+-  fprintf(stderr, 
++  fprintf(stderr,
+ #ifdef INET6
+-	  "usage: %s [-Du46][-f <init_file> -s <log_file(\"-\" for stderr)> -h <pos_file> -N <serverNO> -p <port_base>]\n",
++	  "usage: %s [-Du46][-f <init_file> -a <listenaddr> -s <log_file(\"-\" for stderr)> -h <pos_file> -N <serverNO> -p <port_base>]\n",
+ #else
+-	  "usage: %s [-Du4][-f <init_file> -s <log_file(\"-\" for stderr)> -h <pos_file> -N <serverNO> -p <port_base>]\n",
++	  "usage: %s [-Du4][-f <init_file> -a <listenaddr> -s <log_file(\"-\" for stderr)> -h <pos_file> -N <serverNO> -p <port_base>]\n",
+ #endif
+ 	  cmd_name);
+   fprintf(stderr,
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-jserver-de_header.h b/japanese/FreeWnn-lib/files/patch-Wnn-jserver-de_header.h
new file mode 100644
index 000000000000..f1f9a74e093a
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-jserver-de_header.h
@@ -0,0 +1,28 @@
+Index: Wnn/jserver/de_header.h
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Wnn/jserver/de_header.h,v
+retrieving revision 1.1.1.1
+retrieving revision 1.3
+diff -u -p -r1.1.1.1 -r1.3
+--- Wnn/jserver/de_header.h	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Wnn/jserver/de_header.h	2 Jan 2009 11:46:51 -0000	1.3
+@@ -52,6 +52,8 @@
+ #  endif        /* KOREAN */
+ #endif        /* CHINESE */
+ 
++#include <netdb.h>
++
+ #include "jslib.h"
+ #include "commonhd.h"
+ #include "jdata.h"
+@@ -205,6 +207,10 @@ GLOBAL int option_flag GLOBAL_VAL(0);
+ 
+ GLOBAL char jserver_dir[MAXPATHLEN];
+ GLOBAL char jserverrcfile[MAXPATHLEN];
++
++#define MAXLISTENADDR	256
++GLOBAL char listenaddr[MAXLISTENADDR][NI_MAXHOST];
++
+ GLOBAL char *hinsi_file_name GLOBAL_VAL(NULL);
+ GLOBAL char lang_dir[MAXPATHLEN];
+ 
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-jserver-do_filecom.c b/japanese/FreeWnn-lib/files/patch-Wnn-jserver-do_filecom.c
new file mode 100644
index 000000000000..d61abb016fa9
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-jserver-do_filecom.c
@@ -0,0 +1,209 @@
+Index: Wnn/jserver/do_filecom.c
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Wnn/jserver/do_filecom.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- Wnn/jserver/do_filecom.c	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Wnn/jserver/do_filecom.c	2 Jan 2010 11:51:24 -0000	1.2
+@@ -868,82 +868,96 @@ js_file_write (void)
+ void
+ js_file_receive (void)
+ {
+-  int env_id, fid;
+-  struct wnn_file_uniq fq;
+-  int mode = 1;
+-  int i;
+-  int error = 0;
++	int env_id, fid;
++	struct wnn_file_uniq fq;
++	int mode = 1;
++	int i;
++	int error = 0;
++
++	env_id = get4_cur();         /* env_id */
++	fid = get4_cur();
++	if (find_fid_in_env(env_id, fid) == -1) {
++		fprintf(stderr, "find_fid_in_env failed\n");
++
++		/* valid */
++		/* dummy */
++		puts_cur ("!");
++		putc_purge();
++		
++		error = 1;
++	} else {
++		fprintf(stderr, "find_fid_in_env success: %s\n",
++			files[fid].name);
++		puts_cur(files[fid].name);
++		putc_purge();
++
++	}
++
++	fprintf(stderr, "get4\n");
++       	if (get4_cur() == -1) {
++		/* Ack */
++		return;
++	}
++	fprintf(stderr, "get4: end\n");
++
++	fprintf(stderr, "get4 x 3 start\n");
++
++	fq.time = get4_cur();
++	fq.dev = get4_cur();
++	fq.inode = get4_cur();
++
++	fprintf(stderr, "get4 x 3 end\n");
++
++	for (i = 0; i < WNN_HOSTLEN; i++) {
++		fq.createhost[i] = getc_cur();
++	}
++
++	if (error || files[fid].ref_count == -1) {
++		wnn_errorno = WNN_FID_ERROR;
++		error_ret ();
++		putc_purge ();
++		return;
++	}
++
++	if (fq.time != 0) {
++		/* Old File Exist */
++		mode = must_write_file (&files[fid], &fq);
++	}
++
++	if (mode == -1) {
++		wnn_errorno = WNN_FID_ERROR;
++		error_ret ();
++		putc_purge ();
++		return;
++	} else if (mode == 0) {
++		/* need not saving */
++		put4_cur(0);
++		putc_purge();
++		return;
++	}
++
++	put4_cur (mode);
++	putc_purge ();
++
++	if (get4_cur () == -1)
++		return;
++
++	if (rcv_file (&files[fid], mode) == -1) {
++		/*      wnn_errorno=WNN_FILE_WRITE_ERROR; */
++		error_ret();
++		putc_purge();
++		return;
++	}
++
++	if (mode == 1 || mode == 2) {
++		clear_dirty_bit (&files[fid]);
++	}
+ 
+-  env_id = get4_cur ();         /* env_id */
+-  fid = get4_cur ();
+-   /**/ if (find_fid_in_env (env_id, fid) == -1)
+-    {                           /* valid */
+-      puts_cur ("!");
+-      putc_purge ();            /* dummy */
+-      error = 1;
+-    }
+-  else
+-    {
+-      puts_cur (files[fid].name);
+-      putc_purge ();
+-    }
+-  if (get4_cur () == -1)
+-    return;                     /* Ack */
+-
+-  fq.time = get4_cur ();
+-  fq.dev = get4_cur ();
+-  fq.inode = get4_cur ();
+-  for (i = 0; i < WNN_HOSTLEN; i++)
+-    {
+-      fq.createhost[i] = getc_cur ();
+-    }
+-  if (error || files[fid].ref_count == -1)
+-    {
+-      wnn_errorno = WNN_FID_ERROR;
+-      error_ret ();
+-      putc_purge ();
+-      return;
+-    }
+-  if (fq.time != 0)
+-    {                           /* Old File Exist */
+-      mode = must_write_file (&files[fid], &fq);
+-    }
+-
+-  if (mode == -1)
+-    {
+-      wnn_errorno = WNN_FID_ERROR;
+-      error_ret ();
+-      putc_purge ();
+-      return;
+-    }
+-  else if (mode == 0)
+-    {                           /* need not saving */
+-      put4_cur (0);
+-      putc_purge ();
+-      return;
+-    }
+-  put4_cur (mode);
+-  putc_purge ();
+-
+-  if (get4_cur () == -1)
+-    return;
+-
+-   /**/ if (rcv_file (&files[fid], mode) == -1)
+-    {
+-/*      wnn_errorno=WNN_FILE_WRITE_ERROR; */ error_ret ();
+-      putc_purge ();
+-      return;
+-    }
+-  if (mode == 1 || mode == 2)
+-    {
+-      clear_dirty_bit (&files[fid]);
+-    }
+-
+-  put4_cur (0);
++	put4_cur (0);
+ /*
+- put4_cur(fid);
++  put4_cur(fid);
+ */
+-  putc_purge ();
++	putc_purge();
+ }
+ 
+ 
+@@ -994,18 +1008,18 @@ del_fid_from_env (int env_id, int fid)
+ int
+ find_fid_in_env (int env_id, int fid)
+ {
+-  register int i;
+-  register int *file = env[env_id]->file;
+-  for (i = 0; i < WNN_MAX_FILE_OF_AN_ENV; i++)
+-    {
+-      if ((file)[i] == -1)
+-        continue;
+-      if ((file)[i] == fid)
+-        {
+-          return i;
+-        }
+-    }
+-  return -1;
++	int i;
++	int *file = env[env_id]->file;
++
++	for (i = 0; i < WNN_MAX_FILE_OF_AN_ENV; i++) {
++		if ((file)[i] == -1)
++			continue;
++		if ((file)[i] == fid) {
++			return i;
++		}
++	}
++
++	return -1;
+ }
+ 
+ static int
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-jserver-initjserv.c b/japanese/FreeWnn-lib/files/patch-Wnn-jserver-initjserv.c
new file mode 100644
index 000000000000..8aef17c29d32
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-jserver-initjserv.c
@@ -0,0 +1,52 @@
+Index: Wnn/jserver/initjserv.c
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Wnn/jserver/initjserv.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.3
+diff -u -p -r1.1.1.1 -r1.3
+--- Wnn/jserver/initjserv.c	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Wnn/jserver/initjserv.c	2 Jan 2009 11:46:51 -0000	1.3
+@@ -154,6 +154,7 @@ read_default (void)
+   char param[EXPAND_PATH_LENGTH +1];
+   char *word;
+   int i, num, *v[17];
++  int lindex = 0;
+ 
+   strcpy (jserver_dir, JSERVER_DIR);
+ 
+@@ -215,6 +216,15 @@ read_default (void)
+ 	    }
+           log_debug ("max_client=%d", max_client);
+         }
++      else if (listenaddr[lindex][0] == '\0'
++	       && strcmp(code, "listenaddr") == 0) {
++	      num = sscanf (data, "%s %s ", code, listenaddr[lindex]);
++	      if (num != 2) {
++		      log_err ("command %s invalid.", code);
++		      continue;
++	      }
++	      lindex++;
++      }
+       else if (strcmp (code, "max_sticky_env") == 0)
+         {
+           num = sscanf (data, "%s %d ", code, &max_sticky_env);
+@@ -305,7 +315,9 @@ read_default_files (void)
+     }
+   fclose (fp);
+ 
++  /*
+   printf ("Finished Reading Files\n");
++  */
+ 
+   return (0);
+ }
+@@ -340,7 +352,9 @@ read_default_file (char* buffer, size_t 
+ 
+   files[fid].localf = LOCAL;
+   strcpy (files[fid].name, buffer);
++  /*
+   printf ("Reading %s\t Fid = %d\n", buffer, fid);
++  */
+   if (read_file (&files[fid]) == -1)
+     {
+       printf ("Error reading %s\n", buffer);
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-man-Makefile.in b/japanese/FreeWnn-lib/files/patch-Wnn-man-Makefile.in
index 306a69e795cc..3f877086c50d 100644
--- a/japanese/FreeWnn-lib/files/patch-Wnn-man-Makefile.in
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-man-Makefile.in
@@ -1,11 +1,20 @@
---- Wnn/man/Makefile.in.orig	2008-10-27 03:58:56.000000000 +0900
-+++ Wnn/man/Makefile.in	2008-10-27 04:04:21.000000000 +0900
-@@ -34,7 +34,7 @@
+Index: Wnn/man/Makefile.in
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Wnn/man/Makefile.in,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- Wnn/man/Makefile.in	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Wnn/man/Makefile.in	2 Jan 2010 12:44:07 -0000	1.2
+@@ -32,9 +32,9 @@
+ include @top_srcdir@/makerule.mk
+ top_builddir = ../..
  
- LIB_WNNMANDIR = 3.libwnn
+-LIB_WNNMANDIR = 3.libwnn
++LIB_WNNMANDIR?= 3.libwnn
  
 -SERVER_WNNMANDIR = 2.env 4.cmd 6.jutil
-+#SERVER_WNNMANDIR = 2.env 4.cmd 6.jutil
++SERVER_WNNMANDIR?= 2.env 4.cmd 6.jutil
  
  SUBDIRS = @WNNMANDIR@
  
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-romkan-Makefile.in b/japanese/FreeWnn-lib/files/patch-Wnn-romkan-Makefile.in
new file mode 100644
index 000000000000..707758224a1d
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-romkan-Makefile.in
@@ -0,0 +1,17 @@
+Index: Wnn/romkan/Makefile.in
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Wnn/romkan/Makefile.in,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- Wnn/romkan/Makefile.in	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Wnn/romkan/Makefile.in	2 Jan 2010 12:10:16 -0000	1.2
+@@ -46,7 +46,7 @@ includes::
+ 
+ .c.o:
+ 	$(RM) $@
+-	$(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $<
++	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(_NOOP_) $<
+ 
+ clean::
+ 	$(RM) -r .libs
diff --git a/japanese/FreeWnn-lib/files/patch-Xwnmo-xwnmo-do_socket.c b/japanese/FreeWnn-lib/files/patch-Xwnmo-xwnmo-do_socket.c
new file mode 100644
index 000000000000..61c5d51abf14
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-Xwnmo-xwnmo-do_socket.c
@@ -0,0 +1,17 @@
+Index: Xwnmo/xwnmo/do_socket.c
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Xwnmo/xwnmo/do_socket.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- Xwnmo/xwnmo/do_socket.c	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Xwnmo/xwnmo/do_socket.c	20 Dec 2008 07:23:12 -0000	1.2
+@@ -118,8 +118,6 @@ static int rc = 0;
+ #define sock_clr(array,pos)     (array[pos/BINTSIZE] &= ~(1<<(pos%BINTSIZE)))
+ #define sock_tst(array,pos)     (array[pos/BINTSIZE] & (1<<(pos%BINTSIZE)))
+ 
+-extern int read (), write ();
+-
+ #define _Read(fd, data, size)   read((fd), (data), (size))
+ #define _Write(fd, data, size)  write((fd), (data), (size))
+ 
diff --git a/japanese/FreeWnn-lib/files/patch-Xwnmo-xwnmo-do_xjpdrct.c b/japanese/FreeWnn-lib/files/patch-Xwnmo-xwnmo-do_xjpdrct.c
new file mode 100644
index 000000000000..39bbf580fc7f
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-Xwnmo-xwnmo-do_xjpdrct.c
@@ -0,0 +1,17 @@
+Index: Xwnmo/xwnmo/do_xjpdrct.c
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/Xwnmo/xwnmo/do_xjpdrct.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- Xwnmo/xwnmo/do_xjpdrct.c	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ Xwnmo/xwnmo/do_xjpdrct.c	20 Dec 2008 07:23:12 -0000	1.2
+@@ -89,8 +89,6 @@ extern int cur_sock;
+ #define sock_clr(array,pos)     (array[pos/BINTSIZE] &= ~(1<<(pos%BINTSIZE)))
+ #define sock_tst(array,pos)     (array[pos/BINTSIZE] & (1<<(pos%BINTSIZE)))
+ 
+-extern int read (), write ();
+-
+ extern XJpClientRec *xjp_clients;
+ extern XJpClientRec *xjp_cur_client;
+ extern XJpInputRec *xjp_inputs;
diff --git a/japanese/FreeWnn-lib/files/patch-aclocal.m4 b/japanese/FreeWnn-lib/files/patch-aclocal.m4
new file mode 100644
index 000000000000..248bb2ea5a17
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-aclocal.m4
@@ -0,0 +1,11633 @@
+Index: aclocal.m4
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/aclocal.m4,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- aclocal.m4	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ aclocal.m4	2 Jan 2010 11:58:36 -0000	1.2
+@@ -1,7 +1,7 @@
+-# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
++# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+ 
+-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005, 2006, 2007, 2008  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.
+@@ -12,102 +12,187 @@
+ # PARTICULAR PURPOSE.
+ 
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
++#
++#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
++#                 2006, 2007, 2008 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 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 47 AC_PROG_LIBTOOL
+-
++# serial 56 LT_INIT
+ 
+-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+-# -----------------------------------------------------------
+-# If this macro is not defined by Autoconf, define it here.
+-m4_ifdef([AC_PROVIDE_IFELSE],
+-         [],
+-         [m4_define([AC_PROVIDE_IFELSE],
+-	         [m4_ifdef([AC_PROVIDE_$1],
+-		           [$2], [$3])])])
+ 
++# 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
++])
+ 
+-# AC_PROG_LIBTOOL
+-# ---------------
+-AC_DEFUN([AC_PROG_LIBTOOL],
+-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+-    [AC_LIBTOOL_CXX],
+-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+-  ])])
+-dnl And a similar setup for Fortran 77 support
+-  AC_PROVIDE_IFELSE([AC_PROG_F77],
+-    [AC_LIBTOOL_F77],
+-    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+-])])
+-
+-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+-    [AC_LIBTOOL_GCJ],
+-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+-      [AC_LIBTOOL_GCJ],
+-      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+-	[AC_LIBTOOL_GCJ],
+-      [ifdef([AC_PROG_GCJ],
+-	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+-       ifdef([A][M_PROG_GCJ],
+-	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+-       ifdef([LT_AC_PROG_GCJ],
+-	     [define([LT_AC_PROG_GCJ],
+-		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+-])])# AC_PROG_LIBTOOL
+ 
++# LT_INIT([OPTIONS])
++# ------------------
++AC_DEFUN([LT_INIT],
++[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
++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
+ 
+-# _AC_PROG_LIBTOOL
+-# ----------------
+-AC_DEFUN([_AC_PROG_LIBTOOL],
+-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
++dnl Parse OPTIONS
++_LT_SET_OPTIONS([$0], [$1])
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="$ltmain"
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ AC_SUBST(LIBTOOL)dnl
+ 
+-# Prevent multiple expansion
+-define([AC_PROG_LIBTOOL], [])
+-])# _AC_PROG_LIBTOOL
++_LT_SETUP
+ 
++# Only expand once:
++m4_define([LT_INIT])
++])# LT_INIT
+ 
+-# AC_LIBTOOL_SETUP
+-# ----------------
+-AC_DEFUN([AC_LIBTOOL_SETUP],
+-[AC_PREREQ(2.50)dnl
+-AC_REQUIRE([AC_ENABLE_SHARED])dnl
+-AC_REQUIRE([AC_ENABLE_STATIC])dnl
+-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])dnl
++# 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 "X$cc_temp" | $Xsed -e 's%.*/%%' -e "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
++_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([AC_PROG_LD])dnl
+-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+-AC_REQUIRE([AC_PROG_NM])dnl
+-
++AC_REQUIRE([LT_PATH_LD])dnl
++AC_REQUIRE([LT_PATH_NM])dnl
++dnl
+ AC_REQUIRE([AC_PROG_LN_S])dnl
+-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+-AC_REQUIRE([AC_OBJEXT])dnl
+-AC_REQUIRE([AC_EXEEXT])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_CMD_RELOAD])dnl
++m4_require([_LT_CHECK_MAGIC_METHOD])dnl
++m4_require([_LT_CMD_OLD_ARCHIVE])dnl
++m4_require([_LT_CMD_GLOBAL_SYMBOLS])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
+ 
+-AC_LIBTOOL_SYS_MAX_CMD_LEN
+-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+-AC_LIBTOOL_OBJDIR
++_LT_CHECK_OBJDIR
+ 
+-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+-_LT_AC_PROG_ECHO_BACKSLASH
++m4_require([_LT_TAG_COMPILER])dnl
++_LT_PROG_ECHO_BACKSLASH
+ 
+ case $host_os in
+ aix3*)
+@@ -123,174 +208,879 @@ esac
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
+-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
++sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+ 
+ # Same as above, but do not quote variable references.
+-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
++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'
+ 
+-# Constants:
+-rm="rm -f"
+-
+ # Global variables:
+-default_ofile=libtool
++ofile=libtool
+ can_build_shared=yes
+ 
+-# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+-ltmain="$ac_aux_dir/ltmain.sh"
+-ofile="$default_ofile"
+-with_gnu_ld="$lt_cv_prog_gnu_ld"
+ 
+-AC_CHECK_TOOL(AR, ar, false)
+-AC_CHECK_TOOL(RANLIB, ranlib, :)
+-AC_CHECK_TOOL(STRIP, strip, :)
++with_gnu_ld="$lt_cv_prog_gnu_ld"
+ 
+ old_CC="$CC"
+ old_CFLAGS="$CFLAGS"
+ 
+ # Set sane defaults for various variables
+-test -z "$AR" && AR=ar
+-test -z "$AR_FLAGS" && AR_FLAGS=cru
+-test -z "$AS" && AS=as
+ test -z "$CC" && CC=cc
+ test -z "$LTCC" && LTCC=$CC
+-test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+ test -z "$LD" && LD=ld
+-test -z "$LN_S" && LN_S="ln -s"
+-test -z "$MAGIC_CMD" && MAGIC_CMD=file
+-test -z "$NM" && NM=nm
+-test -z "$SED" && SED=sed
+-test -z "$OBJDUMP" && OBJDUMP=objdump
+-test -z "$RANLIB" && RANLIB=:
+-test -z "$STRIP" && STRIP=:
+ test -z "$ac_objext" && ac_objext=o
+ 
+-# Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+-old_postinstall_cmds='chmod 644 $oldlib'
+-old_postuninstall_cmds=
+-
+-if test -n "$RANLIB"; then
+-  case $host_os in
+-  openbsd*)
+-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+-    ;;
+-  *)
+-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+-    ;;
+-  esac
+-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+-fi
++_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
+-    AC_PATH_MAGIC
++    _LT_PATH_MAGIC
+   fi
+   ;;
+ esac
+ 
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+-enable_win32_dll=yes, enable_win32_dll=no)
+-
+-AC_ARG_ENABLE([libtool-lock],
+-    [AC_HELP_STRING([--disable-libtool-lock],
+-	[avoid locking (might break parallel builds)])])
+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++# 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_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
++
++
++
++# 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], [[!?.]$], [], [.])
++)])
++
++
+ 
+-AC_ARG_WITH([pic],
+-    [AC_HELP_STRING([--with-pic],
+-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+-    [pic_mode="$withval"],
+-    [pic_mode=default])
+-test -z "$pic_mode" && pic_mode=default
+ 
+-# Use C for the default configuration in the libtool script
+-tagname=
+-AC_LIBTOOL_LANG_C_CONFIG
+-_LT_AC_TAGCONFIG
+-])# AC_LIBTOOL_SETUP
++
++# _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 "X$][$1" | $Xsed -e "$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 "X$<var>" | $Xsed -e "$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_AC_SYS_COMPILER
++# _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
+ # -------------------
+-AC_DEFUN([_LT_AC_SYS_COMPILER],
++# 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'
++
++# Quote evaled strings.
++for var in lt_decl_all_varnames([[ \
++]], lt_decl_quote_varnames); do
++    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
++    *[[\\\\\\\`\\"\\\$]]*)
++      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$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 "X\\\\\$\$var"\` in
++    *[[\\\\\\\`\\"\\\$]]*)
++      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
++      ;;
++    *)
++      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
++      ;;
++    esac
++done
++
++# Fix-up fallback echo if it was mangled by the above quoting rules.
++case \$lt_ECHO in
++*'\\\[$]0 --fallback-echo"')dnl "
++  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
++  ;;
++esac
++
++_LT_OUTPUT_LIBTOOL_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])
++cat >"$CONFIG_LT" <<_LTEOF
++#! $SHELL
++# Generated by $as_me.
++# Run this file to recreate a libtool stub with the current configuration.
++
++lt_cl_silent=false
++SHELL=\${CONFIG_SHELL-$SHELL}
++_LTEOF
++
++cat >>"$CONFIG_LT" <<\_LTEOF
++AS_SHELL_SANITIZE
++_AS_PREPARE
++
++exec AS_MESSAGE_FD>&1
++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) 2008 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.
++if test "$no_create" != yes; then
++  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)
++fi
++])# 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 '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
++    || (rm -f "$cfgfile"; exit 1)
++
++  _LT_PROG_XSI_SHELLFNS
++
++  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
++    || (rm -f "$cfgfile"; exit 1)
++
++  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)],
++  [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
++
++
++# _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([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)])
++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], [])
++
++
++# _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_AC_SYS_COMPILER
++])# _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_AC_SYS_LIBPATH_AIX
++# _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 test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 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"
++    ])
++    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" != ":"; then
++      _lt_dsymutil='~$DSYMUTIL $lib || :'
++    else
++      _lt_dsymutil=
++    fi
++    ;;
++  esac
++])
++
++
++# _LT_DARWIN_LINKER_FEATURES
++# --------------------------
++# 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
++  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
++  _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=echo
++    _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
++# -----------------------
+ # 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.
+-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++m4_defun([_LT_SYS_MODULE_PATH_AIX],
++[m4_require([_LT_DECL_SED])dnl
++AC_LINK_IFELSE(AC_LANG_PROGRAM,[
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++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 "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi],[])
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi],[])
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+-])# _LT_AC_SYS_LIBPATH_AIX
++])# _LT_SYS_MODULE_PATH_AIX
+ 
+ 
+-# _LT_AC_SHELL_INIT(ARG)
+-# ----------------------
+-AC_DEFUN([_LT_AC_SHELL_INIT],
++# _LT_SHELL_INIT(ARG)
++# -------------------
++m4_define([_LT_SHELL_INIT],
+ [ifdef([AC_DIVERSION_NOTICE],
+ 	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+ 	 [AC_DIVERT_PUSH(NOTICE)])
+ $1
+ AC_DIVERT_POP
+-])# _LT_AC_SHELL_INIT
++])# _LT_SHELL_INIT
+ 
+ 
+-# _LT_AC_PROG_ECHO_BACKSLASH
+-# --------------------------
++# _LT_PROG_ECHO_BACKSLASH
++# -----------------------
+ # Add some code to the start of the generated configure script which
+ # will find an echo command which doesn't interpret backslashes.
+-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+-[_LT_AC_SHELL_INIT([
++m4_defun([_LT_PROG_ECHO_BACKSLASH],
++[_LT_SHELL_INIT([
+ # Check that we are running under the correct shell.
+ SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+-case X$ECHO in
++case X$lt_ECHO in
+ X*--fallback-echo)
+   # Remove one level of quotation (which was required for Make).
+-  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
++  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+   ;;
+ esac
+ 
+-echo=${ECHO-echo}
++ECHO=${lt_ECHO-echo}
+ if test "X[$]1" = X--no-reexec; then
+   # Discard the --no-reexec flag, and continue.
+   shift
+ elif test "X[$]1" = X--fallback-echo; then
+   # Avoid inline document here, it may be left over
+   :
+-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+-  # Yippee, $echo works!
++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
++  # Yippee, $ECHO works!
+   :
+ else
+   # Restart under the correct shell.
+@@ -300,134 +1090,137 @@ fi
+ if test "X[$]1" = X--fallback-echo; then
+   # used as fallback echo
+   shift
+-  cat <<EOF
++  cat <<_LT_EOF
+ [$]*
+-EOF
++_LT_EOF
+   exit 0
+ fi
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+-
+-if test -z "$ECHO"; then
+-if test "X${echo_test_string+set}" != Xset; then
+-# find a string as large as possible, as long as the shell can cope with it
+-  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+-       echo_test_string="`eval $cmd`" &&
+-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+-    then
+-      break
+-    fi
+-  done
+-fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+-   test "X$echo_testing_string" = "X$echo_test_string"; then
+-  :
+-else
+-  # The Solaris, AIX, and Digital Unix default echo programs unquote
+-  # backslashes.  This makes it impossible to quote backslashes using
+-  #   echo "$something" | sed 's/\\/\\\\/g'
+-  #
+-  # So, first we look for a working echo in the user's PATH.
++if test -z "$lt_ECHO"; then
++  if test "X${echo_test_string+set}" != Xset; then
++    # find a string as large as possible, as long as the shell can cope with it
++    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
++      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
++	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
++      then
++        break
++      fi
++    done
++  fi
+ 
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for dir in $PATH /usr/ucb; do
++  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
++     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
++     test "X$echo_testing_string" = "X$echo_test_string"; then
++    :
++  else
++    # The Solaris, AIX, and Digital Unix default echo programs unquote
++    # backslashes.  This makes it impossible to quote backslashes using
++    #   echo "$something" | sed 's/\\/\\\\/g'
++    #
++    # So, first we look for a working echo in the user's PATH.
++
++    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++    for dir in $PATH /usr/ucb; do
++      IFS="$lt_save_ifs"
++      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++         test "X$echo_testing_string" = "X$echo_test_string"; then
++        ECHO="$dir/echo"
++        break
++      fi
++    done
+     IFS="$lt_save_ifs"
+-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+-       test "X$echo_testing_string" = "X$echo_test_string"; then
+-      echo="$dir/echo"
+-      break
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
+ 
+-  if test "X$echo" = Xecho; then
+-    # We didn't find a better echo, so look for alternatives.
+-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+-       test "X$echo_testing_string" = "X$echo_test_string"; then
+-      # This shell has a builtin print -r that does the trick.
+-      echo='print -r'
+-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+-      # If we have ksh, try running configure again with it.
+-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+-      export ORIGINAL_CONFIG_SHELL
+-      CONFIG_SHELL=/bin/ksh
+-      export CONFIG_SHELL
+-      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+-    else
+-      # Try using printf.
+-      echo='printf %s\n'
+-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+-	 test "X$echo_testing_string" = "X$echo_test_string"; then
+-	# Cool, printf works
+-	:
+-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+-	   test "X$echo_testing_string" = 'X\t' &&
+-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+-	   test "X$echo_testing_string" = "X$echo_test_string"; then
+-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+-	export CONFIG_SHELL
+-	SHELL="$CONFIG_SHELL"
+-	export SHELL
+-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+-      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+-	   test "X$echo_testing_string" = 'X\t' &&
+-	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+-	   test "X$echo_testing_string" = "X$echo_test_string"; then
+-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
++    if test "X$ECHO" = Xecho; then
++      # We didn't find a better echo, so look for alternatives.
++      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
++         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
++         test "X$echo_testing_string" = "X$echo_test_string"; then
++        # This shell has a builtin print -r that does the trick.
++        ECHO='print -r'
++      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
++	   test "X$CONFIG_SHELL" != X/bin/ksh; then
++        # If we have ksh, try running configure again with it.
++        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++        export ORIGINAL_CONFIG_SHELL
++        CONFIG_SHELL=/bin/ksh
++        export CONFIG_SHELL
++        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+       else
+-	# maybe with a smaller string...
+-	prev=:
++        # Try using printf.
++        ECHO='printf %s\n'
++        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
++	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	  # Cool, printf works
++	  :
++        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++	     test "X$echo_testing_string" = 'X\t' &&
++	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	     test "X$echo_testing_string" = "X$echo_test_string"; then
++	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
++	  export CONFIG_SHELL
++	  SHELL="$CONFIG_SHELL"
++	  export SHELL
++	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
++        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++	     test "X$echo_testing_string" = 'X\t' &&
++	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	     test "X$echo_testing_string" = "X$echo_test_string"; then
++	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
++        else
++	  # maybe with a smaller string...
++	  prev=:
+ 
+-	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+-	  then
+-	    break
+-	  fi
+-	  prev="$cmd"
+-	done
++	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
++	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
++	    then
++	      break
++	    fi
++	    prev="$cmd"
++	  done
+ 
+-	if test "$prev" != 'sed 50q "[$]0"'; then
+-	  echo_test_string=`eval $prev`
+-	  export echo_test_string
+-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+-	else
+-	  # Oops.  We lost completely, so just stick with echo.
+-	  echo=echo
+-	fi
++	  if test "$prev" != 'sed 50q "[$]0"'; then
++	    echo_test_string=`eval $prev`
++	    export echo_test_string
++	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
++	  else
++	    # Oops.  We lost completely, so just stick with echo.
++	    ECHO=echo
++	  fi
++        fi
+       fi
+     fi
+   fi
+ fi
+-fi
+ 
+ # Copy echo and quote the copy suitably for passing to libtool from
+ # the Makefile, instead of quoting the original, which is used later.
+-ECHO=$echo
+-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+-   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
++lt_ECHO=$ECHO
++if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
++   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+ fi
+ 
+-AC_SUBST(ECHO)
+-])])# _LT_AC_PROG_ECHO_BACKSLASH
++AC_SUBST(lt_ECHO)
++])
++_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
++_LT_DECL([], [ECHO], [1],
++    [An echo program that does not interpret backslashes])
++])# _LT_PROG_ECHO_BACKSLASH
+ 
+ 
+-# _LT_AC_LOCK
+-# -----------
+-AC_DEFUN([_LT_AC_LOCK],
++# _LT_ENABLE_LOCK
++# ---------------
++m4_defun([_LT_ENABLE_LOCK],
+ [AC_ARG_ENABLE([libtool-lock],
+-    [AC_HELP_STRING([--disable-libtool-lock],
+-	[avoid locking (might break parallel builds)])])
++  [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
+@@ -438,12 +1231,12 @@ ia64-*-hpux*)
+   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"
+-      ;;
++      *ELF-32*)
++	HPUX_IA64_MODE="32"
++	;;
++      *ELF-64*)
++	HPUX_IA64_MODE="64"
++	;;
+     esac
+   fi
+   rm -rf conftest*
+@@ -452,72 +1245,79 @@ ia64-*-hpux*)
+   # Find out which ABI we are using.
+   echo '[#]line __oline__ "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
++    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-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*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-*linux*)
+-          LD="${LD-ld} -m elf_i386"
+-          ;;
+-        ppc64-*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-*linux*)
+-          LD="${LD-ld} -m elf_x86_64"
+-          ;;
+-        ppc*-*linux*|powerpc*-*linux*)
+-          LD="${LD-ld} -m elf64ppc"
+-          ;;
+-        s390*-*linux*)
+-          LD="${LD-ld} -m elf64_s390"
+-          ;;
+-        sparc*-*linux*)
+-          LD="${LD-ld} -m elf64_sparc"
+-          ;;
+-      esac
+-      ;;
++    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"
++	    ;;
++	  ppc64-*linux*|powerpc64-*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"
++	    ;;
++	  ppc*-*linux*|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*
+@@ -529,36 +1329,90 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
+   CFLAGS="$CFLAGS -belf"
+   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+     [AC_LANG_PUSH(C)
+-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
++     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
+   ;;
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+-  AC_CHECK_TOOL(AS, as, false)
+-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
++sparc*-*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*) LD="${LD-ld} -m elf64_sparc" ;;
++      *)
++	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_CMD_OLD_ARCHIVE
++# -------------------
++m4_defun([_LT_CMD_OLD_ARCHIVE],
++[AC_CHECK_TOOL(AR, ar, false)
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++_LT_DECL([], [AR], [1], [The archiver])
++_LT_DECL([], [AR_FLAGS], [1])
++
++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=
+ 
+-])# _LT_AC_LOCK
++if test -n "$RANLIB"; then
++  case $host_os in
++  openbsd*)
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
++    ;;
++  *)
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
++    ;;
++  esac
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++fi
++_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_CMD_OLD_ARCHIVE
+ 
+ 
+-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
++# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+ #		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+ # ----------------------------------------------------------------
+ # Check whether the given compiler option works
+-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+-[AC_CACHE_CHECK([$1], [$2],
++AC_DEFUN([_LT_COMPILER_OPTION],
++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_DECL_SED])dnl
++AC_CACHE_CHECK([$1], [$2],
+   [$2=no
+-  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   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.
+@@ -566,7 +1420,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+    # 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}? :&$lt_compiler_flag :; t' \
++   -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -576,62 +1430,82 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+    echo "$as_me:__oline__: \$? = $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
+-     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/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*
++   $RM conftest*
+ ])
+ 
+ if test x"[$]$2" = xyes; then
+-    ifelse([$5], , :, [$5])
++    m4_if([$5], , :, [$5])
+ else
+-    ifelse([$6], , :, [$6])
++    m4_if([$6], , :, [$6])
+ fi
+-])# AC_LIBTOOL_COMPILER_OPTION
+-
++])# _LT_COMPILER_OPTION
+ 
+-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+-#                          [ACTION-SUCCESS], [ACTION-FAILURE])
+-# ------------------------------------------------------------
+-# Check whether the given compiler option works
+-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+-[AC_CACHE_CHECK([$1], [$2],
++# 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"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+-     # The compiler can only warn and ignore the option if not recognized
++     # 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 "X$_lt_linker_boilerplate" | $Xsed -e '/^$/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 conftest*
++   $RM -r conftest*
+    LDFLAGS="$save_LDFLAGS"
+ ])
+ 
+ if test x"[$]$2" = xyes; then
+-    ifelse([$4], , :, [$4])
++    m4_if([$4], , :, [$4])
+ else
+-    ifelse([$5], , :, [$5])
++    m4_if([$5], , :, [$5])
+ fi
+-])# AC_LIBTOOL_LINKER_OPTION
++])# _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], [])
+ 
+-# AC_LIBTOOL_SYS_MAX_CMD_LEN
+-# --------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+-[# find the maximum length of command line arguments
++
++# 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
+-  testring="ABCD"
++  teststring="ABCD"
+ 
+   case $build_os in
+   msdosdjgpp*)
+@@ -649,7 +1523,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
+     lt_cv_sys_max_cmd_len=-1;
+     ;;
+ 
+-  cygwin* | mingw*)
++  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,
+@@ -660,24 +1534,85 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+- *)
+-    # 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"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
+-	       = "XX$testring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
+-	    lt_cv_sys_max_cmd_len=$new_result &&
+-	    test $i != 17 # 1/2 MB should be enough
+-    do
+-      i=`expr $i + 1`
+-      testring=$testring$testring
+-    done
+-    testring=
+-    # 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`
++  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
++    ;;
++
++  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"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
++	         = "XX$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
+ ])
+@@ -686,27 +1621,35 @@ if test -n $lt_cv_sys_max_cmd_len ; then
+ else
+   AC_MSG_RESULT(none)
+ fi
+-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
++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_AC_CHECK_DLFCN
+-# --------------------
+-AC_DEFUN([_LT_AC_CHECK_DLFCN],
+-[AC_CHECK_HEADERS(dlfcn.h)dnl
+-])# _LT_AC_CHECK_DLFCN
++
++# _LT_HEADER_DLFCN
++# ----------------
++m4_defun([_LT_HEADER_DLFCN],
++[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
++])# _LT_HEADER_DLFCN
+ 
+ 
+-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+-#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+-# ------------------------------------------------------------------
+-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++# _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 <<EOF
++  cat > conftest.$ac_ext <<_LT_EOF
+ [#line __oline__ "configure"
+ #include "confdefs.h"
+ 
+@@ -748,10 +1691,6 @@ else
+ #  endif
+ #endif
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -764,17 +1703,19 @@ int main ()
+       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+       /* dlclose (self); */
+     }
++  else
++    puts (dlerror ());
+ 
+-    exit (status);
++  return status;
+ }]
+-EOF
++_LT_EOF
+   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
++    (./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_unknown|x*) $3 ;;
++      x$lt_dlunknown|x*) $3 ;;
+     esac
+   else :
+     # compilation failed
+@@ -782,13 +1723,13 @@ EOF
+   fi
+ fi
+ rm -fr conftest*
+-])# _LT_AC_TRY_DLOPEN_SELF
++])# _LT_TRY_DLOPEN_SELF
+ 
+ 
+-# AC_LIBTOOL_DLOPEN_SELF
+-# -------------------
+-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++# 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
+@@ -804,15 +1745,15 @@ else
+     lt_cv_dlopen_self=yes
+     ;;
+ 
+-  mingw* | pw32*)
++  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
+@@ -822,13 +1763,13 @@ else
+     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="-dld"],
++	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ 	[AC_CHECK_FUNC([dlopen],
+ 	      [lt_cv_dlopen="dlopen"],
+ 	  [AC_CHECK_LIB([dl], [dlopen],
+@@ -836,7 +1777,7 @@ else
+ 	    [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="-dld"])
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ 	      ])
+ 	    ])
+ 	  ])
+@@ -857,23 +1798,23 @@ else
+     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ 
+     save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++    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_AC_TRY_DLOPEN_SELF(
++	  _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
+-      LDFLAGS="$LDFLAGS $link_static_flag"
++      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_AC_TRY_DLOPEN_SELF(
++	  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)
+       ])
+@@ -895,29 +1836,36 @@ else
+   *) enable_dlopen_self_static=unknown ;;
+   esac
+ fi
+-])# AC_LIBTOOL_DLOPEN_SELF
++_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], [])
+ 
+ 
+-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+-# ---------------------------------
+-# Check to see if options -c and -o are simultaneously supported by compiler
+-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++# _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_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+-   $rm -r conftest 2>/dev/null
++  [_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
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
++   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
+@@ -925,7 +1873,7 @@ AC_CACHE_CHECK([if $compiler supports -c
+    # 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}? :&$lt_compiler_flag :; t' \
++   -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -937,32 +1885,41 @@ AC_CACHE_CHECK([if $compiler supports -c
+    then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+-     if test ! -s out/conftest.err; then
+-       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/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 .
+-   $rm conftest* out/*
+-   rmdir out
++   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 ..
+-   rmdir conftest
+-   $rm conftest*
++   $RM -r conftest
++   $RM conftest*
+ ])
+-])# AC_LIBTOOL_PROG_CC_C_O
++_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
++	[Does compiler simultaneously support -c and -o options?])
++])# _LT_COMPILER_C_O
+ 
+ 
+-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
+-# -----------------------------------------
++# _LT_COMPILER_FILE_LOCKS([TAGNAME])
++# ----------------------------------
+ # Check to see if we can do hard links to lock some files if needed
+-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
+-[AC_REQUIRE([_LT_AC_LOCK])dnl
++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_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
++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*
++  $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
+@@ -975,12 +1932,13 @@ if test "$_LT_AC_TAGVAR(lt_cv_prog_compi
+ else
+   need_locks=no
+ fi
+-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
++_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
++])# _LT_COMPILER_FILE_LOCKS
+ 
+ 
+-# AC_LIBTOOL_OBJDIR
+-# -----------------
+-AC_DEFUN([AC_LIBTOOL_OBJDIR],
++# _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
+@@ -992,40 +1950,46 @@ else
+ fi
+ rmdir .libs 2>/dev/null])
+ objdir=$lt_cv_objdir
+-])# AC_LIBTOOL_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
+ 
+ 
+-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
+-# ----------------------------------------------
++# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
++# --------------------------------------
+ # Check hardcoding attributes.
+-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
++m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+ [AC_MSG_CHECKING([how to hardcode library paths into programs])
+-_LT_AC_TAGVAR(hardcode_action, $1)=
+-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+-   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
++_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-existant directories.
+-  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
++  # 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_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+-     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
++     ## 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_AC_TAGVAR(hardcode_action, $1)=relink
++    _LT_TAGVAR(hardcode_action, $1)=relink
+   else
+     # We can link without hardcoding, and we can hardcode nonexisting dirs.
+-    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
++    _LT_TAGVAR(hardcode_action, $1)=immediate
+   fi
+ else
+   # We cannot hardcode anything, or else we can only hardcode existing
+   # directories.
+-  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
++  _LT_TAGVAR(hardcode_action, $1)=unsupported
+ fi
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
++AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+ 
+-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
++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 ||
+@@ -1033,47 +1997,111 @@ elif test "$shlibpath_overrides_runpath"
+   # Fast installation is not necessary
+   enable_fast_install=needless
+ fi
+-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
++_LT_TAGDECL([], [hardcode_action], [0],
++    [How to hardcode a shared library path into an executable])
++])# _LT_LINKER_HARDCODE_LIBPATH
+ 
+ 
+-# AC_LIBTOOL_SYS_LIB_STRIP
+-# ------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
+-[striplib=
++# _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
++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"
+-         AC_MSG_RESULT([yes])
+-       else
+-  AC_MSG_RESULT([no])
+-fi
+-       ;;
+-   *)
+-  AC_MSG_RESULT([no])
++  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  
++  esac
+ fi
+-])# AC_LIBTOOL_SYS_LIB_STRIP
++_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
++_LT_DECL([], [striplib], [1])
++])# _LT_CMD_STRIPLIB
+ 
+ 
+-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
++# _LT_SYS_DYNAMIC_LINKER([TAG])
+ # -----------------------------
+ # PORTME Fill in your ld.so characteristics
+-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+-[AC_MSG_CHECKING([dynamic linker 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
++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
++  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
++    # 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 -e 's/;/ /g'`
++  else
++    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++  # 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; }
++}'`
++  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi])
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -1083,20 +2111,6 @@ shlibpath_overrides_runpath=unknown
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+-    # 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.
+-    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
+-else
+-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -1114,7 +2128,7 @@ aix3*)
+   soname_spec='${libname}${release}${shared_ext}$major'
+   ;;
+ 
+-aix4* | aix5*)
++aix[[4-9]]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -1133,7 +2147,7 @@ aix4* | aix5*)
+       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
++	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ 	:
+       else
+ 	can_build_shared=no
+@@ -1159,9 +2173,18 @@ aix4* | aix5*)
+   ;;
+ 
+ amigaos*)
+-  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=`$echo "X$lib" | $Xsed -e '\''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'
++  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=`$ECHO "X$lib" | $Xsed -e '\''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*)
+@@ -1170,7 +2193,7 @@ beos*)
+   shlibpath_var=LIBRARY_PATH
+   ;;
+ 
+-bsdi4*)
++bsdi[[45]]*)
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -1184,51 +2207,55 @@ bsdi4*)
+   # libtool to hard-code these into programs
+   ;;
+ 
+-cygwin* | mingw* | pw32*)
++cygwin* | mingw* | pw32* | cegcc*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+   case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32*)
++  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+     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'\''`~
++      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'
++      $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'
++       $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="/lib /lib/w32api /usr/lib /usr/local/lib"
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+       ;;
+-    mingw*)
++    mingw* | cegcc*)
+       # MinGW DLLs use traditional 'lib' prefix
+       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
++      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+         # It is most probably a Windows format PATH printed by
+         # mingw gcc, but we are running on Cygwin. Gcc prints its search
+         # path with ; separators, and with drive letters. We can handle the
+         # drive letters (cygwin fileutils understands them), so leave them,
+         # especially as we might pass files found there to a mingw objdump,
+         # which wouldn't understand a cygwinified path. Ahh.
+-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++        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"`
++        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+       fi
+       ;;
+     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}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+     ;;
+@@ -1247,18 +2274,13 @@ darwin* | rhapsody*)
+   version_type=darwin
+   need_lib_prefix=no
+   need_version=no
+-  # FIXME: Relying on posixy $() will cause problems for
+-  #        cross-compilation, but unfortunately the echo tests do not
+-  #        yet detect zsh echo's removal of \ escapes.
+-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  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='$(test .$module = .yes && echo .so || echo .dylib)'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then 
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  fi
++  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'
+   ;;
+ 
+@@ -1275,8 +2297,17 @@ freebsd1*)
+   dynamic_linker=no
+   ;;
+ 
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++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[[123]]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -1294,14 +2325,19 @@ freebsd*)
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.[01]* | freebsdelf3.[01]*)
++  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+-  *) # from 3.2 on
++  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
+   ;;
+ 
+@@ -1321,9 +2357,9 @@ hpux9* | hpux10* | hpux11*)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+-  case "$host_cpu" in
++  case $host_cpu in
+   ia64*)
+-    shrext='.so'
++    shrext_cmds='.so'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.so"
+     shlibpath_var=LD_LIBRARY_PATH
+@@ -1337,19 +2373,19 @@ hpux9* | hpux10* | hpux11*)
+     fi
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+-   hppa*64*)
+-     shrext='.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='.sl'
++  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
+@@ -1361,6 +2397,18 @@ hpux9* | hpux10* | hpux11*)
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix[[3-9]]*)
++  version_type=linux
++  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 ;;
+@@ -1404,7 +2452,7 @@ linux*oldld* | linux*aout* | linux*coff*
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -1413,11 +2461,28 @@ linux*)
+   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
++  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],
++       [shlibpath_overrides_runpath=yes])])
++  LDFLAGS=$save_LDFLAGS
++  libdir=$save_libdir
++
+   # 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
+ 
++  # 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;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $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,
+@@ -1431,12 +2496,12 @@ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++  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}${release}${shared_ext} ${libname}${shared_ext}'
++    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
+@@ -1452,24 +2517,31 @@ newsos6)
+   shlibpath_overrides_runpath=yes
+   ;;
+ 
+-nto-qnx)
+-  version_type=linux
++*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=yes
++  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
+-  need_version=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
++  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
+@@ -1485,7 +2557,7 @@ openbsd*)
+ 
+ os2*)
+   libname_spec='$name'
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+@@ -1503,11 +2575,8 @@ osf3* | osf4* | osf5*)
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  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
++rdos*)
++  dynamic_linker=no
+   ;;
+ 
+ solaris*)
+@@ -1535,7 +2604,7 @@ sunos4*)
+   need_version=yes
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+@@ -1544,7 +2613,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+     sni)
+       shlibpath_overrides_runpath=no
+       need_lib_prefix=no
+-      export_dynamic_flag_spec='${wl}-Blargedynsym'
+       runpath_var=LD_RUN_PATH
+       ;;
+     siemens)
+@@ -1568,6 +2636,39 @@ sysv4*MP*)
+   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
++  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
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -1581,271 +2682,59 @@ uts4*)
+ esac
+ AC_MSG_RESULT([$dynamic_linker])
+ test "$dynamic_linker" = no && can_build_shared=no
+-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+-
+-
+-# _LT_AC_TAGCONFIG
+-# ----------------
+-AC_DEFUN([_LT_AC_TAGCONFIG],
+-[AC_ARG_WITH([tags],
+-    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+-        [include additional configurations @<:@automatic@:>@])],
+-    [tagnames="$withval"])
+-
+-if test -f "$ltmain" && test -n "$tagnames"; then
+-  if test ! -f "${ofile}"; then
+-    AC_MSG_WARN([output file `$ofile' does not exist])
+-  fi
+-
+-  if test -z "$LTCC"; then
+-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+-    if test -z "$LTCC"; then
+-      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+-    else
+-      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+-    fi
+-  fi
+-
+-  # Extract list of available tagged configurations in $ofile.
+-  # Note that this assumes the entire list is on one line.
+-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
+-
+-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-  for tagname in $tagnames; do
+-    IFS="$lt_save_ifs"
+-    # Check whether tagname contains only valid characters
+-    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
+-    "") ;;
+-    *)  AC_MSG_ERROR([invalid tag name: $tagname])
+-	;;
+-    esac
+-
+-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+-    then
+-      AC_MSG_ERROR([tag name \"$tagname\" already exists])
+-    fi
+-
+-    # Update the list of available tags.
+-    if test -n "$tagname"; then
+-      echo appending configuration tag \"$tagname\" to $ofile
+-
+-      case $tagname in
+-      CXX)
+-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
+-	  AC_LIBTOOL_LANG_CXX_CONFIG
+-	else
+-	  tagname=""
+-	fi
+-	;;
+-
+-      F77)
+-	if test -n "$F77" && test "X$F77" != "Xno"; then
+-	  AC_LIBTOOL_LANG_F77_CONFIG
+-	else
+-	  tagname=""
+-	fi
+-	;;
+ 
+-      GCJ)
+-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+-	  AC_LIBTOOL_LANG_GCJ_CONFIG
+-	else
+-	  tagname=""
+-	fi
+-	;;
+-
+-      RC)
+-	AC_LIBTOOL_LANG_RC_CONFIG
+-	;;
+-
+-      *)
+-	AC_MSG_ERROR([Unsupported tag name: $tagname])
+-	;;
+-      esac
+-
+-      # Append the new tag name to the list of available tags.
+-      if test -n "$tagname" ; then
+-      available_tags="$available_tags $tagname"
+-    fi
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
+-
+-  # Now substitute the updated list of available tags.
+-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+-    mv "${ofile}T" "$ofile"
+-    chmod +x "$ofile"
+-  else
+-    rm -f "${ofile}T"
+-    AC_MSG_ERROR([unable to update list of available tagged configurations.])
+-  fi
++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
+-])# _LT_AC_TAGCONFIG
+-
+-
+-# AC_LIBTOOL_DLOPEN
+-# -----------------
+-# enable checks for dlopen support
+-AC_DEFUN([AC_LIBTOOL_DLOPEN],
+- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
+-])# AC_LIBTOOL_DLOPEN
+-
+-
+-# AC_LIBTOOL_WIN32_DLL
+-# --------------------
+-# declare package support for building win32 dll's
+-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+-])# AC_LIBTOOL_WIN32_DLL
+-
+-
+-# AC_ENABLE_SHARED([DEFAULT])
+-# ---------------------------
+-# implement the --enable-shared flag
+-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_SHARED],
+-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([shared],
+-    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+-	[build shared libraries @<:@default=]AC_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=]AC_ENABLE_SHARED_DEFAULT)
+-])# AC_ENABLE_SHARED
+-
+-
+-# AC_DISABLE_SHARED
+-# -----------------
+-#- set the default shared flag to --disable-shared
+-AC_DEFUN([AC_DISABLE_SHARED],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_SHARED(no)
+-])# AC_DISABLE_SHARED
+-
+-
+-# AC_ENABLE_STATIC([DEFAULT])
+-# ---------------------------
+-# implement the --enable-static flag
+-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_STATIC],
+-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([static],
+-    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+-	[build static libraries @<:@default=]AC_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=]AC_ENABLE_STATIC_DEFAULT)
+-])# AC_ENABLE_STATIC
+-
+-
+-# AC_DISABLE_STATIC
+-# -----------------
+-# set the default static flag to --disable-static
+-AC_DEFUN([AC_DISABLE_STATIC],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_STATIC(no)
+-])# AC_DISABLE_STATIC
+-
+-
+-# AC_ENABLE_FAST_INSTALL([DEFAULT])
+-# ---------------------------------
+-# implement the --enable-fast-install flag
+-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([fast-install],
+-    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+-    [optimize for fast installation @<:@default=]AC_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=]AC_ENABLE_FAST_INSTALL_DEFAULT)
+-])# AC_ENABLE_FAST_INSTALL
+ 
++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
+ 
+-# AC_DISABLE_FAST_INSTALL
+-# -----------------------
+-# set the default to --disable-fast-install
+-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_FAST_INSTALL(no)
+-])# AC_DISABLE_FAST_INSTALL
++_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([], [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
+ 
+ 
+-# AC_LIBTOOL_PICMODE([MODE])
++# _LT_PATH_TOOL_PREFIX(TOOL)
+ # --------------------------
+-# implement the --with-pic flag
+-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+-AC_DEFUN([AC_LIBTOOL_PICMODE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-pic_mode=ifelse($#,1,$1,default)
+-])# AC_LIBTOOL_PICMODE
+-
+-
+-# AC_PROG_EGREP
+-# -------------
+-# This is predefined starting with Autoconf 2.54, so this conditional
+-# definition can be removed once we require Autoconf 2.54 or later.
+-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
+-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+-    then ac_cv_prog_egrep='grep -E'
+-    else ac_cv_prog_egrep='egrep'
+-    fi])
+- EGREP=$ac_cv_prog_egrep
+- AC_SUBST([EGREP])
+-])])
+-
+-
+-# AC_PATH_TOOL_PREFIX
+-# -------------------
+-# find a file program which can recognise shared library
+-AC_DEFUN([AC_PATH_TOOL_PREFIX],
+-[AC_REQUIRE([AC_PROG_EGREP])dnl
++# 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
+@@ -1858,7 +2747,7 @@ AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+ 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="ifelse([$2], , $PATH, [$2])"
++  ac_dummy="m4_if([$2], , $PATH, [$2])"
+   for ac_dir in $ac_dummy; do
+     IFS="$lt_save_ifs"
+     test -z "$ac_dir" && ac_dir=.
+@@ -1867,13 +2756,13 @@ dnl not every word.  This closes a longs
+       if test -n "$file_magic_test_file"; then
+ 	case $deplibs_check_method in
+ 	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"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 <<EOF 1>&2
++	    cat <<_LT_EOF 1>&2
+ 
+ *** Warning: the command libtool uses to detect shared libraries,
+ *** $file_magic_cmd, produces output that libtool cannot recognize.
+@@ -1884,7 +2773,7 @@ dnl not every word.  This closes a longs
+ *** may want to report the problem to your system manager and/or to
+ *** bug-libtool@gnu.org
+ 
+-EOF
++_LT_EOF
+ 	  fi ;;
+ 	esac
+       fi
+@@ -1901,37 +2790,47 @@ if test -n "$MAGIC_CMD"; then
+ else
+   AC_MSG_RESULT(no)
+ fi
+-])# AC_PATH_TOOL_PREFIX
++_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], [])
+ 
+-# AC_PATH_MAGIC
+-# -------------
+-# find a file program which can recognise a shared library
+-AC_DEFUN([AC_PATH_MAGIC],
+-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
++
++# _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
+-    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
++    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+   else
+     MAGIC_CMD=:
+   fi
+ fi
+-])# AC_PATH_MAGIC
++])# _LT_PATH_MAGIC
+ 
+ 
+-# AC_PROG_LD
++# LT_PATH_LD
+ # ----------
+-# find the path to the GNU or non-GNU linker
+-AC_DEFUN([AC_PROG_LD],
+-[AC_ARG_WITH([gnu-ld],
+-    [AC_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])
+-AC_REQUIRE([LT_AC_PROG_SED])dnl
+-AC_REQUIRE([AC_PROG_CC])dnl
++# 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
++
++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.
+@@ -1947,10 +2846,10 @@ if test "$GCC" = yes; then
+     # Accept absolute paths.
+     [[\\/]]* | ?:[[\\/]]*)
+       re_direlt='/[[^/]][[^/]]*/\.\./'
+-      # Canonicalize the path 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%/%"`
++      # 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"
+       ;;
+@@ -1977,7 +2876,7 @@ AC_CACHE_VAL(lt_cv_path_LD,
+     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 GNU ld's only accept -v.
++      # 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'*)
+@@ -2000,17 +2899,26 @@ else
+   AC_MSG_RESULT(no)
+ fi
+ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+-AC_PROG_LD_GNU
+-])# AC_PROG_LD
++_LT_PATH_LD_GNU
++AC_SUBST([LD])
+ 
++_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
++])# LT_PATH_LD
+ 
+-# AC_PROG_LD_GNU
+-# --------------
+-AC_DEFUN([AC_PROG_LD_GNU],
+-[AC_REQUIRE([AC_PROG_EGREP])dnl
+-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 ld's only accept -v.
+-case `"$LD" -v 2>&1 </dev/null` in
++# 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
+   ;;
+@@ -2019,14 +2927,14 @@ case `"$LD" -v 2>&1 </dev/null` in
+   ;;
+ esac])
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+-])# AC_PROG_LD_GNU
++])# _LT_PATH_LD_GNU
+ 
+ 
+-# AC_PROG_LD_RELOAD_FLAG
+-# ----------------------
++# _LT_CMD_RELOAD
++# --------------
+ # find reload flag for linker
+ #   -- PORTME Some linkers may need a different reload flag.
+-AC_DEFUN([AC_PROG_LD_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'])
+@@ -2036,15 +2944,28 @@ case $reload_flag in
+ *) reload_flag=" $reload_flag" ;;
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+-])# AC_PROG_LD_RELOAD_FLAG
++case $host_os in
++  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_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
++_LT_DECL([], [reload_cmds], [2])dnl
++])# _LT_CMD_RELOAD
+ 
+ 
+-# AC_DEPLIBS_CHECK_METHOD
+-# -----------------------
++# _LT_CHECK_MAGIC_METHOD
++# ----------------------
+ # how to check for library dependencies
+ #  -- PORTME fill in with the dynamic library characteristics
+-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+-[AC_CACHE_CHECK([how to recognise dependent libraries],
++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=
+@@ -2061,7 +2982,7 @@ lt_cv_deplibs_check_method='unknown'
+ # whether `pass_all' will *always* work, you probably want this one.
+ 
+ case $host_os in
+-aix4* | aix5*)
++aix[[4-9]]*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -2069,40 +2990,48 @@ beos*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-bsdi4*)
++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* | mingw* | pw32*)
+-  # win32_libid is a shell function defined in ltmain.sh
++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='win32_libid'
++  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.
++  if ( 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
++    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++    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*)
+-  # this will be overwritten by pass_all, but leave it in just in case
+-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  case "$host_os" in
+-  rhapsody* | darwin1.[[012]])
+-    lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
+-    ;;
+-  *) # Darwin 1.3 on
+-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+-    ;;
+-  esac
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-freebsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++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)/i[[3-9]]86 (compact )?demand paged shared library'
++      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.*`
+       ;;
+@@ -2118,7 +3047,7 @@ gnu*)
+ 
+ hpux10.20* | hpux11*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+-  case "$host_cpu" in
++  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
+@@ -2134,41 +3063,28 @@ hpux10.20* | hpux11*)
+   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 $host_os in
+-  irix5* | nonstopux*)
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+-    ;;
+-  *)
+-    case $LD in
+-    *-32|*"-32 ") libmagic=32-bit;;
+-    *-n32|*"-n32 ") libmagic=N32;;
+-    *-64|*"-64 ") libmagic=64-bit;;
+-    *) libmagic=never-match;;
+-    esac
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
+-    ;;
++  case $LD in
++  *-32|*"-32 ") libmagic=32-bit;;
++  *-n32|*"-n32 ") libmagic=N32;;
++  *-64|*"-64 ") libmagic=64-bit;;
++  *) libmagic=never-match;;
+   esac
+-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
+-  case $host_cpu in
+-  alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*)
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  *)
+-    # glibc up to 2.1.1 does not perform some relocations on ARM
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
+-  esac
+-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
++linux* | k*bsd*-gnu)
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ netbsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++  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)$'
+@@ -2181,37 +3097,35 @@ newos6*)
+   lt_cv_file_magic_test_file=/usr/lib/libnls.so
+   ;;
+ 
+-nto-qnx)
+-  lt_cv_deplibs_check_method=unknown
++*nto* | *qnx*)
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ openbsd*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
++  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='file_magic OpenBSD.* shared library'
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+   fi
+   ;;
+ 
+ osf3* | osf4* | osf5*)
+-  # this will be overridden with pass_all, but let us keep it just in case
+-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-sco3.2v5*)
++rdos*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ solaris*)
+   lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=/lib/libc.so
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++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]]'
+@@ -2232,10 +3146,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+   siemens)
+     lt_cv_deplibs_check_method=pass_all
+     ;;
++  pc)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
+   esac
+   ;;
+ 
+-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
++tpf*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ esac
+@@ -2243,58 +3160,106 @@ esac
+ 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
+-])# AC_DEPLIBS_CHECK_METHOD
++
++_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_CHECK_MAGIC_METHOD
+ 
+ 
+-# AC_PROG_NM
++# LT_PATH_NM
+ # ----------
+-# find the path to a BSD-compatible name lister
+-AC_DEFUN([AC_PROG_NM],
+-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_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_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    tmp_nm="$ac_dir/${ac_tool_prefix}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"
++  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
+ 	  ;;
+ 	*)
+-	  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
++	  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
+-      esac
+-    fi
++      fi
++    done
++    IFS="$lt_save_ifs"
+   done
+-  IFS="$lt_save_ifs"
+-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
++  : ${lt_cv_path_NM=no}
+ fi])
+-NM="$lt_cv_path_NM"
+-])# AC_PROG_NM
++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.
++  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
++  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:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
++  (eval "$ac_compile" 2>conftest.err)
++  cat conftest.err >&AS_MESSAGE_LOG_FD
++  (eval echo "\"\$as_me:__oline__: $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:__oline__: 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], [])
+ 
+-# AC_CHECK_LIBM
+-# -------------
++
++# LT_LIB_M
++# --------
+ # check for math library
+-AC_DEFUN([AC_CHECK_LIBM],
++AC_DEFUN([LT_LIB_M],
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+@@ -2309,3537 +3274,4686 @@ case $host in
+   AC_CHECK_LIB(m, cos, LIBM="-lm")
+   ;;
+ esac
+-])# AC_CHECK_LIBM
++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], [])
+ 
+-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
+-# -----------------------------------
+-# sets LIBLTDL to the link flags for the libltdl convenience library and
+-# LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+-# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
+-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
+-# '${top_srcdir}/' (note the single quotes!).  If your package is not
+-# flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
+-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-  case $enable_ltdl_convenience in
+-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+-  "") enable_ltdl_convenience=yes
+-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+-  esac
+-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+-  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+-  # For backwards non-gettext consistent compatibility...
+-  INCLTDL="$LTDLINCL"
+-])# AC_LIBLTDL_CONVENIENCE
+ 
++# _LT_COMPILER_NO_RTTI([TAGNAME])
++# -------------------------------
++m4_defun([_LT_COMPILER_NO_RTTI],
++[m4_require([_LT_TAG_COMPILER])dnl
+ 
+-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
+-# -----------------------------------
+-# sets LIBLTDL to the link flags for the libltdl installable library and
+-# LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+-# DIRECTORY is not provided and an installed libltdl is not found, it is
+-# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
+-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
+-# quotes!).  If your package is not flat and you're not using automake,
+-# define top_builddir and top_srcdir appropriately in the Makefiles.
+-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-  AC_CHECK_LIB(ltdl, lt_dlinit,
+-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+-  [if test x"$enable_ltdl_install" = xno; then
+-     AC_MSG_WARN([libltdl not installed, but installation disabled])
+-   else
+-     enable_ltdl_install=yes
+-   fi
+-  ])
+-  if test x"$enable_ltdl_install" = x"yes"; then
+-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
+-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+-    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+-  else
+-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+-    LIBLTDL="-lltdl"
+-    LTDLINCL=
+-  fi
+-  # For backwards non-gettext consistent compatibility...
+-  INCLTDL="$LTDLINCL"
+-])# AC_LIBLTDL_INSTALLABLE
++_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+ 
++if test "$GCC" = yes; then
++  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+ 
+-# AC_LIBTOOL_CXX
+-# --------------
+-# enable support for C++ libraries
+-AC_DEFUN([AC_LIBTOOL_CXX],
+-[AC_REQUIRE([_LT_AC_LANG_CXX])
+-])# AC_LIBTOOL_CXX
++  _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_AC_LANG_CXX
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_CXX],
+-[AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
+-_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,CXX" | sed 's/^,//'`])
+-])# _LT_AC_LANG_CXX
+-
+-
+-# AC_LIBTOOL_F77
+-# --------------
+-# enable support for Fortran 77 libraries
+-AC_DEFUN([AC_LIBTOOL_F77],
+-[AC_REQUIRE([_LT_AC_LANG_F77])
+-])# AC_LIBTOOL_F77
+-
+-
+-# _LT_AC_LANG_F77
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_F77],
+-[AC_REQUIRE([AC_PROG_F77])
+-_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,F77" | sed 's/^,//'`])
+-])# _LT_AC_LANG_F77
+-
+-
+-# AC_LIBTOOL_GCJ
+-# --------------
+-# enable support for GCJ libraries
+-AC_DEFUN([AC_LIBTOOL_GCJ],
+-[AC_REQUIRE([_LT_AC_LANG_GCJ])
+-])# AC_LIBTOOL_GCJ
+-
+-
+-# _LT_AC_LANG_GCJ
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_GCJ],
+-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
+-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+-	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+-	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
+-_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,GCJ" | sed 's/^,//'`])
+-])# _LT_AC_LANG_GCJ
+-
+-
+-# AC_LIBTOOL_RC
+-# --------------
+-# enable support for Windows resource files
+-AC_DEFUN([AC_LIBTOOL_RC],
+-[AC_REQUIRE([LT_AC_PROG_RC])
+-_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,RC" | sed 's/^,//'`])
+-])# AC_LIBTOOL_RC
+-
+-
+-# AC_LIBTOOL_LANG_C_CONFIG
+-# ------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
+-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
+-[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_AC_TAGVAR(objext, $1)=$objext
+-
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
+-
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
+-
+-_LT_AC_SYS_COMPILER
+-
+-#
+-# Check for any special shared library compilation flags.
+-#
+-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
+-if test "$GCC" = no; then
+-  case $host_os in
+-  sco3.2v5*)
+-    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
+-    ;;
+-  esac
+-fi
+-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
+-  AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
+-  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ 	]]" >/dev/null; then :
+-  else
+-    AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
+-    _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
+-  fi
+-fi
++# _LT_CMD_GLOBAL_SYMBOLS
++# ----------------------
++m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_PROG_CC])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?!! ;)]
+ 
+-#
+-# Check to make sure the static flag actually works.
+-#
+-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
+-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+-  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
+-  [],
+-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
++# 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]]*\)'
+ 
+-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_DLOPEN_SELF($1)
+-
+-# Report which librarie types wil 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
++# Define system-specific variables.
++case $host_os in
++aix*)
++  symcode='[[BCDT]]'
+   ;;
+-
+-aix4*)
+-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+-    test "$enable_shared" = yes && enable_static=no
++cygwin* | mingw* | pw32* | cegcc*)
++  symcode='[[ABCDGISTW]]'
++  ;;
++hpux*)
++  if test "$host_cpu" = ia64; then
++    symcode='[[ABCDEGRST]]'
+   fi
+   ;;
+-  darwin* | rhapsody*)
+-  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then 
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[[012]])
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+-      ;;
+-    *) # Darwin 1.3 on
+-      test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+-      ;;
+-    esac
+-    # FIXME: Relying on posixy $() will cause problems for
+-    #        cross-compilation, but unfortunately the echo tests do not
+-    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+-    #	       `"' quotes if we put them in here... so don't!
+-		output_verbose_link_cmd='echo'
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
+-    _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-		  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-		  _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-    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
+-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])
+-
+-AC_LIBTOOL_CONFIG($1)
+-
+-AC_LANG_POP
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_C_CONFIG
+ 
++# If we're using GNU nm, then use its standard symbol codes.
++case `$NM -V 2>&1` in
++*GNU* | *'with BFD'*)
++  symcode='[[ABCDGIRSTW]]' ;;
++esac
+ 
+-# AC_LIBTOOL_LANG_CXX_CONFIG
+-# --------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
+-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+-[AC_LANG_PUSH(C++)
+-AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
+-
+-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-_LT_AC_TAGVAR(always_export_symbols, $1)=no
+-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_direct, $1)=no
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+-_LT_AC_TAGVAR(module_cmds, $1)=
+-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_AC_TAGVAR(no_undefined_flag, $1)=
+-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++# 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'"
+ 
+-# Dependencies to place before and after the object being linked:
+-_LT_AC_TAGVAR(predep_objects, $1)=
+-_LT_AC_TAGVAR(postdep_objects, $1)=
+-_LT_AC_TAGVAR(predeps, $1)=
+-_LT_AC_TAGVAR(postdeps, $1)=
+-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
++# 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'"
+ 
+-# Source file extension for C++ test sources.
+-ac_ext=cc
++# 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
+ 
+-# Object file extension for compiled C++ test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
++# Try without a prefix underscore, then with it.
++for ac_symprfx in "" "_"; do
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++  symxfrm="\\1 $ac_symprfx\\2 \\2"
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
++  # 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};"\
++"     /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
+ 
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
++  # Check to see that the pipe works correctly.
++  pipe_works=no
+ 
+-# Allow CC to be a program name with arguments.
+-lt_save_CC=$CC
+-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
+-  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
+-  unset lt_cv_path_LD
+-fi
+-test -z "${LDCXX+set}" || LD=$LDCXX
+-CC=${CXX-"c++"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++  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
+ 
+-# We don't want -fno-exception wen compiling C++ code, so set the
+-# no_builtin_flag separately
+-if test "$GXX" = yes; then
+-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+-else
+-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+-fi
++  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
+ 
+-if test "$GXX" = yes; then
+-  # Set up default GNU C++ configuration
++      # 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
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+-  AC_PROG_LD
++_LT_EOF
++	  # Now generate the symbol file.
++	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+ 
+-  # 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_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  cat <<_LT_EOF >> conftest.$ac_ext
+ 
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++/* The mapping between symbol names and symbols.  */
++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}
++};
+ 
+-    # 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}'
++/* This works around a problem in FreeBSD linker */
++#ifdef FREEBSD_WORKAROUND
++static const void *lt_preloaded_setup() {
++  return lt__PROGRAM__LTX_preloaded_symbols;
++}
++#endif
+ 
+-    # 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_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++#ifdef __cplusplus
++}
++#endif
++_LT_EOF
++	  # Now try linking the two files.
++	  mv conftest.$ac_objext conftstm.$ac_objext
++	  lt_save_LIBS="$LIBS"
++	  lt_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_save_LIBS"
++	  CFLAGS="$lt_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
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+     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_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
++    cat conftest.$ac_ext >&5
+   fi
++  rm -rf conftest* conftst*
+ 
+-  # 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 "\-L"'
+-
++  # 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
+-  GXX=no
+-  with_gnu_ld=no
+-  wlarc=
++  AC_MSG_RESULT(ok)
+ 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_AC_TAGVAR(ld_shlibs, $1)=yes
+-case $host_os in
+-  aix3*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  aix4* | aix5*)
+-    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
++_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_CMD_GLOBAL_SYMBOLS
+ 
+-      # 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]].*|aix5*)
+-	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
++# _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)=
+ 
+-    # 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_AC_TAGVAR(archive_cmds, $1)=''
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++AC_MSG_CHECKING([for $compiler option to produce PIC])
++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'
+ 
+-    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
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-	else
+-	  # We have old collect2
+-	  _LT_AC_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_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-	fi
+-      esac
+-      shared_flag='-shared'
+-    else
+-      # not using gcc
++    case $host_os in
++    aix*)
++      # All AIX code is PIC.
+       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
++	# AIX 5 now supports IA64 processor
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       fi
+-    fi
++      ;;
+ 
+-    # It seems that -bexpall does not export symbols beginning with
+-    # underscore (_), so it is better to generate a list of symbols to export.
+-    _LT_AC_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_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+-      # Determine the default libpath from the value encoded in an empty executable.
+-      _LT_AC_SYS_LIBPATH_AIX
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++    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
++      ;;
+ 
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-     else
+-      if test "$host_cpu" = ia64; then
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+-      else
+-	# Determine the default libpath from the value encoded in an empty executable.
+-	_LT_AC_SYS_LIBPATH_AIX
+-	_LT_AC_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_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	# -bexpall does not export symbols beginning with underscore (_)
+-	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
+-	# Exported symbols can be pulled into shared objects from archives
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-	# This is similar to how AIX traditionally builds it's shared libraries.
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-      fi
+-    fi
+-    ;;
+-  chorus*)
+-    case $cc_basename in
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
+-    ;;
+-
+-  cygwin* | mingw* | pw32*)
+-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+-    # as there is no search path for DLLs.
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
+-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-
+-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+-      # If the export-symbols file already is a .def file (1st line
+-      # is EXPORTS), use it as is; otherwise, prepend...
+-      _LT_AC_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}--image-base=0x10000000 ${wl}--out-implib,$lib'
+-    else
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    fi
+-  ;;
+-
+-  darwin* | rhapsody*)
+-   if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then 
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[[012]])
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
+       ;;
+-    *) # Darwin 1.3 on
+-      test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
++    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'])
+       ;;
+-    esac
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-    	else
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -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'
+-      fi
+-      _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+-
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      else
+-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -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~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      fi
+-        _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-   fi 
+-    ;;
+-
+-  dgux*)
+-    case $cc_basename in
+-      ec++)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      ghcx)
+-	# Green Hills C++ Compiler
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
+-    ;;
+-  freebsd[12]*)
+-    # C++ shared libraries reported to be fairly broken before switch to ELF
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  freebsd-elf*)
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    ;;
+-  freebsd*)
+-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+-    # conventions
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-    ;;
+-  gnu*)
+-    ;;
+-  hpux9*)
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-    _LT_AC_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_AC_TAGVAR(ld_shlibs, $1)=no
++    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'
+       ;;
+-    aCC)
+-      _LT_AC_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; echo $list'
++    *djgpp*)
++      # DJGPP does not support shared libraries at all
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+       ;;
+-    *)
+-      if test "$GXX" = yes; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${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_AC_TAGVAR(ld_shlibs, $1)=no
++    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
+       ;;
+-    esac
+-    ;;
+-  hpux10*|hpux11*)
+-    if test $with_gnu_ld = no; then
+-      case "$host_cpu" in
++    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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-        ;;
+-      ia64*)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-        ;;
++	;;
+       *)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-        ;;
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	;;
+       esac
+-    fi
+-    case "$host_cpu" in
+-    hppa*64*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
+-    ia64*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+-					      # but as the default
+-					      # location of the library.
++      ;;
++    *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_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+-					      # but as the default
+-					      # location of the library.
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+       ;;
+     esac
+-
+-    case $cc_basename in
+-      CC)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++  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
+ 	;;
+-      aCC)
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+-	  ;;
+-	*)
+-	  _LT_AC_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'
++      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
+-	# 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; echo $list'
+ 	;;
+-      *)
+-	if test "$GXX" = yes; then
+-	  if test $with_gnu_ld = no; then
+-	    case "$host_cpu" in
+-	    ia64*|hppa*64*)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++      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_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ 	      ;;
+ 	    esac
+-	  fi
+-	else
+-	  # FIXME: insert proper C++ library support
+-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	fi
+-	;;
+-    esac
+-    ;;
+-  irix5* | irix6*)
+-    case $cc_basename in
+-      CC)
+-	# SGI C++
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${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_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
++	    ;;
++	  *)
++	    ;;
++	esac
+ 	;;
+-      *)
+-	if test "$GXX" = yes; then
+-	  if test "$with_gnu_ld" = no; then
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+-	  else
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+-	  fi
+-	fi
+-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++      interix*)
++	# This is c89, which is MS Visual C++ (no shared libs)
++	# Anyone wants to do a port?
+ 	;;
+-    esac
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-    ;;
+-  linux*)
+-    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_AC_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_AC_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; echo $list'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+-	_LT_AC_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_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+-	;;
+-      icpc)
+-	# Intel C++
+-	with_gnu_ld=yes
+-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_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'
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+-	;;
+-      cxx)
+-	# Compaq C++
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+-	_LT_AC_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=`echo $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; echo $list'
++      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
+ 	;;
+-    esac
+-    ;;
+-  lynxos*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  m88k*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  mvs*)
+-    case $cc_basename in
+-      cxx)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      linux* | k*bsd*-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*)
++	    # IBM XL 8.0 on PPC
++	    _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
+ 	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      lynxos*)
+ 	;;
+-    esac
+-    ;;
+-  netbsd*)
+-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+-      wlarc=
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_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::"'
+-    ;;
+-  osf3*)
+-    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_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	# Archives containing C++ object files must be created using
+-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+-
+-	;;
+-      RCC)
+-	# Rational C++ 2.4.1
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      cxx)
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-	_LT_AC_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=`echo $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; echo $list'
++      m88k*)
+ 	;;
+-      *)
+-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	  _LT_AC_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" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+-
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-	  _LT_AC_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 "\-L"'
+-
+-	else
+-	  # FIXME: insert proper C++ library support
+-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	fi
++      mvs*)
++	case $cc_basename in
++	  cxx*)
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
++	    ;;
++	  *)
++	    ;;
++	esac
+ 	;;
+-    esac
+-    ;;
+-  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_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	# Archives containing C++ object files must be created using
+-	# the KAI C++ compiler.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+-	;;
+-      RCC)
+-	# Rational C++ 2.4.1
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      cxx)
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+-	_LT_AC_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 $objdir/so_locations -o $lib~
+-	  $rm $lib.exp'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+-	_LT_AC_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=`echo $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; echo $list'
++      netbsd*)
+ 	;;
+-      *)
+-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+-
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-	  _LT_AC_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 "\-L"'
+-
+-	else
+-	  # FIXME: insert proper C++ library support
+-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	fi
++      *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
+ 	;;
+-    esac
+-    ;;
+-  psos*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  sco*)
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case $cc_basename in
+-      CC)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      psos*)
+ 	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      solaris*)
++	case $cc_basename in
++	  CC*)
++	    # 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
+ 	;;
+-    esac
+-    ;;
+-  sunos4*)
+-    case $cc_basename in
+-      CC)
+-	# Sun C++ 4.x
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      lcc)
+-	# Lucid
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      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
+ 	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      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
+ 	;;
+-    esac
+-    ;;
+-  solaris*)
+-    case $cc_basename in
+-      CC)
+-	# Sun C++ 4.2, 5.x and Centerline C++
+-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	_LT_AC_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} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-	case $host_os in
+-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
++      tandem*)
++	case $cc_basename in
++	  NCC*)
++	    # NonStop-UX NCC 3.20
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    ;;
+ 	  *)
+-	    # The C++ compiler is used as linker so we must use $wl
+-	    # flag to pass the commands to the underlying system
+-	    # linker.
+-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ 	    ;;
+ 	esac
+-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-
+-	# 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 -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-
+-	# 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_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+-	;;
+-      gcx)
+-	# Green Hills C++ Compiler
+-	_LT_AC_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_AC_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_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -shared -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 \"\-L\""
+-	  else
+-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+-	    # platform.
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+-	    _LT_AC_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 \"\-L\""
+-	  fi
+-
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+-	fi
+ 	;;
+-    esac
+-    ;;
+-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    ;;
+-  tandem*)
+-    case $cc_basename in
+-      NCC)
+-	# NonStop-UX NCC 3.20
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      vxworks*)
+ 	;;
+       *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ 	;;
+     esac
+-    ;;
+-  vxworks*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  *)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-esac
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
++  fi
++],
++[
++  if test "$GCC" = yes; then
++    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ 
+-_LT_AC_TAGVAR(GCC, $1)="$GXX"
+-_LT_AC_TAGVAR(LD, $1)="$LD"
++    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
++      ;;
+ 
+-AC_LIBTOOL_POSTDEP_PREDEP($1)
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_DLOPEN_SELF($1)
++    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
++      ;;
+ 
+-AC_LIBTOOL_CONFIG($1)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
+ 
+-AC_LANG_POP
+-CC=$lt_save_CC
+-LDCXX=$LD
+-LD=$lt_save_LD
+-GCC=$lt_save_GCC
+-with_gnu_ldcxx=$with_gnu_ld
+-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
+-])# AC_LIBTOOL_LANG_CXX_CONFIG
++    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'])
++      ;;
+ 
+-# AC_LIBTOOL_POSTDEP_PREDEP([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.
+-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+-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...
+-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
+-int a;
+-void foo (void) { a = 0; }
+-EOF
+-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
+-class Foo
+-{
+-public:
+-  Foo (void) { a = 0; }
+-private:
+-  int a;
+-};
+-EOF
+-],[$1],[F77],[cat > conftest.$ac_ext <<EOF
+-      subroutine foo
+-      implicit none
+-      integer*4 a
+-      a=0
+-      return
+-      end
+-EOF
+-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
+-public class foo {
+-  private int a;
+-  public void bar (void) {
+-    a = 0;
+-  }
+-};
+-EOF
+-])
+-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
++    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'
++      ;;
+ 
+-  # The `*' in the case matches for architectures that use `case' in
+-  # $output_verbose_cmd can trigger glob expansion during the loop
+-  # eval without this substitution.
+-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++    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
++      ;;
+ 
+-  for p in `eval $output_verbose_link_cmd`; do
+-    case $p in
++    interix[[3-9]]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
+ 
+-    -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
+-       else
+-	 prev=
+-       fi
++    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
++      ;;
+ 
+-       if test "$pre_test_object_deps_done" = no; then
+-	 case $p 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_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+-	   else
+-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_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_AC_TAGVAR(postdeps, $1)"; then
+-	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
+-	 else
+-	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
+-	 fi
+-       fi
+-       ;;
++    *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'
++      ;;
+ 
+-    *.$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
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++      fi
++      ;;
+ 
+-       if test "$pre_test_object_deps_done" = no; then
+-	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
+-	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
+-	 else
+-	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
+-	 fi
+-       else
+-	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
+-	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
+-	 else
+-	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
+-	 fi
+-       fi
+-       ;;
++    *)
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++      ;;
++    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
++      ;;
+ 
+-    *) ;; # Ignore the rest.
++    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'])
++      ;;
+ 
+-    esac
+-  done
++    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'
++      ;;
+ 
+-  # Clean up.
+-  rm -f a.out a.exe
+-else
+-  echo "libtool.m4: error: problem compiling $1 test program"
+-fi
++    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'
++      ;;
+ 
+-$rm -f confest.$objext
++    linux* | k*bsd*-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'
++	;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # 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*)
++	# IBM XL C 8.0/Fortran 10.1 on PPC
++	_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)='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # 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)=''
++	  ;;
++	esac
++	;;
++      esac
++      ;;
+ 
+-case " $_LT_AC_TAGVAR(postdeps, $1) " in
+-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+-esac
+-])# AC_LIBTOOL_POSTDEP_PREDEP
++    newsos6)
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
+ 
+-# AC_LIBTOOL_LANG_F77_CONFIG
+-# ------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
+-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
+-[AC_REQUIRE([AC_PROG_F77])
+-AC_LANG_PUSH(Fortran 77)
++    *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'
++      ;;
+ 
+-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-_LT_AC_TAGVAR(always_export_symbols, $1)=no
+-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_direct, $1)=no
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+-_LT_AC_TAGVAR(module_cmds, $1)=
+-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_AC_TAGVAR(no_undefined_flag, $1)=
+-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++    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'
++      ;;
+ 
+-# Source file extension for f77 test sources.
+-ac_ext=f
++    rdos*)
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
+ 
+-# Object file extension for compiled f77 test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
++    solaris*)
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
++      *)
++	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
++      esac
++      ;;
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
++    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'
++      ;;
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code="      program t\n      end\n"
++    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'
++      ;;
+ 
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
++    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
++      ;;
+ 
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${F77-"f77"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++    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'
++      ;;
+ 
+-AC_MSG_CHECKING([if libtool supports shared libraries])
+-AC_MSG_RESULT([$can_build_shared])
++    unicos*)
++      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      ;;
+ 
+-AC_MSG_CHECKING([whether to build shared libraries])
+-test "$can_build_shared" = "no" && enable_shared=no
++    uts4*)
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
+ 
+-# 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'
++    *)
++      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      ;;
++    esac
+   fi
+-  ;;
+-aix4*)
+-  test "$enable_shared" = yes && enable_static=no
+-  ;;
++])
++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_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])
+-
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+-
+-_LT_AC_TAGVAR(GCC, $1)="$G77"
+-_LT_AC_TAGVAR(LD, $1)="$LD"
+-
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
++	[How to pass a linker flag through the compiler])
+ 
+-AC_LIBTOOL_CONFIG($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])
+ 
+-AC_LANG_POP
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_F77_CONFIG
++#
++# 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
+ 
+ 
+-# AC_LIBTOOL_LANG_GCJ_CONFIG
+-# --------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
+-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
+-[AC_LANG_SAVE
++# _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_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'
++  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
++    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")) && ([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*)
++    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  *)
++    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  esac
++  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
++], [
++  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_flag_spec_ld, $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=
+ 
+-# Source file extension for Java test sources.
+-ac_ext=java
++  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
+ 
+-# Object file extension for compiled Java test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
++  _LT_TAGVAR(ld_shlibs, $1)=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
+-
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++    # 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
++      *\ [[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
+ 
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
++    # 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
+ 
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${GCJ-"gcj"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
++*** Warning: the GNU linker, at least up to release 2.9.1, 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 modify your PATH
++*** so that a non-GNU linker is found, and then restart.
+ 
+-# GCJ did not exist at the time GCC didn't implicitly link libc in.
+-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++_LT_EOF
++      fi
++      ;;
+ 
+-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_DLOPEN_SELF($1)
++    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
++      ;;
+ 
+-AC_LIBTOOL_CONFIG($1)
++    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
++      ;;
+ 
+-AC_LANG_RESTORE
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_GCJ_CONFIG
++    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(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/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ 
++      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
++      ;;
+ 
+-# AC_LIBTOOL_LANG_RC_CONFIG
+-# --------------------------
+-# Ensure that the configuration vars for the Windows resource compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
+-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
+-[AC_LANG_SAVE
++    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)
++      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=
++	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; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# 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; $ECHO \"$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]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
++	  tmp_sharedflag='-qmkshrobj'
++	  tmp_addflag= ;;
++	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; $ECHO \"$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'
+ 
+-# Source file extension for RC test sources.
+-ac_ext=rc
++        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
+ 
+-# Object file extension for compiled RC test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
++	case $cc_basename in
++	xlf*)
++	  # 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)=
++	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
++	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_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 $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++	  fi
++	  ;;
++	esac
++      else
++        _LT_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++    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 $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'
++      fi
++      ;;
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code="$lt_simple_compile_test_code"
++    solaris*)
++      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
++	_LT_TAGVAR(ld_shlibs, $1)=no
++	cat <<_LT_EOF 1>&2
+ 
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
++*** 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.
+ 
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${RC-"windres"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++_LT_EOF
++      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	_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
++      ;;
+ 
+-AC_LIBTOOL_CONFIG($1)
++    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
+ 
+-AC_LANG_RESTORE
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_RC_CONFIG
++*** 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
++      ;;
+ 
+-# AC_LIBTOOL_CONFIG([TAGNAME])
+-# ----------------------------
+-# If TAGNAME is not passed, then 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
+-# TAGNAME from the matching tagged config vars.
+-AC_DEFUN([AC_LIBTOOL_CONFIG],
+-[# The else clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+-  # 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  
+-  # Now quote all the things that may contain metacharacters while being
+-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+-  # variables and quote the copies for generation of the libtool script.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+-    deplibs_check_method reload_flag reload_cmds need_locks \
+-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+-    lt_cv_sys_global_symbol_to_c_name_address \
+-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
+-    _LT_AC_TAGVAR(compiler, $1) \
+-    _LT_AC_TAGVAR(CC, $1) \
+-    _LT_AC_TAGVAR(LD, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
+-    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
+-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
+-    _LT_AC_TAGVAR(old_archive_cmds, $1) \
+-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
+-    _LT_AC_TAGVAR(predep_objects, $1) \
+-    _LT_AC_TAGVAR(postdep_objects, $1) \
+-    _LT_AC_TAGVAR(predeps, $1) \
+-    _LT_AC_TAGVAR(postdeps, $1) \
+-    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+-    _LT_AC_TAGVAR(archive_cmds, $1) \
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+-    _LT_AC_TAGVAR(postinstall_cmds, $1) \
+-    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
+-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
+-    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
+-    _LT_AC_TAGVAR(no_undefined_flag, $1) \
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
+-    _LT_AC_TAGVAR(hardcode_automatic, $1) \
+-    _LT_AC_TAGVAR(module_cmds, $1) \
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+-    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+-    _LT_AC_TAGVAR(exclude_expsyms, $1) \
+-    _LT_AC_TAGVAR(include_expsyms, $1); do
+-
+-    case $var in
+-    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
+-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
+-    _LT_AC_TAGVAR(archive_cmds, $1) | \
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+-    _LT_AC_TAGVAR(module_cmds, $1) | \
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \   
+-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+-    postinstall_cmds | postuninstall_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+-      # Double-quote double-evaled strings.
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++    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
+       ;;
++
+     *)
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	_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
+-  done
+-
+-  case $lt_echo in
+-  *'\[$]0 --fallback-echo"')
+-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
+-    ;;
+-  esac
+-
+-ifelse([$1], [],
+-  [cfgfile="${ofile}T"
+-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+-  $rm -f "$cfgfile"
+-  AC_MSG_NOTICE([creating $ofile])],
+-  [cfgfile="$ofile"])
+-
+-  cat <<__EOF__ >> "$cfgfile"
+-ifelse([$1], [],
+-[#! $SHELL
+ 
+-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+-#
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+-# Free Software Foundation, Inc.
+-#
+-# This file is part of GNU Libtool:
+-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 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 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.
+-
+-# A sed program that does not truncate output.
+-SED=$lt_SED
++    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
++      ;;
+ 
+-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
++    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
++	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")) && ([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
+ 
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++	# 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
+ 
+-# The names of the tagged configurations supported by this script.
+-available_tags=
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
+ 
+-# ### BEGIN LIBTOOL CONFIG],
+-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
++      # 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.
+ 
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++      _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,'
+ 
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
++      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
+ 
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
++      _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
++        _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 $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; 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
++	 _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'
++	  # Exported symbols can be pulled into shared objects from archives
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
++	  _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
++      ;;
+ 
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
++    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
++      ;;
+ 
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
++    bsdi[[45]]*)
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
++      ;;
+ 
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
++    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.
++      _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 `$ECHO "X$deplibs" | $Xsed -e '\''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(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
++      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++      ;;
+ 
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
++    darwin* | rhapsody*)
++      _LT_DARWIN_LINKER_FEATURES($1)
++      ;;
+ 
+-# The host system.
+-host_alias=$host_alias
+-host=$host
++    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
++      ;;
+ 
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
++    freebsd1*)
++      _LT_TAGVAR(ld_shlibs, $1)=no
++      ;;
+ 
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
++    # 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
++      ;;
+ 
+-# A C compiler.
+-LTCC=$lt_LTCC
++    # 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
++      ;;
+ 
+-# A language-specific compiler.
+-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | dragonfly*)
++      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -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
++      ;;
+ 
+-# Is the compiler the GNU C compiler?
+-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
++    hpux9*)
++      if test "$GCC" = yes; then
++	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${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
+ 
+-# An ERE matcher.
+-EGREP=$lt_EGREP
++      # 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'
++      ;;
+ 
+-# The linker used to build libraries.
+-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
++    hpux10*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${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_flag_spec_ld, $1)='+b $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
++      ;;
+ 
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+-
+-# A BSD-compatible nm program.
+-NM=$lt_NM
+-
+-# A symbol stripping program
+-STRIP=$STRIP
+-
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
+-
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+-
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+-
+-# Used on cygwin: assembler.
+-AS="$AS"
++    hpux11*)
++      if test "$GCC" = yes -a "$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 -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${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'
++	  ;;
++	*)
++	  _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)=:
+ 
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
++	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'
+ 
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
++	  # 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
++      ;;
+ 
+-# How to pass a linker flag through the compiler.
+-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${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.
++        save_LDFLAGS="$LDFLAGS"
++        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
++        AC_LINK_IFELSE(int foo(void) {},
++          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
++        )
++        LDFLAGS="$save_LDFLAGS"
++      else
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -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" && $ECHO "X-set_version $verstring" | $Xsed` -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
++      ;;
+ 
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
++    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
++      ;;
+ 
+-# Old archive suffix (normally "a").
+-libext="$libext"
++    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
++      ;;
+ 
+-# Shared library suffix (normally ".so").
+-shrext='$shrext'
++    *nto* | *qnx*)
++      ;;
+ 
+-# Executable file suffix (normally "").
+-exeext="$exeext"
++    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
++      ;;
+ 
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+-pic_mode=$pic_mode
++    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'
++      ;;
+ 
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
++    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" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${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" && $ECHO "X-set_version $verstring" | $Xsed` -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)=:
++      ;;
+ 
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $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} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${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" && $ECHO "X-set_version $verstring" | $Xsed` -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 "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ 
+-# Must we lock files when doing compilation ?
+-need_locks=$lt_need_locks
++	# 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)=:
++      ;;
+ 
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
++    solaris*)
++      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
++      if test "$GCC" = yes; then
++	wlarc='${wl}'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${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 ${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
++      ;;
+ 
+-# Do we need a version for libraries?
+-need_version=$need_version
++    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
++      ;;
+ 
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
++    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
++      ;;
+ 
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
++    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'
++      ;;
+ 
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
++    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
++      ;;
+ 
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
++    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'
+ 
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
++      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
++      ;;
+ 
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
++    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'
+ 
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
++      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
++      ;;
+ 
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
++    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
++      ;;
+ 
+-# Library versioning type.
+-version_type=$version_type
++    *)
++      _LT_TAGVAR(ld_shlibs, $1)=no
++      ;;
++    esac
+ 
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
++    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
+ 
+-# 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
++_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+ 
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
++_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])
+ 
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
++#
++# 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
+ 
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
++  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_MSG_CHECKING([whether -lc should be explicitly linked in])
++      $RM conftest*
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
++      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_TAGVAR(archive_cmds_need_lc, $1)=no
++        else
++	  _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*
++      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
++      ;;
++    esac
++  fi
++  ;;
++esac
+ 
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
+-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
++_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_flag_spec_ld], [1],
++    [[If ld is used when linking, 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([], [fix_srcfile_path], [1],
++    [Fix the shell variable $srcfile for the compiler])
++_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([], [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
+ 
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
+-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
+ 
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
++# _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)
+ 
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
++# Source file extension for C test sources.
++ac_ext=c
+ 
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
++# Object file extension for compiled C test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
+ 
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(){return(0);}'
+ 
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
++_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
++
++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])
+ 
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
++  AC_MSG_CHECKING([whether to build shared libraries])
++  test "$can_build_shared" = "no" && enable_shared=no
+ 
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
++  # 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
++    ;;
+ 
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
++  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])
+ 
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
++  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])
+ 
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
++  _LT_CONFIG($1)
++fi
++AC_LANG_POP
++CC="$lt_save_CC"
++])# _LT_LANG_C_CONFIG
+ 
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
+ 
+-# 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
++# _LT_PROG_CXX
++# ------------
++# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
++# compiler, we have our own version here.
++m4_defun([_LT_PROG_CXX],
++[
++pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
++AC_PROG_CXX
++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
++popdef([AC_MSG_ERROR])
++])# _LT_PROG_CXX
+ 
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([_LT_PROG_CXX], [])
+ 
+-# 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
+ 
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
++# _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],
++[AC_REQUIRE([_LT_PROG_CXX])dnl
++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_DECL_EGREP])dnl
++
++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_flag_spec_ld, $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(no_undefined_flag, $1)=
++_LT_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+ 
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
++# Source file extension for C++ test sources.
++ac_ext=cpp
+ 
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++# Object file extension for compiled C++ test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
+ 
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
++# 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_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++"}
++  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
+ 
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
++    if test "$GXX" = yes; then
++      # Set up default GNU C++ configuration
+ 
+-# Flag to hardcode \$libdir into a binary during linking.
+-# This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
++      LT_PATH_LD
+ 
+-# If ld is used when linking, flag to hardcode \$libdir into
+-# a binary during linking. This must work even if \$libdir does
+-# not exist.
+-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
++      # 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 -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -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=
+ 
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
++        # 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
+ 
+-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $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 "\-L"'
+ 
+-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
++    else
++      GXX=no
++      with_gnu_ld=no
++      wlarc=
++    fi
+ 
+-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+-# the resulting binary.
+-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
++    # 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
+ 
+-# 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=$_LT_AC_TAGVAR(hardcode_automatic, $1)
++          # 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
+ 
+-# Variables whose values should be saved in libtool wrapper scripts and
+-# restored at relink time.
+-variables_saved_for_relink="$variables_saved_for_relink"
++          exp_sym_flag='-bexport'
++          no_entry_flag='-bnoentry'
++        fi
+ 
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
++        # 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
+ 
+-# Compile-time system search path for libraries
+-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++        _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
++          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 
+-# Run-time system search path for libraries
+-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++          _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 $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; 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
++	    _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'
++	    # Exported symbols can be pulled into shared objects from archives
++	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
++	    _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
++        ;;
+ 
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
++      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
++	;;
+ 
+-# Set to yes if exported symbols are required.
+-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
++      chorus*)
++        case $cc_basename in
++          *)
++	  # FIXME: insert proper C++ library support
++	  _LT_TAGVAR(ld_shlibs, $1)=no
++	  ;;
++        esac
++        ;;
+ 
+-# The commands to list exported symbols.
+-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
++      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(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
++        ;;
++      darwin* | rhapsody*)
++        _LT_DARWIN_LINKER_FEATURES($1)
++	;;
+ 
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_cmds
++      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
++        ;;
+ 
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
++      freebsd[[12]]*)
++        # C++ shared libraries reported to be fairly broken before
++	# switch to ELF
++        _LT_TAGVAR(ld_shlibs, $1)=no
++        ;;
+ 
+-# Symbols that must always be exported.
+-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
++      freebsd-elf*)
++        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
++        ;;
+ 
+-ifelse([$1],[],
+-[# ### END LIBTOOL CONFIG],
+-[# ### END LIBTOOL TAG CONFIG: $tagname])
++      freebsd* | dragonfly*)
++        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
++        # conventions
++        _LT_TAGVAR(ld_shlibs, $1)=yes
++        ;;
+ 
+-__EOF__
++      gnu*)
++        ;;
+ 
+-ifelse([$1],[], [
+-  case $host_os in
+-  aix3*)
+-    cat <<\EOF >> "$cfgfile"
++      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; $ECHO "X$list" | $Xsed'
++            ;;
++          *)
++            if test "$GXX" = yes; then
++              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${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
++        ;;
+ 
+-# 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
+-EOF
+-    ;;
+-  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; $ECHO "X$list" | $Xsed'
++	    ;;
++          *)
++	    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 -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	            ;;
++	          *)
++	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${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
++        ;;
+ 
+-  # 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)
++      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" && $ECHO "X-set_version $verstring" | $Xsed` -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 -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	      else
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -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
++        ;;
+ 
+-  mv -f "$cfgfile" "$ofile" || \
+-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+-  chmod +x "$ofile"
+-])
+-else
+-  # If there is no Makefile yet, we rely on a make rule to execute
+-  # `config.status --recheck' to rerun these tests and create the
+-  # libtool script then.
+-  test -f Makefile && make "$ltmain"
+-fi
+-])# AC_LIBTOOL_CONFIG
++      linux* | k*bsd*-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; $ECHO "X$list" | $Xsed'
++
++	    _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 | $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 | $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 | $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 | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++	      ;;
++	    *) # Version 6 will 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; $ECHO \"$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'
+ 
+-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
+-# -------------------------------------------
+-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
+-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++	    runpath_var=LD_RUN_PATH
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $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=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
++	    ;;
++	  xl*)
++	    # 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; $ECHO \"$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='echo'
++
++	      # 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
++	;;
+ 
+-if test "$GCC" = yes; then
+-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
++      lynxos*)
++        # FIXME: insert proper C++ library support
++	_LT_TAGVAR(ld_shlibs, $1)=no
++	;;
+ 
+-  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+-    lt_cv_prog_compiler_rtti_exceptions,
+-    [-fno-rtti -fno-exceptions], [],
+-    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+-fi
+-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
++      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
++	;;
+ 
+-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+-# ---------------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+-[AC_REQUIRE([AC_CANONICAL_HOST])
+-AC_REQUIRE([AC_PROG_NM])
+-AC_REQUIRE([AC_OBJEXT])
+-# 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?!! ;)]
++      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::"'
++	;;
+ 
+-# Character class describing NM global symbol codes.
+-symcode='[[BCDEGRST]]'
++      *nto* | *qnx*)
++        _LT_TAGVAR(ld_shlibs, $1)=yes
++	;;
+ 
+-# Regexp to match symbols that can be accessed directly from C.
+-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
++      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=echo
++	else
++	  _LT_TAGVAR(ld_shlibs, $1)=no
++	fi
++	;;
+ 
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
++      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" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -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" && $ECHO "X-set_version $verstring" | $Xsed` -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 "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
++	          $RM $lib.exp'
++	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++		;;
++	    esac
+ 
+-# Transform an extracted symbol line into a proper C declaration
+-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
++	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-# 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\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++	    # 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=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
++	    ;;
++	  *)
++	    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" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++		  ;;
++	        *)
++	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${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 "\-L"'
++
++	    else
++	      # FIXME: insert proper C++ library support
++	      _LT_TAGVAR(ld_shlibs, $1)=no
++	    fi
++	    ;;
++        esac
++        ;;
+ 
+-# Define system-specific variables.
+-case $host_os in
+-aix*)
+-  symcode='[[BCDT]]'
+-  ;;
+-cygwin* | mingw* | pw32*)
+-  symcode='[[ABCDGISTW]]'
+-  ;;
+-hpux*) # Its linker distinguishes data from code symbols
+-  if test "$host_cpu" = ia64; then
+-    symcode='[[ABCDEGRST]]'
+-  fi
+-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+-  ;;
+-irix* | nonstopux*)
+-  symcode='[[BCDEGRST]]'
+-  ;;
+-osf*)
+-  symcode='[[BCDEGQRST]]'
+-  ;;
+-solaris* | sysv5*)
+-  symcode='[[BDT]]'
+-  ;;
+-sysv4)
+-  symcode='[[DFNSTU]]'
+-  ;;
+-esac
++      psos*)
++        # FIXME: insert proper C++ library support
++        _LT_TAGVAR(ld_shlibs, $1)=no
++        ;;
+ 
+-# 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
++      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
++        ;;
+ 
+-# If we're using GNU nm, then use its standard symbol codes.
+-case `$NM -V 2>&1` in
+-*GNU* | *'with BFD'*)
+-  symcode='[[ABCDGISTW]]' ;;
+-esac
++      solaris*)
++        case $cc_basename in
++          CC*)
++	    # 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
+ 
+-# Try without a prefix undercore, then with it.
+-for ac_symprfx in "" "_"; do
++	    output_verbose_link_cmd='echo'
+ 
+-  # Write the raw and C identifiers.
+-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++	    # 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'
+ 
+-  # Check to see that the pipe works correctly.
+-  pipe_works=no
++	    # 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 -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 -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 "\-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 "\-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
++        ;;
+ 
+-  rm -f conftest*
+-  cat > conftest.$ac_ext <<EOF
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-char nm_test_var;
+-void nm_test_func(){}
+-#ifdef __cplusplus
+-}
+-#endif
+-int main(){nm_test_var='a';nm_test_func();return(0);}
+-EOF
++    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 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
++      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
++      ;;
+ 
+-      # 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 <<EOF > conftest.$ac_ext
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
++      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'
+ 
+-EOF
+-	  # Now generate the symbol file.
+-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
++	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
++      ;;
+ 
+-	  cat <<EOF >> conftest.$ac_ext
+-#if defined (__STDC__) && __STDC__
+-# define lt_ptr_t void *
+-#else
+-# define lt_ptr_t char *
+-# define const
+-#endif
++      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
++        ;;
+ 
+-/* The mapping between symbol names and symbols. */
+-const struct {
+-  const char *name;
+-  lt_ptr_t address;
+-}
+-lt_preloaded_symbols[[]] =
+-{
+-EOF
+-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+-	  cat <<\EOF >> conftest.$ac_ext
+-  {0, (lt_ptr_t) 0}
+-};
++      vxworks*)
++        # FIXME: insert proper C++ library support
++        _LT_TAGVAR(ld_shlibs, $1)=no
++        ;;
+ 
+-#ifdef __cplusplus
+-}
+-#endif
+-EOF
+-	  # Now try linking the two files.
+-	  mv conftest.$ac_objext conftstm.$ac_objext
+-	  lt_save_LIBS="$LIBS"
+-	  lt_save_CFLAGS="$CFLAGS"
+-	  LIBS="conftstm.$ac_objext"
+-	  CFLAGS="$CFLAGS$_LT_AC_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_save_LIBS"
+-	  CFLAGS="$lt_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 -f conftest* conftst*
++      *)
++        # FIXME: insert proper C++ library support
++        _LT_TAGVAR(ld_shlibs, $1)=no
++        ;;
++    esac
+ 
+-  # 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
+-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++    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"
+ 
+-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
+-# ---------------------------------------
+-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
+-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
+-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
++    ## 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
++  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_MSG_CHECKING([for $compiler option to produce PIC])
+- ifelse([$1],[CXX],[
+-  # C++ specific cases for pic, static, wl, etc.
+-  if test "$GXX" = yes; then
+-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++AC_LANG_POP
++])# _LT_LANG_CXX_CONFIG
+ 
+-    case $host_os in
+-    aix*)
+-      # All AIX code is PIC.
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      fi
+-      ;;
+-    amigaos*)
+-      # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+-      ;;
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+-      # PIC is the default for these OSes.
+-      ;;
+-    mingw* | os2* | pw32*)
+-      # 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_AC_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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+-      ;;
+-    *djgpp*)
+-      # DJGPP does not support shared libraries at all
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-      ;;
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+-      fi
+-      ;;
+-    hpux*)
+-      # 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*)
+-	;;
+-      *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-	;;
+-      esac
++
++# _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
++# 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
++])
++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 $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
++       else
++	 prev=
++       fi
++
++       if test "$pre_test_object_deps_done" = no; then
++	 case $p 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
++       ;;
++
++    *.$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
++
++# 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
+       ;;
+-    *)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++    esac
++
++    if test "$solaris_use_stlport4" != yes; then
++      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
++
++solaris*)
++  case $cc_basename in
++  CC*)
++    # 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
+-  else
++
++    # 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_PROG_F77
++# ------------
++# Since AC_PROG_F77 is broken, in that it returns the empty string
++# if there is no fortran compiler, we have our own version here.
++m4_defun([_LT_PROG_F77],
++[
++pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
++AC_PROG_F77
++if test -z "$F77" || test "X$F77" = "Xno"; then
++  _lt_disable_F77=yes
++fi
++popdef([AC_MSG_ERROR])
++])# _LT_PROG_F77
++
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([_LT_PROG_F77], [])
++
++
++# _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_REQUIRE([_LT_PROG_F77])dnl
++AC_LANG_PUSH(Fortran 77)
++
++_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_flag_spec_ld, $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(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
++  CC=${F77-"f77"}
++  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
+-      aix4* | aix5*)
+-	# All AIX code is PIC.
+-	if test "$host_cpu" = ia64; then
+-	  # AIX 5 now supports IA64 processor
+-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-	else
+-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++      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
+-	;;
+-      chorus*)
+-	case $cc_basename in
+-	cxch68)
+-	  # Green Hills C++ Compiler
+-	  # _LT_AC_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
+-	;;
+-      dgux*)
+-	case $cc_basename in
+-	  ec++)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	    ;;
+-	  ghcx)
+-	    # Green Hills C++ Compiler
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      freebsd*)
+-	# FreeBSD uses GNU C++
+-	;;
+-      hpux9* | hpux10* | hpux11*)
+-	case $cc_basename in
+-	  CC)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+-	    if test "$host_cpu" != ia64; then
+-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+-	    fi
+-	    ;;
+-	  aCC)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+-	    case "$host_cpu" in
+-	    hppa*64*|ia64*)
+-	      # +Z the default
+-	      ;;
+-	    *)
+-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+-	      ;;
+-	    esac
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      irix5* | irix6* | nonstopux*)
+-	case $cc_basename in
+-	  CC)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+-	    # CC pic flag -KPIC is the default.
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      linux*)
+-	case $cc_basename in
+-	  KCC)
+-	    # KAI C++ Compiler
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-	    ;;
+-	  icpc)
+-	    # Intel C++
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+-	    ;; 
+-	  cxx)
+-	    # Compaq C++
+-	    # Make sure the PIC flag is empty.  It appears that all Alpha
+-	    # Linux and Compaq Tru64 Unix objects are PIC.
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      lynxos*)
+-	;;
+-      m88k*)
+-	;;
+-      mvs*)
+-	case $cc_basename in
+-	  cxx)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      netbsd*)
+-	;;
+-      osf3* | osf4* | osf5*)
+-	case $cc_basename in
+-	  KCC)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+-	    ;;
+-	  RCC)
+-	    # Rational C++ 2.4.1
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+-	    ;;
+-	  cxx)
+-	    # Digital/Compaq C++
+-	    _LT_AC_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_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      psos*)
+-	;;
+-      sco*)
+-	case $cc_basename in
+-	  CC)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      solaris*)
+-	case $cc_basename in
+-	  CC)
+-	    # Sun C++ 4.2, 5.x and Centerline C++
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+-	    ;;
+-	  gcx)
+-	    # Green Hills C++ Compiler
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      sunos4*)
+-	case $cc_basename in
+-	  CC)
+-	    # Sun C++ 4.x
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-	    ;;
+-	  lcc)
+-	    # Lucid
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      tandem*)
+-	case $cc_basename in
+-	  NCC)
+-	    # NonStop-UX NCC 3.20
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      unixware*)
+-	;;
+-      vxworks*)
+-	;;
+-      *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+-	;;
++        ;;
+     esac
+-  fi
+-],
++    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"
++fi # test "$_lt_disable_F77" != yes
++
++AC_LANG_POP
++])# _LT_LANG_F77_CONFIG
++
++
++# _LT_PROG_FC
++# -----------
++# Since AC_PROG_FC is broken, in that it returns the empty string
++# if there is no fortran compiler, we have our own version here.
++m4_defun([_LT_PROG_FC],
+ [
+-  if test "$GCC" = yes; then
+-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
++AC_PROG_FC
++if test -z "$FC" || test "X$FC" = "Xno"; then
++  _lt_disable_FC=yes
++fi
++popdef([AC_MSG_ERROR])
++])# _LT_PROG_FC
++
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([_LT_PROG_FC], [])
++
++
++# _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_REQUIRE([_LT_PROG_FC])dnl
++AC_LANG_PUSH(Fortran)
++
++_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_flag_spec_ld, $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(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
++  CC=${FC-"f95"}
++  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
+-      aix*)
+-      # All AIX code is PIC.
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      fi
+-      ;;
++      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])
+ 
+-    amigaos*)
+-      # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+-      ;;
++    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"
++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_GCC=$GCC
++GCC=yes
++CC=${GCJ-"gcj"}
++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
++
++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"
++])# _LT_LANG_GCJ_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 }'
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+-      # PIC is the default for these OSes.
+-      ;;
++# Code to be used in simple link tests
++lt_simple_link_test_code="$lt_simple_compile_test_code"
+ 
+-    mingw* | pw32* | os2*)
+-      # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+-      ;;
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_TAG_COMPILER
+ 
+-    darwin* | rhapsody*)
+-      # PIC is the default on this platform
+-      # Common symbols not allowed in MH_DYLIB files
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+-      ;;
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
+ 
+-    msdosdjgpp*)
+-      # Just because we use GCC doesn't mean we suddenly get shared libraries
+-      # on systems that don't support them.
+-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+-      enable_shared=no
+-      ;;
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++lt_save_GCC=$GCC
++GCC=
++CC=${RC-"windres"}
++compiler=$CC
++_LT_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
++_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+-      fi
+-      ;;
++if test -n "$compiler"; then
++  :
++  _LT_CONFIG($1)
++fi
+ 
+-    hpux*)
+-      # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-	;;
+-      esac
+-      ;;
++GCC=$lt_save_GCC
++AC_LANG_RESTORE
++CC="$lt_save_CC"
++])# _LT_LANG_RC_CONFIG
+ 
+-    *)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-      ;;
+-    esac
+-  else
+-    # PORTME Check for flag to pass linker flags through the system compiler.
+-    case $host_os in
+-    aix*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      else
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+-      fi
+-      ;;
+ 
+-    mingw* | pw32* | os2*)
+-      # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+-      ;;
++# 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
++])
+ 
+-    hpux9* | hpux10* | hpux11*)
+-      _LT_AC_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_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+-	;;
+-      esac
+-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+-      ;;
++# Old name:
++AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+ 
+-    irix5* | irix6* | nonstopux*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      # PIC (with -KPIC) is the default.
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+-      ;;
+ 
+-    newsos6)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      ;;
++# LT_PROG_RC
++# ----------
++AC_DEFUN([LT_PROG_RC],
++[AC_CHECK_TOOL(RC, windres,)
++])
+ 
+-    linux*)
+-      case $CC in
+-      icc|ecc)
+-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+-        ;;
+-      ccc)
+-        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-        # All Alpha code is PIC.
+-        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+-        ;;
+-      esac
+-      ;;
++# Old name:
++AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([LT_AC_PROG_RC], [])
+ 
+-    osf3* | osf4* | osf5*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      # All OSF/1 code is PIC.
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+-      ;;
+ 
+-    sco3.2v5*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
+-      ;;
++# _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])
++])
+ 
+-    solaris*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      ;;
+ 
+-    sunos4*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      ;;
++# _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])
++])
+ 
+-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      ;;
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec ;then
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      fi
+-      ;;
++# _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
+ 
+-    uts4*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      ;;
++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.                               #
+ 
+-    *)
+-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+-      ;;
+-    esac
++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
+ ])
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
++SED=$lt_cv_path_SED
++AC_SUBST([SED])
++AC_MSG_RESULT([$SED])
++])#AC_PROG_SED
++])#m4_ifndef
+ 
+-#
+-# Check to make sure the PIC flag actually works.
+-#
+-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+-  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+-    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+-    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+-     "" | " "*) ;;
+-     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+-     esac],
+-    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
++# 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"}, \
++      = c,a/b,, \
++    && 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
+-case "$host_os" in
+-  # For platforms which do not support PIC, -DPIC is meaningless:
+-  *djgpp*)
+-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-    ;;
+-  *)
+-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+-    ;;
++_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_XSI_SHELLFNS
++# ---------------------
++# Bourne and XSI compatible variants of some useful shell functions.
++m4_defun([_LT_PROG_XSI_SHELLFNS],
++[case $xsi_shell in
++  yes)
++    cat << \_LT_EOF >> "$cfgfile"
++
++# 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 ()
++{
++  case ${1} in
++    */*) func_dirname_result="${1%/*}${2}" ;;
++    *  ) func_dirname_result="${3}" ;;
++  esac
++}
+ 
++# func_basename file
++func_basename ()
++{
++  func_basename_result="${1##*/}"
++}
+ 
+-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
+-# ------------------------------------
+-# See if the linker supports building shared libraries.
+-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+-ifelse([$1],[CXX],[
+-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  case $host_os in
+-  aix4* | aix5*)
+-    # 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
+-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+-    else
+-      _LT_AC_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
++# 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 ()
++{
++  case ${1} in
++    */*) func_dirname_result="${1%/*}${2}" ;;
++    *  ) func_dirname_result="${3}" ;;
++  esac
++  func_basename_result="${1##*/}"
++}
++
++# 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_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}"}
++}
++
++# func_opt_split
++func_opt_split ()
++{
++  func_opt_split_opt=${1%%=*}
++  func_opt_split_arg=${1#*=}
++}
++
++# func_lo2o object
++func_lo2o ()
++{
++  case ${1} in
++    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
++    *)    func_lo2o_result=${1} ;;
++  esac
++}
++
++# func_xform libobj-or-source
++func_xform ()
++{
++  func_xform_result=${1%.*}.lo
++}
++
++# func_arith arithmetic-term...
++func_arith ()
++{
++  func_arith_result=$(( $[*] ))
++}
++
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
++{
++  func_len_result=${#1}
++}
++
++_LT_EOF
+     ;;
+-  pw32*)
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+-  ;;
+-  cygwin* | mingw*)
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+-  ;;
+-  *)
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  ;;
++  *) # Bourne compatible functions.
++    cat << \_LT_EOF >> "$cfgfile"
++
++# 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 ()
++{
++  # Extract subdirectory from the argument.
++  func_dirname_result=`$ECHO "X${1}" | $Xsed -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 file
++func_basename ()
++{
++  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
++}
++
++dnl func_dirname_and_basename
++dnl A portable version of this function is already defined in general.m4sh
++dnl so there is no need for it here.
++
++# 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 "X${3}" \
++           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
++    *)  func_stripname_result=`$ECHO "X${3}" \
++           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+   esac
+-],[
+-  runpath_var=
+-  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+-  _LT_AC_TAGVAR(archive_cmds, $1)=
+-  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+-  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
+-  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+-  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
+-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+-  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+-  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+-  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+-  _LT_AC_TAGVAR(module_cmds, $1)=
+-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=  
+-  _LT_AC_TAGVAR(always_export_symbols, $1)=no
+-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  # include_expsyms should be a list of space-separated symbols to be *always*
+-  # included in the symbol list
+-  _LT_AC_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_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+-  # 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.
+-  extract_expsyms_cmds=
++}
++
++# sed scripts:
++my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
++my_sed_long_arg='1s/^-[[^=]]*=//'
++
++# func_opt_split
++func_opt_split ()
++{
++  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
++  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
++}
++
++# func_lo2o object
++func_lo2o ()
++{
++  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
++}
++
++# func_xform libobj-or-source
++func_xform ()
++{
++  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
++}
++
++# func_arith arithmetic-term...
++func_arith ()
++{
++  func_arith_result=`expr "$[@]"`
++}
++
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
++{
++  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
++}
+ 
+-  case $host_os in
+-  cygwin* | mingw* | pw32*)
+-    # 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
++_LT_EOF
++esac
++
++case $lt_shell_append in
++  yes)
++    cat << \_LT_EOF >> "$cfgfile"
++
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
++{
++  eval "$[1]+=\$[2]"
++}
++_LT_EOF
+     ;;
+-  openbsd*)
+-    with_gnu_ld=no
++  *)
++    cat << \_LT_EOF >> "$cfgfile"
++
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
++{
++  eval "$[1]=\$$[1]\$[2]"
++}
++
++_LT_EOF
+     ;;
+   esac
++])
+ 
+-  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-  if test "$with_gnu_ld" = yes; then
+-    # If archive_cmds runs LD, not CC, wlarc should be empty
+-    wlarc='${wl}'
++# Helper functions for option handling.                    -*- 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.
+ 
+-    # See if GNU ld supports shared libraries.
+-    case $host_os in
+-    aix3* | aix4* | aix5*)
+-      # On AIX/PPC, the GNU linker is very broken
+-      if test "$host_cpu" != ia64; then
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	cat <<EOF 1>&2
++# serial 6 ltoptions.m4
+ 
+-*** Warning: the GNU linker, at least up to release 2.9.1, 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 modify your PATH
+-*** so that a non-GNU linker is found, and then restart.
++# This is to help aclocal find these macros, as it can't see m4_define.
++AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+ 
+-EOF
+-      fi
+-      ;;
+ 
+-    amigaos*)
+-      _LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-
+-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+-      # that the semantics of dynamic libraries on AmigaOS, at least up
+-      # to version 4, is to share data among multiple programs linked
+-      # with the same dynamic library.  Since this doesn't match the
+-      # behavior of shared libraries on other platforms, we can't use
+-      # them.
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
++# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
++# ------------------------------------------
++m4_define([_LT_MANGLE_OPTION],
++[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+ 
+-    beos*)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+-	# support --undefined.  This deserves some investigation.  FIXME
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      else
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
+ 
+-    cygwin* | mingw* | pw32*)
+-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+-      # as there is no search path for DLLs.
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
+-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++# _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
++])
+ 
+-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+-	# If the export-symbols file already is a .def file (1st line
+-	# is EXPORTS), use it as is; otherwise, prepend...
+-	_LT_AC_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}--image-base=0x10000000  ${wl}--out-implib,$lib'
+-      else
+-	ld_shlibs=no
+-      fi
+-      ;;
+ 
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-	wlarc=
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      fi
+-      ;;
++# _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])])
+ 
+-    solaris* | sysv5*)
+-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	cat <<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_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
++])
+ 
+-EOF
+-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_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_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
+ 
+-    sunos4*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      wlarc=
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++# _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
+ 
+-    *)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_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_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
+-    esac
+ 
+-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-      _LT_AC_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_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-      fi
+-    fi
+-  else
+-    # PORTME fill in a description of your system's linker (not GNU ld)
+-    case $host_os in
+-    aix3*)
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+-      _LT_AC_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_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      if test "$GCC" = yes && test -z "$link_static_flag"; then
+-	# Neither direct hardcoding nor static linking is supported with a
+-	# broken collect2.
+-	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+-      fi
+-      ;;
+ 
+-    aix4* | aix5*)
+-      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
+-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+-	else
+-	  _LT_AC_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
++# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
++# -----------------------------------------
++m4_define([_LT_MANGLE_DEFUN],
++[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+ 
+-	# 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]].*|aix5*)
+-	  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
++# 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
+ 
+-      # 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_AC_TAGVAR(archive_cmds, $1)=''
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++# dlopen
++# ------
++LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
++])
+ 
+-      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
+-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-	  else
+-  	  # We have old collect2
+-  	  _LT_AC_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_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-	  fi
+-	esac
+-	shared_flag='-shared'
+-      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
++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.])
++])
+ 
+-      # It seems that -bexpall does not export symbols beginning with
+-      # underscore (_), so it is better to generate a list of symbols to export.
+-      _LT_AC_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_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+-       # Determine the default libpath from the value encoded in an empty executable.
+-       _LT_AC_SYS_LIBPATH_AIX
+-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-       else
+-	if test "$host_cpu" = ia64; then
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+-	else
+-	 # Determine the default libpath from the value encoded in an empty executable.
+-	 _LT_AC_SYS_LIBPATH_AIX
+-	 _LT_AC_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_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	  # -bexpall does not export symbols beginning with underscore (_)
+-	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+-	  # Exported symbols can be pulled into shared objects from archives
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-	fi
+-      fi
+-      ;;
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+ 
+-    amigaos*)
+-      _LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      # see comment about different semantics on the GNU ld section
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
+ 
+-    bsdi4*)
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+-      ;;
++# win32-dll
++# ---------
++# Declare package support for building win32 dll's.
++LT_OPTION_DEFINE([LT_INIT], [win32-dll],
++[enable_win32_dll=yes
+ 
+-    cygwin* | mingw* | pw32*)
+-      # 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.
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+-      _LT_AC_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=".dll"
+-      # FIXME: Setting linknames here is a bad hack.
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+-      # The linker will automatically build a .lib file if we build a DLL.
+-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+-      # FIXME: Should let the user specify the lib program.
+-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
+-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=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
+ 
+-    darwin* | rhapsody*)
+-    if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then 
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[[012]])
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+-	;;
+-      *) # Darwin 1.3 on
+-	test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+-	;;
+-      esac
+-      # FIXME: Relying on posixy $() will cause problems for
+-      #        cross-compilation, but unfortunately the echo tests do not
+-      #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+-      #	       `"' quotes if we put them in here... so don't!
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-    	else
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -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'
+-      fi
+-      _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        else
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -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~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        fi
+-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-    fi  
+-      ;;
++test -z "$AS" && AS=as
++_LT_DECL([], [AS],      [0], [Assembler program])dnl
+ 
+-    dgux*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+ 
+-    freebsd1*)
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
++test -z "$OBJDUMP" && OBJDUMP=objdump
++_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
++])# win32-dll
+ 
+-    # 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_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++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.])
++])
+ 
+-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+-    freebsd2*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+ 
+-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++
++# _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)
+ 
+-    hpux9*)
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${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_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_DECL([build_libtool_libs], [enable_shared], [0],
++	[Whether or not to build shared libraries])
++])# _LT_ENABLE_SHARED
+ 
+-      # hardcode_minus_L: Not really in the search PATH,
+-      # but as the default location of the library.
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-      ;;
++LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
++LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+ 
+-    hpux10* | hpux11*)
+-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	esac
+-      else
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  ;;
+-	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+-	  ;;
+-	esac
+-      fi
+-      if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*)
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-	  ;;
+-	ia64*)
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=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])
++])
+ 
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-	  ;;
+-	*)
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
++AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+ 
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-	  ;;
+-	esac
+-      fi
+-      ;;
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AM_ENABLE_SHARED], [])
++dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+ 
+-    irix5* | irix6* | nonstopux*)
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-      ;;
+ 
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
+ 
+-    newsos6)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++# _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)
+ 
+-    openbsd*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-      else
+-       case $host_os in
+-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-	   ;;
+-	 *)
+-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
+-      fi
+-      ;;
++    _LT_DECL([build_old_libs], [enable_static], [0],
++	[Whether or not to build static libraries])
++])# _LT_ENABLE_STATIC
+ 
+-    os2*)
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      _LT_AC_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_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+-      ;;
++LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
++LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+ 
+-    osf3*)
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      else
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      ;;
++# Old names:
++AC_DEFUN([AC_ENABLE_STATIC],
++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
++])
+ 
+-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-      else
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	_LT_AC_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~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++AC_DEFUN([AC_DISABLE_STATIC],
++[_LT_SET_OPTION([LT_INIT], [disable-static])
++])
+ 
+-	# Both c and cxx compiler support -rpath directly
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      ;;
++AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
++AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+ 
+-    sco3.2v5*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+-      runpath_var=LD_RUN_PATH
+-      hardcode_runpath_var=yes
+-      ;;
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AM_ENABLE_STATIC], [])
++dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+ 
+-    solaris*)
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	_LT_AC_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'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      case $host_os in
+-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+-      esac
+-      _LT_AC_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_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
+ 
+-    sysv4)
+-      case $host_vendor in
+-	sni)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+-	;;
+-	siemens)
+-	  ## LD is ld it makes a PLAMLIB
+-	  ## CC just makes a GrossModule.
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-        ;;
+-	motorola)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+-	;;
+-      esac
+-      runpath_var='LD_RUN_PATH'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++# _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)
+ 
+-    sysv4.3*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+-      ;;
++_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.])
++])
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-	runpath_var=LD_RUN_PATH
+-	hardcode_runpath_var=yes
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-      fi
+-      ;;
++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.])
++])
+ 
+-    sysv4.2uw2*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      hardcode_runpath_var=yes
+-      runpath_var=LD_RUN_PATH
+-      ;;
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
++dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+ 
+-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      fi
+-      runpath_var='LD_RUN_PATH'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
+ 
+-    sysv5*)
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+-      # $CC -shared without GNU ld will not create a library from C++
+-      # object files and a static libstdc++, better avoid it by now
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_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'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      runpath_var='LD_RUN_PATH'
+-      ;;
++# _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],
++	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
++    [pic_mode="$withval"],
++    [pic_mode=default])
+ 
+-    uts4*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+ 
+-    *)
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
+-    esac
+-  fi
++_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.])
+ ])
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = 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
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
++
+ 
++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])])
++
++# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+ #
+-# Do we need to explicitly link libc?
++# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
++# Written by Gary V. Vaughan, 2004
+ #
+-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
+-x|xyes)
+-  # Assume -lc should be added
+-  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++# 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.
+ 
+-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+-    case $_LT_AC_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_MSG_CHECKING([whether -lc should be explicitly linked in])
+-      $rm conftest*
+-      printf "$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_AC_TAGVAR(lt_prog_compiler_wl, $1)
+-        compiler_flags=-v
+-        linker_flags=-v
+-        verstring=
+-        output_objdir=.
+-        libname=conftest
+-        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
+-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
+-        then
+-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-        else
+-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-        fi
+-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+-      else
+-        cat conftest.err 1>&5
+-      fi
+-      $rm conftest*
+-      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
+-      ;;
+-    esac
+-  fi
+-  ;;
+-esac
+-])# AC_LIBTOOL_PROG_LD_SHLIBS
++# 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_AC_FILE_LTDLL_C
+-# -------------------
+-# Be careful that the start marker always follows a newline.
+-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
+-# /* ltdll.c starts here */
+-# #define WIN32_LEAN_AND_MEAN
+-# #include <windows.h>
+-# #undef WIN32_LEAN_AND_MEAN
+-# #include <stdio.h>
+-#
+-# #ifndef __CYGWIN__
+-# #  ifdef __CYGWIN32__
+-# #    define __CYGWIN__ __CYGWIN32__
+-# #  endif
+-# #endif
+-#
+-# #ifdef __cplusplus
+-# extern "C" {
+-# #endif
+-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+-# #ifdef __cplusplus
+-# }
+-# #endif
+-#
+-# #ifdef __CYGWIN__
+-# #include <cygwin/cygwin_dll.h>
+-# DECLARE_CYGWIN_DLL( DllMain );
+-# #endif
+-# HINSTANCE __hDllInstance_base;
++
++# 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).
+ #
+-# BOOL APIENTRY
+-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+-# {
+-#   __hDllInstance_base = hInst;
+-#   return TRUE;
+-# }
+-# /* ltdll.c ends here */
+-])# _LT_AC_FILE_LTDLL_C
++# 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_AC_TAGVAR(VARNAME, [TAGNAME])
+-# ---------------------------------
+-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$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])])
+ 
+-# old names
+-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
+-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
+-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
+-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
+-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+ 
+-# This is just to silence aclocal about the macro not being used
+-ifelse([AC_DISABLE_FAST_INSTALL])
++# lt_dict_add(DICT, KEY, VALUE)
++# -----------------------------
++m4_define([lt_dict_add],
++[m4_define([$1($2)], [$3])])
+ 
+-AC_DEFUN([LT_AC_PROG_GCJ],
+-[AC_CHECK_TOOL(GCJ, gcj, no)
+-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+-  AC_SUBST(GCJFLAGS)
+-])
+ 
+-AC_DEFUN([LT_AC_PROG_RC],
+-[AC_CHECK_TOOL(RC, windres, no)
++# 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
+ ])
+ 
+-# 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.                               #
+-# LT_AC_PROG_SED
+-# --------------
+-# Check for a fully-functional sed program, that truncates
+-# as few characters as possible.  Prefer GNU sed if found.
+-AC_DEFUN([LT_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
+-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 && break
+-  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_MSG_RESULT([$SED])
++# 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.
++
++# Generated from ltversion.in.
++
++# serial 3012 ltversion.m4
++# This file is part of GNU Libtool
++
++m4_define([LT_PACKAGE_VERSION], [2.2.6])
++m4_define([LT_PACKAGE_REVISION], [1.3012])
++
++AC_DEFUN([LTVERSION_VERSION],
++[macro_version='2.2.6'
++macro_revision='1.3012'
++_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
++_LT_DECL(, macro_revision, 0)
+ ])
+ 
++# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
++#
++#   Copyright (C) 2004, 2005, 2007 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 4 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_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
++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])])
++
diff --git a/japanese/FreeWnn-lib/files/patch-cWnn-cd-cserverrc b/japanese/FreeWnn-lib/files/patch-cWnn-cd-cserverrc
index 513c78b506fe..e1de9b0ec22b 100644
--- a/japanese/FreeWnn-lib/files/patch-cWnn-cd-cserverrc
+++ b/japanese/FreeWnn-lib/files/patch-cWnn-cd-cserverrc
@@ -3,10 +3,10 @@ Index: cWnn/cd/cserverrc
 RCS file: /home/cvs/private/hrs/freewnn/cWnn/cd/cserverrc,v
 retrieving revision 1.1.1.1
 retrieving revision 1.3
-diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.3
+diff -u -p -r1.1.1.1 -r1.3
 --- cWnn/cd/cserverrc	20 Dec 2008 07:13:30 -0000	1.1.1.1
 +++ cWnn/cd/cserverrc	2 Jan 2009 21:56:38 -0000	1.3
-@@ -39,6 +39,9 @@
+@@ -39,6 +39,9 @@ readfile	sys/QianMa.dic
  
  readfile	sys/full.con
  
diff --git a/japanese/FreeWnn-lib/files/patch-cWnn-etc-Makefile.in b/japanese/FreeWnn-lib/files/patch-cWnn-etc-Makefile.in
index c4942f151712..01360baea50f 100644
--- a/japanese/FreeWnn-lib/files/patch-cWnn-etc-Makefile.in
+++ b/japanese/FreeWnn-lib/files/patch-cWnn-etc-Makefile.in
@@ -3,10 +3,10 @@ Index: cWnn/etc/Makefile.in
 RCS file: /home/cvs/private/hrs/freewnn/cWnn/etc/Makefile.in,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
+diff -u -p -r1.1.1.1 -r1.2
 --- cWnn/etc/Makefile.in	20 Dec 2008 07:13:30 -0000	1.1.1.1
 +++ cWnn/etc/Makefile.in	2 Jan 2009 21:09:34 -0000	1.2
-@@ -36,11 +36,13 @@
+@@ -36,11 +36,13 @@ INCLUDES = -I$(CWNNINCLUDESRC) -I$(TOP)
  DEFINES  = $(CWNNDEFINES) $(CWNNLANGDEF)
  
  SRCS =	strings.c sstrings.c bdic.c hindo.c gethinsi.c revdic.c pwd.c bcopy.c \
@@ -22,7 +22,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  OBJS2 = getopt.o getopt1.o
  
  all::
-@@ -195,6 +197,14 @@
+@@ -195,6 +197,14 @@ includes:: getopt1.c
  
  depend:: getopt1.c
  
diff --git a/japanese/FreeWnn-lib/files/patch-cWnn-include-Makefile.in b/japanese/FreeWnn-lib/files/patch-cWnn-include-Makefile.in
index ca9990ae3be2..fb2960ce0297 100644
--- a/japanese/FreeWnn-lib/files/patch-cWnn-include-Makefile.in
+++ b/japanese/FreeWnn-lib/files/patch-cWnn-include-Makefile.in
@@ -3,10 +3,10 @@ Index: cWnn/include/Makefile.in
 RCS file: /home/cvs/private/hrs/freewnn/cWnn/include/Makefile.in,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
+diff -u -p -r1.1.1.1 -r1.2
 --- cWnn/include/Makefile.in	20 Dec 2008 07:13:30 -0000	1.1.1.1
 +++ cWnn/include/Makefile.in	2 Jan 2009 21:09:34 -0000	1.2
-@@ -36,7 +36,8 @@
+@@ -36,7 +36,8 @@ INSTALL      = @INSTALL@ $(INSTALLFLAGS)
  
  HEADERS = commonhd.h jllib.h jslib.h msg.h rk_spclval.h wnnerror.h cplib.h
  LINKS = wnn_config.h copyright.h demcom.h hinsi_file.h jd_sock.h  \
@@ -16,7 +16,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  LINKS2 = getopt.h
  
  
-@@ -204,6 +205,14 @@
+@@ -204,6 +205,14 @@ includes:: getopt.h
  
  depend:: getopt.h
  
diff --git a/japanese/FreeWnn-lib/files/patch-cWnn-jlib-Makefile.in b/japanese/FreeWnn-lib/files/patch-cWnn-jlib-Makefile.in
index 6b1d61c1db7f..bdde71437aeb 100644
--- a/japanese/FreeWnn-lib/files/patch-cWnn-jlib-Makefile.in
+++ b/japanese/FreeWnn-lib/files/patch-cWnn-jlib-Makefile.in
@@ -3,10 +3,10 @@ Index: cWnn/jlib/Makefile.in
 RCS file: /home/cvs/private/hrs/freewnn/cWnn/jlib/Makefile.in,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
+diff -u -p -r1.1.1.1 -r1.2
 --- cWnn/jlib/Makefile.in	20 Dec 2008 07:13:30 -0000	1.1.1.1
 +++ cWnn/jlib/Makefile.in	2 Jan 2009 21:09:34 -0000	1.2
-@@ -57,6 +57,8 @@
+@@ -57,6 +57,8 @@ SRC7= $(CWNNETCSRC)/strings.c
  OBJ7= strings.o
  SRC8= $(CWNNETCSRC)/bcopy.c
  OBJ8= bcopy.o
@@ -15,7 +15,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  
  LOCAL_RKSRCS= $(CWNNROMKANSRC)/rk_bltinfn.c 	$(CWNNROMKANSRC)/rk_main.c 	$(CWNNROMKANSRC)/rk_modread.c 	$(CWNNROMKANSRC)/rk_read.c 	$(CWNNROMKANSRC)/rk_vars.c
  
-@@ -152,6 +154,9 @@
+@@ -152,6 +154,9 @@ $(OBJ7) : $(SRC7)
  $(OBJ8) : $(SRC8)
  	$(LT_CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
  
diff --git a/japanese/FreeWnn-lib/files/patch-cWnn-jserver-Makefile.in b/japanese/FreeWnn-lib/files/patch-cWnn-jserver-Makefile.in
new file mode 100644
index 000000000000..fd545c08cad5
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-cWnn-jserver-Makefile.in
@@ -0,0 +1,41 @@
+Index: cWnn/jserver/Makefile.in
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/cWnn/jserver/Makefile.in,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- cWnn/jserver/Makefile.in	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ cWnn/jserver/Makefile.in	2 Jan 2009 21:09:35 -0000	1.2
+@@ -82,6 +82,8 @@ SRC20= $(CWNNETCSRC)/getopt.c
+ OBJ20= getopt.o
+ SRC21= $(CWNNETCSRC)/getopt1.c
+ OBJ21= getopt1.o
++SRC22= $(CWNNETCSRC)/fake-rfc2553.c
++OBJ22= fake-rfc2553.o
+ TSRC0= de_t.c
+ TOBJ0= de_t.o
+ TSRCGETHINSI= gethinsi_t.c
+@@ -90,11 +92,11 @@ OBJSUPPORT = @JS_SUPPORTOBJS@
+ TSRCS= $(TSRC0) $(TSRCGETHINSI)
+ SRCS= $(SRC0) $(SRC1) $(SRC3) $(SRC4) $(SRC5) $(SRC6) $(SRC7) \
+     $(SRCGETHINSI) $(SRC9) $(SRC10) $(SRC11) $(SRC12) $(SRC13) $(SRC14) \
+-    $(SRC20) $(SRC21) $(TSRCS)
++    $(SRC20) $(SRC21) $(SRC22) $(TSRCS)
+ 
+ OBJS= $(OBJ0) $(OBJ1) $(OBJ3) $(OBJ4) $(OBJ5) $(OBJ6) $(OBJ7) \
+     $(OBJGETHINSI) $(OBJ9) $(OBJ10) $(OBJ11) $(OBJ12) $(OBJ13) $(OBJ14) \
+-    $(OBJ20) $(OBJ21) $(OBJSUPPORT)
++    $(OBJ20) $(OBJ21) $(OBJ22) $(OBJSUPPORT)
+ 
+ TOBJS= $(TOBJ0) $(OBJ1) $(OBJ3) $(OBJ4) $(OBJ5) $(OBJ6) $(OBJ7) \
+     $(TOBJGETHINSI) $(OBJ9) $(OBJ10) $(OBJ11) $(OBJ12) $(OBJ13) $(OBJ14) \
+@@ -609,6 +611,9 @@ $(OBJ20) : $(SRC20) $(CWNNINCLUDESRC)/ge
+ $(OBJ21) : $(SRC21) $(CWNNINCLUDESRC)/getopt.h
+ 	$(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
+ 
++$(OBJ22) : $(SRC22)
++	$(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
++
+ vasprintf.o : $(WNNETCSRC)/vasprintf.c
+ 	$(CC) -c $(CFLAGS)  $?
+ 
diff --git a/japanese/FreeWnn-lib/files/patch-cWnn-romkan-Makefile.in b/japanese/FreeWnn-lib/files/patch-cWnn-romkan-Makefile.in
new file mode 100644
index 000000000000..3028ad374bde
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-cWnn-romkan-Makefile.in
@@ -0,0 +1,17 @@
+Index: cWnn/romkan/Makefile.in
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/cWnn/romkan/Makefile.in,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- cWnn/romkan/Makefile.in	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ cWnn/romkan/Makefile.in	2 Jan 2010 12:10:16 -0000	1.2
+@@ -48,7 +48,7 @@ includes::
+ 
+ .c.o:
+ 	$(RM) $@
+-	$(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $<
++	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(_NOOP_) $<
+ 
+ clean::
+ 	$(RM) -r .libs
diff --git a/japanese/FreeWnn-lib/files/patch-cWnn-td-tserverrc b/japanese/FreeWnn-lib/files/patch-cWnn-td-tserverrc
index 014f33976a0b..fc6234db7b83 100644
--- a/japanese/FreeWnn-lib/files/patch-cWnn-td-tserverrc
+++ b/japanese/FreeWnn-lib/files/patch-cWnn-td-tserverrc
@@ -3,10 +3,10 @@ Index: cWnn/td/tserverrc
 RCS file: /home/cvs/private/hrs/freewnn/cWnn/td/tserverrc,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
+diff -u -p -r1.1.1.1 -r1.2
 --- cWnn/td/tserverrc	20 Dec 2008 07:13:30 -0000	1.1.1.1
 +++ cWnn/td/tserverrc	20 Dec 2008 07:23:12 -0000	1.2
-@@ -35,6 +35,8 @@
+@@ -35,6 +35,8 @@ readfile	sys/cns_wd.dic
  
  readfile	sys/full.con
  
diff --git a/japanese/FreeWnn-lib/files/patch-config.h.in b/japanese/FreeWnn-lib/files/patch-config.h.in
index 2d6dc4a5fc4d..a49654888ff4 100644
--- a/japanese/FreeWnn-lib/files/patch-config.h.in
+++ b/japanese/FreeWnn-lib/files/patch-config.h.in
@@ -2,10 +2,10 @@ Index: config.h.in
 ===================================================================
 RCS file: /home/cvs/private/hrs/freewnn/config.h.in,v
 retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
+retrieving revision 1.3
+diff -u -p -r1.1.1.1 -r1.3
 --- config.h.in	20 Dec 2008 07:13:30 -0000	1.1.1.1
-+++ config.h.in	2 Jan 2009 21:09:32 -0000	1.2
++++ config.h.in	2 Jan 2010 11:58:36 -0000	1.3
 @@ -33,12 +33,24 @@
  /* Define to 1 if you have the `FD_SET' function. */
  #undef HAVE_FD_SET
@@ -50,3 +50,14 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  /* Define to 1 if you have the `syslog' function. */
  #undef HAVE_SYSLOG
  
+@@ -201,6 +225,10 @@
+ /* Define to 1 if you have the `wait3' function. */
+ #undef HAVE_WAIT3
+ 
++/* Define to the sub-directory in which libtool stores uninstalled libraries.
++   */
++#undef LT_OBJDIR
++
+ /* Define to the address where bug reports for this package should be sent. */
+ #undef PACKAGE_BUGREPORT
+ 
diff --git a/japanese/FreeWnn-lib/files/patch-configure b/japanese/FreeWnn-lib/files/patch-configure
index 9d68110df03e..0fd4e91ae30c 100644
--- a/japanese/FreeWnn-lib/files/patch-configure
+++ b/japanese/FreeWnn-lib/files/patch-configure
@@ -2,11 +2,11 @@ Index: configure
 ===================================================================
 RCS file: /home/cvs/private/hrs/freewnn/configure,v
 retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
+retrieving revision 1.3
+diff -u -p -r1.1.1.1 -r1.3
 --- configure	20 Dec 2008 07:13:30 -0000	1.1.1.1
-+++ configure	2 Jan 2009 21:09:32 -0000	1.2
-@@ -1,11 +1,575 @@
++++ configure	2 Jan 2010 11:58:36 -0000	1.3
+@@ -1,410 +1,745 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated by GNU Autoconf 2.53.
@@ -21,7 +21,16 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +## --------------------- ##
 +## M4sh Initialization.  ##
 +## --------------------- ##
-+
+ 
+-
+-# Check that we are running under the correct shell.
+-SHELL=${CONFIG_SHELL-/bin/sh}
+-
+-case X$ECHO in
+-X*--fallback-echo)
+-  # Remove one level of quotation (which was required for Make).
+-  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
+-  ;;
 +# Be more Bourne compatible
 +DUALCASE=1; export DUALCASE # for MKS sh
 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -34,12 +43,48 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +else
 +  case `(set -o) 2>/dev/null` in
 +  *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+
+ esac
+ 
+-echo=${ECHO-echo}
+-if test "X$1" = X--no-reexec; then
+-  # Discard the --no-reexec flag, and continue.
+-  shift
+-elif test "X$1" = X--fallback-echo; then
+-  # Avoid inline document here, it may be left over
+-  :
+-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+-  # Yippee, $echo works!
+-  :
+-else
+-  # Restart under the correct shell.
+-  exec $SHELL "$0" --no-reexec ${1+"$@"}
+ fi
+ 
+-if test "X$1" = X--fallback-echo; then
+-  # used as fallback echo
+-  shift
+-  cat <<EOF
+-$*
+-EOF
+-  exit 0
+-fi
+ 
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+ 
+-if test -z "$ECHO"; then
+-if test "X${echo_test_string+set}" != Xset; then
+-# find a string as large as possible, as long as the shell can cope with it
+-  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+-       echo_test_string="`eval $cmd`" &&
+-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+-    then
+-      break
+-    fi
+-  done
 +
 +# PATH needs CR
 +# Avoid depending upon Character Ranges.
@@ -79,8 +124,12 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  fi
 +  export as_echo_body
 +  as_echo='sh -c $as_echo_body as_echo'
-+fi
-+
+ fi
+ 
+-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+-   test "X$echo_testing_string" = "X$echo_test_string"; then
+-  :
 +# The user is always right.
 +if test "${PATH_SEPARATOR+set}" != set; then
 +  PATH_SEPARATOR=:
@@ -93,11 +142,68 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +# Support unset when possible.
 +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
 +  as_unset=unset
-+else
+ else
+-  # The Solaris, AIX, and Digital Unix default echo programs unquote
+-  # backslashes.  This makes it impossible to quote backslashes using
+-  #   echo "$something" | sed 's/\\/\\\\/g'
+-  #
+-  # So, first we look for a working echo in the user's PATH.
 +  as_unset=false
 +fi
-+
-+
+ 
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for dir in $PATH /usr/ucb; do
+-    IFS="$lt_save_ifs"
+-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+-       test "X$echo_testing_string" = "X$echo_test_string"; then
+-      echo="$dir/echo"
+-      break
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
+ 
+-  if test "X$echo" = Xecho; then
+-    # We didn't find a better echo, so look for alternatives.
+-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+-       test "X$echo_testing_string" = "X$echo_test_string"; then
+-      # This shell has a builtin print -r that does the trick.
+-      echo='print -r'
+-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+-      # If we have ksh, try running configure again with it.
+-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+-      export ORIGINAL_CONFIG_SHELL
+-      CONFIG_SHELL=/bin/ksh
+-      export CONFIG_SHELL
+-      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
+-    else
+-      # Try using printf.
+-      echo='printf %s\n'
+-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+-	 test "X$echo_testing_string" = "X$echo_test_string"; then
+-	# Cool, printf works
+-	:
+-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+-	   test "X$echo_testing_string" = 'X\t' &&
+-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+-	   test "X$echo_testing_string" = "X$echo_test_string"; then
+-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+-	export CONFIG_SHELL
+-	SHELL="$CONFIG_SHELL"
+-	export SHELL
+-	echo="$CONFIG_SHELL $0 --fallback-echo"
+-      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+-	   test "X$echo_testing_string" = 'X\t' &&
+-	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+-	   test "X$echo_testing_string" = "X$echo_test_string"; then
+-	echo="$CONFIG_SHELL $0 --fallback-echo"
+-      else
+-	# maybe with a smaller string...
+-	prev=:
 +# IFS
 +# We need space, tab and new line, in precisely that order.  Quoting is
 +# there to prevent editors from complaining about space-tab.
@@ -116,7 +222,14 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 +done
 +IFS=$as_save_IFS
-+
+ 
+-	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+-	  then
+-	    break
+-	  fi
+-	  prev="$cmd"
+-	done
 +     ;;
 +esac
 +# We did not find ourselves, most probably we were run as `sh COMMAND'
@@ -136,7 +249,18 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +PS1='$ '
 +PS2='> '
 +PS4='+ '
-+
+ 
+-	if test "$prev" != 'sed 50q "$0"'; then
+-	  echo_test_string=`eval $prev`
+-	  export echo_test_string
+-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
+-	else
+-	  # Oops.  We lost completely, so just stick with echo.
+-	  echo=echo
+-	fi
+-      fi
+-    fi
+-  fi
 +# NLS nuisances.
 +LC_ALL=C
 +export LC_ALL
@@ -149,14 +273,19 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  as_expr=expr
 +else
 +  as_expr=false
-+fi
+ fi
 +
 +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
 +  as_basename=basename
 +else
 +  as_basename=false
-+fi
-+
+ fi
+ 
+-# Copy echo and quote the copy suitably for passing to libtool from
+-# the Makefile, instead of quoting the original, which is used later.
+-ECHO=$echo
+-if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+-   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
 +
 +# Name of the executable.
 +as_me=`$as_basename -- "$0" ||
@@ -187,8 +316,8 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  as_have_required=yes
 +else
 +  as_have_required=no
-+fi
-+
+ fi
+ 
 +  if test $as_have_required = yes &&	 (eval ":
 +(as_func_return () {
 +  (exit \$1)
@@ -205,7 +334,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +as_func_ret_failure () {
 +  return 1
 +}
-+
+ 
 +exitcode=0
 +if as_func_success; then
 +  :
@@ -213,31 +342,36 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  exitcode=1
 +  echo as_func_success failed.
 +fi
-+
+ 
 +if as_func_failure; then
 +  exitcode=1
 +  echo as_func_failure succeeded.
 +fi
-+
+ 
+-tagnames=`echo "$tagnames,CXX" | sed 's/^,//'`
 +if as_func_ret_success; then
 +  :
 +else
 +  exitcode=1
 +  echo as_func_ret_success failed.
 +fi
-+
+ 
+-tagnames=`echo "$tagnames,F77" | sed 's/^,//'`
 +if as_func_ret_failure; then
 +  exitcode=1
 +  echo as_func_ret_failure succeeded.
 +fi
-+
+ 
+-if expr a : '\(a\)' >/dev/null 2>&1; then
+-  as_expr=expr
 +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
 +  :
-+else
+ else
+-  as_expr=false
 +  exitcode=1
 +  echo positional parameters were not saved.
-+fi
-+
+ fi
+ 
 +test \$exitcode = 0) || { (exit 1); exit 1; }
 +
 +(
@@ -262,15 +396,21 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +       esac
 +done
 +IFS=$as_save_IFS
-+
-+
+ 
+-## --------------------- ##
+-## M4sh Initialization.  ##
+-## --------------------- ##
+ 
+-# Be Bourne compatible
 +      for as_shell in $as_candidate_shells $SHELL; do
 +	 # Try only shells that exist, to save several forks.
 +	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
 +		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+  emulate sh
-+  NULLCMD=:
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
 +  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
 +  # is contrary to our usage.  Disable this feature.
 +  alias -g '${1+"$@"}'='"$@"'
@@ -280,8 +420,12 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  *posix*) set -o posix ;;
 +esac
 +
-+fi
-+
+ fi
+ 
+-# NLS nuisances.
+-# Support unset when possible.
+-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+-  as_unset=unset
 +
 +:
 +_ASEOF
@@ -296,14 +440,39 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  # is contrary to our usage.  Disable this feature.
 +  alias -g '${1+"$@"}'='"$@"'
 +  setopt NO_GLOB_SUBST
-+else
+ else
+-  as_unset=false
 +  case `(set -o) 2>/dev/null` in
 +  *posix*) set -o posix ;;
 +esac
 +
-+fi
-+
-+
+ fi
+ 
+-(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
+-    { $as_unset LANG || test "${LANG+set}" != set; } ||
+-      { LANG=C; export LANG; }
+-(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
+-    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
+-      { LC_ALL=C; export LC_ALL; }
+-(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
+-    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
+-      { LC_TIME=C; export LC_TIME; }
+-(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
+-    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
+-      { LC_CTYPE=C; export LC_CTYPE; }
+-(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
+-    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
+-      { LANGUAGE=C; export LANGUAGE; }
+-(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
+-    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
+-      { LC_COLLATE=C; export LC_COLLATE; }
+-(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
+-    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
+-      { LC_NUMERIC=C; export LC_NUMERIC; }
+-(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
+-    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
+-      { LC_MESSAGES=C; export LC_MESSAGES; }
+ 
 +:
 +(as_func_return () {
 +  (exit $1)
@@ -320,7 +489,18 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +as_func_ret_failure () {
 +  return 1
 +}
-+
+ 
+-# Name of the executable.
+-as_me=`(basename "$0") 2>/dev/null ||
+-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+-	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)$' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X/"$0" |
+-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\/\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
 +exitcode=0
 +if as_func_success; then
 +  :
@@ -328,12 +508,30 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  exitcode=1
 +  echo as_func_success failed.
 +fi
-+
+ 
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
 +if as_func_failure; then
 +  exitcode=1
 +  echo as_func_failure succeeded.
 +fi
-+
+ 
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conftest.sh
+-  echo  "exit 0"   >>conftest.sh
+-  chmod +x conftest.sh
+-  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
+-    PATH_SEPARATOR=';'
+-  else
+-    PATH_SEPARATOR=:
+-  fi
+-  rm -f conftest.sh
 +if as_func_ret_success; then
 +  :
 +else
@@ -351,14 +549,27 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +else
 +  exitcode=1
 +  echo positional parameters were not saved.
-+fi
-+
+ fi
+ 
 +test $exitcode = 0) || { (exit 1); exit 1; }
-+
+ 
 +(
-+  as_lineno_1=$LINENO
-+  as_lineno_2=$LINENO
-+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+-  # Find who we are.  Look in the path if we contain no path at all
+-  # relative or not.
+-  case $0 in
+-    *[\\/]* ) as_myself=$0 ;;
+-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
 +  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
 +
 +_ASEOF
@@ -451,56 +662,111 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +}
 +
 +
-+
-+  as_lineno_1=$LINENO
-+  as_lineno_2=$LINENO
-+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+ 
+-       ;;
+-  esac
+-  # We did not find ourselves, most probably we were run as `sh COMMAND'
+-  # in which case we are not to be found in the path.
+-  if test "x$as_myself" = x; then
+-    as_myself=$0
+-  fi
+-  if test ! -f "$as_myself"; then
+-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+-   { (exit 1); exit 1; }; }
+-  fi
+-  case $CONFIG_SHELL in
+-  '')
+-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for as_base in sh bash ksh sh5; do
+-	 case $as_dir in
+-	 /*)
+-	   if ("$as_dir/$as_base" -c '
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+-	     CONFIG_SHELL=$as_dir/$as_base
+-	     export CONFIG_SHELL
+-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+-	   fi;;
+-	 esac
+-       done
+-done
+-;;
+-  esac
 +  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-+
-+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-+  # uniformly replaced by the line number.  The first 'sed' inserts a
+ 
+   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+   # uniformly replaced by the line number.  The first 'sed' inserts a
+-  # line-number line before each line; the second 'sed' does the real
+-  # work.  The second script uses 'N' to pair each line-number line
+-  # with the numbered line, and appends trailing '-' during
+-  # substitution so that $LINENO is not a special case at line end.
 +  # line-number line after each line using $LINENO; the second 'sed'
 +  # does the real work.  The second script uses 'N' to pair each
 +  # line-number line with the line containing $LINENO, and appends
 +  # trailing '-' during substitution so that $LINENO is not a special
 +  # case at line end.
-+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+-  sed '=' <$as_myself |
 +  # scripts with optimization help from Paolo Bonzini.  Blame Lee
 +  # E. McMahon (1931-1989) for sed's syntax.  :-)
 +  sed -n '
 +    p
 +    /[$]LINENO/=
 +  ' <$as_myself |
-+    sed '
+     sed '
 +      s/[$]LINENO.*/&-/
 +      t lineno
 +      b
 +      :lineno
-+      N
+       N
+-      s,$,-,
+-      : loop
+-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
 +      :loop
 +      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-+      t loop
+       t loop
+-      s,-$,,
+-      s,^['$as_cr_digits']*\n,,
 +      s/-\n.*//
-+    ' >$as_me.lineno &&
+     ' >$as_me.lineno &&
+-  chmod +x $as_me.lineno ||
+-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
 +  chmod +x "$as_me.lineno" ||
 +    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+   { (exit 1); exit 1; }; }
-+
-+  # Don't try to exec as it changes $[0], causing all sort of problems
-+  # (the dirname of $[0] is not the place where we might find the
+    { (exit 1); exit 1; }; }
+ 
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+-  # original and so on.  Autoconf is especially sensible to this).
+-  . ./$as_me.lineno
 +  # original and so on.  Autoconf is especially sensitive to this).
 +  . "./$as_me.lineno"
-+  # Exit status is that of the last command.
-+  exit
-+}
-+
-+
+   # Exit status is that of the last command.
+   exit
+ }
+ 
+ 
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+-  *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T='	' ;;
+-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+-esac
 +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
 +  as_dirname=dirname
 +else
 +  as_dirname=false
 +fi
-+
+ 
+-if expr a : '\(a\)' >/dev/null 2>&1; then
 +ECHO_C= ECHO_N= ECHO_T=
 +case `echo -n x` in
 +-n*)
@@ -513,12 +779,20 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +esac
 +if expr a : '\(a\)' >/dev/null 2>&1 &&
 +   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
-+
-+rm -f conf$$ conf$$.exe conf$$.file
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+ rm -f conf$$ conf$$.exe conf$$.file
+-echo >conf$$.file
+-if ln -s conf$$.file conf$$ 2>/dev/null; then
+-  # We could just check for DJGPP; but this test a) works b) is more generic
+-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+-  if test -f conf$$.exe; then
+-    # Don't use ln at all; we don't have any links
+-    as_ln_s='cp -p'
+-  else
 +if test -d conf$$.dir; then
 +  rm -f conf$$.dir/conf$$.file
 +else
@@ -527,7 +801,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +fi
 +if (echo >conf$$.file) 2>/dev/null; then
 +  if ln -s conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s='ln -s'
+     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.
@@ -538,13 +812,17 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +    as_ln_s=ln
 +  else
 +    as_ln_s='cp -p'
-+  fi
-+else
-+  as_ln_s='cp -p'
-+fi
+   fi
+-elif ln conf$$.file conf$$ 2>/dev/null; then
+-  as_ln_s=ln
+ else
+   as_ln_s='cp -p'
+ fi
+-rm -f conf$$ conf$$.exe conf$$.file
 +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 +rmdir conf$$.dir 2>/dev/null
-+
+ 
+-as_executable_p="test -f"
 +if mkdir -p . 2>/dev/null; then
 +  as_mkdir_p=:
 +else
@@ -574,244 +852,175 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  '
 +fi
 +as_executable_p=$as_test_x
-+
-+# 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'"
-+
-+
  
+ # Sed expression to map a string onto a valid CPP name.
+-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
  
- # Check that we are running under the correct shell.
-@@ -161,250 +725,26 @@
+ # Sed expression to map a string onto a valid variable name.
+-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
- tagnames=`echo "$tagnames,F77" | sed 's/^,//'`
  
--if expr a : '\(a\)' >/dev/null 2>&1; then
--  as_expr=expr
--else
--  as_expr=false
--fi
--
--
--## --------------------- ##
--## M4sh Initialization.  ##
--## --------------------- ##
--
--# Be Bourne compatible
--if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
--  emulate sh
--  NULLCMD=:
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
--  set -o posix
--fi
--
--# NLS nuisances.
--# Support unset when possible.
--if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
--  as_unset=unset
--else
--  as_unset=false
--fi
--
--(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
--    { $as_unset LANG || test "${LANG+set}" != set; } ||
--      { LANG=C; export LANG; }
--(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
--    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
--      { LC_ALL=C; export LC_ALL; }
--(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
--    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
--      { LC_TIME=C; export LC_TIME; }
--(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
--    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
--      { LC_CTYPE=C; export LC_CTYPE; }
--(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
--    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
--      { LANGUAGE=C; export LANGUAGE; }
--(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
--    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
--      { LC_COLLATE=C; export LC_COLLATE; }
--(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
--    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
--      { LC_NUMERIC=C; export LC_NUMERIC; }
--(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
--    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
--      { LC_MESSAGES=C; export LC_MESSAGES; }
--
--
--# Name of the executable.
--as_me=`(basename "$0") 2>/dev/null ||
--$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
--	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)$' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X/"$0" |
--    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
--  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\/\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
--
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conftest.sh
--  echo  "exit 0"   >>conftest.sh
--  chmod +x conftest.sh
--  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
--    PATH_SEPARATOR=:
--  fi
--  rm -f conftest.sh
--fi
--
--
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
--  # Find who we are.  Look in the path if we contain no path at all
--  # relative or not.
--  case $0 in
--    *[\\/]* ) as_myself=$0 ;;
--    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
--
--       ;;
--  esac
--  # We did not find ourselves, most probably we were run as `sh COMMAND'
--  # in which case we are not to be found in the path.
--  if test "x$as_myself" = x; then
--    as_myself=$0
--  fi
--  if test ! -f "$as_myself"; then
--    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
--   { (exit 1); exit 1; }; }
--  fi
--  case $CONFIG_SHELL in
--  '')
--    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for as_base in sh bash ksh sh5; do
--	 case $as_dir in
--	 /*)
--	   if ("$as_dir/$as_base" -c '
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
--	     CONFIG_SHELL=$as_dir/$as_base
--	     export CONFIG_SHELL
--	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
--	   fi;;
--	 esac
--       done
--done
--;;
--  esac
--
--  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
--  # uniformly replaced by the line number.  The first 'sed' inserts a
--  # line-number line before each line; the second 'sed' does the real
--  # work.  The second script uses 'N' to pair each line-number line
--  # with the numbered line, and appends trailing '-' during
--  # substitution so that $LINENO is not a special case at line end.
--  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
--  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
--  sed '=' <$as_myself |
--    sed '
--      N
--      s,$,-,
--      : loop
--      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
--      t loop
--      s,-$,,
--      s,^['$as_cr_digits']*\n,,
--    ' >$as_me.lineno &&
--  chmod +x $as_me.lineno ||
--    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
--   { (exit 1); exit 1; }; }
--
--  # Don't try to exec as it changes $[0], causing all sort of problems
--  # (the dirname of $[0] is not the place where we might find the
--  # original and so on.  Autoconf is especially sensible to this).
--  . ./$as_me.lineno
--  # Exit status is that of the last command.
--  exit
--}
--
--
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
--  *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T='	' ;;
--  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
--  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
--esac
--
--if expr a : '\(a\)' >/dev/null 2>&1; then
--  as_expr=expr
--else
--  as_expr=false
--fi
--
--rm -f conf$$ conf$$.exe conf$$.file
--echo >conf$$.file
--if ln -s conf$$.file conf$$ 2>/dev/null; then
--  # We could just check for DJGPP; but this test a) works b) is more generic
--  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
--  if test -f conf$$.exe; then
--    # Don't use ln at all; we don't have any links
--    as_ln_s='cp -p'
--  else
--    as_ln_s='ln -s'
--  fi
--elif ln conf$$.file conf$$ 2>/dev/null; then
--  as_ln_s=ln
--else
--  as_ln_s='cp -p'
--fi
--rm -f conf$$ conf$$.exe conf$$.file
--
--as_executable_p="test -f"
--
--# Sed expression to map a string onto a valid CPP name.
--as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
--
--# Sed expression to map a string onto a valid variable name.
--as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
--
--
 -# IFS
 -# We need space, tab and new line, in precisely that order.
 -as_nl='
 -'
 -IFS=" 	$as_nl"
--
+ 
 -# CDPATH.
 -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
--
-+exec 7<&0 </dev/null 6>&1
++
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
++
++case X$lt_ECHO in
++X*--fallback-echo)
++  # Remove one level of quotation (which was required for Make).
++  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
++  ;;
++esac
++
++ECHO=${lt_ECHO-echo}
++if test "X$1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X$1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
++  # Yippee, $ECHO works!
++  :
++else
++  # Restart under the correct shell.
++  exec $SHELL "$0" --no-reexec ${1+"$@"}
++fi
++
++if test "X$1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<_LT_EOF
++$*
++_LT_EOF
++  exit 0
++fi
++
++# 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
++
++if test -z "$lt_ECHO"; then
++  if test "X${echo_test_string+set}" != Xset; then
++    # find a string as large as possible, as long as the shell can cope with it
++    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
++      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
++	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
++      then
++        break
++      fi
++    done
++  fi
++
++  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
++     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
++     test "X$echo_testing_string" = "X$echo_test_string"; then
++    :
++  else
++    # The Solaris, AIX, and Digital Unix default echo programs unquote
++    # backslashes.  This makes it impossible to quote backslashes using
++    #   echo "$something" | sed 's/\\/\\\\/g'
++    #
++    # So, first we look for a working echo in the user's PATH.
++
++    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++    for dir in $PATH /usr/ucb; do
++      IFS="$lt_save_ifs"
++      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++         test "X$echo_testing_string" = "X$echo_test_string"; then
++        ECHO="$dir/echo"
++        break
++      fi
++    done
++    IFS="$lt_save_ifs"
++
++    if test "X$ECHO" = Xecho; then
++      # We didn't find a better echo, so look for alternatives.
++      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
++         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
++         test "X$echo_testing_string" = "X$echo_test_string"; then
++        # This shell has a builtin print -r that does the trick.
++        ECHO='print -r'
++      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
++	   test "X$CONFIG_SHELL" != X/bin/ksh; then
++        # If we have ksh, try running configure again with it.
++        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++        export ORIGINAL_CONFIG_SHELL
++        CONFIG_SHELL=/bin/ksh
++        export CONFIG_SHELL
++        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
++      else
++        # Try using printf.
++        ECHO='printf %s\n'
++        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
++	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	  # Cool, printf works
++	  :
++        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
++	     test "X$echo_testing_string" = 'X\t' &&
++	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	     test "X$echo_testing_string" = "X$echo_test_string"; then
++	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
++	  export CONFIG_SHELL
++	  SHELL="$CONFIG_SHELL"
++	  export SHELL
++	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
++        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
++	     test "X$echo_testing_string" = 'X\t' &&
++	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	     test "X$echo_testing_string" = "X$echo_test_string"; then
++	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
++        else
++	  # maybe with a smaller string...
++	  prev=:
++
++	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
++	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
++	    then
++	      break
++	    fi
++	    prev="$cmd"
++	  done
++
++	  if test "$prev" != 'sed 50q "$0"'; then
++	    echo_test_string=`eval $prev`
++	    export echo_test_string
++	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
++	  else
++	    # Oops.  We lost completely, so just stick with echo.
++	    ECHO=echo
++	  fi
++        fi
++      fi
++    fi
++  fi
++fi
++
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++lt_ECHO=$ECHO
++if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
++   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
++fi
++
++
  
+ 
++exec 7<&0 </dev/null 6>&1
++
  # Name of the host.
  # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
  # so uname gets run too.
@@ -840,7 +1049,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  # Identity of this package.
  PACKAGE_NAME=
  PACKAGE_TARNAME=
-@@ -416,44 +756,192 @@
+@@ -416,44 +751,190 @@ ac_unique_file="Wnn/conv/cvt_head.h"
  # Factoring default headers for most tests.
  ac_includes_default="\
  #include <stdio.h>
@@ -880,11 +1089,12 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -#else
 -# if HAVE_STDINT_H
 -#  include <stdint.h>
- # endif
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
+-# endif
  #endif
 -#if HAVE_UNISTD_H
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
++#endif
 +#ifdef HAVE_UNISTD_H
  # include <unistd.h>
  #endif"
@@ -968,20 +1178,25 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +INSTALL_DATA
 +LN_S
 +SET_MAKE
++LIBTOOL
++SED
 +GREP
 +EGREP
-+ECHO
++FGREP
++LD
++DUMPBIN
++ac_ct_DUMPBIN
++NM
++OBJDUMP
 +AR
-+RANLIB
 +STRIP
-+CXX
-+CXXFLAGS
-+ac_ct_CXX
-+CXXCPP
-+F77
-+FFLAGS
-+ac_ct_F77
-+LIBTOOL
++RANLIB
++lt_ECHO
++DSYMUTIL
++NMEDIT
++LIPO
++OTOOL
++OTOOL64
 +LIBTOOL_DEPS
 +XMKMF
 +LIBOBJS
@@ -1011,11 +1226,10 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +enable_unsafe_path
 +enable_shared
 +enable_static
++with_pic
 +enable_fast_install
 +with_gnu_ld
 +enable_libtool_lock
-+with_pic
-+with_tags
 +with_x
 +with_libwrap
 +'
@@ -1028,12 +1242,6 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +LIBS
 +CPPFLAGS
 +CPP
-+CXX
-+CXXFLAGS
-+CCC
-+CXXCPP
-+F77
-+FFLAGS
 +XMKMF'
 +
  
@@ -1045,7 +1253,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  # The variables have the same names as the options, with
  # dashes changed to underlines.
  cache_file=/dev/null
-@@ -476,34 +964,48 @@
+@@ -476,34 +957,48 @@ x_libraries=NONE
  # 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.
@@ -1101,7 +1309,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
-@@ -525,33 +1027,61 @@
+@@ -525,33 +1020,61 @@ do
    --config-cache | -C)
      cache_file=config.cache ;;
  
@@ -1179,7 +1387,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -578,6 +1108,12 @@
+@@ -578,6 +1101,12 @@ do
    -host=* | --host=* | --hos=* | --ho=*)
      host_alias=$ac_optarg ;;
  
@@ -1192,7 +1400,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
    -includedir | --includedir | --includedi | --included | --include \
    | --includ | --inclu | --incl | --inc)
      ac_prev=includedir ;;
-@@ -602,13 +1138,16 @@
+@@ -602,13 +1131,16 @@ do
    | --libexe=* | --libex=* | --libe=*)
      libexecdir=$ac_optarg ;;
  
@@ -1213,7 +1421,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
      localstatedir=$ac_optarg ;;
  
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -673,6 +1212,16 @@
+@@ -673,6 +1205,16 @@ do
    | --progr-tra=* | --program-tr=* | --program-t=*)
      program_transform_name=$ac_optarg ;;
  
@@ -1230,7 +1438,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
      silent=yes ;;
-@@ -723,26 +1272,38 @@
+@@ -723,26 +1265,38 @@ do
      ac_init_version=: ;;
  
    -with-* | --with-*)
@@ -1282,7 +1490,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  
    --x)
      # Obsolete; use --with-x.
-@@ -762,7 +1323,7 @@
+@@ -762,7 +1316,7 @@ do
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
@@ -1291,7 +1499,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  Try \`$0 --help' for more information." >&2
     { (exit 1); exit 1; }; }
      ;;
-@@ -771,17 +1332,16 @@
+@@ -771,17 +1325,16 @@ Try \`$0 --help' for more information." 
      ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
      # Reject names that are not valid shell variable names.
      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
@@ -1313,7 +1521,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
      : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
      ;;
  
-@@ -790,31 +1350,39 @@
+@@ -790,31 +1343,39 @@ done
  
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -1329,11 +1537,12 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -  case $ac_val in
 -    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
 -    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+-   { (exit 1); exit 1; }; };;
 +if test -n "$ac_unrecognized_opts"; then
 +  case $enable_option_checking in
 +    no) ;;
 +    fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
-    { (exit 1); exit 1; }; };;
++   { (exit 1); exit 1; }; } ;;
 +    *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
 -done
@@ -1369,7 +1578,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -828,7 +1396,7 @@
+@@ -828,7 +1389,7 @@ target=$target_alias
  if test "x$host_alias" != x; then
    if test "x$build_alias" = x; then
      cross_compiling=maybe
@@ -1378,7 +1587,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
      If a cross compiler is detected then cross compile mode will be used." >&2
    elif test "x$build_alias" != "x$host_alias"; then
      cross_compiling=yes
-@@ -841,91 +1409,76 @@
+@@ -841,91 +1402,76 @@ test -n "$host_alias" && ac_tool_prefix=
  test "$silent" = yes && exec 6>/dev/null
  
  
@@ -1407,6 +1616,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
 -  	  /^X\(\/\/\)$/{ s//\1/; q; }
 -  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
 +  # Try the directory containing this script, then the parent directory.
 +  ac_confdir=`$as_dirname -- "$as_myself" ||
 +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -1430,7 +1640,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	    s//\1/
 +	    q
 +	  }
-   	  s/.*/./; q'`
++	  s/.*/./; q'`
    srcdir=$ac_confdir
 -  if test ! -r $srcdir/$ac_unique_file; then
 +  if test ! -r "$srcdir/$ac_unique_file"; then
@@ -1449,15 +1659,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
 +  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
     { (exit 1); exit 1; }; }
-   fi
-+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-+ac_abs_confdir=`(
-+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
-+   { (exit 1); exit 1; }; }
-+	pwd)`
-+# When building in place, set srcdir=.
-+if test "$ac_abs_confdir" = "$ac_pwd"; then
-+  srcdir=.
+-  fi
  fi
 -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
 -ac_env_build_alias_set=${build_alias+set}
@@ -1512,6 +1714,15 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -ac_env_FFLAGS_value=$FFLAGS
 -ac_cv_env_FFLAGS_set=${FFLAGS+set}
 -ac_cv_env_FFLAGS_value=$FFLAGS
++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
++ac_abs_confdir=`(
++	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
++   { (exit 1); exit 1; }; }
++	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.
@@ -1527,7 +1738,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  
  #
  # Report the --help message.
-@@ -954,9 +1507,6 @@
+@@ -954,9 +1500,6 @@ Configuration:
    -n, --no-create         do not create output files
        --srcdir=DIR        find the sources in DIR [configure dir or \`..']
  
@@ -1537,19 +1748,31 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  Installation directories:
    --prefix=PREFIX         install architecture-independent files in PREFIX
                            [$ac_default_prefix]
-@@ -974,15 +1524,22 @@
-   --bindir=DIR           user executables [EPREFIX/bin]
-   --sbindir=DIR          system admin executables [EPREFIX/sbin]
-   --libexecdir=DIR       program executables [EPREFIX/libexec]
+@@ -971,18 +1514,25 @@ for instance \`--prefix=\$HOME'.
+ For better control, use the options below.
+ 
+ Fine tuning of the installation directories:
+-  --bindir=DIR           user executables [EPREFIX/bin]
+-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+-  --libexecdir=DIR       program executables [EPREFIX/libexec]
 -  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-   --libdir=DIR           object code libraries [EPREFIX/lib]
-   --includedir=DIR       C header files [PREFIX/include]
-   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+-  --libdir=DIR           object code libraries [EPREFIX/lib]
+-  --includedir=DIR       C header files [PREFIX/include]
+-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
 -  --infodir=DIR          info documentation [PREFIX/info]
 -  --mandir=DIR           man documentation [PREFIX/man]
++  --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]
@@ -1563,7 +1786,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  _ACEOF
  
    cat <<\_ACEOF
-@@ -1002,6 +1559,7 @@
+@@ -1002,6 +1552,7 @@ if test -n "$ac_init_help"; then
    cat <<\_ACEOF
  
  Optional Features:
@@ -1571,7 +1794,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    --enable-debug          enable debug options [default=no]
-@@ -1013,10 +1571,8 @@
+@@ -1013,10 +1564,8 @@ Optional Features:
    --enable-kWnn           build and install kWnn [default=yes]
    --enable-ipv6           build and install IPv6 [default=no]
    --enable-unsafe-path    allow creating files in an arbitrary path [default=no]
@@ -1584,17 +1807,20 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
    --enable-fast-install[=PKGS]
                            optimize for fast installation [default=yes]
    --disable-libtool-lock  avoid locking (might break parallel builds)
-@@ -1036,8 +1592,7 @@
-   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+@@ -1033,11 +1582,9 @@ Optional Packages:
+   --with-libkwnn            use installed kWnn library [default=no]
+   --with-kwnn-includes=DIR  KWNN include files are in DIR
+   --with-kwnn-libraries=DIR Search for KWNN libraries in DIR [default=/usr/local/lib]
+-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
    --with-pic              try to use only PIC/non-PIC objects [default=use
                            both]
 -  --with-tags[=TAGS]
 -                          include additional configurations [automatic]
-+  --with-tags[=TAGS]      include additional configurations [automatic]
++  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
    --with-x                use the X Window System
    --with-libwrap[=DIR]    Compile in libwrap (tcp_wrappers) support [default=try to find libwrap]
  
-@@ -1046,99 +1601,103 @@
+@@ -1046,99 +1593,98 @@ Some influential environment variables:
    CFLAGS      C compiler flags
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
@@ -1604,11 +1830,11 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
 +              you have headers in a nonstandard directory <include dir>
    CPP         C preprocessor
-   CXX         C++ compiler command
-   CXXFLAGS    C++ compiler flags
-   CXXCPP      C++ preprocessor
-   F77         Fortran 77 compiler command
-   FFLAGS      Fortran 77 compiler flags
+-  CXX         C++ compiler command
+-  CXXFLAGS    C++ compiler flags
+-  CXXCPP      C++ preprocessor
+-  F77         Fortran 77 compiler command
+-  FFLAGS      Fortran 77 compiler flags
 +  XMKMF       Path to xmkmf, Makefile generator for X Window System
  
  Use these variables to override the choices made by `configure' or to help
@@ -1669,21 +1895,14 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -  *) # Relative path.
 -    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
 -    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+    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
+-esac
 -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
 -# absolute.
 -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
 -ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
 -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
 -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- 
+-
 -    cd $ac_dir
 -    # Check for guested configure; otherwise get Cygnus style configure.
 -    if test -f $ac_srcdir/configure.gnu; then
@@ -1696,6 +1915,15 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -           test -f $ac_srcdir/configure.in; then
 -      echo
 -      $ac_configure --help
++    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
@@ -1748,7 +1976,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  {
  cat <<_ASUNAME
  ## --------- ##
-@@ -1157,7 +1716,7 @@
+@@ -1157,7 +1703,7 @@ uname -v = `(uname -v) 2>/dev/null || ec
  /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`
@@ -1757,7 +1985,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  /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`
-@@ -1169,8 +1728,9 @@
+@@ -1169,8 +1715,9 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -1768,7 +1996,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  
  } >&5
  
-@@ -1186,37 +1746,62 @@
+@@ -1186,37 +1733,62 @@ _ACEOF
  
  # Keep a trace of the command line.
  # Strip out --no-create and --no-recursion so they do not pile up.
@@ -1777,31 +2005,37 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +# Make two passes to allow for proper duplicate-argument suppression.
  ac_configure_args=
 -ac_sep=
+-for ac_arg
 +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
+-  case $ac_arg in
 -  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
 -  | --no-cr | --no-c | -n ) continue ;;
 -  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
 -  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+    | -silent | --silent | --silen | --sile | --sil)
-     continue ;;
+-    continue ;;
 -  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
 -    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    *\'*)
-+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-   esac
+-  esac
 -  case " $ac_configure_args " in
 -    *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
 -    *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
 -       ac_sep=" " ;;
+-  esac
+-  # Get rid of the leading space.
++  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) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
 +    2)
@@ -1816,8 +2050,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	  | -with-* | --with-* | -without-* | --without-* | --x)
 +	    case "$ac_configure_args0 " in
 +	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-   esac
--  # Get rid of the leading space.
++	    esac
 +	    ;;
 +	  -* ) ac_must_keep_next=true ;;
 +	esac
@@ -1845,7 +2078,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
      cat <<\_ASBOX
  ## ---------------- ##
  ## Cache variables. ##
-@@ -1224,21 +1809,71 @@
+@@ -1224,21 +1796,71 @@ trap 'exit_status=$?
  _ASBOX
      echo
      # The following way of writing the cache mishandles newlines in values,
@@ -1904,7 +2137,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +      esac
 +      $as_echo "$ac_var='\''$ac_val'\''"
 +    done | sort
-+    echo
+     echo
 +
 +    if test -n "$ac_subst_files"; then
 +      cat <<\_ASBOX
@@ -1921,13 +2154,13 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	esac
 +	$as_echo "$ac_var='\''$ac_val'\''"
 +      done | sort
-     echo
++      echo
 +    fi
 +
      if test -s confdefs.h; then
        cat <<\_ASBOX
  ## ----------- ##
-@@ -1246,15 +1881,15 @@
+@@ -1246,26 +1868,24 @@ _ASBOX
  ## ----------- ##
  _ASBOX
        echo
@@ -1946,9 +2179,11 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  rm -f core *.core core.conftest.* &&
 +    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
      exit $exit_status
-      ' 0
+-     ' 0
++' 0
  for ac_signal in 1 2 13 15; do
-@@ -1263,9 +1898,7 @@
+   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ done
  ac_signal=0
  
  # confdefs.h avoids OS command line length limits that DEFS can exceed.
@@ -1959,7 +2194,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  
  # Predefined preprocessor variables.
  
-@@ -1295,18 +1928,24 @@
+@@ -1295,18 +1915,24 @@ _ACEOF
  
  
  # Let the site file select an alternate cache file if it wants to.
@@ -1967,6 +2202,9 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -if test -z "$CONFIG_SITE"; then
 -  if test "x$prefix" != xNONE; then
 -    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+-  else
+-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+-  fi
 +# Prefer an explicitly selected file to automatically selected ones.
 +ac_site_file1=NONE
 +ac_site_file2=NONE
@@ -1975,9 +2213,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +elif test "x$prefix" != xNONE; then
 +  ac_site_file1=$prefix/share/config.site
 +  ac_site_file2=$prefix/etc/config.site
-   else
--    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
--  fi
++else
 +  ac_site_file1=$ac_default_prefix/share/config.site
 +  ac_site_file2=$ac_default_prefix/etc/config.site
  fi
@@ -1993,7 +2229,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
      sed 's/^/| /' "$ac_site_file" >&5
      . "$ac_site_file"
    fi
-@@ -1316,54 +1955,61 @@
+@@ -1316,54 +1942,61 @@ if test -r "$cache_file"; then
    # Some versions of bash will fail to source /dev/null (special
    # files actually), so we avoid doing that.
    if test -f "$cache_file"; then
@@ -2050,13 +2286,14 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -echo "$as_me:   former value:  $ac_old_val" >&2;}
 -        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
 -echo "$as_me:   current value: $ac_new_val" >&2;}
+-        ac_cache_corrupted=:
 +	# 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:$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=:
++	  ac_cache_corrupted=:
 +	else
 +	  { $as_echo "$as_me:$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;}
@@ -2077,7 +2314,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
      *) ac_arg=$ac_var=$ac_new_val ;;
      esac
      case " $ac_configure_args " in
-@@ -1373,18 +2019,13 @@
+@@ -1373,18 +2006,13 @@ echo "$as_me:   current value: $ac_new_v
    fi
  done
  if $ac_cache_corrupted; then
@@ -2100,7 +2337,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  
  
  
-@@ -1401,6 +2042,11 @@
+@@ -1401,6 +2029,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
@@ -2112,7 +2349,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  
  
  ac_config_headers="$ac_config_headers config.h"
-@@ -1413,141 +2059,176 @@
+@@ -1413,141 +2046,176 @@ ac_config_headers="$ac_config_headers co
  tagnames=
  
  ac_aux_dir=
@@ -2292,9 +2529,9 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
    debug=false
 -fi;
 +fi
++
  
 -# Check whether --enable-libraries or --disable-libraries was given.
-+
 +# Check whether --enable-libraries was given.
  if test "${enable_libraries+set}" = set; then
 -  enableval="$enable_libraries"
@@ -2312,9 +2549,9 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
    libraries=true
 -fi;
 +fi
++
  
 -# Check whether --enable-server or --disable-server was given.
-+
 +# Check whether --enable-server was given.
  if test "${enable_server+set}" = set; then
 -  enableval="$enable_server"
@@ -2332,9 +2569,9 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
    server=true
 -fi;
 +fi
++
  
 -# Check whether --enable-client or --disable-client was given.
-+
 +# Check whether --enable-client was given.
  if test "${enable_client+set}" = set; then
 -  enableval="$enable_client"
@@ -2356,7 +2593,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  
  if test $libraries = true; then
  	SUBDIRS="\$(LIB_SUBDIRS)"
-@@ -1565,19 +2246,19 @@
+@@ -1565,19 +2233,19 @@ fi
  
  
  
@@ -2382,7 +2619,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  
  
  if test "$server" = true -a "$Wnn" = Wnn; then
-@@ -1589,59 +2270,58 @@
+@@ -1589,59 +2257,58 @@ else
  fi
  
  
@@ -2404,10 +2641,10 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
    cWnn="cWnn"
 -fi;
 +fi
++
  
  
 -# Check whether --enable-kWnn or --disable-kWnn was given.
-+
 +# Check whether --enable-kWnn was given.
  if test "${enable_kWnn+set}" = set; then
 -  enableval="$enable_kWnn"
@@ -2425,13 +2662,13 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
    kWnn="kWnn"
 -fi;
 +fi
++
  
  
  
  
  
 -# Check whether --with-libwnn or --without-libwnn was given.
-+
 +# Check whether --with-libwnn was given.
  if test "${with_libwnn+set}" = set; then
 -  withval="$with_libwnn"
@@ -2448,9 +2685,9 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
    wnnincludedir=''
 -fi;
 +fi
++
  
 -# Check whether --with-wnn-libraries or --without-wnn-libraries was given.
-+
 +# Check whether --with-wnn-libraries was given.
  if test "${with_wnn_libraries+set}" = set; then
 -  withval="$with_wnn_libraries"
@@ -2464,7 +2701,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  	if test "X${with_libwnn}" = X-lwnn; then
  		WNNJLIB="-L${wnnlibdir} -lwnn"
  	elif test X"`echo ${with_libwnn} | grep '^/.*'`" != X ; then
-@@ -1657,32 +2337,32 @@
+@@ -1657,32 +2324,32 @@ else
  	DEPWNNJLIB="\$(WNNJLIB)"
  	HINSI_DATA="\$(top_builddir)/Wnn/jd/hinsi.data"
  
@@ -2509,12 +2746,13 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  	if test "X${with_libcwnn}" = X-lcwnn; then
  		CWNNJLIB="-L${cwnnlibdir} -lcwnn"
  	elif test X"`echo ${with_libcwnn} | grep '^/.*'`" != X ; then
-@@ -1700,33 +2380,33 @@
+@@ -1700,33 +2367,33 @@ else
  	CHINSI_DATA="\$(CWNNCDSRC)/cixing.data"
  	THINSI_DATA="\$(TWNNTDSRC)/cixing.data"
  
 -fi;
 +fi
++
  
  
  
@@ -2522,11 +2760,10 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  
  
 -# Check whether --with-libkwnn or --without-libkwnn was given.
--if test "${with_libkwnn+set}" = set; then
--  withval="$with_libkwnn"
- 
 +# Check whether --with-libkwnn was given.
-+if test "${with_libkwnn+set}" = set; then
+ if test "${with_libkwnn+set}" = set; then
+-  withval="$with_libkwnn"
+-
 +  withval=$with_libkwnn;
  
 -# Check whether --with-kwnn-includes or --without-kwnn-includes was given.
@@ -2539,9 +2776,9 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
    kwnnincludedir=''
 -fi;
 +fi
++
  
 -# Check whether --with-kwnn-libraries or --without-kwnn-libraries was given.
-+
 +# Check whether --with-kwnn-libraries was given.
  if test "${with_kwnn_libraries+set}" = set; then
 -  withval="$with_kwnn_libraries"
@@ -2555,19 +2792,19 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  	if test "X${with_libkwnn}" = X-lkwnn; then
  		KWNNJLIB="-L${kwnnlibdir} -lkwnn"
  	elif test X"`echo ${with_libkwnn} | grep '^/.*'`" != X ; then
-@@ -1742,40 +2422,41 @@
+@@ -1742,40 +2409,41 @@ else
  	DEPKWNNJLIB="\$(KWNNJLIB)"
  	KHINSI_DATA="\$(KWNNKDSRC)/hinsi.data"
  
 -fi;
 +fi
++
  
  
  
  
  
 -# Check whether --enable-ipv6 or --disable-ipv6 was given.
-+
 +# Check whether --enable-ipv6 was given.
  if test "${enable_ipv6+set}" = set; then
 -  enableval="$enable_ipv6"
@@ -2585,10 +2822,10 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
    ipv6=""
 -fi;
 +fi
++
  
  
 -# Check whether --enable-unsafe-path or --disable-unsafe-path was given.
-+
 +# Check whether --enable-unsafe-path was given.
  if test "${enable_unsafe_path+set}" = set; then
 -  enableval="$enable_unsafe_path"
@@ -2610,7 +2847,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  
  
  if test ${unsafe_path} = true; then
-@@ -1794,10 +2475,10 @@
+@@ -1794,10 +2462,10 @@ 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
@@ -2624,7 +2861,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1808,34 +2489,36 @@
+@@ -1808,34 +2476,36 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2670,7 +2907,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -1846,26 +2529,41 @@
+@@ -1846,38 +2516,53 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2700,6 +2937,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +$as_echo "no" >&6; }
  fi
  
+-  CC=$ac_ct_CC
 +  if test "x$ac_ct_CC" = x; then
 +    CC=""
 +  else
@@ -2713,14 +2951,17 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 +ac_tool_warned=yes ;;
 +esac
-   CC=$ac_ct_CC
++    CC=$ac_ct_CC
 +  fi
  else
    CC="$ac_cv_prog_CC"
  fi
-@@ -1874,10 +2572,10 @@
-   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.
+ 
+ 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.
++          if test -n "$ac_tool_prefix"; then
++    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
@@ -2732,7 +2973,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1888,76 +2586,36 @@
+@@ -1888,98 +2573,59 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2753,42 +2994,52 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  if test -n "$CC"; then
 -  echo "$as_me:$LINENO: result: $CC" >&5
 -echo "${ECHO_T}$CC" >&6
--else
++  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
--fi
--
--fi
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
++
++  fi
+ fi
 -if test -z "$ac_cv_prog_CC"; then
 -  ac_ct_CC=$CC
--  # Extract the first word of "cc", so it can be a program name with args.
--set dummy cc; ac_word=$2
++if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_CC+set}" = set; 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.
-+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+$as_echo "$CC" >&6; }
++  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
++  ac_prog_rejected=no
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 -    ac_cv_prog_ac_ct_CC="cc"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 -    break 2
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-   fi
+-  fi
 -done
 -done
- 
+-
 -fi
 -fi
 -ac_ct_CC=$ac_cv_prog_ac_ct_CC
@@ -2799,38 +3050,44 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
 -fi
- 
+-
 -  CC=$ac_ct_CC
 -else
 -  CC="$ac_cv_prog_CC"
- fi
+-fi
 -
- 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
+-fi
+-if test -z "$CC"; then
+-  # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
+-if test "${ac_cv_prog_CC+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1969,17 +2627,18 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-  ac_prog_rejected=no
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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"
+-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+-       ac_prog_rejected=yes
+-       continue
+-     fi
+-    ac_cv_prog_CC="cc"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
@@ -2840,7 +3097,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -1990,33 +2649,32 @@
+@@ -1990,33 +2636,32 @@ if test $ac_prog_rejected = yes; then
      # 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
@@ -2884,7 +3141,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2027,38 +2685,40 @@
+@@ -2027,38 +2672,40 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2935,7 +3192,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -2069,68 +2729,101 @@
+@@ -2069,68 +2716,101 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2969,6 +3226,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
    test -n "$ac_ct_CC" && break
  done
  
+-  CC=$ac_ct_CC
 +  if test "x$ac_ct_CC" = x; then
 +    CC=""
 +  else
@@ -2982,9 +3240,9 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 +ac_tool_warned=yes ;;
 +esac
-   CC=$ac_ct_CC
++    CC=$ac_ct_CC
++  fi
  fi
-+fi
  
  fi
  
@@ -3065,7 +3323,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  int
  main ()
  {
-@@ -2140,138 +2833,187 @@
+@@ -2140,138 +2820,187 @@ main ()
  }
  _ACEOF
  ac_clean_files_save=$ac_clean_files
@@ -3129,15 +3387,19 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
    case $ac_file in
 -    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;;
 -    a.out ) # We found the default executable, but exeext='' is most
+-            # certainly right.
+-            break;;
+-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
+-          export ac_cv_exeext
+-          break;;
+-    * ) break;;
 +    *.$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;;
--    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
--          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
--          export ac_cv_exeext
++	# certainly right.
++	break;;
 +    *.* )
 +        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 +	then :; else
@@ -3150,8 +3412,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	# actually working.
 +	break;;
 +    * )
-           break;;
--    * ) break;;
++	break;;
    esac
  done
 +test "$ac_cv_exeext" = no && ac_cv_exeext=
@@ -3239,15 +3500,16 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
 -echo "$as_me:$LINENO: result: $cross_compiling" >&5
 -echo "${ECHO_T}$cross_compiling" >&6
-+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+$as_echo_n "checking whether we are cross compiling... " >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+$as_echo "$cross_compiling" >&6; }
- 
+-
 -echo "$as_me:$LINENO: checking for suffix of executables" >&5
 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
++{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
++$as_echo_n "checking whether we are cross compiling... " >&6; }
++{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
++$as_echo "$cross_compiling" >&6; }
++
 +{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
 +$as_echo_n "checking for suffix of executables... " >&6; }
 +if { (ac_try="$ac_link"
@@ -3274,7 +3536,8 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
      *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 -          export ac_cv_exeext
-           break;;
+-          break;;
++	  break;;
      * ) break;;
    esac
  done
@@ -3323,7 +3586,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  int
  main ()
  {
-@@ -2281,47 +3023,54 @@
+@@ -2281,47 +3010,54 @@ main ()
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -3400,18 +3663,12 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  int
  main ()
  {
-@@ -2334,48 +3083,60 @@
+@@ -2334,48 +3070,60 @@ main ()
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -3422,6 +3679,12 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
@@ -3435,10 +3698,11 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
+-ac_compiler_gnu=no
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
- ac_compiler_gnu=no
++	ac_compiler_gnu=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +
@@ -3467,13 +3731,14 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
 +  ac_save_c_werror_flag=$ac_c_werror_flag
 +   ac_c_werror_flag=yes
 +   ac_cv_prog_cc_g=no
 +   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++   cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
@@ -3489,7 +3754,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  int
  main ()
  {
-@@ -2385,27 +3146,121 @@
+@@ -2385,27 +3133,121 @@ main ()
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -3503,12 +3768,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -3549,7 +3809,10 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -3589,7 +3852,9 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -3607,26 +3872,26 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
++fi
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
++fi
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +   ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 +{ $as_echo "$as_me:$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
-@@ -2421,123 +3276,122 @@
+@@ -2421,123 +3263,122 @@ else
      CFLAGS=
    fi
  fi
@@ -3769,11 +4034,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
    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"
- rm -f conftest.$ac_objext
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
@@ -3782,6 +4043,11 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
++	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++  CC="$ac_save_CC $ac_arg"
++  rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -3848,7 +4114,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2618,15 +3472,15 @@
+@@ -2618,15 +3459,15 @@ 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
@@ -3867,7 +4133,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  else
        # Double quotes because CPP needs to be expanded
      for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-@@ -2636,73 +3490,89 @@
+@@ -2636,73 +3477,89 @@ 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.
@@ -3878,20 +4144,22 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
    cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
+-#include <assert.h>
+-                     Syntax error
 +/* confdefs.h.  */
-+_ACEOF
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
- #include <assert.h>
++# include <assert.h>
 +#endif
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++		     Syntax error
++_ACEOF
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -3994,7 +4262,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -2720,80 +3590,96 @@
+@@ -2720,80 +3577,96 @@ fi
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -4014,6 +4282,8 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
    cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
+-#include <assert.h>
+-                     Syntax error
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
@@ -4022,9 +4292,9 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
- #include <assert.h>
++# include <assert.h>
 +#endif
-                      Syntax error
++		     Syntax error
  _ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -4130,7 +4400,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -2802,8 +3688,10 @@
+@@ -2802,8 +3675,10 @@ rm -f conftest.err conftest.$ac_ext
  if $ac_preproc_ok; then
    :
  else
@@ -4143,7 +4413,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
     { (exit 1); exit 1; }; }
  fi
  
-@@ -2825,12 +3713,14 @@
+@@ -2825,12 +3700,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  # 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"
@@ -4161,7 +4431,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -2841,6 +3731,7 @@
+@@ -2841,6 +3718,7 @@ do
  case $as_dir/ in
    ./ | .// | /cC/* | \
    /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
@@ -4169,19 +4439,34 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
    /usr/ucb/* ) ;;
    *)
      # OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2848,7 +3739,7 @@
+@@ -2848,40 +3726,53 @@ case $as_dir/ in
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
 -        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+-          if test $ac_prog = install &&
+-            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+-            # AIX install.  It has an incompatible calling convention.
+-            :
+-          elif test $ac_prog = install &&
+-            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+-            # program-specific install script used by HP pwplus--don't use.
+-            :
+-          else
+-            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+-            break 3
+-          fi
+-        fi
 +	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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.
-@@ -2858,30 +3749,43 @@
-             # program-specific install script used by HP pwplus--don't use.
-             :
-           else
++	  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
@@ -4191,10 +4476,10 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	      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
++	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
++	      break 3
++	    fi
++	  fi
 +	fi
        done
      done
@@ -4227,7 +4512,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -2891,50 +3795,51 @@
+@@ -2891,203 +3782,392 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -4297,97 +4582,209 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  fi
  
 -# Check whether --enable-shared or --disable-shared was given.
-+# Check whether --enable-shared was given.
- if test "${enable_shared+set}" = set; then
+-if test "${enable_shared+set}" = set; then
 -  enableval="$enable_shared"
 -  p=${PACKAGE-default}
-+  enableval=$enable_shared; p=${PACKAGE-default}
-     case $enableval in
-     yes) enable_shared=yes ;;
-     no) enable_shared=no ;;
-@@ -2953,12 +3858,12 @@
-     esac
- else
-   enable_shared=yes
+-    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;
-+fi
++case `pwd` in
++  *\ * | *\	*)
++    { $as_echo "$as_me:$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
  
 -# Check whether --enable-static or --disable-static was given.
-+
-+# Check whether --enable-static was given.
- if test "${enable_static+set}" = set; then
+-if test "${enable_static+set}" = set; then
 -  enableval="$enable_static"
 -  p=${PACKAGE-default}
-+  enableval=$enable_static; p=${PACKAGE-default}
-     case $enableval in
-     yes) enable_static=yes ;;
-     no) enable_static=no ;;
-@@ -2977,12 +3882,12 @@
-     esac
- else
-   enable_static=yes
+-    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;
-+fi
  
 -# Check whether --enable-fast-install or --disable-fast-install was given.
-+
-+# Check whether --enable-fast-install was given.
- if test "${enable_fast_install+set}" = set; then
+-if test "${enable_fast_install+set}" = set; then
 -  enableval="$enable_fast_install"
 -  p=${PACKAGE-default}
-+  enableval=$enable_fast_install; p=${PACKAGE-default}
-     case $enableval in
-     yes) enable_fast_install=yes ;;
-     no) enable_fast_install=no ;;
-@@ -3001,12 +3906,13 @@
-     esac
- else
-   enable_fast_install=yes
--fi;
-+fi
- 
--echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
--echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
+-    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
++
++macro_version='2.2.6'
++macro_revision='1.3012'
++
++
++
++
++
++
++
++
++
++
++
++
++
++ltmain="$ac_aux_dir/ltmain.sh"
 +
 +{ $as_echo "$as_me:$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 test "${lt_cv_path_SED+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${ac_cv_path_SED+set}" = set; 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
++     $as_unset ac_script || 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"
++      { test -f "$ac_path_SED" && $as_test_x "$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
++    ac_count=`expr $ac_count + 1`
++    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_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
++$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
++   { (exit 1); exit 1; }; }
++  fi
  else
-   # 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.
-@@ -3057,37 +3963,156 @@
- 
- fi
- 
--echo "$as_me:$LINENO: result: $SED" >&5
--echo "${ECHO_T}$SED" >&6
-+{ $as_echo "$as_me:$LINENO: result: $SED" >&5
-+$as_echo "$SED" >&6; }
+-  enable_fast_install=yes
+-fi;
++  ac_cv_path_SED=$SED
++fi
++
++fi
++{ $as_echo "$as_me:$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//"
++
++
++
++
  
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
+-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
+-if test "${lt_cv_path_SED+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
++
++
++
++
++
++
 +{ $as_echo "$as_me:$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 test "${ac_cv_path_GREP+set}" = set; then
 +  $as_echo_n "(cached) " >&6
  else
--  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
--    then ac_cv_prog_egrep='grep -E'
--    else ac_cv_prog_egrep='egrep'
+-  # 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
 +  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=.
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for lt_ac_prog in sed gsed; do
 +  for ac_prog in grep ggrep; do
-+    for ac_exec_ext in '' $ac_executable_extensions; 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
 +      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
 +      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
 +# Check for GNU ac_path_GREP and select it if it is found.
@@ -4411,7 +4808,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +      # 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
++    fi
 +    # 10*(2^10) chars as input seems more than enough
 +    test $ac_count -gt 10 && break
 +  done
@@ -4419,29 +4816,51 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +esac
 +
 +      $ac_path_GREP_found && break 3
-+    done
-+  done
-+done
+     done
+   done
+ done
+-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 && break
+-  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
 +IFS=$as_save_IFS
 +  if test -z "$ac_cv_path_GREP"; then
 +    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 +$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
 +   { (exit 1); exit 1; }; }
-+  fi
+   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
 +else
 +  ac_cv_path_GREP=$GREP
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
- 
++fi
++
 +fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
 +$as_echo "$ac_cv_path_GREP" >&6; }
 + GREP="$ac_cv_path_GREP"
- 
- 
--# Check whether --with-gnu-ld or --without-gnu-ld was given.
++
++
 +{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
 +$as_echo_n "checking for egrep... " >&6; }
 +if test "${ac_cv_path_EGREP+set}" = set; then
@@ -4483,7 +4902,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +      # 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
+     fi
 +    # 10*(2^10) chars as input seems more than enough
 +    test $ac_count -gt 10 && break
 +  done
@@ -4492,8 +4911,9 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +
 +      $ac_path_EGREP_found && break 3
 +    done
-+  done
-+done
+   done
+ done
+-SED=$lt_cv_path_SED
 +IFS=$as_save_IFS
 +  if test -z "$ac_cv_path_EGREP"; then
 +    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
@@ -4503,15 +4923,116 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +else
 +  ac_cv_path_EGREP=$EGREP
 +fi
-+
+ 
 +   fi
-+fi
+ fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
 +$as_echo "$ac_cv_path_EGREP" >&6; }
 + EGREP="$ac_cv_path_EGREP"
+ 
+-echo "$as_me:$LINENO: result: $SED" >&5
+-echo "${ECHO_T}$SED" >&6
+ 
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
++$as_echo_n "checking for fgrep... " >&6; }
++if test "${ac_cv_path_FGREP+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
+-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+-    then ac_cv_prog_egrep='grep -E'
+-    else ac_cv_prog_egrep='egrep'
++  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"
++      { test -f "$ac_path_FGREP" && $as_test_x "$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
++    ac_count=`expr $ac_count + 1`
++    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_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++   { (exit 1); exit 1; }; }
++  fi
++else
++  ac_cv_path_FGREP=$FGREP
++fi
++
++   fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
++{ $as_echo "$as_me:$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 or --without-gnu-ld was given.
 +# Check whether --with-gnu-ld was given.
  if test "${with_gnu_ld+set}" = set; then
 -  withval="$with_gnu_ld"
@@ -4532,7 +5053,22 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -3116,14 +4141,14 @@
+@@ -3099,10 +4179,10 @@ echo $ECHO_N "checking for ld used by $C
+     # Accept absolute paths.
+     [\\/]* | ?:[\\/]*)
+       re_direlt='/[^/][^/]*/\.\./'
+-      # Canonicalize the path 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%/%"`
++      # 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"
+       ;;
+@@ -3116,14 +4196,14 @@ echo $ECHO_N "checking for ld used by $C
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -4552,7 +5088,16 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  else
    if test -z "$LD"; then
    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -3153,19 +4178,19 @@
+@@ -3133,7 +4213,7 @@ else
+     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 GNU ld's only accept -v.
++      # 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'*)
+@@ -3153,22 +4233,22 @@ fi
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -4579,9 +5124,14 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
-   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
- case `"$LD" -v 2>&1 </dev/null` in
-@@ -3177,20 +4202,20 @@
+-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+-case `"$LD" -v 2>&1 </dev/null` in
++  # 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
+   ;;
+@@ -3177,135 +4257,614 @@ case `"$LD" -v 2>&1 </dev/null` in
    ;;
  esac
  fi
@@ -4594,56 +5144,829 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  
 -echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
 -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-+$as_echo_n "checking for $LD option to reload object files... " >&6; }
- if test "${lt_cv_ld_reload_flag+set}" = set; then
+-if test "${lt_cv_ld_reload_flag+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_ld_reload_flag='-r'
- fi
+-else
+-  lt_cv_ld_reload_flag='-r'
+-fi
 -echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
 -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
-+{ $as_echo "$as_me:$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
- "" | " "*) ;;
-@@ -3198,10 +4223,10 @@
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
+-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'
  
 -echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
 -echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-+$as_echo_n "checking for BSD-compatible nm... " >&6; }
++
++
++
++
++
++
++{ $as_echo "$as_me:$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 test "${lt_cv_path_NM+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$NM"; then
    # Let the user override the test.
-@@ -3240,14 +4265,14 @@
-   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+   lt_cv_path_NM="$NM"
+ else
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    tmp_nm="$ac_dir/${ac_tool_prefix}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"
++  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
+ 	  ;;
+ 	*)
+-	  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
++	  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
+-      esac
+-    fi
++      fi
++    done
++    IFS="$lt_save_ifs"
+   done
+-  IFS="$lt_save_ifs"
+-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
++  : ${lt_cv_path_NM=no}
  fi
  fi
 -echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
 -echo "${ECHO_T}$lt_cv_path_NM" >&6
+-NM="$lt_cv_path_NM"
 +{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
 +$as_echo "$lt_cv_path_NM" >&6; }
- NM="$lt_cv_path_NM"
++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 "$ac_tool_prefix"; then
++  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
++  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:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_DUMPBIN+set}" = set; 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
  
 -echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
 -echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-+$as_echo_n "checking how to recognise dependent libraries... " >&6; }
- if test "${lt_cv_deplibs_check_method+set}" = set; then
+-if test "${lt_cv_deplibs_check_method+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++fi
++DUMPBIN=$ac_cv_prog_DUMPBIN
++if test -n "$DUMPBIN"; then
++  { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
++$as_echo "$DUMPBIN" >&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.
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
+-case $host_os in
+-aix4* | aix5*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+ 
+-beos*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++    test -n "$DUMPBIN" && break
++  done
++fi
++if test -z "$DUMPBIN"; then
++  ac_ct_DUMPBIN=$DUMPBIN
++  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
++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:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
 +  $as_echo_n "(cached) " >&6
- else
-   lt_cv_file_magic_cmd='$MAGIC_CMD'
- lt_cv_file_magic_test_file=
-@@ -3444,8 +4469,8 @@
++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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
+ 
+-bsdi4*)
+-  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
+-  ;;
++fi
++fi
++ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
++if test -n "$ac_ct_DUMPBIN"; then
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
++$as_echo "$ac_ct_DUMPBIN" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
+-cygwin* | mingw* | pw32*)
+-  # 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='win32_libid'
+-  ;;
+ 
+-darwin* | rhapsody*)
+-  # this will be overwritten by pass_all, but leave it in just in case
+-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  case "$host_os" in
+-  rhapsody* | darwin1.[012])
+-    lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
++  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:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&5
++$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    DUMPBIN=$ac_ct_DUMPBIN
++  fi
++fi
++
++
++  if test "$DUMPBIN" != ":"; then
++    NM="$DUMPBIN"
++  fi
++fi
++test -z "$NM" && NM=nm
++
++
++
++
++
++
++{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
++$as_echo_n "checking the name lister ($NM) interface... " >&6; }
++if test "${lt_cv_nm_interface+set}" = set; 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:4450: $ac_compile\"" >&5)
++  (eval "$ac_compile" 2>conftest.err)
++  cat conftest.err >&5
++  (eval echo "\"\$as_me:4453: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
++  cat conftest.err >&5
++  (eval echo "\"\$as_me:4456: 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:$LINENO: result: $lt_cv_nm_interface" >&5
++$as_echo "$lt_cv_nm_interface" >&6; }
++
++# find the maximum length of command line arguments
++{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
++$as_echo_n "checking the maximum length of command line arguments... " >&6; }
++if test "${lt_cv_sys_max_cmd_len+set}" = set; 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;
++    ;;
++
++  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
++    ;;
++
++  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
+     ;;
+-  *) # Darwin 1.3 on
+-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
++  *)
++    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"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
++	         = "XX$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:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
++$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
++else
++  { $as_echo "$as_me:$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:$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"}, \
++      = c,a/b,, \
++    && eval 'test $(( 1 + 1 )) -eq 2 \
++    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
++  && xsi_shell=yes
++{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
++$as_echo "$xsi_shell" >&6; }
++
++
++{ $as_echo "$as_me:$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:$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:$LINENO: checking for $LD option to reload object files" >&5
++$as_echo_n "checking for $LD option to reload object files... " >&6; }
++if test "${lt_cv_ld_reload_flag+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  lt_cv_ld_reload_flag='-r'
++fi
++{ $as_echo "$as_me:$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
++  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:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_OBJDUMP+set}" = set; 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
++    $as_echo "$as_me:$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:$LINENO: result: $OBJDUMP" >&5
++$as_echo "$OBJDUMP" >&6; }
++else
++  { $as_echo "$as_me:$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:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_OBJDUMP="objdump"
++    $as_echo "$as_me:$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:$LINENO: result: $ac_ct_OBJDUMP" >&5
++$as_echo "$ac_ct_OBJDUMP" >&6; }
++else
++  { $as_echo "$as_me:$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:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&5
++$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&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:$LINENO: checking how to recognize dependent libraries" >&5
++$as_echo_n "checking how to recognize dependent libraries... " >&6; }
++if test "${lt_cv_deplibs_check_method+set}" = set; 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.
++  if ( 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
++    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++    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*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++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)/i[3-9]86 (compact )?demand paged shared library'
++      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.*`
+       ;;
+@@ -3321,7 +4880,7 @@ gnu*)
+ 
+ hpux10.20* | hpux11*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+-  case "$host_cpu" in
++  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
+@@ -3337,41 +4896,28 @@ hpux10.20* | hpux11*)
+   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 $host_os in
+-  irix5* | nonstopux*)
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+-    ;;
+-  *)
+-    case $LD in
+-    *-32|*"-32 ") libmagic=32-bit;;
+-    *-n32|*"-n32 ") libmagic=N32;;
+-    *-64|*"-64 ") libmagic=64-bit;;
+-    *) libmagic=never-match;;
+-    esac
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
+-    ;;
++  case $LD in
++  *-32|*"-32 ") libmagic=32-bit;;
++  *-n32|*"-n32 ") libmagic=N32;;
++  *-64|*"-64 ") libmagic=64-bit;;
++  *) libmagic=never-match;;
+   esac
+-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
+-  case $host_cpu in
+-  alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*)
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  *)
+-    # glibc up to 2.1.1 does not perform some relocations on ARM
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
+-  esac
+-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
++linux* | k*bsd*-gnu)
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ netbsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++  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)$'
+@@ -3384,37 +4930,35 @@ newos6*)
+   lt_cv_file_magic_test_file=/usr/lib/libnls.so
+   ;;
+ 
+-nto-qnx)
+-  lt_cv_deplibs_check_method=unknown
++*nto* | *qnx*)
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ openbsd*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
++  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='file_magic OpenBSD.* shared library'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+   fi
+   ;;
+ 
+ osf3* | osf4* | osf5*)
+-  # this will be overridden with pass_all, but let us keep it just in case
+-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-sco3.2v5*)
++rdos*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ solaris*)
+   lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=/lib/libc.so
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++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]'
+@@ -3435,17 +4979,20 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+   siemens)
+     lt_cv_deplibs_check_method=pass_all
+     ;;
++  pc)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
+   esac
+   ;;
+ 
+-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
++tpf*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
  esac
  
  fi
@@ -4654,78 +5977,147 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  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
-@@ -3460,11 +4485,11 @@
- compiler=$CC
+@@ -3453,338 +5000,114 @@ test -z "$deplibs_check_method" && depli
  
  
+ 
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
+-
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
+-
+ 
 -# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-+# Check whether --enable-libtool-lock was given.
- if test "${enable_libtool_lock+set}" = set; then
+-if test "${enable_libtool_lock+set}" = set; then
 -  enableval="$enable_libtool_lock"
-+  enableval=$enable_libtool_lock;
-+fi
  
 -fi;
- test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
- 
- # Some flags need to be propagated to the compiler or linker for good
-@@ -3476,7 +4501,7 @@
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
+-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:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-     case `/usr/bin/file conftest.$ac_objext` in
-     *ELF-32*)
-@@ -3491,11 +4516,11 @@
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
+-  (exit $ac_status); }; 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 3494 "configure"' > conftest.$ac_ext
-+  echo '#line 4519 "configure"' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
+-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-     case `/usr/bin/file conftest.$ac_objext` in
-@@ -3532,7 +4557,7 @@
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
+-  (exit $ac_status); }; 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-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+-  # Find out which ABI we are using.
+-  echo 'int i;' > conftest.$ac_ext
+-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-     case "`/usr/bin/file conftest.o`" in
-     *32-bit*)
-@@ -3576,10 +4601,10 @@
-   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-   SAVE_CFLAGS="$CFLAGS"
-   CFLAGS="$CFLAGS -belf"
+-  (exit $ac_status); }; then
+-    case "`/usr/bin/file conftest.o`" in
+-    *32-bit*)
+-      case $host in
+-        x86_64-*linux*)
+-          LD="${LD-ld} -m elf_i386"
+-          ;;
+-        ppc64-*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-*linux*)
+-          LD="${LD-ld} -m elf_x86_64"
+-          ;;
+-        ppc*-*linux*|powerpc*-*linux*)
+-          LD="${LD-ld} -m elf64ppc"
+-          ;;
+-        s390*-*linux*)
+-          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"
 -  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
-+  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
- if test "${lt_cv_cc_needs_belf+set}" = set; then
+-if test "${lt_cv_cc_needs_belf+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -3588,15 +4613,12 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-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 >conftest.$ac_ext <<_ACEOF
+-     cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
@@ -4733,13 +6125,15 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
- int
- main ()
- {
-@@ -3606,24 +4628,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-int
+-main ()
+-{
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
@@ -4748,289 +6142,289 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   lt_cv_cc_needs_belf=yes
+-  lt_cv_cc_needs_belf=yes
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ar; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_AR+set}" = set; then
++  $as_echo_n "(cached) " >&6
  else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- lt_cv_cc_needs_belf=no
- fi
+-lt_cv_cc_needs_belf=no
+-fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-      ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3631,8 +4666,8 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 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
+-
+-fi
 -echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
-+{ $as_echo "$as_me:$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"
-@@ -3645,55 +4680,71 @@
- 
- 
- 
+-  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
+-  ;;
+-
+-esac
+-
+-need_locks="$enable_libtool_lock"
+-
+-
+-
 -echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+$as_echo_n "checking for ANSI C header files... " >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
+-if test "${ac_cv_header_stdc+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
++  if test -n "$AR"; then
++  ac_cv_prog_AR="$AR" # Let the user override the test.
  else
-   cat >conftest.$ac_ext <<_ACEOF
+-  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <stdlib.h>
- #include <stdarg.h>
- #include <string.h>
- #include <float.h>
- 
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
- _ACEOF
+-#include <stdlib.h>
+-#include <stdarg.h>
+-#include <string.h>
+-#include <float.h>
+-
+-_ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
-+  grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
+-  rm -f conftest.er1
+-  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null; then
 -  if test -s conftest.err; then
 -    ac_cpp_err=$ac_c_preproc_warn_flag
 -  else
 -    ac_cpp_err=
--  fi
++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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_AR="${ac_tool_prefix}ar"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
+   fi
 -else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_header_stdc=yes
- else
+-  ac_cv_header_stdc=yes
+-else
 -  echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-   ac_cv_header_stdc=no
- fi
+-  ac_cv_header_stdc=no
+-fi
 -rm -f conftest.err conftest.$ac_ext
-+
-+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 >conftest.$ac_ext <<_ACEOF
+-
+-if test $ac_cv_header_stdc = yes; then
+-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+-  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <string.h>
+-#include <string.h>
++done
++done
++IFS=$as_save_IFS
  
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 -  egrep "memchr" >/dev/null 2>&1; then
-+  $EGREP "memchr" >/dev/null 2>&1; then
-   :
- else
-   ac_cv_header_stdc=no
-@@ -3705,13 +4756,16 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
+-  :
+-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 >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <stdlib.h>
- 
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-#include <stdlib.h>
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 -  egrep "free" >/dev/null 2>&1; then
-+  $EGREP "free" >/dev/null 2>&1; then
-   :
+-  :
++AR=$ac_cv_prog_AR
++if test -n "$AR"; then
++  { $as_echo "$as_me:$LINENO: result: $AR" >&5
++$as_echo "$AR" >&6; }
  else
-   ac_cv_header_stdc=no
-@@ -3726,14 +4780,19 @@
-   :
+-  ac_cv_header_stdc=no
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ 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
+-  :
++fi
++if test -z "$ac_cv_prog_AR"; then
++  ac_ct_AR=$AR
++  # Extract the first word of "ar", so it can be a program name with args.
++set dummy ar; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
++  $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
+-  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* 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
+-#include <ctype.h>
+-#if ((' ' & 0x0FF) == 0x020)
+-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+-#else
 -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
-+# define ISLOWER(c) \
-+		   (('a' <= (c) && (c) <= 'i') \
-                      || ('j' <= (c) && (c) <= 'r') \
-                      || ('s' <= (c) && (c) <= 'z'))
- # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-@@ -3747,35 +4806,50 @@
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
-         || toupper (i) != TOUPPER (i))
+-                     || ('j' <= (c) && (c) <= 'r') \
+-                     || ('s' <= (c) && (c) <= 'z'))
+-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+-#endif
+-
+-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+-int
+-main ()
+-{
+-  int i;
+-  for (i = 0; i < 256; i++)
+-    if (XOR (islower (i), ISLOWER (i))
+-        || toupper (i) != TOUPPER (i))
 -      exit(2);
 -  exit (0);
-+      return 2;
-+  return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
+-  (exit $ac_status); }; }; then
+-  :
++  if test -n "$ac_ct_AR"; then
++  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
  else
 -  echo "$as_me: program exited with status $ac_status" >&5
 -echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $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
+-( exit $ac_status )
+-ac_cv_header_stdc=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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_AR="ar"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
 +
- ( exit $ac_status )
- ac_cv_header_stdc=no
  fi
 -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -rf conftest.dSYM
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
-+
-+
++ac_ct_AR=$ac_cv_prog_ac_ct_AR
++if test -n "$ac_ct_AR"; then
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
++$as_echo "$ac_ct_AR" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
  fi
++
++  if test "x$ac_ct_AR" = x; then
++    AR="false"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&5
++$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    AR=$ac_ct_AR
++  fi
++else
++  AR="$ac_cv_prog_AR"
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
 -echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+$as_echo "$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
+-if test $ac_cv_header_stdc = yes; then
  
- cat >>confdefs.h <<\_ACEOF
-@@ -3797,44 +4871,58 @@
- 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
+-cat >>confdefs.h <<\_ACEOF
+-#define STDC_HEADERS 1
+-_ACEOF
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
+ 
+-fi
+ 
+-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+ 
+ 
+ 
+@@ -3794,185 +5117,119 @@ fi
+ 
+ 
+ 
+-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+-                  inttypes.h stdint.h unistd.h
+-do
 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:$LINENO: checking for $ac_header" >&5
 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; 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:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_STRIP+set}" = set; then
 +  $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
+-  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- $ac_includes_default
- 
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
+-$ac_includes_default
+-
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
@@ -5039,94 +6433,85 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   eval "$as_ac_Header=yes"
+-  eval "$as_ac_Header=yes"
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
  else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- eval "$as_ac_Header=no"
- fi
+-eval "$as_ac_Header=no"
+-fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+if test `eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'` = yes; then
-   cat >>confdefs.h <<_ACEOF
+-  cat >>confdefs.h <<_ACEOF
 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
+-
+-fi
+-
++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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
+ done
++IFS=$as_save_IFS
  
- fi
-@@ -3845,131 +4933,166 @@
++fi
++fi
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
++$as_echo "$STRIP" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
  
- for ac_header in dlfcn.h
- do
+ 
+-for ac_header in dlfcn.h
+-do
 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
 -  echo "$as_me:$LINENO: checking for $ac_header" >&5
 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  $as_echo_n "(cached) " >&6
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
++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:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
++  $as_echo_n "(cached) " >&6
  else
-   # Is the header compilable?
+-  # Is the header compilable?
 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
+-cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
@@ -5135,105 +6520,78 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
+-  ac_header_compiler=yes
++  if test -n "$ac_ct_STRIP"; then
++  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
  else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_compiler=no
- fi
+-ac_header_compiler=no
+-fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
+-
+-# Is the header present?
 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
+-cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
+-#include <$ac_header>
+-_ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
-+  grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
+-  rm -f conftest.er1
+-  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null; then
 -  if test -s conftest.err; then
 -    ac_cpp_err=$ac_c_preproc_warn_flag
 -  else
 -    ac_cpp_err=
--  fi
++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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_STRIP="strip"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
+   fi
 -else
 -  ac_cpp_err=yes
--fi
++done
++done
++IFS=$as_save_IFS
++
+ fi
 -if test -z "$ac_cpp_err"; then
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   ac_header_preproc=yes
+-  ac_header_preproc=yes
++fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++$as_echo "$ac_ct_STRIP" >&6; }
  else
 -  echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-   ac_header_preproc=no
+-  ac_header_preproc=no
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
  fi
-+
- rm -f conftest.err conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_ext
 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -echo "${ECHO_T}$ac_header_preproc" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
  
- # So?  What about this header?
+-# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc in
 -  yes:no )
 -    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
@@ -5247,96 +6605,84 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
- esac
+-esac
 -echo "$as_me:$LINENO: checking for $ac_header" >&5
 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  $as_echo_n "(cached) " >&6
++  if test "x$ac_ct_STRIP" = x; then
++    STRIP=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&5
++$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    STRIP=$ac_ct_STRIP
++  fi
  else
 -  eval "$as_ac_Header=$ac_header_preproc"
-+  eval "$as_ac_Header=\$ac_header_preproc"
++  STRIP="$ac_cv_prog_STRIP"
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
  
- fi
+-fi
 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+if test `eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'` = yes; then
-   cat >>confdefs.h <<_ACEOF
+-  cat >>confdefs.h <<_ACEOF
 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
++test -z "$STRIP" && STRIP=:
++
++
++
  
- fi
+-fi
  
- done
+-done
  
 -ac_ext=cc
-+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
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  if test -n "$ac_tool_prefix"; then
 -  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-+  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
+-  do
+-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CXX+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  # 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:$LINENO: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CXX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${ac_cv_prog_RANLIB+set}" = set; then
 +  $as_echo_n "(cached) " >&6
  else
-   if test -n "$CXX"; then
-   ac_cv_prog_CXX="$CXX" # Let the user override the test.
-@@ -3980,38 +5103,40 @@
+-  if test -n "$CXX"; then
+-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
++  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
+@@ -3980,41 +5237,39 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
@@ -5346,12 +6692,14 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  
  fi
  fi
- CXX=$ac_cv_prog_CXX
- if test -n "$CXX"; then
+-CXX=$ac_cv_prog_CXX
+-if test -n "$CXX"; then
 -  echo "$as_me:$LINENO: result: $CXX" >&5
 -echo "${ECHO_T}$CXX" >&6
-+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
-+$as_echo "$CXX" >&6; }
++RANLIB=$ac_cv_prog_RANLIB
++if test -n "$RANLIB"; then
++  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
++$as_echo "$RANLIB" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
@@ -5359,35 +6707,45 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +$as_echo "no" >&6; }
  fi
  
+-    test -n "$CXX" && break
+-  done
 +
-     test -n "$CXX" && break
-   done
  fi
- if test -z "$CXX"; then
-   ac_ct_CXX=$CXX
+-if test -z "$CXX"; then
+-  ac_ct_CXX=$CXX
 -  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-+  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
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++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:$LINENO: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; 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.
-@@ -4022,68 +5147,99 @@
+-  if test -n "$ac_ct_CXX"; then
+-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
++  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
+@@ -4022,519 +5277,597 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CXX="$ac_prog"
+-    ac_cv_prog_ac_ct_CXX="$ac_prog"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_RANLIB="ranlib"
 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
@@ -5397,26 +6755,21 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  
  fi
  fi
- ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
- if test -n "$ac_ct_CXX"; then
+-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+-if test -n "$ac_ct_CXX"; then
 -  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
 -echo "${ECHO_T}$ac_ct_CXX" >&6
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-+$as_echo "$ac_ct_CXX" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
++if test -n "$ac_ct_RANLIB"; then
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++$as_echo "$ac_ct_RANLIB" >&6; }
++else
 +  { $as_echo "$as_me:$LINENO: result: no" >&5
 +$as_echo "no" >&6; }
- fi
- 
++fi
 +
-   test -n "$ac_ct_CXX" && break
- done
--test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
- 
-+  if test "x$ac_ct_CXX" = x; then
-+    CXX="g++"
++  if test "x$ac_ct_RANLIB" = x; then
++    RANLIB=":"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
@@ -5428,79 +6781,71 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 +ac_tool_warned=yes ;;
 +esac
-   CXX=$ac_ct_CXX
++    RANLIB=$ac_ct_RANLIB
++  fi
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  RANLIB="$ac_cv_prog_RANLIB"
  fi
-+fi
  
--
-+  fi
-+fi
- # Provide some information about the compiler.
+-  test -n "$ac_ct_CXX" && break
+-done
+-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
++test -z "$RANLIB" && RANLIB=:
+ 
+-  CXX=$ac_ct_CXX
++
++
++
++
++
++# 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 \$oldlib"
++    ;;
++  *)
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
++    ;;
++  esac
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+ 
+ 
+-# Provide some information about the compiler.
 -echo "$as_me:$LINENO:" \
 -     "checking for C++ compiler version" >&5
 -ac_compiler=`set X $ac_compile; echo $2`
 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
 -  (eval $ac_compiler --version </dev/null >&5) 2>&5
-+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
-+{ (ac_try="$ac_compiler --version >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
+-  (exit $ac_status); }
 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
 -  (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -v >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
+-  (exit $ac_status); }
 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
 -  (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -V >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
+-  (exit $ac_status); }
  
 -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
-+{ $as_echo "$as_me:$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 test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
@@ -5508,13 +6853,18 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
- int
- main ()
- {
-@@ -4096,48 +5252,60 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
+-int
+-main ()
+-{
+-#ifndef __GNUC__
+-       choke me
+-#endif
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
@@ -5523,73 +6873,33 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_compiler_gnu=yes
- else
+-  ac_compiler_gnu=yes
+-else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_compiler_gnu=no
- fi
+-ac_compiler_gnu=no
+-fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- 
- fi
+-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+-
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
 -GXX=`test $ac_compiler_gnu = yes && echo yes`
-+{ $as_echo "$as_me:$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
+-ac_test_CXXFLAGS=${CXXFLAGS+set}
+-ac_save_CXXFLAGS=$CXXFLAGS
 -CXXFLAGS="-g"
 -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
- if test "${ac_cv_prog_cxx_g+set}" = set; then
+-if test "${ac_cv_prog_cxx_g+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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 >conftest.$ac_ext <<_ACEOF
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
@@ -5597,13 +6907,15 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
- int
- main ()
- {
-@@ -4147,149 +5315,152 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
+-int
+-main ()
+-{
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
@@ -5612,27 +6924,11 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cxx_g=yes
- else
+-  ac_cv_prog_cxx_g=yes
+-else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 -ac_cv_prog_cxx_g=no
@@ -5649,12 +6945,75 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -  else
 -    CXXFLAGS="-g"
 -  fi
--else
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++# 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:$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 test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
 -  if test "$GXX" = yes; then
 -    CXXFLAGS="-O2"
 -  else
 -    CXXFLAGS=
--  fi
++
++# 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
 -fi
 -for ac_declaration in \
 -   ''\
@@ -5665,11 +7024,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -   'extern "C" void exit (int);' \
 -   'void exit (int);'
 -do
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	CXXFLAGS=""
-   cat >conftest.$ac_ext <<_ACEOF
+-  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
 -#include <stdlib.h>
@@ -5679,63 +7034,131 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
--#endif
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
++  ;;
++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
 +
- int
- main ()
- {
--exit (42);
++# If we're using GNU nm, then use its standard symbol codes.
++case `$NM -V 2>&1` in
++*GNU* | *'with BFD'*)
++  symcode='[ABCDGIRSTW]' ;;
++esac
 +
-   ;
-   return 0;
++# 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};"\
++"     /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
++
++  # 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
+-int
+-main ()
+-{
+-exit (42);
+-  ;
+-  return 0;
++char nm_test_var;
++void nm_test_func(void);
++void nm_test_func(void){}
++#ifdef __cplusplus
  }
- _ACEOF
- rm -f conftest.$ac_objext
+-_ACEOF
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
++_LT_EOF
++
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if { (eval echo "$as_me:$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=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   :
- else
+-  :
+-else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 -continue
 -fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+	 CXXFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
+-  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
 -$ac_declaration
@@ -5744,23 +7167,55 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
--#endif
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && 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
 +
- int
- main ()
++      # 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
++#ifdef __cplusplus
++extern "C" {
+ #endif
+-int
+-main ()
++
++_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.  */
++const struct {
++  const char *name;
++  void       *address;
++}
++lt__PROGRAM__LTX_preloaded_symbols[] =
  {
 -exit (42);
-+
-   ;
-   return 0;
+-  ;
+-  return 0;
++  { "@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;
  }
- _ACEOF
- rm -f conftest.$ac_objext
+-_ACEOF
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
@@ -5769,35 +7224,14 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  break
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_cv_prog_cxx_g=yes
- else
+-else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
- fi
+-fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 -done
 -rm -f conftest*
@@ -5805,231 +7239,174 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -  echo '#ifdef __cplusplus' >>confdefs.h
 -  echo $ac_declaration      >>confdefs.h
 -  echo '#endif'             >>confdefs.h
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
+-fi
+-
 -ac_ext=cc
-+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:$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
- 
+-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=cc
-+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_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
 -echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
-+{ $as_echo "$as_me:$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 test "${ac_cv_prog_CXXCPP+set}" = set; then
+-if test -z "$CXXCPP"; then
+-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-       # Double quotes because CXXCPP needs to be expanded
-     for CXXCPP in "$CXX -E" "/lib/cpp"
-@@ -4299,73 +5470,89 @@
- do
-   # Use a header file that comes with gcc, so configuring glibc
-   # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
+-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.
+-  # On the NeXT, cc -E runs the code through the compiler's parser,
+-  # not just through cpp. "Syntax error" is here to catch this case.
+-  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
- #include <assert.h>
-+#endif
-                      Syntax error
- _ACEOF
+-#include <assert.h>
+-                     Syntax error
+-_ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++#endif
++
++#ifdef __cplusplus
++}
++#endif
++_LT_EOF
++	  # Now try linking the two files.
++	  mv conftest.$ac_objext conftstm.$ac_objext
++	  lt_save_LIBS="$LIBS"
++	  lt_save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$ac_objext"
++	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
++	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
    ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
-+  grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
+-  rm -f conftest.er1
+-  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null; then
 -  if test -s conftest.err; then
 -    ac_cpp_err=$ac_cxx_preproc_warn_flag
--  else
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext}; then
++	    pipe_works=yes
++	  fi
++	  LIBS="$lt_save_LIBS"
++	  CFLAGS="$lt_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
 -    ac_cpp_err=
--  fi
++    echo "$progname: failed program was:" >&5
++    cat conftest.$ac_ext >&5
+   fi
 -else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   :
- else
+-  :
+-else
 -  echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-   # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
+-  # Broken: fails on valid input.
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_ext
++  rm -rf conftest* conftst*
  
 -  # OK, works on sane cases.  Now check whether non-existent headers
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
+-  # can be detected and how.
+-  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
+-#include <ac_nonexistent.h>
+-_ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
-+  grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
+-  rm -f conftest.er1
+-  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null; then
 -  if test -s conftest.err; then
 -    ac_cpp_err=$ac_cxx_preproc_warn_flag
--  else
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
+   else
 -    ac_cpp_err=
--  fi
++    lt_cv_sys_global_symbol_pipe=
+   fi
 -else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   # Broken: success on invalid input.
- continue
- else
+-  # Broken: success on invalid input.
+-continue
+-else
 -  echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-   # Passes both tests.
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
+-  # Passes both tests.
+-ac_preproc_ok=:
+-break
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-
  done
-@@ -4383,80 +5570,96 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then
+-  break
+-fi
+-
+-    done
+-    ac_cv_prog_CXXCPP=$CXXCPP
+ 
  fi
+-  CXXCPP=$ac_cv_prog_CXXCPP
+-else
+-  ac_cv_prog_CXXCPP=$CXXCPP
+-fi
 -echo "$as_me:$LINENO: result: $CXXCPP" >&5
 -echo "${ECHO_T}$CXXCPP" >&6
-+{ $as_echo "$as_me:$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 >conftest.$ac_ext <<_ACEOF
+-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.
+-  # On the NeXT, cc -E runs the code through the compiler's parser,
+-  # not just through cpp. "Syntax error" is here to catch this case.
+-  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
- #include <assert.h>
-+#endif
-                      Syntax error
- _ACEOF
+-#include <assert.h>
+-                     Syntax error
+-_ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
-+  grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
+-  rm -f conftest.er1
+-  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null; then
 -  if test -s conftest.err; then
@@ -6041,52 +7418,28 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   :
- else
+-  :
+-else
 -  echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-   # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
+-  # Broken: fails on valid input.
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_ext
  
 -  # OK, works on sane cases.  Now check whether non-existent headers
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
+-  # can be detected and how.
+-  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
+-#include <ac_nonexistent.h>
+-_ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
-+  grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
+-  rm -f conftest.er1
+-  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null; then
 -  if test -s conftest.err; then
@@ -6096,125 +7449,361 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -  fi
 -else
 -  ac_cpp_err=yes
--fi
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++  lt_cv_sys_global_symbol_to_cdecl=
+ fi
 -if test -z "$ac_cpp_err"; then
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   # Broken: success on invalid input.
- continue
+-  # Broken: success on invalid input.
+-continue
++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
++  { $as_echo "$as_me:$LINENO: result: failed" >&5
++$as_echo "failed" >&6; }
  else
 -  echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-   # Passes both tests.
- ac_preproc_ok=:
- break
+-  # Passes both tests.
+-ac_preproc_ok=:
+-break
++  { $as_echo "$as_me:$LINENO: result: ok" >&5
++$as_echo "ok" >&6; }
  fi
-+
- rm -f conftest.err conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_ext
  
- done
-@@ -4465,12 +5668,14 @@
- if $ac_preproc_ok; then
-   :
- else
+-done
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then
+-  :
+-else
 -  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
 -echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-+See \`config.log' for more details." >&5
-+$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-+See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- fi
+-   { (exit 1); exit 1; }; }
+-fi
  
 -ac_ext=cc
-+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'
-@@ -4482,14 +5687,14 @@
- ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_f77_compiler_gnu
- if test -n "$ac_tool_prefix"; then
+-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=f
+-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+-if test -n "$ac_tool_prefix"; then
 -  for ac_prog in g77 f77 xlf cf77 cft77 frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 fc
-+  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
-   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
+-  do
+-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_F77+set}" = set; then
+-if test "${ac_cv_prog_F77+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$F77"; then
-   ac_cv_prog_F77="$F77" # Let the user override the test.
-@@ -4500,38 +5705,40 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+-else
+-  if test -n "$F77"; then
+-  ac_cv_prog_F77="$F77" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+-    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
+-    break 2
+-  fi
+-done
+-done
  
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++# Check whether --enable-libtool-lock was given.
++if test "${enable_libtool_lock+set}" = set; then
++  enableval=$enable_libtool_lock;
  fi
- fi
- F77=$ac_cv_prog_F77
- if test -n "$F77"; then
+-fi
+-F77=$ac_cv_prog_F77
+-if test -n "$F77"; then
 -  echo "$as_me:$LINENO: result: $F77" >&5
 -echo "${ECHO_T}$F77" >&6
-+  { $as_echo "$as_me:$LINENO: result: $F77" >&5
-+$as_echo "$F77" >&6; }
++
++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:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; 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 5667 "configure"' > conftest.$ac_ext
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; 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*|ppc*-*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:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; 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"
++	    ;;
++	  ppc64-*linux*|powerpc64-*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"
++	    ;;
++	  ppc*-*linux*|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:$LINENO: checking whether the C compiler needs -belf" >&5
++$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
++if test "${lt_cv_cc_needs_belf+set}" = set; 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 >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (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:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  lt_cv_cc_needs_belf=yes
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	lt_cv_cc_needs_belf=no
  fi
  
+-    test -n "$F77" && break
+-  done
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      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
 +
-     test -n "$F77" && break
-   done
  fi
- if test -z "$F77"; then
-   ac_ct_F77=$F77
+-if test -z "$F77"; then
+-  ac_ct_F77=$F77
 -  for ac_prog in g77 f77 xlf cf77 cft77 frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 fc
-+  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:$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
++  ;;
++sparc*-*solaris*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++    case `/usr/bin/file conftest.o` in
++    *64-bit*)
++      case $lt_cv_prog_gnu_ld in
++      yes*) LD="${LD-ld} -m elf64_sparc" ;;
++      *)
++	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"
++
++
++  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:$LINENO: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
 +  $as_echo_n "(cached) " >&6
  else
-   if test -n "$ac_ct_F77"; then
-   ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
-@@ -4542,60 +5749,95 @@
+-  if test -n "$ac_ct_F77"; then
+-  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
++  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
+@@ -4542,11079 +5875,3359 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_F77="$ac_prog"
+-    ac_cv_prog_ac_ct_F77="$ac_prog"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
@@ -6224,12 +7813,14 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  
  fi
  fi
- ac_ct_F77=$ac_cv_prog_ac_ct_F77
- if test -n "$ac_ct_F77"; then
+-ac_ct_F77=$ac_cv_prog_ac_ct_F77
+-if test -n "$ac_ct_F77"; then
 -  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
 -echo "${ECHO_T}$ac_ct_F77" >&6
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-+$as_echo "$ac_ct_F77" >&6; }
++DSYMUTIL=$ac_cv_prog_DSYMUTIL
++if test -n "$DSYMUTIL"; then
++  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
++$as_echo "$DSYMUTIL" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
@@ -6237,12 +7828,50 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +$as_echo "no" >&6; }
  fi
  
+-  test -n "$ac_ct_F77" && break
 +
-   test -n "$ac_ct_F77" && break
++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:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
  done
++done
++IFS=$as_save_IFS
+ 
+-  F77=$ac_ct_F77
++fi
++fi
++ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
++if test -n "$ac_ct_DSYMUTIL"; then
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
++$as_echo "$ac_ct_DSYMUTIL" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
  
-+  if test "x$ac_ct_F77" = x; then
-+    F77=""
++  if test "x$ac_ct_DSYMUTIL" = x; then
++    DSYMUTIL=":"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
@@ -6254,81 +7883,84 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 +ac_tool_warned=yes ;;
 +esac
-   F77=$ac_ct_F77
- fi
++    DSYMUTIL=$ac_ct_DSYMUTIL
++  fi
++else
++  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
 +fi
  
- 
- # Provide some information about the compiler.
+-# Provide some information about the compiler.
 -echo "$as_me:4572:" \
 -     "checking for Fortran 77 compiler version" >&5
 -ac_compiler=`set X $ac_compile; echo $2`
 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
 -  (eval $ac_compiler --version </dev/null >&5) 2>&5
-+$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
-+{ (ac_try="$ac_compiler --version >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
+-  (exit $ac_status); }
 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
 -  (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -v >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
+-  (exit $ac_status); }
 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
 -  (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -V >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-+rm -f a.out
+-  (exit $ac_status); }
++    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:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_NMEDIT+set}" = set; 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
  
- # If we don't use `.F' as extension, the preprocessor is not run on the
+-# If we don't use `.F' as extension, the preprocessor is not run on the
 -# input file.
-+# input file.  (Note that this only needs to work for GNU compilers.)
- ac_save_ext=$ac_ext
- ac_ext=F
+-ac_save_ext=$ac_ext
+-ac_ext=F
 -echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
 -echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-+$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
- if test "${ac_cv_f77_compiler_gnu+set}" = set; then
+-if test "${ac_cv_f77_compiler_gnu+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
++fi
++fi
++NMEDIT=$ac_cv_prog_NMEDIT
++if test -n "$NMEDIT"; then
++  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
++$as_echo "$NMEDIT" >&6; }
  else
-   cat >conftest.$ac_ext <<_ACEOF
-       program main
-@@ -4606,38 +5848,45 @@
-       end
- _ACEOF
- rm -f conftest.$ac_objext
+-  cat >conftest.$ac_ext <<_ACEOF
+-      program main
+-#ifndef __GNUC__
+-       choke me
+-#endif
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
+-      end
+-_ACEOF
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
@@ -6337,63 +7969,64 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_f77_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_compiler_gnu=yes
+-  ac_compiler_gnu=yes
++
++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:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
++  $as_echo_n "(cached) " >&6
  else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_compiler_gnu=no
- fi
+-ac_compiler_gnu=no
+-fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_f77_compiler_gnu=$ac_compiler_gnu
- 
- fi
+-ac_cv_f77_compiler_gnu=$ac_compiler_gnu
+-
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
 -echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-+$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
- ac_ext=$ac_save_ext
+-ac_ext=$ac_save_ext
 -G77=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_FFLAGS=${FFLAGS+set}
- ac_save_FFLAGS=$FFLAGS
- FFLAGS=
+-ac_test_FFLAGS=${FFLAGS+set}
+-ac_save_FFLAGS=$FFLAGS
+-FFLAGS=
 -echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
 -echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-+$as_echo_n "checking whether $F77 accepts -g... " >&6; }
- if test "${ac_cv_prog_f77_g+set}" = set; then
+-if test "${ac_cv_prog_f77_g+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
++  if test -n "$ac_ct_NMEDIT"; then
++  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
  else
-   FFLAGS=-g
- cat >conftest.$ac_ext <<_ACEOF
-@@ -4646,43 +5895,57 @@
-       end
- _ACEOF
- rm -f conftest.$ac_objext
+-  FFLAGS=-g
+-cat >conftest.$ac_ext <<_ACEOF
+-      program main
++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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_NMEDIT="nmedit"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
+ 
+-      end
+-_ACEOF
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
@@ -6402,811 +8035,2335 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_f77_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_prog_f77_g=yes
+-  ac_cv_prog_f77_g=yes
++fi
++fi
++ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
++if test -n "$ac_ct_NMEDIT"; then
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
++$as_echo "$ac_ct_NMEDIT" >&6; }
  else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_prog_f77_g=no
- fi
+-ac_cv_prog_f77_g=no
+-fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
+-
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
 -echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-+$as_echo "$ac_cv_prog_f77_g" >&6; }
- if test "$ac_test_FFLAGS" = set; then
-   FFLAGS=$ac_save_FFLAGS
- elif test $ac_cv_prog_f77_g = yes; then
+-if test "$ac_test_FFLAGS" = set; then
+-  FFLAGS=$ac_save_FFLAGS
+-elif test $ac_cv_prog_f77_g = yes; then
 -  if test "$G77" = yes; then
-+  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-     FFLAGS="-g -O2"
+-    FFLAGS="-g -O2"
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++  if test "x$ac_ct_NMEDIT" = x; then
++    NMEDIT=":"
    else
-     FFLAGS="-g"
+-    FFLAGS="-g"
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&5
++$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    NMEDIT=$ac_ct_NMEDIT
    fi
  else
 -  if test "$G77" = yes; then
-+  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-     FFLAGS="-O2"
-   else
-     FFLAGS=
-   fi
+-    FFLAGS="-O2"
+-  else
+-    FFLAGS=
+-  fi
++  NMEDIT="$ac_cv_prog_NMEDIT"
  fi
-+
-+if test $ac_compiler_gnu = yes; then
-+  G77=yes
+-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}lipo", so it can be a program name with args.
++set dummy ${ac_tool_prefix}lipo; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_LIPO+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$LIPO"; then
++  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
 +else
-+  G77=
++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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
+ 
 +fi
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4694,10 +5957,10 @@
- # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
++fi
++LIPO=$ac_cv_prog_LIPO
++if test -n "$LIPO"; then
++  { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
++$as_echo "$LIPO" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
+-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
  
- # find the maximum length of command line arguments
+-# find the maximum length of command line arguments
 -echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
 -echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
- if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
++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:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
 +  $as_echo_n "(cached) " >&6
  else
-     i=0
-   testring="ABCD"
-@@ -4753,21 +6016,21 @@
+-    i=0
+-  testring="ABCD"
++  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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_LIPO="lipo"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
+ 
+-  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
+-    ;;
++fi
++fi
++ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
++if test -n "$ac_ct_LIPO"; then
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
++$as_echo "$ac_ct_LIPO" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
+-  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;
+-    ;;
++  if test "x$ac_ct_LIPO" = x; then
++    LIPO=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&5
++$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    LIPO=$ac_ct_LIPO
++  fi
++else
++  LIPO="$ac_cv_prog_LIPO"
++fi
+ 
+-  cygwin* | mingw*)
+-    # 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;
+-    ;;
++    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:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_OTOOL+set}" = set; 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
++    $as_echo "$as_me:$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:$LINENO: result: $OTOOL" >&5
++$as_echo "$OTOOL" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
+- *)
+-    # 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"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
+-	       = "XX$testring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
+-	    lt_cv_sys_max_cmd_len=$new_result &&
+-	    test $i != 17 # 1/2 MB should be enough
+-    do
+-      i=`expr $i + 1`
+-      testring=$testring$testring
+-    done
+-    testring=
+-    # 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`
+-    ;;
+-  esac
+ 
  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:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_OTOOL="otool"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
  
- if test -n $lt_cv_sys_max_cmd_len ; then
+-if test -n $lt_cv_sys_max_cmd_len ; then
 -  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
 -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
-+  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
++fi
++fi
++ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
++if test -n "$ac_ct_OTOOL"; then
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
++$as_echo "$ac_ct_OTOOL" >&6; }
  else
 -  echo "$as_me:$LINENO: result: none" >&5
 -echo "${ECHO_T}none" >&6
-+  { $as_echo "$as_me:$LINENO: result: none" >&5
-+$as_echo "none" >&6; }
++  { $as_echo "$as_me:$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:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&5
++$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&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:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_OTOOL64+set}" = set; 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
++    $as_echo "$as_me:$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:$LINENO: result: $OTOOL64" >&5
++$as_echo "$OTOOL64" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
  
  
- # Check for command to grab the raw symbol name followed by C symbol from nm.
+-# Check for command to grab the raw symbol name followed by C symbol from nm.
 -echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
 -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
-+{ $as_echo "$as_me:$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 test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
++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:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_OTOOL64="otool64"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
  
- # These are sane defaults that work on at least a few old systems.
-@@ -4856,14 +6119,14 @@
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
+-# These are sane defaults that work on at least a few old systems.
+-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++fi
++fi
++ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
++if test -n "$ac_ct_OTOOL64"; then
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
++$as_echo "$ac_ct_OTOOL64" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
+-# Character class describing NM global symbol codes.
+-symcode='[BCDEGRST]'
++  if test "x$ac_ct_OTOOL64" = x; then
++    OTOOL64=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&5
++$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    OTOOL64=$ac_ct_OTOOL64
++  fi
++else
++  OTOOL64="$ac_cv_prog_OTOOL64"
++fi
+ 
+-# Regexp to match symbols that can be accessed directly from C.
+-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+ 
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+ 
+-# Transform an extracted symbol line into a proper C declaration
+-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \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\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+ 
+-# Define system-specific variables.
+-case $host_os in
+-aix*)
+-  symcode='[BCDT]'
+-  ;;
+-cygwin* | mingw* | pw32*)
+-  symcode='[ABCDGISTW]'
+-  ;;
+-hpux*) # Its linker distinguishes data from code symbols
+-  if test "$host_cpu" = ia64; then
+-    symcode='[ABCDEGRST]'
+-  fi
+-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+-  ;;
+-irix* | nonstopux*)
+-  symcode='[BCDEGRST]'
+-  ;;
+-osf*)
+-  symcode='[BCDEGQRST]'
+-  ;;
+-solaris* | sysv5*)
+-  symcode='[BDT]'
+-  ;;
+-sysv4)
+-  symcode='[DFNSTU]'
+-  ;;
+-esac
+ 
+-# 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
+ 
+-# If we're using GNU nm, then use its standard symbol codes.
+-case `$NM -V 2>&1` in
+-*GNU* | *'with BFD'*)
+-  symcode='[ABCDGISTW]' ;;
+-esac
+ 
+-# Try without a prefix undercore, then with it.
+-for ac_symprfx in "" "_"; do
+ 
+-  # Write the raw and C identifiers.
+-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+ 
+-  # Check to see that the pipe works correctly.
+-  pipe_works=no
+ 
+-  rm -f conftest*
+-  cat > conftest.$ac_ext <<EOF
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-char nm_test_var;
+-void nm_test_func(){}
+-#ifdef __cplusplus
+-}
+-#endif
+-int main(){nm_test_var='a';nm_test_func();return(0);}
+-EOF
+ 
+-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-     # Now try to grab the symbols.
-     nlist=conftest.nm
-     if { (eval echo "$as_me:$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=$?
+-  (exit $ac_status); }; then
+-    # Now try to grab the symbols.
+-    nlist=conftest.nm
+-    if { (eval echo "$as_me:$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=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s "$nlist"; then
-       # Try sorting and uniquifying the output.
-       if sort "$nlist" | uniq > "$nlist"T; then
-@@ -4918,7 +6181,7 @@
- 	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
+-  (exit $ac_status); } && 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 <<EOF > conftest.$ac_ext
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+ 
+-EOF
+-	  # Now generate the symbol file.
+-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
+ 
+-	  cat <<EOF >> conftest.$ac_ext
+-#if defined (__STDC__) && __STDC__
+-# define lt_ptr_t void *
+-#else
+-# define lt_ptr_t char *
+-# define const
+-#endif
+ 
+-/* The mapping between symbol names and symbols. */
+-const struct {
+-  const char *name;
+-  lt_ptr_t address;
+-}
+-lt_preloaded_symbols[] =
+-{
+-EOF
+-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+-	  cat <<\EOF >> conftest.$ac_ext
+-  {0, (lt_ptr_t) 0}
+-};
+ 
+-#ifdef __cplusplus
+-}
+-#endif
+-EOF
+-	  # Now try linking the two files.
+-	  mv conftest.$ac_objext conftstm.$ac_objext
+-	  lt_save_LIBS="$LIBS"
+-	  lt_save_CFLAGS="$CFLAGS"
+-	  LIBS="conftstm.$ac_objext"
+-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+-	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext}; then
- 	    pipe_works=yes
- 	  fi
-@@ -4953,17 +6216,17 @@
-   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
+-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+-	    pipe_works=yes
+-	  fi
+-	  LIBS="$lt_save_LIBS"
+-	  CFLAGS="$lt_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 -f 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
 -  echo "$as_me:$LINENO: result: failed" >&5
 -echo "${ECHO_T}failed" >&6
-+  { $as_echo "$as_me:$LINENO: result: failed" >&5
-+$as_echo "failed" >&6; }
- else
+-else
 -  echo "$as_me:$LINENO: result: ok" >&5
 -echo "${ECHO_T}ok" >&6
-+  { $as_echo "$as_me:$LINENO: result: ok" >&5
-+$as_echo "ok" >&6; }
- fi
+-fi
  
 -echo "$as_me:$LINENO: checking for objdir" >&5
 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
-+$as_echo_n "checking for objdir... " >&6; }
- if test "${lt_cv_objdir+set}" = set; then
+-if test "${lt_cv_objdir+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
++
++
++
++
++
++
++    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
++$as_echo_n "checking for -single_module linker flag... " >&6; }
++if test "${lt_cv_apple_cc_single_mod+set}" = set; then
 +  $as_echo_n "(cached) " >&6
  else
-   rm -f .libs 2>/dev/null
- mkdir .libs 2>/dev/null
-@@ -4975,8 +6238,8 @@
- fi
- rmdir .libs 2>/dev/null
+-  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
++  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 test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
++	  lt_cv_apple_cc_single_mod=yes
++	else
++	  cat conftest.err >&5
++	fi
++	rm -rf libconftest.dylib*
++	rm -f conftest.*
++      fi
  fi
 -echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
 -echo "${ECHO_T}$lt_cv_objdir" >&6
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-+$as_echo "$lt_cv_objdir" >&6; }
- objdir=$lt_cv_objdir
+-objdir=$lt_cv_objdir
+-
+-
+-
++{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
++$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
++    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
++$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
++if test "${lt_cv_ld_exported_symbols_list+set}" = set; 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 >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  
++int
++main ()
++{
  
-@@ -5027,10 +6290,10 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
+-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
+-  ;;
++  ;
++  return 0;
++}
++_ACEOF
++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:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  lt_cv_ld_exported_symbols_list=yes
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	lt_cv_ld_exported_symbols_list=no
++fi
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++	LDFLAGS="$save_LDFLAGS"
+ 
+-# Sed substitution that helps us do robust quoting.  It backslashifies
+-# metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
+-sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
++fi
++{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
++$as_echo "$lt_cv_ld_exported_symbols_list" >&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" != ":"; then
++      _lt_dsymutil='~$DSYMUTIL $lib || :'
++    else
++      _lt_dsymutil=
++    fi
++    ;;
++  esac
+ 
+-# 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'
++{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++$as_echo_n "checking for ANSI C header files... " >&6; }
++if test "${ac_cv_header_stdc+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdlib.h>
++#include <stdarg.h>
++#include <string.h>
++#include <float.h>
+ 
+-# Sed substitution to avoid accidental globbing in evaled expressions
+-no_glob_subst='s/\*/\\\*/g'
++int
++main ()
++{
+ 
+-# Constants:
+-rm="rm -f"
++  ;
++  return 0;
++}
++_ACEOF
++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:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  ac_cv_header_stdc=yes
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-# Global variables:
+-default_ofile=libtool
+-can_build_shared=yes
++	ac_cv_header_stdc=no
++fi
+ 
+-# All known linkers require a `.a' archive for static linking (except M$VC,
+-# which needs '.lib').
+-libext=a
+-ltmain="$ac_aux_dir/ltmain.sh"
+-ofile="$default_ofile"
+-with_gnu_ld="$lt_cv_prog_gnu_ld"
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}ar; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_AR+set}" = set; then
+-if test "${ac_cv_prog_AR+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$AR"; then
-   ac_cv_prog_AR="$AR" # Let the user override the test.
-@@ -5041,34 +6304,36 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+-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_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_AR="${ac_tool_prefix}ar"
+-    ac_cv_prog_AR="${ac_tool_prefix}ar"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
+-    break 2
+-  fi
+-done
+-done
++if test $ac_cv_header_stdc = yes; then
++  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <string.h>
  
- fi
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
+-fi
+-fi
+-AR=$ac_cv_prog_AR
+-if test -n "$AR"; then
 -  echo "$as_me:$LINENO: result: $AR" >&5
 -echo "${ECHO_T}$AR" >&6
-+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
-+$as_echo "$AR" >&6; }
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "memchr" >/dev/null 2>&1; then
++  :
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
++  ac_cv_header_stdc=no
  fi
++rm -f conftest*
  
-+
  fi
- if test -z "$ac_cv_prog_AR"; then
-   ac_ct_AR=$AR
-   # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
+-if test -z "$ac_cv_prog_AR"; then
+-  ac_ct_AR=$AR
+-  # Extract the first word of "ar", so it can be a program name with args.
+-set dummy ar; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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.
-@@ -5079,27 +6344,41 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+-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_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_AR="ar"
+-    ac_cv_prog_ac_ct_AR="ar"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
+-    break 2
+-  fi
+-done
+-done
  
 -  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
- fi
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
+-fi
+-fi
+-ac_ct_AR=$ac_cv_prog_ac_ct_AR
+-if test -n "$ac_ct_AR"; then
 -  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
 -echo "${ECHO_T}$ac_ct_AR" >&6
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-+$as_echo "$ac_ct_AR" >&6; }
++if test $ac_cv_header_stdc = yes; then
++  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdlib.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "free" >/dev/null 2>&1; then
++  :
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
++  ac_cv_header_stdc=no
  fi
++rm -f conftest*
  
-+  if test "x$ac_ct_AR" = x; then
-+    AR="false"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-   AR=$ac_ct_AR
-+  fi
- else
-   AR="$ac_cv_prog_AR"
+-  AR=$ac_ct_AR
+-else
+-  AR="$ac_cv_prog_AR"
  fi
-@@ -5107,10 +6386,10 @@
- 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
+ 
+-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
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_RANLIB+set}" = set; then
+-if test "${ac_cv_prog_RANLIB+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
++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
-   if test -n "$RANLIB"; then
-   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-@@ -5121,34 +6400,36 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if test -n "$RANLIB"; then
+-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ctype.h>
++#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
++rm -f 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:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { 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:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
+-    break 2
+-  fi
+-done
+-done
++  $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
  
++( exit $ac_status )
++ac_cv_header_stdc=no
  fi
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
+-fi
+-RANLIB=$ac_cv_prog_RANLIB
+-if test -n "$RANLIB"; then
 -  echo "$as_me:$LINENO: result: $RANLIB" >&5
 -echo "${ECHO_T}$RANLIB" >&6
-+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
-+$as_echo "$RANLIB" >&6; }
- else
+-else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
++rm -rf conftest.dSYM
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  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
+-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
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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.
-@@ -5159,27 +6440,41 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+-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_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_RANLIB="ranlib"
+-    ac_cv_prog_ac_ct_RANLIB="ranlib"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
+-    break 2
+-  fi
+-done
+-done
  
 -  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+-fi
  fi
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
+-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+-if test -n "$ac_ct_RANLIB"; then
 -  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
 -echo "${ECHO_T}$ac_ct_RANLIB" >&6
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+$as_echo "$ac_ct_RANLIB" >&6; }
- else
+-else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
  fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++$as_echo "$ac_cv_header_stdc" >&6; }
++if test $ac_cv_header_stdc = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define STDC_HEADERS 1
++_ACEOF
  
-+  if test "x$ac_ct_RANLIB" = x; then
-+    RANLIB=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-   RANLIB=$ac_ct_RANLIB
-+  fi
- else
-   RANLIB="$ac_cv_prog_RANLIB"
+-  RANLIB=$ac_ct_RANLIB
+-else
+-  RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -5187,10 +6482,10 @@
- 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
+ 
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}strip; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_STRIP+set}" = set; then
+-if test "${ac_cv_prog_STRIP+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$STRIP"; then
-   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-@@ -5201,34 +6496,36 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+-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_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
+-    break 2
+-  fi
+-done
+-done
++# On IRIX 5.3, sys/types and inttypes.h are conflicting.
  
- fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
+-fi
+-fi
+-STRIP=$ac_cv_prog_STRIP
+-if test -n "$STRIP"; then
 -  echo "$as_me:$LINENO: result: $STRIP" >&5
 -echo "${ECHO_T}$STRIP" >&6
-+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-+$as_echo "$STRIP" >&6; }
- else
+-else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+-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
+-fi
+-if test -z "$ac_cv_prog_STRIP"; then
+-  ac_ct_STRIP=$STRIP
+-  # Extract the first word of "strip", so it can be a program name with args.
+-set dummy strip; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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.
-@@ -5239,27 +6536,41 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+-else
+-  if test -n "$ac_ct_STRIP"; then
+-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_STRIP="strip"
+-    ac_cv_prog_ac_ct_STRIP="strip"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
+-    break 2
+-  fi
+-done
+-done
  
 -  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
- fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
+-fi
+-fi
+-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+-if test -n "$ac_ct_STRIP"; then
 -  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
 -echo "${ECHO_T}$ac_ct_STRIP" >&6
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+$as_echo "$ac_ct_STRIP" >&6; }
- else
+-else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+-fi
  
-+  if test "x$ac_ct_STRIP" = x; then
-+    STRIP=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-   STRIP=$ac_ct_STRIP
-+  fi
- else
-   STRIP="$ac_cv_prog_STRIP"
- fi
-@@ -5306,10 +6617,10 @@
- case $deplibs_check_method in
- file_magic*)
-   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+-  STRIP=$ac_ct_STRIP
+-else
+-  STRIP="$ac_cv_prog_STRIP"
+-fi
+ 
+ 
+-old_CC="$CC"
+-old_CFLAGS="$CFLAGS"
+ 
+-# Set sane defaults for various variables
+-test -z "$AR" && AR=ar
+-test -z "$AR_FLAGS" && AR_FLAGS=cru
+-test -z "$AS" && AS=as
+-test -z "$CC" && CC=cc
+-test -z "$LTCC" && LTCC=$CC
+-test -z "$DLLTOOL" && DLLTOOL=dlltool
+-test -z "$LD" && LD=ld
+-test -z "$LN_S" && LN_S="ln -s"
+-test -z "$MAGIC_CMD" && MAGIC_CMD=file
+-test -z "$NM" && NM=nm
+-test -z "$SED" && SED=sed
+-test -z "$OBJDUMP" && OBJDUMP=objdump
+-test -z "$RANLIB" && RANLIB=:
+-test -z "$STRIP" && STRIP=:
+-test -z "$ac_objext" && ac_objext=o
+ 
+-# Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+-old_postinstall_cmds='chmod 644 $oldlib'
+-old_postuninstall_cmds=
+ 
+-if test -n "$RANLIB"; then
+-  case $host_os in
+-  openbsd*)
+-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+-    ;;
+-  *)
+-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+-    ;;
+-  esac
+-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+-fi
++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`
++{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
++$as_echo_n "checking for $ac_header... " >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  $as_echo_n "(cached) " >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
+ 
+-# Only perform the check for file, if the check method requires it
+-case $deplibs_check_method in
+-file_magic*)
+-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
 -    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
-+    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
- if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   case $MAGIC_CMD in
- [\\/*] |  ?:[\\/]*)
-@@ -5359,19 +6670,19 @@
++#include <$ac_header>
++_ACEOF
++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:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  eval "$as_ac_Header=yes"
+ 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 <<EOF 1>&2
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-*** 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
++	eval "$as_ac_Header=no"
++fi
  
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if test -n "$MAGIC_CMD"; then
+-EOF
+-	  fi ;;
+-	esac
+-      fi
+-      break
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
+-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+-  ;;
+-esac
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++ac_res=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++if test `eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+ 
+-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-if test -n "$MAGIC_CMD"; then
 -  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
 -echo "${ECHO_T}$MAGIC_CMD" >&6
-+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+$as_echo "$MAGIC_CMD" >&6; }
- else
+-else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { $as_echo "$as_me:$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
+-if test -z "$lt_cv_path_MAGIC_CMD"; then
+-  if test -n "$ac_tool_prefix"; then
 -    echo "$as_me:$LINENO: checking for file" >&5
 -echo $ECHO_N "checking for file... $ECHO_C" >&6
-+    { $as_echo "$as_me:$LINENO: checking for file" >&5
-+$as_echo_n "checking for file... " >&6; }
- if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
++done
++
++
++
++for ac_header in dlfcn.h
++do
++as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
++$as_echo_n "checking for $ac_header... " >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  $as_echo_n "(cached) " >&6
  else
-   case $MAGIC_CMD in
- [\\/*] |  ?:[\\/]*)
-@@ -5421,11 +6732,11 @@
+-  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 <<EOF 1>&2
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
  
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if test -n "$MAGIC_CMD"; then
+-*** 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
++#include <$ac_header>
++_ACEOF
++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:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  eval "$as_ac_Header=yes"
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-EOF
+-	  fi ;;
+-	esac
+-      fi
+-      break
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
+-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+-  ;;
+-esac
++	eval "$as_ac_Header=no"
+ fi
+ 
+-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-if test -n "$MAGIC_CMD"; then
 -  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
 -echo "${ECHO_T}$MAGIC_CMD" >&6
-+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+$as_echo "$MAGIC_CMD" >&6; }
- else
+-else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
++ac_res=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++if test `eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
  
-   else
-@@ -5440,21 +6751,21 @@
- enable_dlopen=no
- enable_win32_dll=no
+-  else
+-    MAGIC_CMD=:
+-  fi
+ fi
+ 
+-  fi
+-  ;;
+-esac
++done
+ 
+-enable_dlopen=no
+-enable_win32_dll=no
  
 -# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-+# Check whether --enable-libtool-lock was given.
- if test "${enable_libtool_lock+set}" = set; then
+-if test "${enable_libtool_lock+set}" = set; then
 -  enableval="$enable_libtool_lock"
-+  enableval=$enable_libtool_lock;
-+fi
  
 -fi;
- test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++# Set options
  
  
 -# Check whether --with-pic or --without-pic was given.
-+# Check whether --with-pic was given.
- if test "${with_pic+set}" = set; then
+-if test "${with_pic+set}" = set; then
 -  withval="$with_pic"
 -  pic_mode="$withval"
-+  withval=$with_pic; pic_mode="$withval"
- else
-   pic_mode=default
+-else
+-  pic_mode=default
 -fi;
+-test -z "$pic_mode" && pic_mode=default
+ 
+-# Use C for the default configuration in the libtool script
+-tagname=
+-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
++        enable_dlopen=no
+ 
+ 
+-# Source file extension for C test sources.
+-ac_ext=c
++  enable_win32_dll=no
+ 
+-# 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;\n"
++            # 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
-+
- test -z "$pic_mode" && pic_mode=default
  
- # Use C for the default configuration in the libtool script
-@@ -5500,12 +6811,12 @@
-   esac
- fi
- if test -n "$lt_prog_cc_shlib"; then
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
+ 
+ 
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
+ 
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
+ 
+ 
+-#
+-# Check for any special shared library compilation flags.
+-#
+-lt_prog_cc_shlib=
+-if test "$GCC" = no; then
+-  case $host_os in
+-  sco3.2v5*)
+-    lt_prog_cc_shlib='-belf'
+-    ;;
+-  esac
+-fi
+-if test -n "$lt_prog_cc_shlib"; then
 -  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
 -echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
-+  { $as_echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
-+$as_echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
-   if echo "$old_CC $old_CFLAGS " | grep "[ 	]$lt_prog_cc_shlib[ 	]" >/dev/null; then :
-   else
+-  if echo "$old_CC $old_CFLAGS " | grep "[ 	]$lt_prog_cc_shlib[ 	]" >/dev/null; then :
+-  else
 -    { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
 -echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
-+$as_echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
-     lt_cv_prog_cc_can_build_shared=no
-   fi
- fi
-@@ -5514,10 +6825,10 @@
- #
- # Check to make sure the static flag actually works.
- #
+-    lt_cv_prog_cc_can_build_shared=no
+-  fi
+-fi
+-
+ 
+-#
+-# Check to make sure the static flag actually works.
+-#
 -echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
 -echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
-+$as_echo_n "checking if $compiler static flag $lt_prog_compiler_static works... " >&6; }
- if test "${lt_prog_compiler_static_works+set}" = set; then
+-if test "${lt_prog_compiler_static_works+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_prog_compiler_static_works=no
-    save_LDFLAGS="$LDFLAGS"
-@@ -5537,8 +6848,8 @@
-    LDFLAGS="$save_LDFLAGS"
+-else
+-  lt_prog_compiler_static_works=no
+-   save_LDFLAGS="$LDFLAGS"
+-   LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+-     # The compiler 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
+-     else
+-       lt_prog_compiler_static_works=yes
+-     fi
+-   fi
+-   $rm conftest*
+-   LDFLAGS="$save_LDFLAGS"
  
- fi
+-fi
 -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
 -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
-+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-+$as_echo "$lt_prog_compiler_static_works" >&6; }
  
- if test x"$lt_prog_compiler_static_works" = xyes; then
-     :
-@@ -5554,10 +6865,10 @@
- if test "$GCC" = yes; then
-   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+-if test x"$lt_prog_compiler_static_works" = xyes; then
+-    :
++  # 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
+-    lt_prog_compiler_static=
++  enable_static=yes
+ fi
+ 
+ 
+ 
+ 
+-lt_prog_compiler_no_builtin_flag=
+ 
+-if test "$GCC" = yes; then
+-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
 -  echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
-+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
- if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-@@ -5572,11 +6883,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
+-else
+-  lt_cv_prog_compiler_rtti_exceptions=no
+-  ac_outfile=conftest.$ac_objext
+-   printf "$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}? :&$lt_compiler_flag :; t' \
+-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:5575: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:6886: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
+-   (eval "$lt_compile" 2>conftest.err)
+-   ac_status=$?
+-   cat conftest.err >&5
 -   echo "$as_me:5579: \$? = $ac_status" >&5
-+   echo "$as_me:6890: \$? = $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
-@@ -5587,8 +6898,8 @@
-    $rm conftest*
+-   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
+-     if test ! -s conftest.err; then
+-       lt_cv_prog_compiler_rtti_exceptions=yes
+-     fi
+-   fi
+-   $rm conftest*
  
- fi
+-fi
 -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
-+{ $as_echo "$as_me:$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"
-@@ -5602,8 +6913,8 @@
- lt_prog_compiler_pic=
- lt_prog_compiler_static=
+-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"
++
++
++# Check whether --with-pic was given.
++if test "${with_pic+set}" = set; then
++  withval=$with_pic; pic_mode="$withval"
+ else
+-    :
++  pic_mode=default
+ fi
+ 
+-fi
+ 
+-lt_prog_compiler_wl=
+-lt_prog_compiler_pic=
+-lt_prog_compiler_static=
++test -z "$pic_mode" && pic_mode=default
  
 -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  
-   if test "$GCC" = yes; then
-     lt_prog_compiler_wl='-Wl,'
-@@ -5779,17 +7090,17 @@
-     esac
-   fi
+-  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*)
+-      # 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'
+-      ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+-      # PIC is the default for these OSes.
+-      ;;
+ 
+-    mingw* | pw32* | os2*)
+-      # 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'
+-      ;;
+ 
+-    darwin* | rhapsody*)
+-      # PIC is the default on this platform
+-      # Common symbols not allowed in MH_DYLIB files
+-      lt_prog_compiler_pic='-fno-common'
++  # 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
+ 
+-    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
+-      ;;
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	lt_prog_compiler_pic=-Kconform_pic
+-      fi
+-      ;;
+ 
+-    hpux*)
+-      # 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='-fPIC'
+-	;;
+-      esac
+-      ;;
+ 
+-    *)
+-      lt_prog_compiler_pic='-fPIC'
+-      ;;
+-    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* | pw32* | os2*)
+-      # 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'
+-      ;;
+ 
+-    newsos6)
+-      lt_prog_compiler_pic='-KPIC'
+-      lt_prog_compiler_static='-Bstatic'
+-      ;;
+ 
+-    linux*)
+-      case $CC in
+-      icc|ecc)
+-	lt_prog_compiler_wl='-Wl,'
+-	lt_prog_compiler_pic='-KPIC'
+-	lt_prog_compiler_static='-static'
+-        ;;
+-      ccc)
+-        lt_prog_compiler_wl='-Wl,'
+-        # All Alpha code is PIC.
+-        lt_prog_compiler_static='-non_shared'
+-        ;;
+-      esac
+-      ;;
+ 
+-    osf3* | osf4* | osf5*)
+-      lt_prog_compiler_wl='-Wl,'
+-      # All OSF/1 code is PIC.
+-      lt_prog_compiler_static='-non_shared'
+-      ;;
+ 
+-    sco3.2v5*)
+-      lt_prog_compiler_pic='-Kpic'
+-      lt_prog_compiler_static='-dn'
+-      ;;
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ltmain"
+ 
+-    solaris*)
+-      lt_prog_compiler_wl='-Wl,'
+-      lt_prog_compiler_pic='-KPIC'
+-      lt_prog_compiler_static='-Bstatic'
+-      ;;
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+-    sunos4*)
+-      lt_prog_compiler_wl='-Qoption ld '
+-      lt_prog_compiler_pic='-PIC'
+-      lt_prog_compiler_static='-Bstatic'
+-      ;;
+ 
+-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-      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
+-      ;;
+ 
+-    uts4*)
+-      lt_prog_compiler_pic='-pic'
+-      lt_prog_compiler_static='-Bstatic'
+-      ;;
+ 
+-    *)
+-      lt_prog_compiler_can_build_shared=no
+-      ;;
+-    esac
+-  fi
  
 -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
 -echo "${ECHO_T}$lt_prog_compiler_pic" >&6
-+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-+$as_echo "$lt_prog_compiler_pic" >&6; }
  
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic"; then
+-#
+-# Check to make sure the PIC flag actually works.
+-#
+-if test -n "$lt_prog_compiler_pic"; then
 -  echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
-+  { $as_echo "$as_me:$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 test "${lt_prog_compiler_pic_works+set}" = set; then
+-if test "${lt_prog_compiler_pic_works+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_prog_compiler_pic_works=no
-   ac_outfile=conftest.$ac_objext
-@@ -5804,11 +7115,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
+-else
+-  lt_prog_compiler_pic_works=no
+-  ac_outfile=conftest.$ac_objext
+-   printf "$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}? :&$lt_compiler_flag :; t' \
+-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:5807: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7118: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
+-   (eval "$lt_compile" 2>conftest.err)
+-   ac_status=$?
+-   cat conftest.err >&5
 -   echo "$as_me:5811: \$? = $ac_status" >&5
-+   echo "$as_me:7122: \$? = $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
-@@ -5819,8 +7130,8 @@
-    $rm conftest*
+-   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
+-     if test ! -s conftest.err; then
+-       lt_prog_compiler_pic_works=yes
+-     fi
+-   fi
+-   $rm conftest*
  
- fi
+-fi
 -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
 -echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
-+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-+$as_echo "$lt_prog_compiler_pic_works" >&6; }
  
- if test x"$lt_prog_compiler_pic_works" = xyes; then
-     case $lt_prog_compiler_pic in
-@@ -5843,10 +7154,10 @@
-     ;;
- esac
+-if test x"$lt_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
+-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
  
 -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-+{ $as_echo "$as_me:$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 test "${lt_cv_prog_compiler_c_o+set}" = set; then
+-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o=no
-    $rm -r conftest 2>/dev/null
-@@ -5871,11 +7182,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
+-else
+-  lt_cv_prog_compiler_c_o=no
+-   $rm -r conftest 2>/dev/null
+-   mkdir conftest
+-   cd conftest
+-   mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+ 
+-   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}? :&$lt_compiler_flag :; t' \
+-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:5874: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7185: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
+-   (eval "$lt_compile" 2>out/conftest.err)
+-   ac_status=$?
+-   cat out/conftest.err >&5
 -   echo "$as_me:5878: \$? = $ac_status" >&5
-+   echo "$as_me:7189: \$? = $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
-@@ -5892,34 +7203,34 @@
-    $rm conftest*
+-   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
+-     if test ! -s out/conftest.err; then
+-       lt_cv_prog_compiler_c_o=yes
+-     fi
+-   fi
+-   chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
+-   cd ..
+-   rmdir conftest
+-   $rm conftest*
  
- fi
+-fi
 -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
-+{ $as_echo "$as_me:$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
+-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
 -  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-+  { $as_echo "$as_me:$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
+-  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
 -  echo "$as_me:$LINENO: result: $hard_links" >&5
 -echo "${ECHO_T}$hard_links" >&6
-+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-+$as_echo "$hard_links" >&6; }
-   if test "$hard_links" = no; then
+-  if test "$hard_links" = no; then
 -    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+    { $as_echo "$as_me:$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
+-    need_locks=warn
+-  fi
+-else
+-  need_locks=no
+-fi
  
 -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+{ $as_echo "$as_me:$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=
-@@ -6211,15 +7522,12 @@
- 	allow_undefined_flag='-berok'
-        # Determine the default libpath from the value encoded in an empty executable.
-        cat >conftest.$ac_ext <<_ACEOF
+-  runpath_var=
+-  allow_undefined_flag=
+-  enable_shared_with_static_runtimes=no
+-  archive_cmds=
+-  archive_expsym_cmds=
+-  old_archive_From_new_cmds=
+-  old_archive_from_expsyms_cmds=
+-  export_dynamic_flag_spec=
+-  whole_archive_flag_spec=
+-  thread_safe_flag_spec=
+-  hardcode_libdir_flag_spec=
+-  hardcode_libdir_flag_spec_ld=
+-  hardcode_libdir_separator=
+-  hardcode_direct=no
+-  hardcode_minus_L=no
+-  hardcode_shlibpath_var=unsupported
+-  link_all_deplibs=unknown
+-  hardcode_automatic=no
+-  module_cmds=
+-  module_expsym_cmds=
+-  always_export_symbols=no
+-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  # 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_"
+-  # 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.
+-  extract_expsyms_cmds=
+ 
+-  case $host_os in
+-  cygwin* | mingw* | pw32*)
+-    # 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
+-    ;;
+-  openbsd*)
+-    with_gnu_ld=no
+-    ;;
+-  esac
+ 
+-  ld_shlibs=yes
+-  if test "$with_gnu_ld" = yes; then
+-    # If archive_cmds runs LD, not CC, wlarc should be empty
+-    wlarc='${wl}'
+ 
+-    # See if GNU ld supports shared libraries.
+-    case $host_os in
+-    aix3* | aix4* | aix5*)
+-      # On AIX/PPC, the GNU linker is very broken
+-      if test "$host_cpu" != ia64; then
+-	ld_shlibs=no
+-	cat <<EOF 1>&2
+ 
+-*** Warning: the GNU linker, at least up to release 2.9.1, 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 modify your PATH
+-*** so that a non-GNU linker is found, and then restart.
+ 
+-EOF
+-      fi
+-      ;;
+ 
+-    amigaos*)
+-      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
+ 
+-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+-      # that the semantics of dynamic libraries on AmigaOS, at least up
+-      # to version 4, is to share data among multiple programs linked
+-      # with the same dynamic library.  Since this doesn't match the
+-      # behavior of shared libraries on other platforms, we can't use
+-      # them.
+-      ld_shlibs=no
+-      ;;
++test -z "$LN_S" && LN_S="ln -s"
+ 
+-    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*)
+-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+-      # as there is no search path for DLLs.
+-      hardcode_libdir_flag_spec='-L$libdir'
+-      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 '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+ 
+-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$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}--image-base=0x10000000  ${wl}--out-implib,$lib'
+-      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 $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'
+-      fi
+-      ;;
+ 
+-    solaris* | sysv5*)
+-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+-	ld_shlibs=no
+-	cat <<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.
+ 
+-EOF
+-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	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
+-      ;;
+ 
+-    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 $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
+ 
+-    if test "$ld_shlibs" = yes; then
+-      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
+-    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 "$link_static_flag"; then
+-	# Neither direct hardcoding nor static linking is supported with a
+-	# broken collect2.
+-	hardcode_direct=unsupported
+-      fi
+-      ;;
+ 
+-    aix4* | aix5*)
+-      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
+-	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")) && (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].*|aix5*)
+-	  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.
++if test -n "${ZSH_VERSION+set}" ; then
++   setopt NO_GLOB_SUBST
++fi
+ 
+-      archive_cmds=''
+-      hardcode_direct=yes
+-      hardcode_libdir_separator=':'
+-      link_all_deplibs=yes
++{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
++$as_echo_n "checking for objdir... " >&6; }
++if test "${lt_cv_objdir+set}" = set; 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:$LINENO: result: $lt_cv_objdir" >&5
++$as_echo "$lt_cv_objdir" >&6; }
++objdir=$lt_cv_objdir
+ 
+-      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
+-  	  hardcode_direct=yes
+-	  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'
+-      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
+ 
+-      # 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.
+-       cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
@@ -7214,13 +10371,18 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
- int
- main ()
- {
-@@ -6229,17 +7537,26 @@
- }
+-int
+-main ()
+-{
+ 
+-  ;
+-  return 0;
+-}
++
++cat >>confdefs.h <<_ACEOF
++#define LT_OBJDIR "$lt_cv_objdir/"
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
@@ -7229,61 +10391,34 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
  
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
- }'`
-@@ -6247,10 +7564,15 @@
- if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
- }'`; fi
- else
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
+-else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
- fi
+-fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -6263,15 +7585,12 @@
- 	else
- 	 # Determine the default libpath from the value encoded in an empty executable.
- 	 cat >conftest.$ac_ext <<_ACEOF
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+-       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${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 $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+-	else
+-	 # Determine the default libpath from the value encoded in an empty executable.
+-	 cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
@@ -7291,13 +10426,15 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
- int
- main ()
- {
-@@ -6281,17 +7600,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-int
+-main ()
+-{
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
@@ -7306,229 +10443,1649 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
  
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
- }'`
-@@ -6299,10 +7627,15 @@
- if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
- }'`; fi
- else
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
+-else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
- fi
+-fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; 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'
+-	  # -bexpall does not export symbols beginning with underscore (_)
+-	  always_export_symbols=yes
+-	  # Exported symbols can be pulled into shared objects from archives
+-	  whole_archive_flag_spec=' '
+-	  archive_cmds_need_lc=yes
+-	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-	fi
+-      fi
+-      ;;
+ 
+-    amigaos*)
+-      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
+-      # see comment about different semantics on the GNU ld section
+-      ld_shlibs=no
+-      ;;
+ 
+-    bsdi4*)
+-      export_dynamic_flag_spec=-rdynamic
+-      ;;
+ 
+-    cygwin* | mingw* | pw32*)
+-      # 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.
+-      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=".dll"
+-      # FIXME: Setting linknames here is a bad hack.
+-      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''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'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
+-      enable_shared_with_static_runtimes=yes
+-      ;;
+ 
+-    darwin* | rhapsody*)
+-    if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+-      archive_cmds_need_lc=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[012])
+-	allow_undefined_flag='-undefined suppress'
+-	;;
+-      *) # Darwin 1.3 on
+-	test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress'
+-	;;
+-      esac
+-      # FIXME: Relying on posixy $() will cause problems for
+-      #        cross-compilation, but unfortunately the echo tests do not
+-      #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+-      #	       `"' quotes if we put them in here... so don't!
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-    	else
+-        archive_cmds='$CC -r ${wl}-bind_at_load -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'
+-      fi
+-      module_cmds='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        else
+-          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -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~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        fi
+-          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      hardcode_direct=no
+-      hardcode_automatic=yes
+-      hardcode_shlibpath_var=unsupported
+-      whole_archive_flag_spec='-all_load $convenience'
+-      link_all_deplibs=yes
+-    fi
+-      ;;
+ 
+-    dgux*)
+-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_libdir_flag_spec='-L$libdir'
+-      hardcode_shlibpath_var=no
+-      ;;
+ 
+-    freebsd1*)
+-      ld_shlibs=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*)
+-      archive_cmds='$CC -shared -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 -fPIC ${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'
+-      ;;
++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
+ 
+-    hpux10* | hpux11*)
+-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	*)
+-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	esac
+-      else
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  ;;
+-	*)
+-	  archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+-	  ;;
+-	esac
+-      fi
+-      if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*)
+-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+-	  hardcode_libdir_flag_spec_ld='+b $libdir'
+-	  hardcode_libdir_separator=:
+-	  hardcode_direct=no
+-	  hardcode_shlibpath_var=no
+-	  ;;
+-	ia64*)
+-	  hardcode_libdir_flag_spec='-L$libdir'
+-	  hardcode_direct=no
+-	  hardcode_shlibpath_var=no
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+ 
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  hardcode_minus_L=yes
+-	  ;;
+-	*)
+-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+-	  hardcode_libdir_separator=:
+-	  hardcode_direct=yes
+-	  export_dynamic_flag_spec='${wl}-E'
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\(["`\\]\)/\\\1/g'
+ 
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  hardcode_minus_L=yes
+-	  ;;
+-	esac
+-      fi
+-      ;;
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+ 
+-    irix5* | irix6* | nonstopux*)
+-      if test "$GCC" = yes; then
+-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      else
+-	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	hardcode_libdir_flag_spec_ld='-rpath $libdir'
+-      fi
+-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator=:
+-      link_all_deplibs=yes
+-      ;;
++# Sed substitution to delay expansion of an escaped single quote.
++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+ 
+-    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
+-      ;;
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
+ 
+-    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
+-      ;;
++# Global variables:
++ofile=libtool
++can_build_shared=yes
+ 
+-    openbsd*)
+-      hardcode_direct=yes
+-      hardcode_shlibpath_var=no
+-      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'
+-	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
+-      ;;
++# All known linkers require a `.a' archive for static linking (except MSVC,
++# which needs '.lib').
++libext=a
+ 
+-    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'
+-      ;;
++with_gnu_ld="$lt_cv_prog_gnu_ld"
+ 
+-    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" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      else
+-	allow_undefined_flag=' -expect_unresolved \*'
+-	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-      fi
+-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator=:
+-      ;;
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
+ 
+-    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} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${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='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -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; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++# 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
+ 
+-	# Both c and cxx compiler support -rpath directly
+-	hardcode_libdir_flag_spec='-rpath $libdir'
+-      fi
+-      hardcode_libdir_separator=:
+-      ;;
++for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ 
+-    sco3.2v5*)
+-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_shlibpath_var=no
+-      export_dynamic_flag_spec='${wl}-Bexport'
+-      runpath_var=LD_RUN_PATH
+-      hardcode_runpath_var=yes
+-      ;;
+ 
+-    solaris*)
+-      no_undefined_flag=' -z text'
+-      if test "$GCC" = yes; then
+-	archive_cmds='$CC -shared ${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 ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+-      else
+-	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'
+-      fi
+-      hardcode_libdir_flag_spec='-R$libdir'
+-      hardcode_shlibpath_var=no
+-      case $host_os in
+-      solaris2.[0-5] | solaris2.[0-5].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+-      esac
+-      link_all_deplibs=yes
+-      ;;
++# 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:$LINENO: checking for ${ac_tool_prefix}file" >&5
++$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; 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
+ 
+-    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'
++*** 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
+-      hardcode_libdir_flag_spec='-L$libdir'
+-      hardcode_direct=yes
+-      hardcode_minus_L=yes
+-      hardcode_shlibpath_var=no
+-      ;;
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  ;;
++esac
++fi
+ 
+-    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
+-      ;;
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++$as_echo "$MAGIC_CMD" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
+-    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.2uw2*)
+-      archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct=yes
+-      hardcode_minus_L=no
+-      hardcode_shlibpath_var=no
+-      hardcode_runpath_var=yes
+-      runpath_var=LD_RUN_PATH
+-      ;;
+ 
+-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+-      no_undefined_flag='${wl}-z ${wl}text'
+-      if test "$GCC" = yes; then
+-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    { $as_echo "$as_me:$LINENO: checking for file" >&5
++$as_echo_n "checking for file... " >&6; }
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; 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
+-      runpath_var='LD_RUN_PATH'
+-      hardcode_shlibpath_var=no
+-      ;;
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  ;;
++esac
++fi
  
- 	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -6714,8 +8047,8 @@
-     esac
+-    sysv5*)
+-      no_undefined_flag=' -z text'
+-      # $CC -shared without GNU ld will not create a library from C++
+-      # object files and a static libstdc++, better avoid it by now
+-      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'
+-      hardcode_libdir_flag_spec=
+-      hardcode_shlibpath_var=no
+-      runpath_var='LD_RUN_PATH'
+-      ;;
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++$as_echo "$MAGIC_CMD" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++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
++  else
++    MAGIC_CMD=:
    fi
++fi
  
 -echo "$as_me:$LINENO: result: $ld_shlibs" >&5
 -echo "${ECHO_T}$ld_shlibs" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-+$as_echo "$ld_shlibs" >&6; }
- test "$ld_shlibs" = no && can_build_shared=no
+-test "$ld_shlibs" = no && can_build_shared=no
++  fi
++  ;;
++esac
+ 
+-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
++# Use C for the default configuration in the libtool script
+ 
+-#
+-# 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
++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
  
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -6740,15 +8073,15 @@
-       # 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.
+-  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.
 -      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-       $rm conftest*
-       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-      $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
+-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } 2>conftest.err; then
-         soname=conftest
-         lib=conftest
-@@ -6765,7 +8098,7 @@
-         if { (eval echo "$as_me:$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=$?
+-  (exit $ac_status); } 2>conftest.err; then
+-        soname=conftest
+-        lib=conftest
+-        libobjs=conftest.$ac_objext
+-        deplibs=
+-        wl=$lt_prog_compiler_wl
+-        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:$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=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-         then
- 	  archive_cmds_need_lc=no
-@@ -6777,16 +8110,16 @@
-         cat conftest.err 1>&5
-       fi
-       $rm conftest*
+-  (exit $ac_status); }
+-        then
+-	  archive_cmds_need_lc=no
+-        else
+-	  archive_cmds_need_lc=yes
+-        fi
+-        allow_undefined_flag=$lt_save_allow_undefined_flag
+-      else
+-        cat conftest.err 1>&5
+-      fi
+-      $rm conftest*
 -      echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
 -echo "${ECHO_T}$archive_cmds_need_lc" >&6
-+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-+$as_echo "$archive_cmds_need_lc" >&6; }
-       ;;
-     esac
-   fi
-   ;;
- esac
+-      ;;
+-    esac
+-  fi
+-  ;;
+-esac
++# Source file extension for C test sources.
++ac_ext=c
  
 -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-+{ $as_echo "$as_me:$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 " || \
-@@ -6810,8 +8143,8 @@
-   # directories.
-   hardcode_action=unsupported
- fi
+-hardcode_action=
+-if test -n "$hardcode_libdir_flag_spec" || \
+-   test -n "$runpath_var " || \
+-   test "X$hardcode_automatic"="Xyes" ; then
++# Object file extension for compiled C test sources.
++objext=o
++objext=$objext
+ 
+-  # We can hardcode non-existant 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_AC_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
 -echo "$as_me:$LINENO: result: $hardcode_action" >&5
 -echo "${ECHO_T}$hardcode_action" >&6
-+{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
-+$as_echo "$hardcode_action" >&6; }
- 
- if test "$hardcode_action" = relink; then
-   # Fast installation is not supported
-@@ -6824,35 +8157,35 @@
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+-if test "$hardcode_action" = relink; 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
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(){return(0);}'
  
- striplib=
- old_striplib=
+-striplib=
+-old_striplib=
 -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-+{ $as_echo "$as_me:$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"
+-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"
 -  echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
++
++
++
++
++
++
++# 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*
++
++
++if test -n "$compiler"; then
++
++lt_prog_compiler_no_builtin_flag=
++
++if test "$GCC" = yes; then
++  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
++
++  { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
++  $as_echo_n "(cached) " >&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"
+-# 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"
 -         echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
-+         { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-        else
+-       else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-        ;;
-    *)
+-fi
+-       ;;
+-   *)
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-     ;;
-   esac
+-    ;;
+-  esac
++  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:7302: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:7306: \$? = $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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/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:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
  
 -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+$as_echo_n "checking dynamic linker characteristics... " >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -7362,8 +8695,8 @@
-   dynamic_linker=no
-   ;;
- esac
+-library_names_spec=
+-libname_spec='lib$name'
+-soname_spec=
+-shrext=".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"
+-if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+-    # 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.
+-    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
++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
+-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++    :
+ fi
+-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
++fi
+ 
+-case $host_os in
+-aix3*)
+-  version_type=linux
+-  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'
+-  ;;
+ 
+-aix4* | aix5*)
+-  version_type=linux
+-  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*)
+-  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=`$echo "X$lib" | $Xsed -e '\''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'
+-  ;;
+ 
+-beos*)
+-  library_names_spec='${libname}${shared_ext}'
+-  dynamic_linker="$host_os ld.so"
+-  shlibpath_var=LIBRARY_PATH
+-  ;;
+ 
+-bsdi4*)
+-  version_type=linux
+-  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
+-  ;;
++  lt_prog_compiler_wl=
++lt_prog_compiler_pic=
++lt_prog_compiler_static=
+ 
+-cygwin* | mingw* | pw32*)
+-  version_type=windows
+-  shrext=".dll"
+-  need_version=no
+-  need_lib_prefix=no
++{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+ 
+-  case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32*)
+-    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'
+-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+-      dlpath=$dir/\$dldll~
+-       $rm \$dlpath'
+-    shlibpath_overrides_runpath=yes
++  if test "$GCC" = yes; then
++    lt_prog_compiler_wl='-Wl,'
++    lt_prog_compiler_static='-static'
+ 
+     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="/lib /lib/w32api /usr/lib /usr/local/lib"
+-      ;;
+-    mingw*)
+-      # MinGW DLLs use traditional 'lib' prefix
+-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+-        # It is most probably a Windows format PATH printed by
+-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+-        # path with ; separators, and with drive letters. We can handle the
+-        # drive letters (cygwin fileutils understands them), so leave them,
+-        # especially as we might pass files found there to a mingw objdump,
+-        # which wouldn't understand a cygwinified path. Ahh.
+-        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"`
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static='-Bstatic'
+       fi
+       ;;
+-    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}'
++
++    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
+       ;;
+-    esac
+-    ;;
+ 
+-  *)
+-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+-    ;;
+-  esac
+-  dynamic_linker='Win32 ld.exe'
+-  # FIXME: first we should search . and the directory the executable is in
+-  shlibpath_var=PATH
+-  ;;
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
+ 
+-darwin* | rhapsody*)
+-  dynamic_linker="$host_os dyld"
+-  version_type=darwin
+-  need_lib_prefix=no
+-  need_version=no
+-  # FIXME: Relying on posixy $() will cause problems for
+-  #        cross-compilation, but unfortunately the echo tests do not
+-  #        yet detect zsh echo's removal of \ escapes.
+-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${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='$(test .$module = .yes && echo .so || echo .dylib)'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  fi
+-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+-  ;;
++    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'
++      ;;
+ 
+-dgux*)
+-  version_type=linux
+-  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
+-  ;;
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic='-fno-common'
++      ;;
+ 
+-freebsd1*)
+-  dynamic_linker=no
+-  ;;
++    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
++      ;;
+ 
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+-  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
++    interix[3-9]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
+       ;;
+-    freebsd-*)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+-      need_version=yes
++
++    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
+       ;;
+-  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
+-    ;;
+-  *) # from 3.2 on
+-    shlibpath_overrides_runpath=no
+-    hardcode_into_libs=yes
+-    ;;
+-  esac
+-  ;;
+ 
+-gnu*)
+-  version_type=linux
+-  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
+-  hardcode_into_libs=yes
+-  ;;
++    *nto* | *qnx*)
++      # QNX uses GNU C++, but need to define -shared option too, otherwise
++      # it will coredump.
++      lt_prog_compiler_pic='-fPIC -shared'
++      ;;
+ 
+-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='.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='.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='.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'
+-  ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic=-Kconform_pic
++      fi
++      ;;
+ 
+-irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-    nonstopux*) version_type=nonstopux ;;
+     *)
+-	if test "$lt_cv_prog_gnu_ld" = yes; then
+-		version_type=linux
+-	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;;
++      lt_prog_compiler_pic='-fPIC'
++      ;;
+     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 Linux ELF.
+-linux*)
+-  version_type=linux
+-  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
+-  # 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
+-
+-  # 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}${release}${shared_ext} ${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
+-  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
+-  ;;
++    # 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
++      ;;
+ 
+-nto-qnx)
+-  version_type=linux
+-  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
+-  ;;
++    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'
++      ;;
+ 
+-openbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  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
++    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
+ 	;;
+       *)
+-	shlibpath_overrides_runpath=yes
++	lt_prog_compiler_pic='+Z'
+ 	;;
+       esac
+-  else
+-    shlibpath_overrides_runpath=yes
+-  fi
+-  ;;
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      lt_prog_compiler_static='${wl}-a ${wl}archive'
++      ;;
+ 
+-os2*)
+-  libname_spec='$name'
+-  shrext=".dll"
+-  need_lib_prefix=no
+-  library_names_spec='$libname${shared_ext} $libname.a'
+-  dynamic_linker='OS/2 ld.exe'
+-  shlibpath_var=LIBPATH
+-  ;;
++    irix5* | irix6* | nonstopux*)
++      lt_prog_compiler_wl='-Wl,'
++      # PIC (with -KPIC) is the default.
++      lt_prog_compiler_static='-non_shared'
++      ;;
+ 
+-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"
+-  ;;
++    linux* | k*bsd*-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'
++	;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # 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*)
++	# IBM XL C 8.0/Fortran 10.1 on PPC
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-qpic'
++	lt_prog_compiler_static='-qstaticlink'
++	;;
++      *)
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  lt_prog_compiler_pic='-KPIC'
++	  lt_prog_compiler_static='-Bstatic'
++	  lt_prog_compiler_wl='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # 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=''
++	  ;;
++	esac
++	;;
++      esac
++      ;;
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  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
+-  ;;
++    newsos6)
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
+ 
+-solaris*)
+-  version_type=linux
+-  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'
+-  ;;
++    *nto* | *qnx*)
++      # QNX uses GNU C++, but need to define -shared option too, otherwise
++      # it will coredump.
++      lt_prog_compiler_pic='-fPIC -shared'
++      ;;
+ 
+-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
+-  ;;
++    osf3* | osf4* | osf5*)
++      lt_prog_compiler_wl='-Wl,'
++      # All OSF/1 code is PIC.
++      lt_prog_compiler_static='-non_shared'
++      ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-  version_type=linux
+-  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
+-      export_dynamic_flag_spec='${wl}-Blargedynsym'
+-      runpath_var=LD_RUN_PATH
++    rdos*)
++      lt_prog_compiler_static='-non_shared'
+       ;;
+-    siemens)
+-      need_lib_prefix=no
++
++    solaris*)
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	lt_prog_compiler_wl='-Qoption ld ';;
++      *)
++	lt_prog_compiler_wl='-Wl,';;
++      esac
+       ;;
+-    motorola)
+-      need_lib_prefix=no
+-      need_version=no
+-      shlibpath_overrides_runpath=no
+-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++
++    sunos4*)
++      lt_prog_compiler_wl='-Qoption ld '
++      lt_prog_compiler_pic='-PIC'
++      lt_prog_compiler_static='-Bstatic'
+       ;;
+-  esac
+-  ;;
+ 
+-sysv4*MP*)
+-  if test -d /usr/nec ;then
+-    version_type=linux
+-    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
+-  ;;
++    sysv4 | sysv4.2uw2* | sysv4.3*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
+ 
+-uts4*)
+-  version_type=linux
+-  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
+-  ;;
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_prog_compiler_pic='-Kconform_pic'
++	lt_prog_compiler_static='-Bstatic'
++      fi
++      ;;
+ 
+-*)
+-  dynamic_linker=no
+-  ;;
+-esac
 -echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 -echo "${ECHO_T}$dynamic_linker" >&6
-+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+$as_echo "$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
+-test "$dynamic_linker" = no && can_build_shared=no
++    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
  
- if test "x$enable_dlopen" != xyes; then
-@@ -7393,61 +8726,71 @@
+-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=
++    unicos*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_can_build_shared=no
++      ;;
  
-   darwin*)
-   # if libdl is installed we need to link against it
+-  case $host_os in
+-  beos*)
+-    lt_cv_dlopen="load_add_on"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
++    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:$LINENO: result: $lt_prog_compiler_pic" >&5
++$as_echo "$lt_prog_compiler_pic" >&6; }
+ 
+-  mingw* | pw32*)
+-    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
 -    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+$as_echo_n "checking for dlopen in -ldl... " >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
 -/* We use char because int might match the return type of a gcc2
-+/* 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.  */
+-   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -#ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
- #  endif
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
-+char dlopen ();
- int
- main ()
- {
+-int
+-main ()
+-{
 -dlopen ();
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
@@ -7537,128 +12094,128 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_dl_dlopen=yes
+-  ac_cv_lib_dl_dlopen=yes
++
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic"; then
++  { $as_echo "$as_me:$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 test "${lt_cv_prog_compiler_pic_works+set}" = set; 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:7641: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:7645: \$? = $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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/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:$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
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dl_dlopen=no
+-ac_cv_lib_dl_dlopen=no
++    lt_prog_compiler_pic=
++     lt_prog_compiler_can_build_shared=no
  fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
 +
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
-@@ -7461,369 +8804,451 @@
-    ;;
+-if test $ac_cv_lib_dl_dlopen = yes; 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
+ 
+-   ;;
+ 
+-  *)
 -    echo "$as_me:$LINENO: checking for shl_load" >&5
 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-+    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
-+$as_echo_n "checking for shl_load... " >&6; }
- if test "${ac_cv_func_shl_load+set}" = set; then
+-if test "${ac_cv_func_shl_load+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define shl_load innocuous_shl_load
-+
- /* System header to define __stub macros and hopefully few prototypes,
+-/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char shl_load (); below.  */
-+    which can conflict with char shl_load (); 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>
+-#include <assert.h>
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
- #endif
+-#endif
 -/* We use char because int might match the return type of a gcc2
 -   builtin and then its argument prototype would still apply.  */
 -char shl_load ();
 -char (*f) ();
  
 -#ifdef F77_DUMMY_MAIN
-+#undef shl_load
-+
-+/* 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
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
 -int
 -main ()
 -{
-+char shl_load ();
- /* 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.  */
+-/* 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_shl_load) || defined (__stub___shl_load)
-+#if defined __stub_shl_load || defined __stub___shl_load
- choke me
+-choke me
 -#else
 -f = shl_load;
- #endif
+-#endif
  
-+int
-+main ()
-+{
-+return shl_load ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
@@ -7667,95 +12224,87 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_func_shl_load=yes
+-  ac_cv_func_shl_load=yes
++#
++# 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:$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 test "${lt_cv_prog_compiler_static_works+set}" = set; then
++  $as_echo_n "(cached) " >&6
  else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_func_shl_load=no
- fi
+-ac_cv_func_shl_load=no
+-fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++  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 "X$_lt_linker_boilerplate" | $Xsed -e '/^$/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"
 +
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-+$as_echo "$ac_cv_func_shl_load" >&6; }
- if test $ac_cv_func_shl_load = yes; then
-   lt_cv_dlopen="shl_load"
- else
+-if test $ac_cv_func_shl_load = yes; then
+-  lt_cv_dlopen="shl_load"
+-else
 -  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-+  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-+$as_echo_n "checking for shl_load in -ldld... " >&6; }
- if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
++$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
 -/* We use char because int might match the return type of a gcc2
-+/* 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.  */
+-   builtin and then its argument prototype would still apply.  */
 -char shl_load ();
 -#ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
- #  endif
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
-+char shl_load ();
- int
- main ()
- {
+-int
+-main ()
+-{
 -shl_load ();
-+return shl_load ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
@@ -7764,124 +12313,69 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_dld_shl_load=yes
+-  ac_cv_lib_dld_shl_load=yes
++if test x"$lt_cv_prog_compiler_static_works" = xyes; then
++    :
  else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dld_shl_load=no
- fi
+-ac_cv_lib_dld_shl_load=no
+-fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
+-LIBS=$ac_check_lib_save_LIBS
++    lt_prog_compiler_static=
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
- if test $ac_cv_lib_dld_shl_load = yes; then
-   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
- else
+-if test $ac_cv_lib_dld_shl_load = yes; then
+-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+-else
 -  echo "$as_me:$LINENO: checking for dlopen" >&5
 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-+  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-+$as_echo_n "checking for dlopen... " >&6; }
- if test "${ac_cv_func_dlopen+set}" = set; then
+-if test "${ac_cv_func_dlopen+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define dlopen innocuous_dlopen
-+
- /* System header to define __stub macros and hopefully few prototypes,
+-/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char dlopen (); below.  */
-+    which can conflict with char dlopen (); 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>
+-#include <assert.h>
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
- #endif
+-#endif
 -/* We use char because int might match the return type of a gcc2
 -   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -char (*f) ();
  
 -#ifdef F77_DUMMY_MAIN
-+#undef dlopen
-+
-+/* 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
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
 -int
 -main ()
 -{
-+char dlopen ();
- /* 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.  */
+-/* 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_dlopen) || defined (__stub___dlopen)
-+#if defined __stub_dlopen || defined __stub___dlopen
- choke me
+-choke me
 -#else
 -f = dlopen;
- #endif
+-#endif
  
-+int
-+main ()
-+{
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
@@ -7890,95 +12384,55 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_func_dlopen=yes
- else
+-  ac_cv_func_dlopen=yes
+-else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_func_dlopen=no
- fi
+-ac_cv_func_dlopen=no
+-fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-+$as_echo "$ac_cv_func_dlopen" >&6; }
- if test $ac_cv_func_dlopen = yes; then
-   lt_cv_dlopen="dlopen"
- else
+-if test $ac_cv_func_dlopen = yes; then
+-  lt_cv_dlopen="dlopen"
+-else
 -  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+$as_echo_n "checking for dlopen in -ldl... " >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
 -/* We use char because int might match the return type of a gcc2
-+/* 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.  */
+-   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -#ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
- #  endif
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
-+char dlopen ();
- int
- main ()
- {
+-int
+-main ()
+-{
 -dlopen ();
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
@@ -7987,96 +12441,56 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_dl_dlopen=yes
- else
+-  ac_cv_lib_dl_dlopen=yes
+-else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dl_dlopen=no
- fi
+-ac_cv_lib_dl_dlopen=no
+-fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-LIBS=$ac_check_lib_save_LIBS
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
+-if test $ac_cv_lib_dl_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
 -  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-+  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
- if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsvld  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsvld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
 -/* We use char because int might match the return type of a gcc2
-+/* 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.  */
+-   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -#ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
- #  endif
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
-+char dlopen ();
- int
- main ()
- {
+-int
+-main ()
+-{
 -dlopen ();
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
@@ -8085,96 +12499,56 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_svld_dlopen=yes
- else
+-  ac_cv_lib_svld_dlopen=yes
+-else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_svld_dlopen=no
- fi
+-ac_cv_lib_svld_dlopen=no
+-fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-LIBS=$ac_check_lib_save_LIBS
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
- if test $ac_cv_lib_svld_dlopen = yes; then
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
- else
+-if test $ac_cv_lib_svld_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+-else
 -  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-+  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-+$as_echo_n "checking for dld_link in -ldld... " >&6; }
- if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
 -/* We use char because int might match the return type of a gcc2
-+/* 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.  */
+-   builtin and then its argument prototype would still apply.  */
 -char dld_link ();
 -#ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
- #  endif
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
-+char dld_link ();
- int
- main ()
- {
+-int
+-main ()
+-{
 -dld_link ();
-+return dld_link ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
@@ -8183,374 +12557,1382 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_dld_dld_link=yes
+-  ac_cv_lib_dld_dld_link=yes
++
++
++  { $as_echo "$as_me:$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 test "${lt_cv_prog_compiler_c_o+set}" = set; then
++  $as_echo_n "(cached) " >&6
  else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dld_dld_link=no
- fi
+-ac_cv_lib_dld_dld_link=no
+-fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-LIBS=$ac_check_lib_save_LIBS
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
- if test $ac_cv_lib_dld_dld_link = yes; then
-   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+-if test $ac_cv_lib_dld_dld_link = yes; then
+-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+-fi
++  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:7746: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:7750: \$? = $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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/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
-@@ -7863,10 +9288,10 @@
-     save_LIBS="$LIBS"
-     LIBS="$lt_cv_dlopen_libs $LIBS"
++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
++$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+ 
+ 
+-fi
+ 
+ 
+-fi
  
+ 
+-fi
++  { $as_echo "$as_me:$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 test "${lt_cv_prog_compiler_c_o+set}" = set; 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:7801: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:7805: \$? = $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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/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:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
++$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+ 
+-    ;;
+-  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"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+-
+-    save_LIBS="$LIBS"
+-    LIBS="$lt_cv_dlopen_libs $LIBS"
+-
 -    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-+    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
- if test "${lt_cv_dlopen_self+set}" = set; then
+-if test "${lt_cv_dlopen_self+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   	  if test "$cross_compiling" = yes; then :
-   lt_cv_dlopen_self=cross
-@@ -7874,7 +9299,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
+-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 <<EOF
 -#line 7877 "configure"
-+#line 9302 "configure"
- #include "confdefs.h"
+-#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
+-
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
  
- #if HAVE_DLFCN_H
-@@ -7938,7 +9363,7 @@
-   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-     (./conftest; exit; ) 2>/dev/null
-     lt_status=$?
-@@ -7956,15 +9381,15 @@
+-void fnord() { int i=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;
+-      /* dlclose (self); */
+-    }
  
- fi
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 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_unknown|x*) lt_cv_dlopen_self=no ;;
+-    esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self=no
++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:$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:$LINENO: result: $hard_links" >&5
++$as_echo "$hard_links" >&6; }
++  if test "$hard_links" = no; then
++    { $as_echo "$as_me:$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
+-fi
+-rm -fr conftest*
+-
+-
+-fi
 -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-+$as_echo "$lt_cv_dlopen_self" >&6; }
- 
-     if test "x$lt_cv_dlopen_self" = xyes; then
-       LDFLAGS="$LDFLAGS $link_static_flag"
+-
+-    if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
 -      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-+      { $as_echo "$as_me:$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 test "${lt_cv_dlopen_self_static+set}" = set; then
+-if test "${lt_cv_dlopen_self_static+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
+-else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self_static=cross
  else
-   	  if test "$cross_compiling" = yes; then :
-   lt_cv_dlopen_self_static=cross
-@@ -7972,7 +9397,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
 -#line 7975 "configure"
-+#line 9400 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -8036,7 +9461,7 @@
-   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
+-#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
+-
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+-void fnord() { int i=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;
+-      /* dlclose (self); */
+-    }
+-
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-     (./conftest; exit; ) 2>/dev/null
-     lt_status=$?
-@@ -8054,8 +9479,8 @@
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 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_unknown|x*) lt_cv_dlopen_self_static=no ;;
+-    esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self_static=no
+-  fi
++  need_locks=no
+ fi
+-rm -fr conftest*
  
  
- fi
+-fi
 -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-+$as_echo "$lt_cv_dlopen_self_static" >&6; }
-     fi
+-    fi
  
-     CPPFLAGS="$save_CPPFLAGS"
-@@ -8077,13 +9502,13 @@
+-    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
  
- # Report which librarie types wil actually be built
+-  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
+ 
++  { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+ 
+-# Report which librarie types wil actually be built
 -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
 -echo "$as_me:$LINENO: result: $can_build_shared" >&5
 -echo "${ECHO_T}$can_build_shared" >&6
-+{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
-+$as_echo "$can_build_shared" >&6; }
- 
+-
 -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
-+{ $as_echo "$as_me:$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
-@@ -8131,15 +9556,15 @@
+-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
+-  ;;
++  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_flag_spec_ld=
++  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=
+ 
+-aix4*)
+-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+-    test "$enable_shared" = yes && enable_static=no
+-  fi
+-  ;;
+-  darwin* | rhapsody*)
+-  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+-    archive_cmds_need_lc=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[012])
+-      allow_undefined_flag='-undefined suppress'
+-      ;;
+-    *) # Darwin 1.3 on
+-      test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress'
+-      ;;
+-    esac
+-    # FIXME: Relying on posixy $() will cause problems for
+-    #        cross-compilation, but unfortunately the echo tests do not
+-    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+-    #	       `"' quotes if we put them in here... so don't!
+-		output_verbose_link_cmd='echo'
+-    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
+-    module_cmds='$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-		  archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-		  module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    hardcode_direct=no
+-    hardcode_automatic=yes
+-    hardcode_shlibpath_var=unsupported
+-    whole_archive_flag_spec='-all_load $convenience'
+-    link_all_deplibs=yes
++  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
      ;;
- esac
+-esac
 -echo "$as_me:$LINENO: result: $enable_shared" >&5
 -echo "${ECHO_T}$enable_shared" >&6
-+{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
-+$as_echo "$enable_shared" >&6; }
- 
+-
 -echo "$as_me:$LINENO: checking whether to build static libraries" >&5
 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
-+{ $as_echo "$as_me:$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
+-# Make sure either enable_shared or enable_static is yes.
+-test "$enable_shared" = yes || enable_static=yes
 -echo "$as_me:$LINENO: result: $enable_static" >&5
 -echo "${ECHO_T}$enable_static" >&6
-+{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
-+$as_echo "$enable_static" >&6; }
- 
- # The else clause should only fire when bootstrapping the
- # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -8229,8 +9654,8 @@
- cfgfile="${ofile}T"
-   trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-   $rm -f "$cfgfile"
+-
+-# The else clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+-  # 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
+-  # Now quote all the things that may contain metacharacters while being
+-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+-  # variables and quote the copies for generation of the libtool script.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+-    deplibs_check_method reload_flag reload_cmds need_locks \
+-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+-    lt_cv_sys_global_symbol_to_c_name_address \
+-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
+-    compiler \
+-    CC \
+-    LD \
+-    lt_prog_compiler_wl \
+-    lt_prog_compiler_pic \
+-    lt_prog_compiler_static \
+-    lt_prog_compiler_no_builtin_flag \
+-    export_dynamic_flag_spec \
+-    thread_safe_flag_spec \
+-    whole_archive_flag_spec \
+-    enable_shared_with_static_runtimes \
+-    old_archive_cmds \
+-    old_archive_from_new_cmds \
+-    predep_objects \
+-    postdep_objects \
+-    predeps \
+-    postdeps \
+-    compiler_lib_search_path \
+-    archive_cmds \
+-    archive_expsym_cmds \
+-    postinstall_cmds \
+-    postuninstall_cmds \
+-    old_archive_from_expsyms_cmds \
+-    allow_undefined_flag \
+-    no_undefined_flag \
+-    export_symbols_cmds \
+-    hardcode_libdir_flag_spec \
+-    hardcode_libdir_flag_spec_ld \
+-    hardcode_libdir_separator \
+-    hardcode_automatic \
+-    module_cmds \
+-    module_expsym_cmds \
+-    lt_cv_prog_compiler_c_o \
+-    exclude_expsyms \
+-    include_expsyms; do
+-
+-    case $var in
+-    old_archive_cmds | \
+-    old_archive_from_new_cmds | \
+-    archive_cmds | \
+-    archive_expsym_cmds | \
+-    module_cmds | \
+-    module_expsym_cmds | \
+-    old_archive_from_expsyms_cmds | \
+-    export_symbols_cmds | \
+-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+-    postinstall_cmds | postuninstall_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+-      # Double-quote double-evaled strings.
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+-      ;;
+-    *)
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+-      ;;
+-    esac
+-  done
+-
+-  case $lt_echo in
+-  *'\$0 --fallback-echo"')
+-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+-    ;;
+-  esac
+-
+-cfgfile="${ofile}T"
+-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+-  $rm -f "$cfgfile"
 -  { echo "$as_me:$LINENO: creating $ofile" >&5
 -echo "$as_me: creating $ofile" >&6;}
-+  { $as_echo "$as_me:$LINENO: creating $ofile" >&5
-+$as_echo "$as_me: creating $ofile" >&6;}
- 
-   cat <<__EOF__ >> "$cfgfile"
- #! $SHELL
-@@ -8618,26 +10043,26 @@
- CC="$lt_save_CC"
- 
- 
+-
+-  cat <<__EOF__ >> "$cfgfile"
+-#! $SHELL
+-
+-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+-#
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+-# Free Software Foundation, Inc.
+-#
+-# This file is part of GNU Libtool:
+-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 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 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.
+-
+-# 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 s/^X//"
+-
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+-
+-# The names of the tagged configurations supported by this script.
+-available_tags=
+-
+-# ### BEGIN LIBTOOL CONFIG
+-
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
+-
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
+-
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
+-
+-# 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
+-
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
+-
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+-
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
+-
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
+-
+-# A C compiler.
+-LTCC=$lt_LTCC
+-
+-# A language-specific compiler.
+-CC=$lt_compiler
+-
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC
+-
+-# An ERE matcher.
+-EGREP=$lt_EGREP
+-
+-# The linker used to build libraries.
+-LD=$lt_LD
+-
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+-
+-# A BSD-compatible nm program.
+-NM=$lt_NM
+-
+-# A symbol stripping program
+-STRIP=$STRIP
+-
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
+-
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+-
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+-
+-# Used on cygwin: assembler.
+-AS="$AS"
+-
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
+-
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
+-
+-# How to pass a linker flag through the compiler.
+-wl=$lt_lt_prog_compiler_wl
+-
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
+-
+-# Old archive suffix (normally "a").
+-libext="$libext"
+-
+-# Shared library suffix (normally ".so").
+-shrext='$shrext'
+-
+-# Executable file suffix (normally "").
+-exeext="$exeext"
+-
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_lt_prog_compiler_pic
+-pic_mode=$pic_mode
+-
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
+-
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+-
+-# Must we lock files when doing compilation ?
+-need_locks=$lt_need_locks
+-
+-# 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
+-
+-# 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
+-
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_lt_prog_compiler_static
+-
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+-
+-# 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
+-
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_thread_safe_flag_spec
+-
+-# Library versioning type.
+-version_type=$version_type
+-
+-# 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
+-
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_old_archive_cmds
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+-
+-# 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 and install a shared archive.
+-archive_cmds=$lt_archive_cmds
+-archive_expsym_cmds=$lt_archive_expsym_cmds
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
+-
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_module_cmds
+-module_expsym_cmds=$lt_module_expsym_cmds
+-
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=$lt_predep_objects
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=$lt_postdep_objects
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_predeps
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-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
+-
+-# 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
+-
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag
+-
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_no_undefined_flag
+-
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
+-
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
+-
+-# 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
+-
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
+-
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
+-
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+-
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$hardcode_action
+-
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
+-
+-# 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
+-
+-# If ld is used when linking, flag to hardcode \$libdir into
+-# a binary during linking. This must work even if \$libdir does
+-# not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
+-
+-# 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 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
+-
+-# Variables whose values should be saved in libtool wrapper scripts and
+-# restored at relink time.
+-variables_saved_for_relink="$variables_saved_for_relink"
+-
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$link_all_deplibs
+-
+-# 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
+-
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path"
+-
+-# 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
+-
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_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
+-
+-# ### END LIBTOOL CONFIG
+-
+-__EOF__
+-
+-
+-  case $host_os in
+-  aix3*)
+-    cat <<\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
+-EOF
+-    ;;
+-  esac
+-
+-  # 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)
+-
+-  mv -f "$cfgfile" "$ofile" || \
+-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+-  chmod +x "$ofile"
+-
+-else
+-  # If there is no Makefile yet, we rely on a make rule to execute
+-  # `config.status --recheck' to rerun these tests and create the
+-  # libtool script then.
+-  test -f Makefile && make "$ltmain"
+-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
+-
+-CC="$lt_save_CC"
+-
+-
 -# Check whether --with-tags or --without-tags was given.
-+# Check whether --with-tags was given.
- if test "${with_tags+set}" = set; then
+-if test "${with_tags+set}" = set; then
 -  withval="$with_tags"
 -  tagnames="$withval"
 -fi;
-+  withval=$with_tags; tagnames="$withval"
-+fi
-+
- 
- if test -f "$ltmain" && test -n "$tagnames"; then
-   if test ! -f "${ofile}"; then
+-
+-if test -f "$ltmain" && test -n "$tagnames"; then
+-  if test ! -f "${ofile}"; then
 -    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
 -echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-+$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
-   fi
- 
-   if test -z "$LTCC"; then
-     eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-     if test -z "$LTCC"; then
+-  fi
+-
+-  if test -z "$LTCC"; then
+-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+-    if test -z "$LTCC"; then
 -      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
 -echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
-+      { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-+$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
-     else
+-    else
 -      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
 -echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
-+      { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-+$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
-     fi
-   fi
- 
-@@ -8651,16 +10076,16 @@
-     # Check whether tagname contains only valid characters
-     case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
-     "") ;;
+-    fi
+-  fi
+-
+-  # Extract list of available tagged configurations in $ofile.
+-  # Note that this assumes the entire list is on one line.
+-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
+-
+-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-  for tagname in $tagnames; do
+-    IFS="$lt_save_ifs"
+-    # Check whether tagname contains only valid characters
+-    case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
+-    "") ;;
 -    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
 -echo "$as_me: error: invalid tag name: $tagname" >&2;}
-+    *)  { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-+$as_echo "$as_me: error: invalid tag name: $tagname" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-     esac
- 
-     if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-     then
+-   { (exit 1); exit 1; }; }
+-	;;
+-    esac
+-
+-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+-    then
 -      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
 -echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
-+      { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-+$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
-    { (exit 1); exit 1; }; }
-     fi
- 
-@@ -8671,7 +10096,7 @@
-       case $tagname in
-       CXX)
- 	if test -n "$CXX" && test "X$CXX" != "Xno"; then
+-   { (exit 1); exit 1; }; }
+-    fi
+-
+-    # Update the list of available tags.
+-    if test -n "$tagname"; then
+-      echo appending configuration tag \"$tagname\" to $ofile
+-
+-      case $tagname in
+-      CXX)
+-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
 -	  ac_ext=cc
-+	  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'
-@@ -8763,18 +10188,18 @@
-   # Set up default GNU C++ configuration
- 
- 
+-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=
+-export_dynamic_flag_spec_CXX=
+-hardcode_direct_CXX=no
+-hardcode_libdir_flag_spec_CXX=
+-hardcode_libdir_flag_spec_ld_CXX=
+-hardcode_libdir_separator_CXX=
+-hardcode_minus_L_CXX=no
+-hardcode_automatic_CXX=no
+-module_cmds_CXX=
+-module_expsym_cmds_CXX=
+-link_all_deplibs_CXX=unknown
+-old_archive_cmds_CXX=$old_archive_cmds
+-no_undefined_flag_CXX=
+-whole_archive_flag_spec_CXX=
+-enable_shared_with_static_runtimes_CXX=no
+-
+-# 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=
+-
+-# Source file extension for C++ test sources.
+-ac_ext=cc
+-
+-# Object file extension for compiled C++ test sources.
+-objext=o
+-objext_CXX=$objext
+-
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
+-
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
+-
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
+-
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
+-
+-
+-# Allow CC to be a program name with arguments.
+-lt_save_CC=$CC
+-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
+-  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
+-  unset lt_cv_path_LD
+-fi
+-test -z "${LDCXX+set}" || LD=$LDCXX
+-CC=${CXX-"c++"}
+-compiler=$CC
+-compiler_CXX=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+-
+-# We don't want -fno-exception wen 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 or --without-gnu-ld was given.
-+# Check whether --with-gnu-ld was given.
- if test "${with_gnu_ld+set}" = set; then
+-if test "${with_gnu_ld+set}" = set; then
 -  withval="$with_gnu_ld"
 -  test "$withval" = no || with_gnu_ld=yes
-+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
- else
-   with_gnu_ld=no
+-else
+-  with_gnu_ld=no
 -fi;
-+fi
-+
- ac_prog=ld
- if test "$GCC" = yes; then
-   # Check if gcc -print-prog-name=ld gives a path.
+-ac_prog=ld
+-if test "$GCC" = yes; then
+-  # Check if gcc -print-prog-name=ld gives a path.
 -  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
-+  { $as_echo "$as_me:$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
-@@ -8803,14 +10228,14 @@
-     ;;
-   esac
- elif test "$with_gnu_ld" = yes; then
+-  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 path 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
 -  echo "$as_me:$LINENO: checking for GNU ld" >&5
 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
-+$as_echo_n "checking for GNU ld... " >&6; }
- else
+-else
 -  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+$as_echo_n "checking for non-GNU ld... " >&6; }
- fi
- if test "${lt_cv_path_LD+set}" = set; then
+-fi
+-if test "${lt_cv_path_LD+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -z "$LD"; then
-   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -8840,19 +10265,19 @@
- 
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
+-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 GNU ld's 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
 -  echo "$as_me:$LINENO: result: $LD" >&5
 -echo "${ECHO_T}$LD" >&6
-+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
-+$as_echo "$LD" >&6; }
- else
+-else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+-fi
 -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
 -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
+-if test "${lt_cv_prog_gnu_ld+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
- case `"$LD" -v 2>&1 </dev/null` in
-@@ -8864,8 +10289,8 @@
-   ;;
- esac
- fi
+-else
+-  # I'd rather use --version here, but apparently some GNU ld's 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
 -echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
- with_gnu_ld=$lt_cv_prog_gnu_ld
- 
- 
-@@ -8915,8 +10340,8 @@
- fi
- 
- # PORTME: fill in a description of your system's C++ link characteristics
+-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 -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-    archive_expsym_cmds_CXX='$CC -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 $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 "\-L"'
+-
+-else
+-  GXX=no
+-  with_gnu_ld=no
+-  wlarc=
+-fi
+-
+-# PORTME: fill in a description of your system's C++ link characteristics
 -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+{ $as_echo "$as_me:$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*)
-@@ -9008,15 +10433,12 @@
-       allow_undefined_flag_CXX='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
+-ld_shlibs_CXX=yes
+-case $host_os in
+-  aix3*)
+-    # FIXME: insert proper C++ library support
+-    ld_shlibs_CXX=no
+-    ;;
+-  aix4* | aix5*)
+-    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].*|aix5*)
+-	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_libdir_separator_CXX=':'
+-    link_all_deplibs_CXX=yes
+-
+-    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
+-	  hardcode_direct_CXX=yes
+-	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'
+-    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
+-
+-    # 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.
+-      cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
+-
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
- int
- main ()
- {
-@@ -9026,17 +10448,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
@@ -8559,75 +13941,51 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
- 
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
- }'`
-@@ -9044,10 +10475,15 @@
- if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
- }'`; fi
- else
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
+-else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
- fi
+-fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-       hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -9061,15 +10497,12 @@
-       else
- 	# Determine the default libpath from the value encoded in an empty executable.
- 	cat >conftest.$ac_ext <<_ACEOF
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+-
+-      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+-
+-      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${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 $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+-      else
+-	# Determine the default libpath from the value encoded in an empty executable.
+-	cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
+-
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
- int
- main ()
- {
-@@ -9079,17 +10512,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
@@ -8636,381 +13994,1876 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
- 
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
- }'`
-@@ -9097,10 +10539,15 @@
- if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
- }'`; fi
- else
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
+-else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
- fi
+-fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
- 	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -9712,8 +11159,8 @@
-     ld_shlibs_CXX=no
-     ;;
- esac
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; 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'
+-	# -bexpall does not export symbols beginning with underscore (_)
+-	always_export_symbols_CXX=yes
+-	# Exported symbols can be pulled into shared objects from archives
+-	whole_archive_flag_spec_CXX=' '
+-	archive_cmds_need_lc_CXX=yes
+-	# This is similar to how AIX traditionally builds it's shared libraries.
+-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-      fi
+-    fi
+-    ;;
+-  chorus*)
+-    case $cc_basename in
+-      *)
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
+-    esac
+-    ;;
+-
+-  cygwin* | mingw* | pw32*)
+-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+-    # as there is no search path for DLLs.
+-    hardcode_libdir_flag_spec_CXX='-L$libdir'
+-    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}--image-base=0x10000000 ${wl}--out-implib,$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}--image-base=0x10000000 ${wl}--out-implib,$lib'
+-    else
+-      ld_shlibs_CXX=no
+-    fi
+-  ;;
+-
+-  darwin* | rhapsody*)
+-   if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+-    archive_cmds_need_lc_CXX=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[012])
+-      allow_undefined_flag_CXX='-undefined suppress'
+-      ;;
+-    *) # Darwin 1.3 on
+-      test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
+-      ;;
+-    esac
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	  archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-    	else
+-        archive_cmds_CXX='$CC -r ${wl}-bind_at_load -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'
+-      fi
+-      module_cmds_CXX='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+-
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-        archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      else
+-        archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -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~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      fi
+-        module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    hardcode_direct_CXX=no
+-    hardcode_automatic_CXX=yes
+-    hardcode_shlibpath_var_CXX=unsupported
+-    whole_archive_flag_spec_CXX='-all_load $convenience'
+-    link_all_deplibs_CXX=yes
+-   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
+-    ;;
+-  freebsd12*)
+-    # 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*)
+-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+-    # conventions
+-    ld_shlibs_CXX=yes
+-    ;;
+-  gnu*)
+-    ;;
+-  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; echo $list'
+-      ;;
+-    *)
+-      if test "$GXX" = yes; then
+-        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${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
+-      case "$host_cpu" in
+-      hppa*64*)
+-	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+-	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
+-	hardcode_libdir_separator_CXX=:
+-        ;;
+-      ia64*)
+-	hardcode_libdir_flag_spec_CXX='-L$libdir'
+-        ;;
+-      *)
+-	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+-	hardcode_libdir_separator_CXX=:
+-	export_dynamic_flag_spec_CXX='${wl}-E'
+-        ;;
+-      esac
+-    fi
+-    case "$host_cpu" in
+-    hppa*64*)
+-      hardcode_direct_CXX=no
+-      hardcode_shlibpath_var_CXX=no
+-      ;;
+-    ia64*)
+-      hardcode_direct_CXX=no
+-      hardcode_shlibpath_var_CXX=no
+-      hardcode_minus_L_CXX=yes # Not in the search PATH,
+-					      # but as the default
+-					      # location of the library.
+-      ;;
+-    *)
+-      hardcode_direct_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*|ia64*)
+-	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+-	  ;;
+-	*)
+-	  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; echo $list'
+-	;;
+-      *)
+-	if test "$GXX" = yes; then
+-	  if test $with_gnu_ld = no; then
+-	    case "$host_cpu" in
+-	    ia64*|hppa*64*)
+-	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+-	      ;;
+-	    *)
+-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${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
+-    ;;
+-  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" && echo -set_version $verstring` -update_registry ${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 -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+-	  else
+-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${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=:
+-    ;;
+-  linux*)
+-    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; echo $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)
+-	# Intel C++
+-	with_gnu_ld=yes
+-	archive_cmds_need_lc_CXX=no
+-	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'
+-	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'
+-	;;
+-      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=`echo $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; echo $list'
+-	;;
+-    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::"'
+-    ;;
+-  osf3*)
+-    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
+-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+-	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+-
+-	;;
+-      RCC)
+-	# Rational C++ 2.4.1
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
+-      cxx)
+-	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" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+-
+-	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.
+-	#
+-	# 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=`echo $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; echo $list'
+-	;;
+-      *)
+-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+-	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+-	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+-
+-	  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 "\-L"'
+-
+-	else
+-	  # FIXME: insert proper C++ library support
+-	  ld_shlibs_CXX=no
+-	fi
+-	;;
+-    esac
+-    ;;
+-  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.
+-	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
+-	;;
+-      RCC)
+-	# Rational C++ 2.4.1
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
+-      cxx)
+-	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" && echo -set_version $verstring` -update_registry ${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 $objdir/so_locations -o $lib~
+-	  $rm $lib.exp'
+-
+-	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" | grep -v "ld:"`; templist=`echo $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; echo $list'
+-	;;
+-      *)
+-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+-	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+-	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+-
+-	  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 "\-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
+-    ;;
+-  sco*)
+-    archive_cmds_need_lc_CXX=no
+-    case $cc_basename in
+-      CC)
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
+-    esac
+-    ;;
+-  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)
+-	# Sun C++ 4.2, 5.x and Centerline C++
+-	no_undefined_flag_CXX=' -zdefs'
+-	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -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} -nolib ${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 C++ compiler is used as linker so we must use $wl
+-	    # flag to pass the commands to the underlying system
+-	    # linker.
+-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+-	    ;;
+-	esac
+-	link_all_deplibs_CXX=yes
+-
+-	# 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 -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-
+-	# 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 -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 -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 \"\-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 \"\-L\""
+-	  fi
+-
+-	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+-	fi
+-	;;
+-    esac
+-    ;;
+-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
+-    archive_cmds_need_lc_CXX=no
+-    ;;
+-  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
 -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
 -echo "${ECHO_T}$ld_shlibs_CXX" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-+$as_echo "$ld_shlibs_CXX" >&6; }
- test "$ld_shlibs_CXX" = no && can_build_shared=no
- 
- GCC_CXX="$GXX"
-@@ -9733,7 +11180,7 @@
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
+-test "$ld_shlibs_CXX" = no && can_build_shared=no
+-
+-GCC_CXX="$GXX"
+-LD_CXX="$LD"
+-
+-
+-cat > conftest.$ac_ext <<EOF
+-class Foo
+-{
+-public:
+-  Foo (void) { a = 0; }
+-private:
+-  int a;
+-};
+-EOF
+-
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   # Parse the compiler output and extract the necessary
-   # objects, libraries and library flags.
-@@ -9829,8 +11276,8 @@
- lt_prog_compiler_pic_CXX=
- lt_prog_compiler_static_CXX=
- 
+-  (exit $ac_status); }; 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
+-
+-  # The `*' in the case matches for architectures that use `case' in
+-  # $output_verbose_cmd can trigger glob expansion during the loop
+-  # eval without this substitution.
+-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
+-
+-  for p in `eval $output_verbose_link_cmd`; do
+-    case $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
+-       else
+-	 prev=
+-       fi
+-
+-       if test "$pre_test_object_deps_done" = no; then
+-	 case $p 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
+-       ;;
+-
+-    *.$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
+-
+-case " $postdeps_CXX " in
+-*" -lc "*) archive_cmds_need_lc_CXX=no ;;
+-esac
+-
+-lt_prog_compiler_wl_CXX=
+-lt_prog_compiler_pic_CXX=
+-lt_prog_compiler_static_CXX=
+-
 -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- 
-   # C++ specific cases for pic, static, wl, etc.
-   if test "$GXX" = yes; then
-@@ -10081,17 +11528,17 @@
-     esac
-   fi
- 
+-
+-  # 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*)
+-      # 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'
+-      ;;
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+-      # PIC is the default for these OSes.
+-      ;;
+-    mingw* | os2* | pw32*)
+-      # 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'
+-      ;;
+-    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=
+-      ;;
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	lt_prog_compiler_pic_CXX=-Kconform_pic
+-      fi
+-      ;;
+-    hpux*)
+-      # 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*)
+-	;;
+-      *)
+-	lt_prog_compiler_pic_CXX='-fPIC'
+-	;;
+-      esac
+-      ;;
+-    *)
+-      lt_prog_compiler_pic_CXX='-fPIC'
+-      ;;
+-    esac
+-  else
+-    case $host_os in
+-      aix4* | aix5*)
+-	# 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_AC_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
+-	;;
+-      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*)
+-	# FreeBSD uses GNU C++
+-	;;
+-      hpux9* | hpux10* | hpux11*)
+-	case $cc_basename in
+-	  CC)
+-	    lt_prog_compiler_wl_CXX='-Wl,'
+-	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_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="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+-	    case "$host_cpu" in
+-	    hppa*64*|ia64*)
+-	      # +Z the default
+-	      ;;
+-	    *)
+-	      lt_prog_compiler_pic_CXX='+Z'
+-	      ;;
+-	    esac
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      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*)
+-	case $cc_basename in
+-	  KCC)
+-	    # KAI C++ Compiler
+-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+-	    lt_prog_compiler_pic_CXX='-fPIC'
+-	    ;;
+-	  icpc)
+-	    # Intel C++
+-	    lt_prog_compiler_wl_CXX='-Wl,'
+-	    lt_prog_compiler_pic_CXX='-KPIC'
+-	    lt_prog_compiler_static_CXX='-static'
+-	    ;;
+-	  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'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      lynxos*)
+-	;;
+-      m88k*)
+-	;;
+-      mvs*)
+-	case $cc_basename in
+-	  cxx)
+-	    lt_prog_compiler_pic_CXX='-W c,exportall'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      netbsd*)
+-	;;
+-      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*)
+-	;;
+-      sco*)
+-	case $cc_basename in
+-	  CC)
+-	    lt_prog_compiler_pic_CXX='-fPIC'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      solaris*)
+-	case $cc_basename in
+-	  CC)
+-	    # 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
+-	;;
+-      tandem*)
+-	case $cc_basename in
+-	  NCC)
+-	    # NonStop-UX NCC 3.20
+-	    lt_prog_compiler_pic_CXX='-KPIC'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      unixware*)
+-	;;
+-      vxworks*)
+-	;;
+-      *)
+-	lt_prog_compiler_can_build_shared_CXX=no
+-	;;
+-    esac
+-  fi
+-
 -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
 -echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
-+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
- 
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_CXX"; then
+-
+-#
+-# Check to make sure the PIC flag actually works.
+-#
+-if test -n "$lt_prog_compiler_pic_CXX"; then
 -  echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
-+  { $as_echo "$as_me:$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 test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
+-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_prog_compiler_pic_works_CXX=no
-   ac_outfile=conftest.$ac_objext
-@@ -10106,11 +11553,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
+-else
+-  lt_prog_compiler_pic_works_CXX=no
+-  ac_outfile=conftest.$ac_objext
+-   printf "$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}? :&$lt_compiler_flag :; t' \
+-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:10109: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11556: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
+-   (eval "$lt_compile" 2>conftest.err)
+-   ac_status=$?
+-   cat conftest.err >&5
 -   echo "$as_me:10113: \$? = $ac_status" >&5
-+   echo "$as_me:11560: \$? = $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
-@@ -10121,8 +11568,8 @@
-    $rm conftest*
- 
- fi
+-   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
+-     if test ! -s conftest.err; then
+-       lt_prog_compiler_pic_works_CXX=yes
+-     fi
+-   fi
+-   $rm conftest*
+-
+-fi
 -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
 -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
-+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-+$as_echo "$lt_prog_compiler_pic_works_CXX" >&6; }
- 
- if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
-     case $lt_prog_compiler_pic_CXX in
-@@ -10145,10 +11592,10 @@
-     ;;
- esac
- 
+-
+-if test x"$lt_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
+-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
+-
 -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-+{ $as_echo "$as_me:$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 test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o_CXX=no
-    $rm -r conftest 2>/dev/null
-@@ -10173,11 +11620,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
+-else
+-  lt_cv_prog_compiler_c_o_CXX=no
+-   $rm -r conftest 2>/dev/null
+-   mkdir conftest
+-   cd conftest
+-   mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+-   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}? :&$lt_compiler_flag :; t' \
+-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:10176: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11623: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
+-   (eval "$lt_compile" 2>out/conftest.err)
+-   ac_status=$?
+-   cat out/conftest.err >&5
 -   echo "$as_me:10180: \$? = $ac_status" >&5
-+   echo "$as_me:11627: \$? = $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
-@@ -10194,34 +11641,34 @@
-    $rm conftest*
- 
- fi
+-   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
+-     if test ! -s out/conftest.err; then
+-       lt_cv_prog_compiler_c_o_CXX=yes
+-     fi
+-   fi
+-   chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
+-   cd ..
+-   rmdir conftest
+-   $rm conftest*
+-
+-fi
 -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
-+{ $as_echo "$as_me:$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
+-
+-
+-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
 -  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-+  { $as_echo "$as_me:$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
+-  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
 -  echo "$as_me:$LINENO: result: $hard_links" >&5
 -echo "${ECHO_T}$hard_links" >&6
-+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-+$as_echo "$hard_links" >&6; }
-   if test "$hard_links" = no; then
+-  if test "$hard_links" = no; then
 -    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+    { $as_echo "$as_me:$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
- 
+-    need_locks=warn
+-  fi
+-else
+-  need_locks=no
+-fi
+-
 -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+{ $as_echo "$as_me:$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'
-   case $host_os in
-@@ -10245,8 +11692,8 @@
-   ;;
-   esac
- 
+-
+-  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  case $host_os in
+-  aix4* | aix5*)
+-    # 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
+-    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")) && (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*)
+-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+-  ;;
+-  *)
+-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  ;;
+-  esac
+-
 -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
 -echo "${ECHO_T}$ld_shlibs_CXX" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-+$as_echo "$ld_shlibs_CXX" >&6; }
- test "$ld_shlibs_CXX" = no && can_build_shared=no
- 
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -10271,15 +11718,15 @@
-       # 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.
+-test "$ld_shlibs_CXX" = 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
+-
+-#
+-# 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.
 -      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-       $rm conftest*
-       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
-       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
+-      $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
+-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } 2>conftest.err; then
-         soname=conftest
-         lib=conftest
-@@ -10296,7 +11743,7 @@
-         if { (eval echo "$as_me:$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=$?
+-  (exit $ac_status); } 2>conftest.err; then
+-        soname=conftest
+-        lib=conftest
+-        libobjs=conftest.$ac_objext
+-        deplibs=
+-        wl=$lt_prog_compiler_wl_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:$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=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-         then
- 	  archive_cmds_need_lc_CXX=no
-@@ -10308,16 +11755,16 @@
-         cat conftest.err 1>&5
-       fi
-       $rm conftest*
+-  (exit $ac_status); }
+-        then
+-	  archive_cmds_need_lc_CXX=no
+-        else
+-	  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*
 -      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
 -echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
-+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
-       ;;
-     esac
-   fi
-   ;;
- esac
- 
+-      ;;
+-    esac
+-  fi
+-  ;;
+-esac
+-
 -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-+{ $as_echo "$as_me:$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" || \
-@@ -10341,8 +11788,8 @@
-   # directories.
-   hardcode_action_CXX=unsupported
- fi
+-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-existant 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_AC_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
 -echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
 -echo "${ECHO_T}$hardcode_action_CXX" >&6
-+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-+$as_echo "$hardcode_action_CXX" >&6; }
- 
- if test "$hardcode_action_CXX" = relink; then
-   # Fast installation is not supported
-@@ -10355,35 +11802,35 @@
- 
- striplib=
- old_striplib=
+-
+-if test "$hardcode_action_CXX" = relink; 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
+-
+-striplib=
+-old_striplib=
 -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-+{ $as_echo "$as_me:$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"
+-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"
 -  echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
-+  { $as_echo "$as_me:$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"
+-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"
 -         echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
-+         { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-        else
+-       else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-        ;;
-    *)
+-fi
+-       ;;
+-   *)
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-     ;;
-   esac
- fi
- 
+-    ;;
+-  esac
+-fi
+-
 -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+$as_echo_n "checking dynamic linker characteristics... " >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -10893,8 +12340,8 @@
-   dynamic_linker=no
-   ;;
- esac
+-library_names_spec=
+-libname_spec='lib$name'
+-soname_spec=
+-shrext=".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"
+-if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+-    # 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.
+-    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
+-else
+-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
+-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
+-  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'
+-  ;;
+-
+-aix4* | aix5*)
+-  version_type=linux
+-  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*)
+-  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=`$echo "X$lib" | $Xsed -e '\''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'
+-  ;;
+-
+-beos*)
+-  library_names_spec='${libname}${shared_ext}'
+-  dynamic_linker="$host_os ld.so"
+-  shlibpath_var=LIBRARY_PATH
+-  ;;
+-
+-bsdi4*)
+-  version_type=linux
+-  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*)
+-  version_type=windows
+-  shrext=".dll"
+-  need_version=no
+-  need_lib_prefix=no
+-
+-  case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32*)
+-    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'
+-    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="/lib /lib/w32api /usr/lib /usr/local/lib"
+-      ;;
+-    mingw*)
+-      # MinGW DLLs use traditional 'lib' prefix
+-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+-        # It is most probably a Windows format PATH printed by
+-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+-        # path with ; separators, and with drive letters. We can handle the
+-        # drive letters (cygwin fileutils understands them), so leave them,
+-        # especially as we might pass files found there to a mingw objdump,
+-        # which wouldn't understand a cygwinified path. Ahh.
+-        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
+-      ;;
+-    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
+-    ;;
+-
+-  *)
+-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+-    ;;
+-  esac
+-  dynamic_linker='Win32 ld.exe'
+-  # 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
+-  # FIXME: Relying on posixy $() will cause problems for
+-  #        cross-compilation, but unfortunately the echo tests do not
+-  #        yet detect zsh echo's removal of \ escapes.
+-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${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='$(test .$module = .yes && echo .so || echo .dylib)'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  fi
+-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+-  ;;
+-
+-dgux*)
+-  version_type=linux
+-  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
+-  ;;
+-
+-freebsd1*)
+-  dynamic_linker=no
+-  ;;
+-
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+-  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
+-    ;;
+-  *) # from 3.2 on
+-    shlibpath_overrides_runpath=no
+-    hardcode_into_libs=yes
+-    ;;
+-  esac
+-  ;;
+-
+-gnu*)
+-  version_type=linux
+-  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
+-  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='.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='.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='.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'
+-  ;;
+-
+-irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-    nonstopux*) version_type=nonstopux ;;
+-    *)
+-	if test "$lt_cv_prog_gnu_ld" = yes; then
+-		version_type=linux
+-	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 Linux ELF.
+-linux*)
+-  version_type=linux
+-  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
+-  # 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
+-
+-  # 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}${release}${shared_ext} ${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
+-  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=linux
+-  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
+-  ;;
+-
+-openbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  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=".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"
+-  ;;
+-
+-sco3.2v5*)
+-  version_type=osf
+-  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
+-  ;;
+-
+-solaris*)
+-  version_type=linux
+-  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.2uw2* | sysv4.3* | sysv5*)
+-  version_type=linux
+-  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
+-      export_dynamic_flag_spec='${wl}-Blargedynsym'
+-      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
+-    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
+-  ;;
+-
+-uts4*)
+-  version_type=linux
+-  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
 -echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 -echo "${ECHO_T}$dynamic_linker" >&6
-+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+$as_echo "$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
- if test "x$enable_dlopen" != xyes; then
-@@ -10924,61 +12371,71 @@
- 
-   darwin*)
-   # if libdl is installed we need to link against it
+-test "$dynamic_linker" = no && can_build_shared=no
+-
+-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*)
+-    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
 -    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+$as_echo_n "checking for dlopen in -ldl... " >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
+-
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
 -/* We use char because int might match the return type of a gcc2
-+/* 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.  */
+-   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -#ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
- #  endif
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
-+char dlopen ();
- int
- main ()
- {
+-int
+-main ()
+-{
 -dlopen ();
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
@@ -9019,128 +15872,76 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_dl_dlopen=yes
- else
+-  ac_cv_lib_dl_dlopen=yes
+-else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dl_dlopen=no
- fi
+-ac_cv_lib_dl_dlopen=no
+-fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-LIBS=$ac_check_lib_save_LIBS
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
-@@ -10992,369 +12449,451 @@
-    ;;
- 
-   *)
+-if test $ac_cv_lib_dl_dlopen = yes; 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
+-
+-   ;;
+-
+-  *)
 -    echo "$as_me:$LINENO: checking for shl_load" >&5
 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-+    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
-+$as_echo_n "checking for shl_load... " >&6; }
- if test "${ac_cv_func_shl_load+set}" = set; then
+-if test "${ac_cv_func_shl_load+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define shl_load innocuous_shl_load
-+
- /* System header to define __stub macros and hopefully few prototypes,
+-/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char shl_load (); below.  */
-+    which can conflict with char shl_load (); 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>
+-#include <assert.h>
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
- #endif
+-#endif
 -/* We use char because int might match the return type of a gcc2
 -   builtin and then its argument prototype would still apply.  */
 -char shl_load ();
 -char (*f) ();
- 
+-
 -#ifdef F77_DUMMY_MAIN
-+#undef shl_load
-+
-+/* 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
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
 -int
 -main ()
 -{
-+char shl_load ();
- /* 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.  */
+-/* 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_shl_load) || defined (__stub___shl_load)
-+#if defined __stub_shl_load || defined __stub___shl_load
- choke me
+-choke me
 -#else
 -f = shl_load;
- #endif
- 
-+int
-+main ()
-+{
-+return shl_load ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-#endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
@@ -9149,95 +15950,55 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_func_shl_load=yes
- else
+-  ac_cv_func_shl_load=yes
+-else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_func_shl_load=no
- fi
+-ac_cv_func_shl_load=no
+-fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-+$as_echo "$ac_cv_func_shl_load" >&6; }
- if test $ac_cv_func_shl_load = yes; then
-   lt_cv_dlopen="shl_load"
- else
+-if test $ac_cv_func_shl_load = yes; then
+-  lt_cv_dlopen="shl_load"
+-else
 -  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-+  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-+$as_echo_n "checking for shl_load in -ldld... " >&6; }
- if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
+-
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
 -/* We use char because int might match the return type of a gcc2
-+/* 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.  */
+-   builtin and then its argument prototype would still apply.  */
 -char shl_load ();
 -#ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
- #  endif
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
-+char shl_load ();
- int
- main ()
- {
+-int
+-main ()
+-{
 -shl_load ();
-+return shl_load ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
@@ -9246,124 +16007,66 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_dld_shl_load=yes
- else
+-  ac_cv_lib_dld_shl_load=yes
+-else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dld_shl_load=no
- fi
+-ac_cv_lib_dld_shl_load=no
+-fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-LIBS=$ac_check_lib_save_LIBS
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
- if test $ac_cv_lib_dld_shl_load = yes; then
-   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
- else
+-if test $ac_cv_lib_dld_shl_load = yes; then
+-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+-else
 -  echo "$as_me:$LINENO: checking for dlopen" >&5
 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-+  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-+$as_echo_n "checking for dlopen... " >&6; }
- if test "${ac_cv_func_dlopen+set}" = set; then
+-if test "${ac_cv_func_dlopen+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define dlopen innocuous_dlopen
-+
- /* System header to define __stub macros and hopefully few prototypes,
+-/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char dlopen (); below.  */
-+    which can conflict with char dlopen (); 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>
+-#include <assert.h>
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
- #endif
+-#endif
 -/* We use char because int might match the return type of a gcc2
 -   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -char (*f) ();
- 
+-
 -#ifdef F77_DUMMY_MAIN
-+#undef dlopen
-+
-+/* 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
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
 -int
 -main ()
 -{
-+char dlopen ();
- /* 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.  */
+-/* 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_dlopen) || defined (__stub___dlopen)
-+#if defined __stub_dlopen || defined __stub___dlopen
- choke me
+-choke me
 -#else
 -f = dlopen;
- #endif
- 
-+int
-+main ()
-+{
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-#endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
@@ -9372,95 +16075,55 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_func_dlopen=yes
- else
+-  ac_cv_func_dlopen=yes
+-else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_func_dlopen=no
- fi
+-ac_cv_func_dlopen=no
+-fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-+$as_echo "$ac_cv_func_dlopen" >&6; }
- if test $ac_cv_func_dlopen = yes; then
-   lt_cv_dlopen="dlopen"
- else
+-if test $ac_cv_func_dlopen = yes; then
+-  lt_cv_dlopen="dlopen"
+-else
 -  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+$as_echo_n "checking for dlopen in -ldl... " >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
+-
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
 -/* We use char because int might match the return type of a gcc2
-+/* 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.  */
+-   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -#ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
- #  endif
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
-+char dlopen ();
- int
- main ()
- {
+-int
+-main ()
+-{
 -dlopen ();
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
@@ -9469,96 +16132,56 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_dl_dlopen=yes
- else
+-  ac_cv_lib_dl_dlopen=yes
+-else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dl_dlopen=no
- fi
+-ac_cv_lib_dl_dlopen=no
+-fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-LIBS=$ac_check_lib_save_LIBS
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
+-if test $ac_cv_lib_dl_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
 -  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-+  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
- if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsvld  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsvld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
+-
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
 -/* We use char because int might match the return type of a gcc2
-+/* 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.  */
+-   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -#ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
- #  endif
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
-+char dlopen ();
- int
- main ()
- {
+-int
+-main ()
+-{
 -dlopen ();
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
@@ -9567,96 +16190,56 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_svld_dlopen=yes
- else
+-  ac_cv_lib_svld_dlopen=yes
+-else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_svld_dlopen=no
- fi
+-ac_cv_lib_svld_dlopen=no
+-fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-LIBS=$ac_check_lib_save_LIBS
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
- if test $ac_cv_lib_svld_dlopen = yes; then
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
- else
+-if test $ac_cv_lib_svld_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+-else
 -  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-+  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-+$as_echo_n "checking for dld_link in -ldld... " >&6; }
- if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
+-
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
 -/* We use char because int might match the return type of a gcc2
-+/* 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.  */
+-   builtin and then its argument prototype would still apply.  */
 -char dld_link ();
 -#ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
- #  endif
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
-+char dld_link ();
- int
- main ()
- {
+-int
+-main ()
+-{
 -dld_link ();
-+return dld_link ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
@@ -9665,311 +16248,1402 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_dld_dld_link=yes
- else
+-  ac_cv_lib_dld_dld_link=yes
+-else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dld_dld_link=no
- fi
+-ac_cv_lib_dld_dld_link=no
+-fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-LIBS=$ac_check_lib_save_LIBS
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
- if test $ac_cv_lib_dld_dld_link = yes; then
-   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
- fi
-@@ -11394,10 +12933,10 @@
-     save_LIBS="$LIBS"
-     LIBS="$lt_cv_dlopen_libs $LIBS"
- 
+-if test $ac_cv_lib_dld_dld_link = yes; then
+-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+-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"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+-
+-    save_LIBS="$LIBS"
+-    LIBS="$lt_cv_dlopen_libs $LIBS"
+-
 -    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-+    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
- if test "${lt_cv_dlopen_self+set}" = set; then
+-if test "${lt_cv_dlopen_self+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   	  if test "$cross_compiling" = yes; then :
-   lt_cv_dlopen_self=cross
-@@ -11405,7 +12944,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
+-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 <<EOF
 -#line 11408 "configure"
-+#line 12947 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11469,7 +13008,7 @@
-   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
+-#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
+-
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+-void fnord() { int i=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;
+-      /* dlclose (self); */
+-    }
+-
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-     (./conftest; exit; ) 2>/dev/null
-     lt_status=$?
-@@ -11487,15 +13026,15 @@
- 
- 
- fi
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 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_unknown|x*) lt_cv_dlopen_self=no ;;
+-    esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self=no
+-  fi
+-fi
+-rm -fr conftest*
+-
+-
+-fi
 -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-+$as_echo "$lt_cv_dlopen_self" >&6; }
- 
-     if test "x$lt_cv_dlopen_self" = xyes; then
-       LDFLAGS="$LDFLAGS $link_static_flag"
+-
+-    if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
 -      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-+      { $as_echo "$as_me:$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 test "${lt_cv_dlopen_self_static+set}" = set; then
+-if test "${lt_cv_dlopen_self_static+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   	  if test "$cross_compiling" = yes; then :
-   lt_cv_dlopen_self_static=cross
-@@ -11503,7 +13042,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
+-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 <<EOF
 -#line 11506 "configure"
-+#line 13045 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11567,7 +13106,7 @@
-   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
+-#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
+-
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+-void fnord() { int i=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;
+-      /* dlclose (self); */
+-    }
+-
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-     (./conftest; exit; ) 2>/dev/null
-     lt_status=$?
-@@ -11585,8 +13124,8 @@
- 
- 
- fi
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 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_unknown|x*) lt_cv_dlopen_self_static=no ;;
+-    esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self_static=no
+-  fi
+-fi
+-rm -fr conftest*
+-
+-
+-fi
 -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-+$as_echo "$lt_cv_dlopen_self_static" >&6; }
-     fi
- 
-     CPPFLAGS="$save_CPPFLAGS"
-@@ -12081,13 +13620,13 @@
- compiler_F77=$CC
- cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
- 
+-    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
+-
+-
+-# The else clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+-  # 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
+-  # Now quote all the things that may contain metacharacters while being
+-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+-  # variables and quote the copies for generation of the libtool script.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+-    deplibs_check_method reload_flag reload_cmds need_locks \
+-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+-    lt_cv_sys_global_symbol_to_c_name_address \
+-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
+-    compiler_CXX \
+-    CC_CXX \
+-    LD_CXX \
+-    lt_prog_compiler_wl_CXX \
+-    lt_prog_compiler_pic_CXX \
+-    lt_prog_compiler_static_CXX \
+-    lt_prog_compiler_no_builtin_flag_CXX \
+-    export_dynamic_flag_spec_CXX \
+-    thread_safe_flag_spec_CXX \
+-    whole_archive_flag_spec_CXX \
+-    enable_shared_with_static_runtimes_CXX \
+-    old_archive_cmds_CXX \
+-    old_archive_from_new_cmds_CXX \
+-    predep_objects_CXX \
+-    postdep_objects_CXX \
+-    predeps_CXX \
+-    postdeps_CXX \
+-    compiler_lib_search_path_CXX \
+-    archive_cmds_CXX \
+-    archive_expsym_cmds_CXX \
+-    postinstall_cmds_CXX \
+-    postuninstall_cmds_CXX \
+-    old_archive_from_expsyms_cmds_CXX \
+-    allow_undefined_flag_CXX \
+-    no_undefined_flag_CXX \
+-    export_symbols_cmds_CXX \
+-    hardcode_libdir_flag_spec_CXX \
+-    hardcode_libdir_flag_spec_ld_CXX \
+-    hardcode_libdir_separator_CXX \
+-    hardcode_automatic_CXX \
+-    module_cmds_CXX \
+-    module_expsym_cmds_CXX \
+-    lt_cv_prog_compiler_c_o_CXX \
+-    exclude_expsyms_CXX \
+-    include_expsyms_CXX; do
+-
+-    case $var in
+-    old_archive_cmds_CXX | \
+-    old_archive_from_new_cmds_CXX | \
+-    archive_cmds_CXX | \
+-    archive_expsym_cmds_CXX | \
+-    module_cmds_CXX | \
+-    module_expsym_cmds_CXX | \
+-    old_archive_from_expsyms_cmds_CXX | \
+-    export_symbols_cmds_CXX | \
+-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+-    postinstall_cmds | postuninstall_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+-      # Double-quote double-evaled strings.
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+-      ;;
+-    *)
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+-      ;;
+-    esac
+-  done
+-
+-  case $lt_echo in
+-  *'\$0 --fallback-echo"')
+-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+-    ;;
+-  esac
+-
+-cfgfile="$ofile"
+-
+-  cat <<__EOF__ >> "$cfgfile"
+-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+-
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
+-
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
+-
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
+-
+-# 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
+-
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
+-
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+-
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
+-
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
+-
+-# A C compiler.
+-LTCC=$lt_LTCC
+-
+-# A language-specific compiler.
+-CC=$lt_compiler_CXX
+-
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_CXX
+-
+-# An ERE matcher.
+-EGREP=$lt_EGREP
+-
+-# The linker used to build libraries.
+-LD=$lt_LD_CXX
+-
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+-
+-# A BSD-compatible nm program.
+-NM=$lt_NM
+-
+-# A symbol stripping program
+-STRIP=$STRIP
+-
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
+-
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+-
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+-
+-# Used on cygwin: assembler.
+-AS="$AS"
+-
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
+-
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
+-
+-# How to pass a linker flag through the compiler.
+-wl=$lt_lt_prog_compiler_wl_CXX
+-
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
+-
+-# Old archive suffix (normally "a").
+-libext="$libext"
+-
+-# Shared library suffix (normally ".so").
+-shrext='$shrext'
+-
+-# Executable file suffix (normally "").
+-exeext="$exeext"
+-
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_lt_prog_compiler_pic_CXX
+-pic_mode=$pic_mode
+-
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
+-
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+-
+-# Must we lock files when doing compilation ?
+-need_locks=$lt_need_locks
+-
+-# 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
+-
+-# 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
+-
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_lt_prog_compiler_static_CXX
+-
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_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
+-
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
+-
+-# Library versioning type.
+-version_type=$version_type
+-
+-# 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
+-
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_old_archive_cmds_CXX
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+-
+-# 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 and install a shared archive.
+-archive_cmds=$lt_archive_cmds_CXX
+-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
+-
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_module_cmds_CXX
+-module_expsym_cmds=$lt_module_expsym_cmds_CXX
+-
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=$lt_predep_objects_CXX
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=$lt_postdep_objects_CXX
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_predeps_CXX
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-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
+-
+-# 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
+-
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag_CXX
+-
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_no_undefined_flag_CXX
+-
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
+-
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
+-
+-# 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
+-
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
+-
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
+-
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+-
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$hardcode_action_CXX
+-
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
+-
+-# 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
+-
+-# If ld is used when linking, flag to hardcode \$libdir into
+-# a binary during linking. This must work even if \$libdir does
+-# not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_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 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
+-
+-# Variables whose values should be saved in libtool wrapper scripts and
+-# restored at relink time.
+-variables_saved_for_relink="$variables_saved_for_relink"
+-
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$link_all_deplibs_CXX
+-
+-# 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
+-
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_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
+-
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_cmds
+-
+-# 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
+-
+-# ### END LIBTOOL TAG CONFIG: $tagname
+-
+-__EOF__
+-
+-
+-else
+-  # If there is no Makefile yet, we rely on a make rule to execute
+-  # `config.status --recheck' to rerun these tests and create the
+-  # libtool script then.
+-  test -f Makefile && make "$ltmain"
+-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
+-
+-CC=$lt_save_CC
+-LDCXX=$LD
+-LD=$lt_save_LD
+-GCC=$lt_save_GCC
+-with_gnu_ldcxx=$with_gnu_ld
+-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
+-
+-	else
+-	  tagname=""
+-	fi
+-	;;
+-
+-      F77)
+-	if test -n "$F77" && test "X$F77" != "Xno"; then
+-
+-ac_ext=f
+-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+-
+-
+-archive_cmds_need_lc_F77=no
+-allow_undefined_flag_F77=
+-always_export_symbols_F77=no
+-archive_expsym_cmds_F77=
+-export_dynamic_flag_spec_F77=
+-hardcode_direct_F77=no
+-hardcode_libdir_flag_spec_F77=
+-hardcode_libdir_flag_spec_ld_F77=
+-hardcode_libdir_separator_F77=
+-hardcode_minus_L_F77=no
+-hardcode_automatic_F77=no
+-module_cmds_F77=
+-module_expsym_cmds_F77=
+-link_all_deplibs_F77=unknown
+-old_archive_cmds_F77=$old_archive_cmds
+-no_undefined_flag_F77=
+-whole_archive_flag_spec_F77=
+-enable_shared_with_static_runtimes_F77=no
+-
+-# Source file extension for f77 test sources.
+-ac_ext=f
+-
+-# Object file extension for compiled f77 test sources.
+-objext=o
+-objext_F77=$objext
+-
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+-
+-# Code to be used in simple link tests
+-lt_simple_link_test_code="      program t\n      end\n"
+-
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
+-
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
+-
+-
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${F77-"f77"}
+-compiler=$CC
+-compiler_F77=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+-
 -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
 -echo "$as_me:$LINENO: result: $can_build_shared" >&5
 -echo "${ECHO_T}$can_build_shared" >&6
-+{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
-+$as_echo "$can_build_shared" >&6; }
- 
+-
 -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
-+{ $as_echo "$as_me:$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
-@@ -12104,15 +13643,15 @@
-   test "$enable_shared" = yes && enable_static=no
-   ;;
- esac
+-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
+-  ;;
+-aix4*)
+-  test "$enable_shared" = yes && enable_static=no
+-  ;;
+-esac
 -echo "$as_me:$LINENO: result: $enable_shared" >&5
 -echo "${ECHO_T}$enable_shared" >&6
-+{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
-+$as_echo "$enable_shared" >&6; }
- 
+-
 -echo "$as_me:$LINENO: checking whether to build static libraries" >&5
 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
-+{ $as_echo "$as_me:$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
+-# Make sure either enable_shared or enable_static is yes.
+-test "$enable_shared" = yes || enable_static=yes
 -echo "$as_me:$LINENO: result: $enable_static" >&5
 -echo "${ECHO_T}$enable_static" >&6
-+{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
-+$as_echo "$enable_static" >&6; }
- 
- test "$ld_shlibs_F77" = no && can_build_shared=no
- 
-@@ -12123,8 +13662,8 @@
- lt_prog_compiler_pic_F77=
- lt_prog_compiler_static_F77=
- 
+-
+-test "$ld_shlibs_F77" = no && can_build_shared=no
+-
+-GCC_F77="$G77"
+-LD_F77="$LD"
+-
+-lt_prog_compiler_wl_F77=
+-lt_prog_compiler_pic_F77=
+-lt_prog_compiler_static_F77=
+-
 -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- 
-   if test "$GCC" = yes; then
-     lt_prog_compiler_wl_F77='-Wl,'
-@@ -12300,17 +13839,17 @@
-     esac
-   fi
- 
+-
+-  if test "$GCC" = yes; then
+-    lt_prog_compiler_wl_F77='-Wl,'
+-    lt_prog_compiler_static_F77='-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_F77='-Bstatic'
+-      fi
+-      ;;
+-
+-    amigaos*)
+-      # 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_F77='-m68020 -resident32 -malways-restore-a4'
+-      ;;
+-
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+-      # PIC is the default for these OSes.
+-      ;;
+-
+-    mingw* | pw32* | os2*)
+-      # 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_F77='-DDLL_EXPORT'
+-      ;;
+-
+-    darwin* | rhapsody*)
+-      # PIC is the default on this platform
+-      # Common symbols not allowed in MH_DYLIB files
+-      lt_prog_compiler_pic_F77='-fno-common'
+-      ;;
+-
+-    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_F77=no
+-      enable_shared=no
+-      ;;
+-
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	lt_prog_compiler_pic_F77=-Kconform_pic
+-      fi
+-      ;;
+-
+-    hpux*)
+-      # 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_F77='-fPIC'
+-	;;
+-      esac
+-      ;;
+-
+-    *)
+-      lt_prog_compiler_pic_F77='-fPIC'
+-      ;;
+-    esac
+-  else
+-    # PORTME Check for flag to pass linker flags through the system compiler.
+-    case $host_os in
+-    aix*)
+-      lt_prog_compiler_wl_F77='-Wl,'
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	lt_prog_compiler_static_F77='-Bstatic'
+-      else
+-	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
+-      fi
+-      ;;
+-
+-    mingw* | pw32* | os2*)
+-      # 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_F77='-DDLL_EXPORT'
+-      ;;
+-
+-    hpux9* | hpux10* | hpux11*)
+-      lt_prog_compiler_wl_F77='-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_F77='+Z'
+-	;;
+-      esac
+-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+-      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
+-      ;;
+-
+-    irix5* | irix6* | nonstopux*)
+-      lt_prog_compiler_wl_F77='-Wl,'
+-      # PIC (with -KPIC) is the default.
+-      lt_prog_compiler_static_F77='-non_shared'
+-      ;;
+-
+-    newsos6)
+-      lt_prog_compiler_pic_F77='-KPIC'
+-      lt_prog_compiler_static_F77='-Bstatic'
+-      ;;
+-
+-    linux*)
+-      case $CC in
+-      icc|ecc)
+-	lt_prog_compiler_wl_F77='-Wl,'
+-	lt_prog_compiler_pic_F77='-KPIC'
+-	lt_prog_compiler_static_F77='-static'
+-        ;;
+-      ccc)
+-        lt_prog_compiler_wl_F77='-Wl,'
+-        # All Alpha code is PIC.
+-        lt_prog_compiler_static_F77='-non_shared'
+-        ;;
+-      esac
+-      ;;
+-
+-    osf3* | osf4* | osf5*)
+-      lt_prog_compiler_wl_F77='-Wl,'
+-      # All OSF/1 code is PIC.
+-      lt_prog_compiler_static_F77='-non_shared'
+-      ;;
+-
+-    sco3.2v5*)
+-      lt_prog_compiler_pic_F77='-Kpic'
+-      lt_prog_compiler_static_F77='-dn'
+-      ;;
+-
+-    solaris*)
+-      lt_prog_compiler_wl_F77='-Wl,'
+-      lt_prog_compiler_pic_F77='-KPIC'
+-      lt_prog_compiler_static_F77='-Bstatic'
+-      ;;
+-
+-    sunos4*)
+-      lt_prog_compiler_wl_F77='-Qoption ld '
+-      lt_prog_compiler_pic_F77='-PIC'
+-      lt_prog_compiler_static_F77='-Bstatic'
+-      ;;
+-
+-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-      lt_prog_compiler_wl_F77='-Wl,'
+-      lt_prog_compiler_pic_F77='-KPIC'
+-      lt_prog_compiler_static_F77='-Bstatic'
+-      ;;
+-
+-    sysv4*MP*)
+-      if test -d /usr/nec ;then
+-	lt_prog_compiler_pic_F77='-Kconform_pic'
+-	lt_prog_compiler_static_F77='-Bstatic'
+-      fi
+-      ;;
+-
+-    uts4*)
+-      lt_prog_compiler_pic_F77='-pic'
+-      lt_prog_compiler_static_F77='-Bstatic'
+-      ;;
+-
+-    *)
+-      lt_prog_compiler_can_build_shared_F77=no
+-      ;;
+-    esac
+-  fi
+-
 -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
 -echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
-+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-+$as_echo "$lt_prog_compiler_pic_F77" >&6; }
- 
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_F77"; then
+-
+-#
+-# Check to make sure the PIC flag actually works.
+-#
+-if test -n "$lt_prog_compiler_pic_F77"; then
 -  echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
-+  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; }
- if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
+-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_prog_compiler_pic_works_F77=no
-   ac_outfile=conftest.$ac_objext
-@@ -12325,11 +13864,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
+-else
+-  lt_prog_compiler_pic_works_F77=no
+-  ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-   lt_compiler_flag="$lt_prog_compiler_pic_F77"
+-   # 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}? :&$lt_compiler_flag :; t' \
+-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:12328: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:13867: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
+-   (eval "$lt_compile" 2>conftest.err)
+-   ac_status=$?
+-   cat conftest.err >&5
 -   echo "$as_me:12332: \$? = $ac_status" >&5
-+   echo "$as_me:13871: \$? = $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
-@@ -12340,8 +13879,8 @@
-    $rm conftest*
- 
- fi
+-   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
+-     if test ! -s conftest.err; then
+-       lt_prog_compiler_pic_works_F77=yes
+-     fi
+-   fi
+-   $rm conftest*
+-
+-fi
 -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
 -echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
-+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-+$as_echo "$lt_prog_compiler_pic_works_F77" >&6; }
- 
- if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
-     case $lt_prog_compiler_pic_F77 in
-@@ -12364,10 +13903,10 @@
-     ;;
- esac
- 
+-
+-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+-    case $lt_prog_compiler_pic_F77 in
+-     "" | " "*) ;;
+-     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
+-     esac
+-else
+-    lt_prog_compiler_pic_F77=
+-     lt_prog_compiler_can_build_shared_F77=no
+-fi
+-
+-fi
+-case "$host_os" in
+-  # For platforms which do not support PIC, -DPIC is meaningless:
+-  *djgpp*)
+-    lt_prog_compiler_pic_F77=
+-    ;;
+-  *)
+-    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
+-    ;;
+-esac
+-
 -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-+{ $as_echo "$as_me:$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 test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o_F77=no
-    $rm -r conftest 2>/dev/null
-@@ -12392,11 +13931,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
+-else
+-  lt_cv_prog_compiler_c_o_F77=no
+-   $rm -r conftest 2>/dev/null
+-   mkdir conftest
+-   cd conftest
+-   mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+-   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}? :&$lt_compiler_flag :; t' \
+-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:12395: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:13934: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
+-   (eval "$lt_compile" 2>out/conftest.err)
+-   ac_status=$?
+-   cat out/conftest.err >&5
 -   echo "$as_me:12399: \$? = $ac_status" >&5
-+   echo "$as_me:13938: \$? = $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
-@@ -12413,34 +13952,34 @@
-    $rm conftest*
- 
- fi
+-   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
+-     if test ! -s out/conftest.err; then
+-       lt_cv_prog_compiler_c_o_F77=yes
+-     fi
+-   fi
+-   chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
+-   cd ..
+-   rmdir conftest
+-   $rm conftest*
+-
+-fi
 -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
- 
- 
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
-   # do not overwrite the value of need_locks provided by the user
+-
+-
+-hard_links="nottested"
+-if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
+-  # do not overwrite the value of need_locks provided by the user
 -  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-+  { $as_echo "$as_me:$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
+-  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
 -  echo "$as_me:$LINENO: result: $hard_links" >&5
 -echo "${ECHO_T}$hard_links" >&6
-+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-+$as_echo "$hard_links" >&6; }
-   if test "$hard_links" = no; then
+-  if test "$hard_links" = no; then
 -    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+    { $as_echo "$as_me:$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
- 
+-    need_locks=warn
+-  fi
+-else
+-  need_locks=no
+-fi
+-
 -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+{ $as_echo "$as_me:$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_F77=
-@@ -12737,17 +14276,26 @@
-       end
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-
+-  runpath_var=
+-  allow_undefined_flag_F77=
+-  enable_shared_with_static_runtimes_F77=no
+-  archive_cmds_F77=
+-  archive_expsym_cmds_F77=
+-  old_archive_From_new_cmds_F77=
+-  old_archive_from_expsyms_cmds_F77=
+-  export_dynamic_flag_spec_F77=
+-  whole_archive_flag_spec_F77=
+-  thread_safe_flag_spec_F77=
+-  hardcode_libdir_flag_spec_F77=
+-  hardcode_libdir_flag_spec_ld_F77=
+-  hardcode_libdir_separator_F77=
+-  hardcode_direct_F77=no
+-  hardcode_minus_L_F77=no
+-  hardcode_shlibpath_var_F77=unsupported
+-  link_all_deplibs_F77=unknown
+-  hardcode_automatic_F77=no
+-  module_cmds_F77=
+-  module_expsym_cmds_F77=
+-  always_export_symbols_F77=no
+-  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  # include_expsyms should be a list of space-separated symbols to be *always*
+-  # included in the symbol list
+-  include_expsyms_F77=
+-  # 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_F77="_GLOBAL_OFFSET_TABLE_"
+-  # 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.
+-  extract_expsyms_cmds=
+-
+-  case $host_os in
+-  cygwin* | mingw* | pw32*)
+-    # 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
+-    ;;
+-  openbsd*)
+-    with_gnu_ld=no
+-    ;;
+-  esac
+-
+-  ld_shlibs_F77=yes
+-  if test "$with_gnu_ld" = yes; then
+-    # If archive_cmds runs LD, not CC, wlarc should be empty
+-    wlarc='${wl}'
+-
+-    # See if GNU ld supports shared libraries.
+-    case $host_os in
+-    aix3* | aix4* | aix5*)
+-      # On AIX/PPC, the GNU linker is very broken
+-      if test "$host_cpu" != ia64; then
+-	ld_shlibs_F77=no
+-	cat <<EOF 1>&2
+-
+-*** Warning: the GNU linker, at least up to release 2.9.1, 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 modify your PATH
+-*** so that a non-GNU linker is found, and then restart.
+-
+-EOF
+-      fi
+-      ;;
+-
+-    amigaos*)
+-      archive_cmds_F77='$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_F77='-L$libdir'
+-      hardcode_minus_L_F77=yes
+-
+-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+-      # that the semantics of dynamic libraries on AmigaOS, at least up
+-      # to version 4, is to share data among multiple programs linked
+-      # with the same dynamic library.  Since this doesn't match the
+-      # behavior of shared libraries on other platforms, we can't use
+-      # them.
+-      ld_shlibs_F77=no
+-      ;;
+-
+-    beos*)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	allow_undefined_flag_F77=unsupported
+-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+-	# support --undefined.  This deserves some investigation.  FIXME
+-	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      else
+-	ld_shlibs_F77=no
+-      fi
+-      ;;
+-
+-    cygwin* | mingw* | pw32*)
+-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
+-      # as there is no search path for DLLs.
+-      hardcode_libdir_flag_spec_F77='-L$libdir'
+-      allow_undefined_flag_F77=unsupported
+-      always_export_symbols_F77=no
+-      enable_shared_with_static_runtimes_F77=yes
+-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+-
+-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+-	# If the export-symbols file already is a .def file (1st line
+-	# is EXPORTS), use it as is; otherwise, prepend...
+-	archive_expsym_cmds_F77='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}--image-base=0x10000000  ${wl}--out-implib,$lib'
+-      else
+-	ld_shlibs=no
+-      fi
+-      ;;
+-
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-	wlarc=
+-      else
+-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      fi
+-      ;;
+-
+-    solaris* | sysv5*)
+-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+-	ld_shlibs_F77=no
+-	cat <<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.
+-
+-EOF
+-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      else
+-	ld_shlibs_F77=no
+-      fi
+-      ;;
+-
+-    sunos4*)
+-      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      wlarc=
+-      hardcode_direct_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      ;;
+-
+-    *)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      else
+-	ld_shlibs_F77=no
+-      fi
+-      ;;
+-    esac
+-
+-    if test "$ld_shlibs_F77" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
+-      export_dynamic_flag_spec_F77='${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_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	whole_archive_flag_spec_F77=
+-      fi
+-    fi
+-  else
+-    # PORTME fill in a description of your system's linker (not GNU ld)
+-    case $host_os in
+-    aix3*)
+-      allow_undefined_flag_F77=unsupported
+-      always_export_symbols_F77=yes
+-      archive_expsym_cmds_F77='$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_F77=yes
+-      if test "$GCC" = yes && test -z "$link_static_flag"; then
+-	# Neither direct hardcoding nor static linking is supported with a
+-	# broken collect2.
+-	hardcode_direct_F77=unsupported
+-      fi
+-      ;;
+-
+-    aix4* | aix5*)
+-      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
+-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+-	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+-	else
+-	  export_symbols_cmds_F77='$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].*|aix5*)
+-	  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_F77=''
+-      hardcode_direct_F77=yes
+-      hardcode_libdir_separator_F77=':'
+-      link_all_deplibs_F77=yes
+-
+-      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
+-  	  hardcode_direct_F77=yes
+-	  else
+-  	  # We have old collect2
+-  	  hardcode_direct_F77=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_F77=yes
+-  	  hardcode_libdir_flag_spec_F77='-L$libdir'
+-  	  hardcode_libdir_separator_F77=
+-	  fi
+-	esac
+-	shared_flag='-shared'
+-      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
+-
+-      # 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_F77=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_F77='-berok'
+-       # Determine the default libpath from the value encoded in an empty executable.
+-       cat >conftest.$ac_ext <<_ACEOF
+-      program main
+-
+-      end
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
@@ -9978,6 +17652,1623 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+-
+-       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-       else
+-	if test "$host_cpu" = ia64; then
+-	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
+-	  allow_undefined_flag_F77="-z nodefs"
+-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+-	else
+-	 # Determine the default libpath from the value encoded in an empty executable.
+-	 cat >conftest.$ac_ext <<_ACEOF
+-      program main
+-
+-      end
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+-
+-	 hardcode_libdir_flag_spec_F77='${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_F77=' ${wl}-bernotok'
+-	  allow_undefined_flag_F77=' ${wl}-berok'
+-	  # -bexpall does not export symbols beginning with underscore (_)
+-	  always_export_symbols_F77=yes
+-	  # Exported symbols can be pulled into shared objects from archives
+-	  whole_archive_flag_spec_F77=' '
+-	  archive_cmds_need_lc_F77=yes
+-	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-	fi
+-      fi
+-      ;;
+-
+-    amigaos*)
+-      archive_cmds_F77='$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_F77='-L$libdir'
+-      hardcode_minus_L_F77=yes
+-      # see comment about different semantics on the GNU ld section
+-      ld_shlibs_F77=no
+-      ;;
+-
+-    bsdi4*)
+-      export_dynamic_flag_spec_F77=-rdynamic
+-      ;;
+-
+-    cygwin* | mingw* | pw32*)
+-      # 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.
+-      hardcode_libdir_flag_spec_F77=' '
+-      allow_undefined_flag_F77=unsupported
+-      # Tell ltmain to make .lib files, not .a files.
+-      libext=lib
+-      # Tell ltmain to make .dll files, not .so files.
+-      shrext=".dll"
+-      # FIXME: Setting linknames here is a bad hack.
+-      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+-      # The linker will automatically build a .lib file if we build a DLL.
+-      old_archive_From_new_cmds_F77='true'
+-      # FIXME: Should let the user specify the lib program.
+-      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
+-      enable_shared_with_static_runtimes_F77=yes
+-      ;;
+-
+-    darwin* | rhapsody*)
+-    if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+-      archive_cmds_need_lc_F77=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[012])
+-	allow_undefined_flag_F77='-undefined suppress'
+-	;;
+-      *) # Darwin 1.3 on
+-	test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_F77='-flat_namespace -undefined suppress'
+-	;;
+-      esac
+-      # FIXME: Relying on posixy $() will cause problems for
+-      #        cross-compilation, but unfortunately the echo tests do not
+-      #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+-      #	       `"' quotes if we put them in here... so don't!
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-    	else
+-        archive_cmds_F77='$CC -r ${wl}-bind_at_load -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'
+-      fi
+-      module_cmds_F77='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        else
+-          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -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~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        fi
+-          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      hardcode_direct_F77=no
+-      hardcode_automatic_F77=yes
+-      hardcode_shlibpath_var_F77=unsupported
+-      whole_archive_flag_spec_F77='-all_load $convenience'
+-      link_all_deplibs_F77=yes
+-    fi
+-      ;;
+-
+-    dgux*)
+-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_libdir_flag_spec_F77='-L$libdir'
+-      hardcode_shlibpath_var_F77=no
+-      ;;
+-
+-    freebsd1*)
+-      ld_shlibs_F77=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_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+-      hardcode_libdir_flag_spec_F77='-R$libdir'
+-      hardcode_direct_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      ;;
+-
+-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+-    freebsd2*)
+-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct_F77=yes
+-      hardcode_minus_L_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      ;;
+-
+-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd*)
+-      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+-      hardcode_libdir_flag_spec_F77='-R$libdir'
+-      hardcode_direct_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      ;;
+-
+-    hpux9*)
+-      if test "$GCC" = yes; then
+-	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${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_F77='$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_F77='${wl}+b ${wl}$libdir'
+-      hardcode_libdir_separator_F77=:
+-      hardcode_direct_F77=yes
+-
+-      # hardcode_minus_L: Not really in the search PATH,
+-      # but as the default location of the library.
+-      hardcode_minus_L_F77=yes
+-      export_dynamic_flag_spec_F77='${wl}-E'
+-      ;;
+-
+-    hpux10* | hpux11*)
+-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	*)
+-	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	esac
+-      else
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  ;;
+-	*)
+-	  archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+-	  ;;
+-	esac
+-      fi
+-      if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*)
+-	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+-	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
+-	  hardcode_libdir_separator_F77=:
+-	  hardcode_direct_F77=no
+-	  hardcode_shlibpath_var_F77=no
+-	  ;;
+-	ia64*)
+-	  hardcode_libdir_flag_spec_F77='-L$libdir'
+-	  hardcode_direct_F77=no
+-	  hardcode_shlibpath_var_F77=no
+-
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  hardcode_minus_L_F77=yes
+-	  ;;
+-	*)
+-	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+-	  hardcode_libdir_separator_F77=:
+-	  hardcode_direct_F77=yes
+-	  export_dynamic_flag_spec_F77='${wl}-E'
+-
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  hardcode_minus_L_F77=yes
+-	  ;;
+-	esac
+-      fi
+-      ;;
+-
+-    irix5* | irix6* | nonstopux*)
+-      if test "$GCC" = yes; then
+-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      else
+-	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
+-      fi
+-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator_F77=:
+-      link_all_deplibs_F77=yes
+-      ;;
+-
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+-      else
+-	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+-      fi
+-      hardcode_libdir_flag_spec_F77='-R$libdir'
+-      hardcode_direct_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      ;;
+-
+-    newsos6)
+-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct_F77=yes
+-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator_F77=:
+-      hardcode_shlibpath_var_F77=no
+-      ;;
+-
+-    openbsd*)
+-      hardcode_direct_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+-	export_dynamic_flag_spec_F77='${wl}-E'
+-      else
+-       case $host_os in
+-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+-	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   hardcode_libdir_flag_spec_F77='-R$libdir'
+-	   ;;
+-	 *)
+-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
+-      fi
+-      ;;
+-
+-    os2*)
+-      hardcode_libdir_flag_spec_F77='-L$libdir'
+-      hardcode_minus_L_F77=yes
+-      allow_undefined_flag_F77=unsupported
+-      archive_cmds_F77='$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_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+-      ;;
+-
+-    osf3*)
+-      if test "$GCC" = yes; then
+-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      else
+-	allow_undefined_flag_F77=' -expect_unresolved \*'
+-	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-      fi
+-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator_F77=:
+-      ;;
+-
+-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+-      if test "$GCC" = yes; then
+-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+-      else
+-	allow_undefined_flag_F77=' -expect_unresolved \*'
+-	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+-
+-	# Both c and cxx compiler support -rpath directly
+-	hardcode_libdir_flag_spec_F77='-rpath $libdir'
+-      fi
+-      hardcode_libdir_separator_F77=:
+-      ;;
+-
+-    sco3.2v5*)
+-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_shlibpath_var_F77=no
+-      export_dynamic_flag_spec_F77='${wl}-Bexport'
+-      runpath_var=LD_RUN_PATH
+-      hardcode_runpath_var=yes
+-      ;;
+-
+-    solaris*)
+-      no_undefined_flag_F77=' -z text'
+-      if test "$GCC" = yes; then
+-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+-      else
+-	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	archive_expsym_cmds_F77='$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'
+-      fi
+-      hardcode_libdir_flag_spec_F77='-R$libdir'
+-      hardcode_shlibpath_var_F77=no
+-      case $host_os in
+-      solaris2.[0-5] | solaris2.[0-5].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
+-      esac
+-      link_all_deplibs_F77=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_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+-      fi
+-      hardcode_libdir_flag_spec_F77='-L$libdir'
+-      hardcode_direct_F77=yes
+-      hardcode_minus_L_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      ;;
+-
+-    sysv4)
+-      case $host_vendor in
+-	sni)
+-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  hardcode_direct_F77=yes # is this really true???
+-	;;
+-	siemens)
+-	  ## LD is ld it makes a PLAMLIB
+-	  ## CC just makes a GrossModule.
+-	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-	  reload_cmds_F77='$CC -r -o $output$reload_objs'
+-	  hardcode_direct_F77=no
+-        ;;
+-	motorola)
+-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
+-	;;
+-      esac
+-      runpath_var='LD_RUN_PATH'
+-      hardcode_shlibpath_var_F77=no
+-      ;;
+-
+-    sysv4.3*)
+-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_shlibpath_var_F77=no
+-      export_dynamic_flag_spec_F77='-Bexport'
+-      ;;
+-
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	hardcode_shlibpath_var_F77=no
+-	runpath_var=LD_RUN_PATH
+-	hardcode_runpath_var=yes
+-	ld_shlibs_F77=yes
+-      fi
+-      ;;
+-
+-    sysv4.2uw2*)
+-      archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct_F77=yes
+-      hardcode_minus_L_F77=no
+-      hardcode_shlibpath_var_F77=no
+-      hardcode_runpath_var=yes
+-      runpath_var=LD_RUN_PATH
+-      ;;
+-
+-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+-      no_undefined_flag_F77='${wl}-z ${wl}text'
+-      if test "$GCC" = yes; then
+-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      fi
+-      runpath_var='LD_RUN_PATH'
+-      hardcode_shlibpath_var_F77=no
+-      ;;
+-
+-    sysv5*)
+-      no_undefined_flag_F77=' -z text'
+-      # $CC -shared without GNU ld will not create a library from C++
+-      # object files and a static libstdc++, better avoid it by now
+-      archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      archive_expsym_cmds_F77='$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'
+-      hardcode_libdir_flag_spec_F77=
+-      hardcode_shlibpath_var_F77=no
+-      runpath_var='LD_RUN_PATH'
+-      ;;
+-
+-    uts4*)
+-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_libdir_flag_spec_F77='-L$libdir'
+-      hardcode_shlibpath_var_F77=no
+-      ;;
+-
+-    *)
+-      ld_shlibs_F77=no
+-      ;;
+-    esac
+-  fi
+-
+-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+-echo "${ECHO_T}$ld_shlibs_F77" >&6
+-test "$ld_shlibs_F77" = 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
+-
+-#
+-# Do we need to explicitly link libc?
+-#
+-case "x$archive_cmds_need_lc_F77" in
+-x|xyes)
+-  # Assume -lc should be added
+-  archive_cmds_need_lc_F77=yes
+-
+-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+-    case $archive_cmds_F77 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.
+-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+-      $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
+-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } 2>conftest.err; then
+-        soname=conftest
+-        lib=conftest
+-        libobjs=conftest.$ac_objext
+-        deplibs=
+-        wl=$lt_prog_compiler_wl_F77
+-        compiler_flags=-v
+-        linker_flags=-v
+-        verstring=
+-        output_objdir=.
+-        libname=conftest
+-        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
+-        allow_undefined_flag_F77=
+-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+-  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-        then
+-	  archive_cmds_need_lc_F77=no
+-        else
+-	  archive_cmds_need_lc_F77=yes
+-        fi
+-        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
+-      else
+-        cat conftest.err 1>&5
+-      fi
+-      $rm conftest*
+-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
+-      ;;
+-    esac
+-  fi
+-  ;;
+-esac
+-
+-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+-hardcode_action_F77=
+-if test -n "$hardcode_libdir_flag_spec_F77" || \
+-   test -n "$runpath_var F77" || \
+-   test "X$hardcode_automatic_F77"="Xyes" ; then
+-
+-  # We can hardcode non-existant directories.
+-  if test "$hardcode_direct_F77" != 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_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
+-     test "$hardcode_minus_L_F77" != no; then
+-    # Linking always hardcodes the temporary library directory.
+-    hardcode_action_F77=relink
+-  else
+-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+-    hardcode_action_F77=immediate
+-  fi
+-else
+-  # We cannot hardcode anything, or else we can only hardcode existing
+-  # directories.
+-  hardcode_action_F77=unsupported
+-fi
+-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+-echo "${ECHO_T}$hardcode_action_F77" >&6
+-
+-if test "$hardcode_action_F77" = relink; 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
+-
+-striplib=
+-old_striplib=
+-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&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"
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}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"
+-         echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-       else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-       ;;
+-   *)
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-    ;;
+-  esac
+-fi
+-
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+-library_names_spec=
+-libname_spec='lib$name'
+-soname_spec=
+-shrext=".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"
+-if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+-    # 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.
+-    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
+-else
+-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
+-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
+-  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'
+-  ;;
+-
+-aix4* | aix5*)
+-  version_type=linux
+-  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*)
+-  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=`$echo "X$lib" | $Xsed -e '\''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'
+-  ;;
+-
+-beos*)
+-  library_names_spec='${libname}${shared_ext}'
+-  dynamic_linker="$host_os ld.so"
+-  shlibpath_var=LIBRARY_PATH
+-  ;;
+-
+-bsdi4*)
+-  version_type=linux
+-  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*)
+-  version_type=windows
+-  shrext=".dll"
+-  need_version=no
+-  need_lib_prefix=no
+-
+-  case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32*)
+-    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'
+-    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="/lib /lib/w32api /usr/lib /usr/local/lib"
+-      ;;
+-    mingw*)
+-      # MinGW DLLs use traditional 'lib' prefix
+-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+-        # It is most probably a Windows format PATH printed by
+-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+-        # path with ; separators, and with drive letters. We can handle the
+-        # drive letters (cygwin fileutils understands them), so leave them,
+-        # especially as we might pass files found there to a mingw objdump,
+-        # which wouldn't understand a cygwinified path. Ahh.
+-        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
+-      ;;
+-    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
+-    ;;
+-
+-  *)
+-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+-    ;;
+-  esac
+-  dynamic_linker='Win32 ld.exe'
+-  # 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
+-  # FIXME: Relying on posixy $() will cause problems for
+-  #        cross-compilation, but unfortunately the echo tests do not
+-  #        yet detect zsh echo's removal of \ escapes.
+-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${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='$(test .$module = .yes && echo .so || echo .dylib)'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  fi
+-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+-  ;;
+-
+-dgux*)
+-  version_type=linux
+-  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
+-  ;;
+-
+-freebsd1*)
+-  dynamic_linker=no
+-  ;;
+-
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+-  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
++  interix*)
++    # we just hope/assume this is gcc and not c89 (= MSVC++)
++    with_gnu_ld=yes
+     ;;
+-  *) # from 3.2 on
+-    shlibpath_overrides_runpath=no
+-    hardcode_into_libs=yes
+-    ;;
+-  esac
+-  ;;
+-
+-gnu*)
+-  version_type=linux
+-  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
+-  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='.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='.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='.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'
+-  ;;
+-
+-irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-    nonstopux*) version_type=nonstopux ;;
+-    *)
+-	if test "$lt_cv_prog_gnu_ld" = yes; then
+-		version_type=linux
+-	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
++  openbsd*)
++    with_gnu_ld=no
+     ;;
+   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 Linux ELF.
+-linux*)
+-  version_type=linux
+-  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
+-  # 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
+-
+-  # 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}${release}${shared_ext} ${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
+-  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
+-  ;;
++  ld_shlibs=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
+ 
+-nto-qnx)
+-  version_type=linux
+-  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
+-  ;;
++    # 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
++      *\ [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
+ 
+-openbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  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
++    # See if GNU ld supports shared libraries.
+     case $host_os in
+-      openbsd2.[89] | openbsd2.[89].*)
+-	shlibpath_overrides_runpath=no
+-	;;
+-      *)
+-	shlibpath_overrides_runpath=yes
+-	;;
+-      esac
+-  else
+-    shlibpath_overrides_runpath=yes
+-  fi
+-  ;;
++    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
+ 
+-os2*)
+-  libname_spec='$name'
+-  shrext=".dll"
+-  need_lib_prefix=no
+-  library_names_spec='$libname${shared_ext} $libname.a'
+-  dynamic_linker='OS/2 ld.exe'
+-  shlibpath_var=LIBPATH
+-  ;;
++*** Warning: the GNU linker, at least up to release 2.9.1, 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 modify your PATH
++*** so that a non-GNU linker is found, and then restart.
+ 
+-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"
+-  ;;
++_LT_EOF
++      fi
++      ;;
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  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
+-  ;;
++    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
++      ;;
+ 
+-solaris*)
+-  version_type=linux
+-  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'
+-  ;;
++    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
++      ;;
+ 
+-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
+-  ;;
++    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'
++      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/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-  version_type=linux
+-  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
+-      export_dynamic_flag_spec='${wl}-Blargedynsym'
+-      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'
++      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
+       ;;
+-  esac
+-  ;;
+-
+-sysv4*MP*)
+-  if test -d /usr/nec ;then
+-    version_type=linux
+-    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
+-  ;;
+ 
+-uts4*)
+-  version_type=linux
+-  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
+-  ;;
++    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'
++      ;;
+ 
+-*)
+-  dynamic_linker=no
+-  ;;
+-esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
+-test "$dynamic_linker" = no && can_build_shared=no
++    gnu* | linux* | tpf* | k*bsd*-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=
++	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; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# 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; $ECHO \"$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]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
++	  tmp_sharedflag='-qmkshrobj'
++	  tmp_addflag= ;;
++	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; $ECHO \"$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
+ 
+-# The else clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+-  # 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
+-  # Now quote all the things that may contain metacharacters while being
+-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+-  # variables and quote the copies for generation of the libtool script.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+-    deplibs_check_method reload_flag reload_cmds need_locks \
+-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+-    lt_cv_sys_global_symbol_to_c_name_address \
+-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
+-    compiler_F77 \
+-    CC_F77 \
+-    LD_F77 \
+-    lt_prog_compiler_wl_F77 \
+-    lt_prog_compiler_pic_F77 \
+-    lt_prog_compiler_static_F77 \
+-    lt_prog_compiler_no_builtin_flag_F77 \
+-    export_dynamic_flag_spec_F77 \
+-    thread_safe_flag_spec_F77 \
+-    whole_archive_flag_spec_F77 \
+-    enable_shared_with_static_runtimes_F77 \
+-    old_archive_cmds_F77 \
+-    old_archive_from_new_cmds_F77 \
+-    predep_objects_F77 \
+-    postdep_objects_F77 \
+-    predeps_F77 \
+-    postdeps_F77 \
+-    compiler_lib_search_path_F77 \
+-    archive_cmds_F77 \
+-    archive_expsym_cmds_F77 \
+-    postinstall_cmds_F77 \
+-    postuninstall_cmds_F77 \
+-    old_archive_from_expsyms_cmds_F77 \
+-    allow_undefined_flag_F77 \
+-    no_undefined_flag_F77 \
+-    export_symbols_cmds_F77 \
+-    hardcode_libdir_flag_spec_F77 \
+-    hardcode_libdir_flag_spec_ld_F77 \
+-    hardcode_libdir_separator_F77 \
+-    hardcode_automatic_F77 \
+-    module_cmds_F77 \
+-    module_expsym_cmds_F77 \
+-    lt_cv_prog_compiler_c_o_F77 \
+-    exclude_expsyms_F77 \
+-    include_expsyms_F77; do
+-
+-    case $var in
+-    old_archive_cmds_F77 | \
+-    old_archive_from_new_cmds_F77 | \
+-    archive_cmds_F77 | \
+-    archive_expsym_cmds_F77 | \
+-    module_cmds_F77 | \
+-    module_expsym_cmds_F77 | \
+-    old_archive_from_expsyms_cmds_F77 | \
+-    export_symbols_cmds_F77 | \
+-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+-    postinstall_cmds | postuninstall_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+-      # Double-quote double-evaled strings.
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++	case $cc_basename in
++	xlf*)
++	  # 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=
++	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
++	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_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 $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++	  fi
++	  ;;
++	esac
++      else
++        ld_shlibs=no
++      fi
+       ;;
+-    *)
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++
++    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 $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'
++      fi
+       ;;
+-    esac
+-  done
+ 
+-  case $lt_echo in
+-  *'\$0 --fallback-echo"')
+-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+-    ;;
+-  esac
++    solaris*)
++      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
++	ld_shlibs=no
++	cat <<_LT_EOF 1>&2
+ 
+-cfgfile="$ofile"
++*** 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.
+ 
+-  cat <<__EOF__ >> "$cfgfile"
+-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++_LT_EOF
++      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	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
++      ;;
+ 
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++    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
+ 
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
++*** 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.
+ 
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
++_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
++      ;;
+ 
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
++    sunos4*)
++      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
+ 
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$archive_cmds_need_lc_F77
++    *)
++      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	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
++
++    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
++      ;;
+ 
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
++    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
++	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")) && (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
+ 
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
++	# 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
+ 
+-# The host system.
+-host_alias=$host_alias
+-host=$host
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
+ 
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
++      # 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.
+ 
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
++      archive_cmds=''
++      hardcode_direct=yes
++      hardcode_direct_absolute=yes
++      hardcode_libdir_separator=':'
++      link_all_deplibs=yes
++      file_list_spec='${wl}-f,'
+ 
+-# A C compiler.
+-LTCC=$lt_LTCC
++      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
+ 
+-# A language-specific compiler.
+-CC=$lt_compiler_F77
++      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.
++        cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_F77
++int
++main ()
++{
+ 
+-# An ERE matcher.
+-EGREP=$lt_EGREP
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -9986,54 +19277,389 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && {
-+	 test -z "$ac_f77_werror_flag" ||
++	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest$ac_exeext && {
 +	 test "$cross_compiling" = yes ||
 +	 $as_test_x conftest$ac_exeext
 +       }; then
- 
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
- }'`
-@@ -12755,10 +14303,15 @@
- if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
- }'`; fi
- else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
++
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++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 "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
++else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-# The linker used to build libraries.
+-LD=$lt_LD_F77
+ 
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
++fi
+ 
+-# A BSD-compatible nm program.
+-NM=$lt_NM
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+-# A symbol stripping program
+-STRIP=$STRIP
++        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 $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; 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.
++	 cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
++int
++main ()
++{
+ 
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
++  ;
++  return 0;
++}
++_ACEOF
++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:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
 +
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++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 "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+ 
+-# Used on cygwin: assembler.
+-AS="$AS"
++fi
+ 
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
 +rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
++	 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'
++	  # Exported symbols can be pulled into shared objects from archives
++	  whole_archive_flag_spec='$convenience'
++	  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
++      ;;
  
-        hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -12776,17 +14329,26 @@
-       end
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-# How to pass a linker flag through the compiler.
+-wl=$lt_lt_prog_compiler_wl_F77
++    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
++      ;;
+ 
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
++    bsdi[45]*)
++      export_dynamic_flag_spec=-rdynamic
++      ;;
+ 
+-# Old archive suffix (normally "a").
+-libext="$libext"
++    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.
++      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 `$ECHO "X$deplibs" | $Xsed -e '\''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'
++      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      enable_shared_with_static_runtimes=yes
++      ;;
+ 
+-# Shared library suffix (normally ".so").
+-shrext='$shrext'
++    darwin* | rhapsody*)
+ 
+-# Executable file suffix (normally "").
+-exeext="$exeext"
+ 
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_lt_prog_compiler_pic_F77
+-pic_mode=$pic_mode
++  archive_cmds_need_lc=no
++  hardcode_direct=no
++  hardcode_automatic=yes
++  hardcode_shlibpath_var=unsupported
++  whole_archive_flag_spec=''
++  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=echo
++    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}"
+ 
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
++  else
++  ld_shlibs=no
++  fi
+ 
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
++      ;;
+ 
+-# Must we lock files when doing compilation ?
+-need_locks=$lt_need_locks
++    dgux*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_shlibpath_var=no
++      ;;
+ 
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
++    freebsd1*)
++      ld_shlibs=no
++      ;;
+ 
+-# Do we need a version for libraries?
+-need_version=$need_version
++    # 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
++      ;;
+ 
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
++    # 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
++      ;;
+ 
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | dragonfly*)
++      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
+ 
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
++    hpux9*)
++      if test "$GCC" = yes; then
++	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${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
+ 
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_lt_prog_compiler_static_F77
++      # 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'
++      ;;
+ 
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
++    hpux10*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	archive_cmds='$CC -shared -fPIC ${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_flag_spec_ld='+b $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
++      ;;
+ 
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
++    hpux11*)
++      if test "$GCC" = yes -a "$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 -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  archive_cmds='$CC -shared -fPIC ${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'
++	  ;;
++	*)
++	  archive_cmds='$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
++	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++	hardcode_libdir_separator=:
+ 
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
++	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'
+ 
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L=yes
++	  ;;
++	esac
++      fi
++      ;;
+ 
+-# Library versioning type.
+-version_type=$version_type
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${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.
++        save_LDFLAGS="$LDFLAGS"
++        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
++        cat >conftest.$ac_ext <<_ACEOF
++int foo(void) {}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -10042,362 +19668,1221 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && {
-+	 test -z "$ac_f77_werror_flag" ||
++	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest$ac_exeext && {
 +	 test "$cross_compiling" = yes ||
 +	 $as_test_x conftest$ac_exeext
 +       }; then
++  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
- }'`
-@@ -12794,10 +14356,15 @@
- if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
- }'`; fi
- else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
++else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
+ 
+-# 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
++fi
+ 
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_old_archive_cmds_F77
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
 +rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++        LDFLAGS="$save_LDFLAGS"
++      else
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -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
++      ;;
  
- 	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -13209,8 +14776,8 @@
-     esac
-   fi
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
++    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
++      ;;
  
--echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
--echo "${ECHO_T}$ld_shlibs_F77" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-+$as_echo "$ld_shlibs_F77" >&6; }
- test "$ld_shlibs_F77" = no && can_build_shared=no
- 
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -13235,15 +14802,15 @@
-       # 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.
--      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
++    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
++      ;;
+ 
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_archive_cmds_F77
+-archive_expsym_cmds=$lt_archive_expsym_cmds_F77
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
++    *nto* | *qnx*)
++      ;;
+ 
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_module_cmds_F77
+-module_expsym_cmds=$lt_module_expsym_cmds_F77
++    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
++      ;;
+ 
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
++    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'
++      ;;
+ 
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=$lt_predep_objects_F77
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=$lt_postdep_objects_F77
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_predeps_F77
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$lt_postdeps_F77
+-
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
++    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" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${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" && $ECHO "X-set_version $verstring" | $Xsed` -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=:
++      ;;
+ 
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
++    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} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${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" && $ECHO "X-set_version $verstring" | $Xsed` -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 "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ 
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
++	# Both c and cxx compiler support -rpath directly
++	hardcode_libdir_flag_spec='-rpath $libdir'
++      fi
++      archive_cmds_need_lc='no'
++      hardcode_libdir_separator=:
++      ;;
+ 
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag_F77
++    solaris*)
++      no_undefined_flag=' -z defs'
++      if test "$GCC" = yes; then
++	wlarc='${wl}'
++	archive_cmds='$CC -shared ${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 ${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
++      ;;
+ 
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_no_undefined_flag_F77
++    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
++      ;;
+ 
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
++    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
++      ;;
+ 
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
++    sysv4.3*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var=no
++      export_dynamic_flag_spec='-Bexport'
++      ;;
+ 
+-# 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
++    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
++      ;;
+ 
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++    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'
+ 
+-# 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
++      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
++      ;;
+ 
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
++    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'
+ 
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
++      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
++      ;;
+ 
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++    uts4*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_shlibpath_var=no
++      ;;
+ 
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$hardcode_action_F77
++    *)
++      ld_shlibs=no
++      ;;
++    esac
+ 
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
++    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
+ 
+-# 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_F77
++{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
++$as_echo "$ld_shlibs" >&6; }
++test "$ld_shlibs" = no && can_build_shared=no
+ 
+-# If ld is used when linking, flag to hardcode \$libdir into
+-# a binary during linking. This must work even if \$libdir does
+-# not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
+-
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
+-
+-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_direct=$hardcode_direct_F77
+-
+-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_minus_L=$hardcode_minus_L_F77
+-
+-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+-# the resulting binary.
+-hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
+-
+-# 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_F77
++with_gnu_ld=$with_gnu_ld
+ 
+-# Variables whose values should be saved in libtool wrapper scripts and
+-# restored at relink time.
+-variables_saved_for_relink="$variables_saved_for_relink"
+ 
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$link_all_deplibs_F77
+ 
+-# 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
+ 
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_F77"
+ 
+-# Set to yes if exported symbols are required.
+-always_export_symbols=$always_export_symbols_F77
+ 
+-# The commands to list exported symbols.
+-export_symbols_cmds=$lt_export_symbols_cmds_F77
+ 
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_cmds
+ 
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_exclude_expsyms_F77
+ 
+-# Symbols that must always be exported.
+-include_expsyms=$lt_include_expsyms_F77
+ 
+-# ### END LIBTOOL TAG CONFIG: $tagname
+ 
+-__EOF__
+ 
+ 
+-else
+-  # If there is no Makefile yet, we rely on a make rule to execute
+-  # `config.status --recheck' to rerun these tests and create the
+-  # libtool script then.
+-  test -f Makefile && make "$ltmain"
+-fi
++
++#
++# 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:$LINENO: checking whether -lc should be explicitly linked in" >&5
 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-       $rm conftest*
-       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
-       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++      $RM conftest*
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } 2>conftest.err; then
-         soname=conftest
-         lib=conftest
-@@ -13260,7 +14827,7 @@
-         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-   (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } 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:$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:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-         then
- 	  archive_cmds_need_lc_F77=no
-@@ -13272,16 +14839,16 @@
-         cat conftest.err 1>&5
-       fi
-       $rm conftest*
--      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
--echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
-+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-+$as_echo "$archive_cmds_need_lc_F77" >&6; }
-       ;;
-     esac
-   fi
-   ;;
- esac
++  (exit $ac_status); }
++        then
++	  archive_cmds_need_lc=no
++        else
++	  archive_cmds_need_lc=yes
++        fi
++        allow_undefined_flag=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $RM conftest*
++      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
++$as_echo "$archive_cmds_need_lc" >&6; }
++      ;;
++    esac
++  fi
++  ;;
++esac
++
++
++
++
++
++
++
++
++
  
--echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
- hardcode_action_F77=
- if test -n "$hardcode_libdir_flag_spec_F77" || \
-    test -n "$runpath_var F77" || \
-@@ -13305,8 +14872,8 @@
-   # directories.
-   hardcode_action_F77=unsupported
- fi
--echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
--echo "${ECHO_T}$hardcode_action_F77" >&6
-+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-+$as_echo "$hardcode_action_F77" >&6; }
  
- if test "$hardcode_action_F77" = relink; then
-   # Fast installation is not supported
-@@ -13319,35 +14886,35 @@
+-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
  
- striplib=
- old_striplib=
--echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-+{ $as_echo "$as_me:$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"
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { $as_echo "$as_me:$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"
--         echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+         { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-        else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-        ;;
-    *)
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-     ;;
-   esac
- fi
+-CC="$lt_save_CC"
  
--echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+$as_echo_n "checking dynamic linker characteristics... " >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -13857,8 +15424,8 @@
-   dynamic_linker=no
-   ;;
- esac
--echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6
-+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+$as_echo "$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
+-	else
+-	  tagname=""
+-	fi
+-	;;
  
+-      GCJ)
+-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
  
-@@ -14274,7 +15841,6 @@
- 	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
  
  
--
- # Source file extension for Java test sources.
- ac_ext=java
+-# Source file extension for Java test sources.
+-ac_ext=java
  
-@@ -14312,10 +15878,10 @@
- if test "$GCC" = yes; then
-   lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
+-# Object file extension for compiled Java test sources.
+-objext=o
+-objext_GCJ=$objext
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
+ 
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ 
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
+ 
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
+ 
+ 
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${GCJ-"gcj"}
+-compiler=$CC
+-compiler_GCJ=$CC
+ 
+-# GCJ did not exist at the time GCC didn't implicitly link libc in.
+-archive_cmds_need_lc_GCJ=no
+ 
+ 
+-lt_prog_compiler_no_builtin_flag_GCJ=
+ 
+-if test "$GCC" = yes; then
+-  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
  
 -  echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
-+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
- if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-@@ -14330,11 +15896,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
+-else
+-  lt_cv_prog_compiler_rtti_exceptions=no
+-  ac_outfile=conftest.$ac_objext
+-   printf "$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}? :&$lt_compiler_flag :; t' \
+-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14333: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15899: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
+-   (eval "$lt_compile" 2>conftest.err)
+-   ac_status=$?
+-   cat conftest.err >&5
 -   echo "$as_me:14337: \$? = $ac_status" >&5
-+   echo "$as_me:15903: \$? = $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
-@@ -14345,8 +15911,8 @@
-    $rm conftest*
+-   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
+-     if test ! -s conftest.err; then
+-       lt_cv_prog_compiler_rtti_exceptions=yes
+-     fi
+-   fi
+-   $rm conftest*
  
- fi
+-fi
 -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
-+{ $as_echo "$as_me:$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_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -14360,8 +15926,8 @@
- lt_prog_compiler_pic_GCJ=
- lt_prog_compiler_static_GCJ=
+-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+-    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
+-else
+-    :
+-fi
+ 
+-fi
+ 
+-lt_prog_compiler_wl_GCJ=
+-lt_prog_compiler_pic_GCJ=
+-lt_prog_compiler_static_GCJ=
  
 -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  
-   if test "$GCC" = yes; then
-     lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -14537,17 +16103,17 @@
-     esac
-   fi
+-  if test "$GCC" = yes; then
+-    lt_prog_compiler_wl_GCJ='-Wl,'
+-    lt_prog_compiler_static_GCJ='-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_GCJ='-Bstatic'
+-      fi
+-      ;;
+ 
+-    amigaos*)
+-      # 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_GCJ='-m68020 -resident32 -malways-restore-a4'
+-      ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+-      # PIC is the default for these OSes.
+-      ;;
+ 
+-    mingw* | pw32* | os2*)
+-      # 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_GCJ='-DDLL_EXPORT'
+-      ;;
+ 
+-    darwin* | rhapsody*)
+-      # PIC is the default on this platform
+-      # Common symbols not allowed in MH_DYLIB files
+-      lt_prog_compiler_pic_GCJ='-fno-common'
+-      ;;
+ 
+-    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_GCJ=no
+-      enable_shared=no
+-      ;;
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	lt_prog_compiler_pic_GCJ=-Kconform_pic
+-      fi
+-      ;;
+ 
+-    hpux*)
+-      # 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_GCJ='-fPIC'
+-	;;
+-      esac
+-      ;;
+ 
+-    *)
+-      lt_prog_compiler_pic_GCJ='-fPIC'
+-      ;;
+-    esac
+-  else
+-    # PORTME Check for flag to pass linker flags through the system compiler.
+-    case $host_os in
+-    aix*)
+-      lt_prog_compiler_wl_GCJ='-Wl,'
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	lt_prog_compiler_static_GCJ='-Bstatic'
+-      else
+-	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
+-      fi
+-      ;;
+ 
+-    mingw* | pw32* | os2*)
+-      # 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_GCJ='-DDLL_EXPORT'
+-      ;;
+ 
+-    hpux9* | hpux10* | hpux11*)
+-      lt_prog_compiler_wl_GCJ='-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_GCJ='+Z'
+-	;;
+-      esac
+-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+-      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
+-      ;;
+ 
+-    irix5* | irix6* | nonstopux*)
+-      lt_prog_compiler_wl_GCJ='-Wl,'
+-      # PIC (with -KPIC) is the default.
+-      lt_prog_compiler_static_GCJ='-non_shared'
+-      ;;
+ 
+-    newsos6)
+-      lt_prog_compiler_pic_GCJ='-KPIC'
+-      lt_prog_compiler_static_GCJ='-Bstatic'
+-      ;;
+ 
+-    linux*)
+-      case $CC in
+-      icc|ecc)
+-	lt_prog_compiler_wl_GCJ='-Wl,'
+-	lt_prog_compiler_pic_GCJ='-KPIC'
+-	lt_prog_compiler_static_GCJ='-static'
+-        ;;
+-      ccc)
+-        lt_prog_compiler_wl_GCJ='-Wl,'
+-        # All Alpha code is PIC.
+-        lt_prog_compiler_static_GCJ='-non_shared'
+-        ;;
+-      esac
+-      ;;
+ 
+-    osf3* | osf4* | osf5*)
+-      lt_prog_compiler_wl_GCJ='-Wl,'
+-      # All OSF/1 code is PIC.
+-      lt_prog_compiler_static_GCJ='-non_shared'
+-      ;;
+ 
+-    sco3.2v5*)
+-      lt_prog_compiler_pic_GCJ='-Kpic'
+-      lt_prog_compiler_static_GCJ='-dn'
+-      ;;
+ 
+-    solaris*)
+-      lt_prog_compiler_wl_GCJ='-Wl,'
+-      lt_prog_compiler_pic_GCJ='-KPIC'
+-      lt_prog_compiler_static_GCJ='-Bstatic'
+-      ;;
+ 
+-    sunos4*)
+-      lt_prog_compiler_wl_GCJ='-Qoption ld '
+-      lt_prog_compiler_pic_GCJ='-PIC'
+-      lt_prog_compiler_static_GCJ='-Bstatic'
+-      ;;
+ 
+-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-      lt_prog_compiler_wl_GCJ='-Wl,'
+-      lt_prog_compiler_pic_GCJ='-KPIC'
+-      lt_prog_compiler_static_GCJ='-Bstatic'
+-      ;;
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec ;then
+-	lt_prog_compiler_pic_GCJ='-Kconform_pic'
+-	lt_prog_compiler_static_GCJ='-Bstatic'
+-      fi
+-      ;;
+ 
+-    uts4*)
+-      lt_prog_compiler_pic_GCJ='-pic'
+-      lt_prog_compiler_static_GCJ='-Bstatic'
+-      ;;
+ 
+-    *)
+-      lt_prog_compiler_can_build_shared_GCJ=no
+-      ;;
+-    esac
+-  fi
  
 -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
 -echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
-+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-+$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }
  
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_GCJ"; then
+-#
+-# Check to make sure the PIC flag actually works.
+-#
+-if test -n "$lt_prog_compiler_pic_GCJ"; then
 -  echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
-+  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; }
- if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
+-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_prog_compiler_pic_works_GCJ=no
-   ac_outfile=conftest.$ac_objext
-@@ -14562,11 +16128,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
+-else
+-  lt_prog_compiler_pic_works_GCJ=no
+-  ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
+-   # 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}? :&$lt_compiler_flag :; t' \
+-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14565: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16131: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
+-   (eval "$lt_compile" 2>conftest.err)
+-   ac_status=$?
+-   cat conftest.err >&5
 -   echo "$as_me:14569: \$? = $ac_status" >&5
-+   echo "$as_me:16135: \$? = $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
-@@ -14577,8 +16143,8 @@
-    $rm conftest*
+-   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
+-     if test ! -s conftest.err; then
+-       lt_prog_compiler_pic_works_GCJ=yes
+-     fi
+-   fi
+-   $rm conftest*
  
- fi
+-fi
 -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
 -echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
-+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-+$as_echo "$lt_prog_compiler_pic_works_GCJ" >&6; }
  
- if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
-     case $lt_prog_compiler_pic_GCJ in
-@@ -14601,10 +16167,10 @@
-     ;;
- esac
+-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
+-    case $lt_prog_compiler_pic_GCJ in
+-     "" | " "*) ;;
+-     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
+-     esac
+-else
+-    lt_prog_compiler_pic_GCJ=
+-     lt_prog_compiler_can_build_shared_GCJ=no
+-fi
+ 
+-fi
+-case "$host_os" in
+-  # For platforms which do not support PIC, -DPIC is meaningless:
+-  *djgpp*)
+-    lt_prog_compiler_pic_GCJ=
+-    ;;
+-  *)
+-    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
+-    ;;
+-esac
  
 -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-+{ $as_echo "$as_me:$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 test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
+-if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o_GCJ=no
-    $rm -r conftest 2>/dev/null
-@@ -14629,11 +16195,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
+-else
+-  lt_cv_prog_compiler_c_o_GCJ=no
+-   $rm -r conftest 2>/dev/null
+-   mkdir conftest
+-   cd conftest
+-   mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+ 
+-   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}? :&$lt_compiler_flag :; t' \
+-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14632: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16198: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
+-   (eval "$lt_compile" 2>out/conftest.err)
+-   ac_status=$?
+-   cat out/conftest.err >&5
 -   echo "$as_me:14636: \$? = $ac_status" >&5
-+   echo "$as_me:16202: \$? = $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
-@@ -14650,34 +16216,34 @@
-    $rm conftest*
+-   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
+-     if test ! -s out/conftest.err; then
+-       lt_cv_prog_compiler_c_o_GCJ=yes
+-     fi
+-   fi
+-   chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
+-   cd ..
+-   rmdir conftest
+-   $rm conftest*
  
- fi
+-fi
 -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; }
  
  
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
-   # do not overwrite the value of need_locks provided by the user
+-hard_links="nottested"
+-if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
+-  # do not overwrite the value of need_locks provided by the user
 -  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-+  { $as_echo "$as_me:$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
+-  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
 -  echo "$as_me:$LINENO: result: $hard_links" >&5
 -echo "${ECHO_T}$hard_links" >&6
-+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-+$as_echo "$hard_links" >&6; }
-   if test "$hard_links" = no; then
+-  if test "$hard_links" = no; then
 -    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+    { $as_echo "$as_me:$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
+-    need_locks=warn
+-  fi
+-else
+-  need_locks=no
+-fi
  
 -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+{ $as_echo "$as_me:$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_GCJ=
-@@ -14969,15 +16535,12 @@
- 	allow_undefined_flag_GCJ='-berok'
-        # Determine the default libpath from the value encoded in an empty executable.
-        cat >conftest.$ac_ext <<_ACEOF
+-  runpath_var=
+-  allow_undefined_flag_GCJ=
+-  enable_shared_with_static_runtimes_GCJ=no
+-  archive_cmds_GCJ=
+-  archive_expsym_cmds_GCJ=
+-  old_archive_From_new_cmds_GCJ=
+-  old_archive_from_expsyms_cmds_GCJ=
+-  export_dynamic_flag_spec_GCJ=
+-  whole_archive_flag_spec_GCJ=
+-  thread_safe_flag_spec_GCJ=
+-  hardcode_libdir_flag_spec_GCJ=
+-  hardcode_libdir_flag_spec_ld_GCJ=
+-  hardcode_libdir_separator_GCJ=
+-  hardcode_direct_GCJ=no
+-  hardcode_minus_L_GCJ=no
+-  hardcode_shlibpath_var_GCJ=unsupported
+-  link_all_deplibs_GCJ=unknown
+-  hardcode_automatic_GCJ=no
+-  module_cmds_GCJ=
+-  module_expsym_cmds_GCJ=
+-  always_export_symbols_GCJ=no
+-  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  # include_expsyms should be a list of space-separated symbols to be *always*
+-  # included in the symbol list
+-  include_expsyms_GCJ=
+-  # 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_GCJ="_GLOBAL_OFFSET_TABLE_"
+-  # 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.
+-  extract_expsyms_cmds=
+ 
+-  case $host_os in
+-  cygwin* | mingw* | pw32*)
+-    # 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
+-    ;;
+-  openbsd*)
+-    with_gnu_ld=no
+-    ;;
+-  esac
+ 
+-  ld_shlibs_GCJ=yes
+-  if test "$with_gnu_ld" = yes; then
+-    # If archive_cmds runs LD, not CC, wlarc should be empty
+-    wlarc='${wl}'
+ 
+-    # See if GNU ld supports shared libraries.
+-    case $host_os in
+-    aix3* | aix4* | aix5*)
+-      # On AIX/PPC, the GNU linker is very broken
+-      if test "$host_cpu" != ia64; then
+-	ld_shlibs_GCJ=no
+-	cat <<EOF 1>&2
+ 
+-*** Warning: the GNU linker, at least up to release 2.9.1, 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 modify your PATH
+-*** so that a non-GNU linker is found, and then restart.
+ 
+-EOF
+-      fi
+-      ;;
+ 
+-    amigaos*)
+-      archive_cmds_GCJ='$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_GCJ='-L$libdir'
+-      hardcode_minus_L_GCJ=yes
+-
+-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+-      # that the semantics of dynamic libraries on AmigaOS, at least up
+-      # to version 4, is to share data among multiple programs linked
+-      # with the same dynamic library.  Since this doesn't match the
+-      # behavior of shared libraries on other platforms, we can't use
+-      # them.
+-      ld_shlibs_GCJ=no
+-      ;;
+ 
+-    beos*)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	allow_undefined_flag_GCJ=unsupported
+-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+-	# support --undefined.  This deserves some investigation.  FIXME
+-	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      else
+-	ld_shlibs_GCJ=no
+-      fi
+-      ;;
+ 
+-    cygwin* | mingw* | pw32*)
+-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
+-      # as there is no search path for DLLs.
+-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-      allow_undefined_flag_GCJ=unsupported
+-      always_export_symbols_GCJ=no
+-      enable_shared_with_static_runtimes_GCJ=yes
+-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+ 
+-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+-	# If the export-symbols file already is a .def file (1st line
+-	# is EXPORTS), use it as is; otherwise, prepend...
+-	archive_expsym_cmds_GCJ='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}--image-base=0x10000000  ${wl}--out-implib,$lib'
+-      else
+-	ld_shlibs=no
+-      fi
+-      ;;
+ 
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-	wlarc=
+-      else
+-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      fi
+-      ;;
+ 
+-    solaris* | sysv5*)
+-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+-	ld_shlibs_GCJ=no
+-	cat <<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.
+ 
+-EOF
+-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      else
+-	ld_shlibs_GCJ=no
+-      fi
+-      ;;
+ 
+-    sunos4*)
+-      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      wlarc=
+-      hardcode_direct_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
+-      ;;
+ 
+-    *)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      else
+-	ld_shlibs_GCJ=no
+-      fi
+-      ;;
+-    esac
+ 
+-    if test "$ld_shlibs_GCJ" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
+-      export_dynamic_flag_spec_GCJ='${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_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	whole_archive_flag_spec_GCJ=
+-      fi
+-    fi
+-  else
+-    # PORTME fill in a description of your system's linker (not GNU ld)
+-    case $host_os in
+-    aix3*)
+-      allow_undefined_flag_GCJ=unsupported
+-      always_export_symbols_GCJ=yes
+-      archive_expsym_cmds_GCJ='$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_GCJ=yes
+-      if test "$GCC" = yes && test -z "$link_static_flag"; then
+-	# Neither direct hardcoding nor static linking is supported with a
+-	# broken collect2.
+-	hardcode_direct_GCJ=unsupported
+-      fi
+-      ;;
+ 
+-    aix4* | aix5*)
+-      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
+-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+-	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+-	else
+-	  export_symbols_cmds_GCJ='$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].*|aix5*)
+-	  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_GCJ=''
+-      hardcode_direct_GCJ=yes
+-      hardcode_libdir_separator_GCJ=':'
+-      link_all_deplibs_GCJ=yes
+ 
+-      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
+-  	  hardcode_direct_GCJ=yes
+-	  else
+-  	  # We have old collect2
+-  	  hardcode_direct_GCJ=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_GCJ=yes
+-  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-  	  hardcode_libdir_separator_GCJ=
+-	  fi
+-	esac
+-	shared_flag='-shared'
+-      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
+ 
+-      # 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_GCJ=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_GCJ='-berok'
+-       # Determine the default libpath from the value encoded in an empty executable.
+-       cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
@@ -10405,13 +20890,15 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
- int
- main ()
- {
-@@ -14987,17 +16550,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-int
+-main ()
+-{
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
@@ -10420,61 +20907,34 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
  
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
- }'`
-@@ -15005,10 +16577,15 @@
- if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
- }'`; fi
- else
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
+-else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
- fi
+-fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-        hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -15021,15 +16598,12 @@
- 	else
- 	 # Determine the default libpath from the value encoded in an empty executable.
- 	 cat >conftest.$ac_ext <<_ACEOF
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+-       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-       else
+-	if test "$host_cpu" = ia64; then
+-	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
+-	  allow_undefined_flag_GCJ="-z nodefs"
+-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+-	else
+-	 # Determine the default libpath from the value encoded in an empty executable.
+-	 cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
  
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
@@ -10482,13 +20942,15 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
- int
- main ()
- {
-@@ -15039,17 +16613,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-int
+-main ()
+-{
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
@@ -10497,170 +20959,1128 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+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:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
  
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
- }'`
-@@ -15057,10 +16640,15 @@
- if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
- }'`; fi
- else
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
+-else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
- fi
+-fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+-	 hardcode_libdir_flag_spec_GCJ='${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_GCJ=' ${wl}-bernotok'
+-	  allow_undefined_flag_GCJ=' ${wl}-berok'
+-	  # -bexpall does not export symbols beginning with underscore (_)
+-	  always_export_symbols_GCJ=yes
+-	  # Exported symbols can be pulled into shared objects from archives
+-	  whole_archive_flag_spec_GCJ=' '
+-	  archive_cmds_need_lc_GCJ=yes
+-	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-	fi
+-      fi
+-      ;;
  
- 	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -15472,8 +17060,8 @@
-     esac
-   fi
+-    amigaos*)
+-      archive_cmds_GCJ='$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_GCJ='-L$libdir'
+-      hardcode_minus_L_GCJ=yes
+-      # see comment about different semantics on the GNU ld section
+-      ld_shlibs_GCJ=no
+-      ;;
+ 
+-    bsdi4*)
+-      export_dynamic_flag_spec_GCJ=-rdynamic
+-      ;;
+ 
+-    cygwin* | mingw* | pw32*)
+-      # 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.
+-      hardcode_libdir_flag_spec_GCJ=' '
+-      allow_undefined_flag_GCJ=unsupported
+-      # Tell ltmain to make .lib files, not .a files.
+-      libext=lib
+-      # Tell ltmain to make .dll files, not .so files.
+-      shrext=".dll"
+-      # FIXME: Setting linknames here is a bad hack.
+-      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+-      # The linker will automatically build a .lib file if we build a DLL.
+-      old_archive_From_new_cmds_GCJ='true'
+-      # FIXME: Should let the user specify the lib program.
+-      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
+-      enable_shared_with_static_runtimes_GCJ=yes
+-      ;;
+ 
+-    darwin* | rhapsody*)
+-    if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+-      archive_cmds_need_lc_GCJ=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[012])
+-	allow_undefined_flag_GCJ='-undefined suppress'
+-	;;
+-      *) # Darwin 1.3 on
+-	test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
+-	;;
+-      esac
+-      # FIXME: Relying on posixy $() will cause problems for
+-      #        cross-compilation, but unfortunately the echo tests do not
+-      #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+-      #	       `"' quotes if we put them in here... so don't!
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-    	else
+-        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -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'
+-      fi
+-      module_cmds_GCJ='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        else
+-          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -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~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        fi
+-          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      hardcode_direct_GCJ=no
+-      hardcode_automatic_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=unsupported
+-      whole_archive_flag_spec_GCJ='-all_load $convenience'
+-      link_all_deplibs_GCJ=yes
+-    fi
+-      ;;
+ 
+-    dgux*)
+-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-      hardcode_shlibpath_var_GCJ=no
+-      ;;
+ 
+-    freebsd1*)
+-      ld_shlibs_GCJ=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_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+-      hardcode_direct_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
+-      ;;
+ 
+-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+-    freebsd2*)
+-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct_GCJ=yes
+-      hardcode_minus_L_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
+-      ;;
+ 
+-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd*)
+-      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+-      hardcode_direct_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
+-      ;;
+ 
+-    hpux9*)
+-      if test "$GCC" = yes; then
+-	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${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_GCJ='$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_GCJ='${wl}+b ${wl}$libdir'
+-      hardcode_libdir_separator_GCJ=:
+-      hardcode_direct_GCJ=yes
+ 
+-      # hardcode_minus_L: Not really in the search PATH,
+-      # but as the default location of the library.
+-      hardcode_minus_L_GCJ=yes
+-      export_dynamic_flag_spec_GCJ='${wl}-E'
+-      ;;
+ 
+-    hpux10* | hpux11*)
+-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	*)
+-	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	esac
+-      else
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  ;;
+-	*)
+-	  archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+-	  ;;
+-	esac
+-      fi
+-      if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*)
+-	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+-	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
+-	  hardcode_libdir_separator_GCJ=:
+-	  hardcode_direct_GCJ=no
+-	  hardcode_shlibpath_var_GCJ=no
+-	  ;;
+-	ia64*)
+-	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-	  hardcode_direct_GCJ=no
+-	  hardcode_shlibpath_var_GCJ=no
+ 
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  hardcode_minus_L_GCJ=yes
+-	  ;;
+-	*)
+-	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+-	  hardcode_libdir_separator_GCJ=:
+-	  hardcode_direct_GCJ=yes
+-	  export_dynamic_flag_spec_GCJ='${wl}-E'
+ 
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  hardcode_minus_L_GCJ=yes
+-	  ;;
+-	esac
+-      fi
+-      ;;
+ 
+-    irix5* | irix6* | nonstopux*)
+-      if test "$GCC" = yes; then
+-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      else
+-	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
+-      fi
+-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator_GCJ=:
+-      link_all_deplibs_GCJ=yes
+-      ;;
+ 
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+-      else
+-	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+-      fi
+-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+-      hardcode_direct_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
+-      ;;
+ 
+-    newsos6)
+-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct_GCJ=yes
+-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator_GCJ=:
+-      hardcode_shlibpath_var_GCJ=no
+-      ;;
+ 
+-    openbsd*)
+-      hardcode_direct_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+-	export_dynamic_flag_spec_GCJ='${wl}-E'
+-      else
+-       case $host_os in
+-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+-	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
+-	   ;;
+-	 *)
+-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
+-      fi
+-      ;;
+ 
+-    os2*)
+-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-      hardcode_minus_L_GCJ=yes
+-      allow_undefined_flag_GCJ=unsupported
+-      archive_cmds_GCJ='$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_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+-      ;;
+ 
+-    osf3*)
+-      if test "$GCC" = yes; then
+-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      else
+-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
+-	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-      fi
+-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+-      hardcode_libdir_separator_GCJ=:
+-      ;;
+ 
+-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+-      if test "$GCC" = yes; then
+-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+-      else
+-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
+-	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+ 
+-	# Both c and cxx compiler support -rpath directly
+-	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
+-      fi
+-      hardcode_libdir_separator_GCJ=:
+-      ;;
+ 
+-    sco3.2v5*)
+-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_shlibpath_var_GCJ=no
+-      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
+-      runpath_var=LD_RUN_PATH
+-      hardcode_runpath_var=yes
+-      ;;
+ 
+-    solaris*)
+-      no_undefined_flag_GCJ=' -z text'
+-      if test "$GCC" = yes; then
+-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+-      else
+-	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	archive_expsym_cmds_GCJ='$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'
+-      fi
+-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+-      hardcode_shlibpath_var_GCJ=no
+-      case $host_os in
+-      solaris2.[0-5] | solaris2.[0-5].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
+-      esac
+-      link_all_deplibs_GCJ=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_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+-      fi
+-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-      hardcode_direct_GCJ=yes
+-      hardcode_minus_L_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
+-      ;;
+ 
+-    sysv4)
+-      case $host_vendor in
+-	sni)
+-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  hardcode_direct_GCJ=yes # is this really true???
+-	;;
+-	siemens)
+-	  ## LD is ld it makes a PLAMLIB
+-	  ## CC just makes a GrossModule.
+-	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
+-	  hardcode_direct_GCJ=no
+-        ;;
+-	motorola)
+-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
+-	;;
+-      esac
+-      runpath_var='LD_RUN_PATH'
+-      hardcode_shlibpath_var_GCJ=no
+-      ;;
+ 
+-    sysv4.3*)
+-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_shlibpath_var_GCJ=no
+-      export_dynamic_flag_spec_GCJ='-Bexport'
+-      ;;
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	hardcode_shlibpath_var_GCJ=no
+-	runpath_var=LD_RUN_PATH
+-	hardcode_runpath_var=yes
+-	ld_shlibs_GCJ=yes
+-      fi
+-      ;;
+ 
+-    sysv4.2uw2*)
+-      archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct_GCJ=yes
+-      hardcode_minus_L_GCJ=no
+-      hardcode_shlibpath_var_GCJ=no
+-      hardcode_runpath_var=yes
+-      runpath_var=LD_RUN_PATH
+-      ;;
+ 
+-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+-      no_undefined_flag_GCJ='${wl}-z ${wl}text'
+-      if test "$GCC" = yes; then
+-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      fi
+-      runpath_var='LD_RUN_PATH'
+-      hardcode_shlibpath_var_GCJ=no
+-      ;;
+ 
+-    sysv5*)
+-      no_undefined_flag_GCJ=' -z text'
+-      # $CC -shared without GNU ld will not create a library from C++
+-      # object files and a static libstdc++, better avoid it by now
+-      archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      archive_expsym_cmds_GCJ='$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'
+-      hardcode_libdir_flag_spec_GCJ=
+-      hardcode_shlibpath_var_GCJ=no
+-      runpath_var='LD_RUN_PATH'
+-      ;;
+ 
+-    uts4*)
+-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-      hardcode_shlibpath_var_GCJ=no
+-      ;;
+ 
+-    *)
+-      ld_shlibs_GCJ=no
+-      ;;
+-    esac
+-  fi
  
 -echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
 -echo "${ECHO_T}$ld_shlibs_GCJ" >&6
-+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-+$as_echo "$ld_shlibs_GCJ" >&6; }
- test "$ld_shlibs_GCJ" = no && can_build_shared=no
- 
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -15498,15 +17086,15 @@
-       # 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.
+-test "$ld_shlibs_GCJ" = 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
+ 
+-#
+-# Do we need to explicitly link libc?
+-#
+-case "x$archive_cmds_need_lc_GCJ" in
+-x|xyes)
+-  # Assume -lc should be added
+-  archive_cmds_need_lc_GCJ=yes
+ 
+-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+-    case $archive_cmds_GCJ 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.
 -      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-       $rm conftest*
-       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-      $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
+-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } 2>conftest.err; then
-         soname=conftest
-         lib=conftest
-@@ -15523,7 +17111,7 @@
-         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-   (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-   ac_status=$?
+-  (exit $ac_status); } 2>conftest.err; then
+-        soname=conftest
+-        lib=conftest
+-        libobjs=conftest.$ac_objext
+-        deplibs=
+-        wl=$lt_prog_compiler_wl_GCJ
+-        compiler_flags=-v
+-        linker_flags=-v
+-        verstring=
+-        output_objdir=.
+-        libname=conftest
+-        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
+-        allow_undefined_flag_GCJ=
+-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+-  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+-  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-         then
- 	  archive_cmds_need_lc_GCJ=no
-@@ -15535,16 +17123,16 @@
-         cat conftest.err 1>&5
-       fi
-       $rm conftest*
+-  (exit $ac_status); }
+-        then
+-	  archive_cmds_need_lc_GCJ=no
+-        else
+-	  archive_cmds_need_lc_GCJ=yes
+-        fi
+-        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
+-      else
+-        cat conftest.err 1>&5
+-      fi
+-      $rm conftest*
 -      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
 -echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
-+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-+$as_echo "$archive_cmds_need_lc_GCJ" >&6; }
-       ;;
-     esac
-   fi
-   ;;
- esac
+-      ;;
+-    esac
+-  fi
+-  ;;
+-esac
  
 -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
- hardcode_action_GCJ=
- if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-    test -n "$runpath_var GCJ" || \
-@@ -15568,8 +17156,8 @@
-   # directories.
-   hardcode_action_GCJ=unsupported
- fi
+-hardcode_action_GCJ=
+-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+-   test -n "$runpath_var GCJ" || \
+-   test "X$hardcode_automatic_GCJ"="Xyes" ; then
+ 
+-  # We can hardcode non-existant directories.
+-  if test "$hardcode_direct_GCJ" != 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_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
+-     test "$hardcode_minus_L_GCJ" != no; then
+-    # Linking always hardcodes the temporary library directory.
+-    hardcode_action_GCJ=relink
+-  else
+-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+-    hardcode_action_GCJ=immediate
+-  fi
+-else
+-  # We cannot hardcode anything, or else we can only hardcode existing
+-  # directories.
+-  hardcode_action_GCJ=unsupported
+-fi
 -echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
 -echo "${ECHO_T}$hardcode_action_GCJ" >&6
-+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-+$as_echo "$hardcode_action_GCJ" >&6; }
  
- if test "$hardcode_action_GCJ" = relink; then
-   # Fast installation is not supported
-@@ -15582,35 +17170,35 @@
+-if test "$hardcode_action_GCJ" = relink; 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
  
- striplib=
- old_striplib=
+-striplib=
+-old_striplib=
 -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-+{ $as_echo "$as_me:$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"
+-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"
 -  echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
- # FIXME - insert some real tests, host_os isn't really good enough
+-else
+-# FIXME - insert some real tests, host_os isn't really good enough
++
++
++
++
++
++
++
++
++
++
++
++
++
++  { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++$as_echo_n "checking dynamic linker characteristics... " >&6; }
++
++if test "$GCC" = yes; then
    case $host_os in
-    darwin*)
-        if test -n "$STRIP" ; then
-          striplib="$STRIP -x"
+-   darwin*)
+-       if test -n "$STRIP" ; then
+-         striplib="$STRIP -x"
 -         echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
-+         { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-        else
+-       else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-        ;;
-    *)
+-fi
+-       ;;
+-   *)
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-     ;;
+-    ;;
++    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++    *) lt_awk_arg="/^libraries:/" ;;
    esac
++  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
++    # 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 -e 's/;/ /g'`
++  else
++    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++  # 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; }
++}'`
++  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
  fi
- 
+-
 -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+$as_echo_n "checking dynamic linker characteristics... " >&6; }
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -16120,8 +17708,8 @@
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -15624,20 +9237,6 @@ shlibpath_overrides_runpath=unknown
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+-    # 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.
+-    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
+-else
+-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -15655,7 +9254,7 @@ aix3*)
+   soname_spec='${libname}${release}${shared_ext}$major'
+   ;;
+ 
+-aix4* | aix5*)
++aix[4-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -15674,7 +9273,7 @@ aix4* | aix5*)
+       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
++	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ 	:
+       else
+ 	can_build_shared=no
+@@ -15700,9 +9299,18 @@ aix4* | aix5*)
+   ;;
+ 
+ amigaos*)
+-  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=`$echo "X$lib" | $Xsed -e '\''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'
++  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=`$ECHO "X$lib" | $Xsed -e '\''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*)
+@@ -15711,7 +9319,7 @@ beos*)
+   shlibpath_var=LIBRARY_PATH
+   ;;
+ 
+-bsdi4*)
++bsdi[45]*)
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -15725,51 +9333,55 @@ bsdi4*)
+   # libtool to hard-code these into programs
+   ;;
+ 
+-cygwin* | mingw* | pw32*)
++cygwin* | mingw* | pw32* | cegcc*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+   case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32*)
++  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+     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'\''`~
++      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'
++      $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'
++       $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="/lib /lib/w32api /usr/lib /usr/local/lib"
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+       ;;
+-    mingw*)
++    mingw* | cegcc*)
+       # MinGW DLLs use traditional 'lib' prefix
+       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
++      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+         # It is most probably a Windows format PATH printed by
+         # mingw gcc, but we are running on Cygwin. Gcc prints its search
+         # path with ; separators, and with drive letters. We can handle the
+         # drive letters (cygwin fileutils understands them), so leave them,
+         # especially as we might pass files found there to a mingw objdump,
+         # which wouldn't understand a cygwinified path. Ahh.
+-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++        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"`
++        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+       fi
+       ;;
+     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}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+     ;;
+@@ -15788,18 +9400,13 @@ darwin* | rhapsody*)
+   version_type=darwin
+   need_lib_prefix=no
+   need_version=no
+-  # FIXME: Relying on posixy $() will cause problems for
+-  #        cross-compilation, but unfortunately the echo tests do not
+-  #        yet detect zsh echo's removal of \ escapes.
+-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  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='$(test .$module = .yes && echo .so || echo .dylib)'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  fi
++  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'
+   ;;
+ 
+@@ -15816,8 +9423,17 @@ freebsd1*)
+   dynamic_linker=no
+   ;;
+ 
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++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[123]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -15835,14 +9451,19 @@ freebsd*)
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.01* | freebsdelf3.01*)
++  freebsd3.[01]* | freebsdelf3.[01]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+-  *) # from 3.2 on
++  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
+   ;;
+ 
+@@ -15862,9 +9483,9 @@ hpux9* | hpux10* | hpux11*)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+-  case "$host_cpu" in
++  case $host_cpu in
+   ia64*)
+-    shrext='.so'
++    shrext_cmds='.so'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.so"
+     shlibpath_var=LD_LIBRARY_PATH
+@@ -15878,19 +9499,19 @@ hpux9* | hpux10* | hpux11*)
+     fi
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+-   hppa*64*)
+-     shrext='.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='.sl'
++  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
+@@ -15902,6 +9523,18 @@ hpux9* | hpux10* | hpux11*)
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix[3-9]*)
++  version_type=linux
++  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 ;;
+@@ -15945,7 +9578,7 @@ linux*oldld* | linux*aout* | linux*coff*
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -15954,11 +9587,75 @@ linux*)
+   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
++  save_LDFLAGS=$LDFLAGS
++  save_libdir=$libdir
++  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
++       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (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:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
++  shlibpath_overrides_runpath=yes
++fi
++
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++  LDFLAGS=$save_LDFLAGS
++  libdir=$save_libdir
++
+   # 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
+ 
++  # 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;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $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,
+@@ -15972,12 +9669,12 @@ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++  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}${release}${shared_ext} ${libname}${shared_ext}'
++    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
+@@ -15993,24 +9690,31 @@ newsos6)
+   shlibpath_overrides_runpath=yes
+   ;;
+ 
+-nto-qnx)
+-  version_type=linux
++*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=yes
++  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
+-  need_version=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
++  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
+@@ -16026,7 +9730,7 @@ openbsd*)
+ 
+ os2*)
+   libname_spec='$name'
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+@@ -16044,11 +9748,8 @@ osf3* | osf4* | osf5*)
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  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
++rdos*)
++  dynamic_linker=no
+   ;;
+ 
+ solaris*)
+@@ -16076,7 +9777,7 @@ sunos4*)
+   need_version=yes
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+@@ -16085,7 +9786,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+     sni)
+       shlibpath_overrides_runpath=no
+       need_lib_prefix=no
+-      export_dynamic_flag_spec='${wl}-Blargedynsym'
+       runpath_var=LD_RUN_PATH
+       ;;
+     siemens)
+@@ -16109,6 +9809,39 @@ sysv4*MP*)
+   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
++  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
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -16120,11 +9853,152 @@ uts4*)
    dynamic_linker=no
    ;;
  esac
@@ -10670,8 +22090,168 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +$as_echo "$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
- if test "x$enable_dlopen" != xyes; then
-@@ -16151,61 +17739,71 @@
+-if test "x$enable_dlopen" != xyes; then
++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:$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:$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
+@@ -16139,73 +10013,83 @@ else
+     lt_cv_dlopen_self=yes
+     ;;
+ 
+-  mingw* | pw32*)
++  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
@@ -10695,21 +22275,21 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +/* end confdefs.h.  */
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
 +/* 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.  */
--char dlopen ();
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dlopen ();
 -#ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
- #  endif
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
-+char dlopen ();
  int
  main ()
  {
@@ -10754,10 +22334,11 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
+-ac_cv_lib_dl_dlopen=no
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
- ac_cv_lib_dl_dlopen=no
++	ac_cv_lib_dl_dlopen=no
  fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +
@@ -10773,8 +22354,12 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  if test $ac_cv_lib_dl_dlopen = yes; then
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
-@@ -16219,369 +17817,451 @@
-    ;;
+@@ -16216,374 +10100,456 @@ else
+ 
+ fi
+ 
+-   ;;
++    ;;
  
    *)
 -    echo "$as_me:$LINENO: checking for shl_load" >&5
@@ -10799,6 +22384,8 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +
  /* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char shl_load (); below.  */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +    which can conflict with char shl_load (); below.
 +    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +    <limits.h> exists even on freestanding compilers.  */
@@ -10806,31 +22393,31 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
- #include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char shl_load ();
--char (*f) ();
- 
--#ifdef F77_DUMMY_MAIN
++# include <assert.h>
++#endif
++
 +#undef shl_load
 +
 +/* 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
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char shl_load ();
+-char (*f) ();
+-
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
 -int
 -main ()
 -{
-+char shl_load ();
  /* 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.  */
@@ -10884,10 +22471,11 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
+-ac_cv_func_shl_load=no
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
- ac_cv_func_shl_load=no
++	ac_cv_func_shl_load=no
  fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +
@@ -10922,21 +22510,21 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +/* end confdefs.h.  */
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
 +/* 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.  */
--char shl_load ();
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char shl_load ();
 -#ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
- #  endif
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
-+char shl_load ();
  int
  main ()
  {
@@ -10981,10 +22569,11 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
+-ac_cv_lib_dld_shl_load=no
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
- ac_cv_lib_dld_shl_load=no
++	ac_cv_lib_dld_shl_load=no
  fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +
@@ -10998,7 +22587,8 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
  if test $ac_cv_lib_dld_shl_load = yes; then
-   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
  else
 -  echo "$as_me:$LINENO: checking for dlopen" >&5
 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
@@ -11022,6 +22612,8 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +
  /* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char dlopen (); below.  */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +    which can conflict with char dlopen (); below.
 +    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +    <limits.h> exists even on freestanding compilers.  */
@@ -11029,31 +22621,31 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
- #include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char dlopen ();
--char (*f) ();
- 
--#ifdef F77_DUMMY_MAIN
++# include <assert.h>
++#endif
++
 +#undef dlopen
 +
 +/* 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
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dlopen ();
+-char (*f) ();
+-
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
 -int
 -main ()
 -{
-+char dlopen ();
  /* 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.  */
@@ -11107,10 +22699,11 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
+-ac_cv_func_dlopen=no
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
- ac_cv_func_dlopen=no
++	ac_cv_func_dlopen=no
  fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +
@@ -11145,21 +22738,21 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +/* end confdefs.h.  */
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
 +/* 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.  */
--char dlopen ();
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dlopen ();
 -#ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
- #  endif
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
-+char dlopen ();
  int
  main ()
  {
@@ -11204,10 +22797,11 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
+-ac_cv_lib_dl_dlopen=no
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
- ac_cv_lib_dl_dlopen=no
++	ac_cv_lib_dl_dlopen=no
  fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +
@@ -11243,21 +22837,21 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +/* end confdefs.h.  */
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
 +/* 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.  */
--char dlopen ();
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dlopen ();
 -#ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
- #  endif
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
-+char dlopen ();
  int
  main ()
  {
@@ -11302,10 +22896,11 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
+-ac_cv_lib_svld_dlopen=no
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
- ac_cv_lib_svld_dlopen=no
++	ac_cv_lib_svld_dlopen=no
  fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +
@@ -11341,21 +22936,21 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +/* end confdefs.h.  */
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
 +/* 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.  */
--char dld_link ();
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dld_link ();
 -#ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
- #  endif
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
-+char dld_link ();
  int
  main ()
  {
@@ -11400,10 +22995,11 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
+-ac_cv_lib_dld_dld_link=no
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
- ac_cv_lib_dld_dld_link=no
++	ac_cv_lib_dld_dld_link=no
  fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +
@@ -11417,9 +23013,18 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
  if test $ac_cv_lib_dld_dld_link = yes; then
-   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
  fi
-@@ -16621,10 +18301,10 @@
+ 
+ 
+@@ -16616,23 +10582,23 @@ fi
+     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ 
+     save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
  
@@ -11433,168 +23038,355 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  else
    	  if test "$cross_compiling" = yes; then :
    lt_cv_dlopen_self=cross
-@@ -16632,7 +18312,7 @@
+ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
+-  cat > conftest.$ac_ext <<EOF
 -#line 16635 "configure"
-+#line 18315 "configure"
++  cat > conftest.$ac_ext <<_LT_EOF
++#line 10601 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -16696,7 +18376,7 @@
-   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-     (./conftest; exit; ) 2>/dev/null
-     lt_status=$?
-@@ -16714,15 +18394,15 @@
- 
+@@ -16673,8 +10639,100 @@ else
+ #  endif
+ #endif
  
- fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+-#ifdef __cplusplus
+-extern "C" void exit (int);
++void fnord() { int i=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;
++      /* dlclose (self); */
++    }
++  else
++    puts (dlerror ());
++
++  return status;
++}
++_LT_EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && 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:$LINENO: result: $lt_cv_dlopen_self" >&5
 +$as_echo "$lt_cv_dlopen_self" >&6; }
- 
-     if test "x$lt_cv_dlopen_self" = xyes; then
-       LDFLAGS="$LDFLAGS $link_static_flag"
--      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
--echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&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:$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 test "${lt_cv_dlopen_self_static+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${lt_cv_dlopen_self_static+set}" = set; then
 +  $as_echo_n "(cached) " >&6
- else
-   	  if test "$cross_compiling" = yes; then :
-   lt_cv_dlopen_self_static=cross
-@@ -16730,7 +18410,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 16733 "configure"
-+#line 18413 "configure"
- #include "confdefs.h"
++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 10697 "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
  
- #if HAVE_DLFCN_H
-@@ -16794,7 +18474,7 @@
-   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ void fnord() { int i=42;}
+@@ -16689,4029 +10747,5534 @@ int main ()
+       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+       /* dlclose (self); */
+     }
++  else
++    puts (dlerror ());
++
++  return status;
++}
++_LT_EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-     (./conftest; exit; ) 2>/dev/null
-     lt_status=$?
-@@ -16812,8 +18492,8 @@
- 
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
++  (exit $ac_status); } && 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:$LINENO: result: $lt_cv_dlopen_self_static" >&5
 +$as_echo "$lt_cv_dlopen_self_static" >&6; }
-     fi
- 
-     CPPFLAGS="$save_CPPFLAGS"
-@@ -17245,7 +18925,6 @@
-       RC)
- 
- 
--
- # Source file extension for RC test sources.
- ac_ext=rc
- 
-@@ -17681,8 +19360,8 @@
- 	;;
- 
-       *)
--	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
--echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-+	{ { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-+$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-       esac
-@@ -17701,8 +19380,8 @@
-     chmod +x "$ofile"
-   else
-     rm -f "${ofile}T"
--    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
--echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
-+    { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-+$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
-    { (exit 1); exit 1; }; }
-   fi
- fi
-@@ -17739,170 +19418,159 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking for library containing crypt" >&5
--echo $ECHO_N "checking for library containing crypt... $ECHO_C" >&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:$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:$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:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++    else
++      { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++    fi
++    ;;
++  *)
++    { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++    ;;
++  esac
++fi
++
++
++
++
++
++
++
++
++
++
++
++
++  # Report which library types will actually be built
++  { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++$as_echo_n "checking if libtool supports shared libraries... " >&6; }
++  { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
++$as_echo "$can_build_shared" >&6; }
++
++  { $as_echo "$as_me:$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:$LINENO: result: $enable_shared" >&5
++$as_echo "$enable_shared" >&6; }
++
++  { $as_echo "$as_me:$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:$LINENO: result: $enable_static" >&5
++$as_echo "$enable_static" >&6; }
++
++
++
++
++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
++
++CC="$lt_save_CC"
++
++
++
++
++
++
++
++
++
++
++
++
++
++        ac_config_commands="$ac_config_commands libtool"
++
++
++
++
++# Only expand once:
++
++
++
++
++
 +{ $as_echo "$as_me:$LINENO: checking for library containing crypt" >&5
 +$as_echo_n "checking for library containing crypt... " >&6; }
- if test "${ac_cv_search_crypt+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${ac_cv_search_crypt+set}" = set; then
 +  $as_echo_n "(cached) " >&6
- else
-   ac_func_search_save_LIBS=$LIBS
--ac_cv_search_crypt=no
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++else
++  ac_func_search_save_LIBS=$LIBS
++cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
+-    exit (status);
 +/* 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.  */
--char crypt ();
--#ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
- #  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
 +char crypt ();
- int
- main ()
- {
--crypt ();
++int
++main ()
++{
 +return crypt ();
-   ;
-   return 0;
++  ;
++  return 0;
  }
- _ACEOF
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 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_unknown|x*) lt_cv_dlopen_self=no ;;
+-    esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self=no
++_ACEOF
 +for ac_lib in '' crypt; 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
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+   fi
+-fi
+-rm -fr conftest*
++  rm -f conftest.$ac_objext conftest$ac_exeext
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -11603,10 +23395,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_search_crypt="none required"
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -11619,141 +23408,84 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 $as_test_x conftest$ac_exeext
 +       }; then
 +  ac_cv_search_crypt=$ac_res
- else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
++else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
+ 
+ 
  fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_crypt" = no; then
--  for ac_lib in crypt; do
--    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
--    cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
  
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char crypt ();
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--crypt ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_search_crypt="-l$ac_lib"
+-    if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
+-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self_static+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext
 +  if test "${ac_cv_search_crypt+set}" = set; then
- break
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-   done
++  break
++fi
++done
 +if test "${ac_cv_search_crypt+set}" = set; then
 +  :
-+else
+ else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self_static=cross
 +  ac_cv_search_crypt=no
- fi
++fi
 +rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
--echo "${ECHO_T}$ac_cv_search_crypt" >&6
--if test "$ac_cv_search_crypt" != no; then
--  test "$ac_cv_search_crypt" = "none required" || LIBS="$ac_cv_search_crypt $LIBS"
++LIBS=$ac_func_search_save_LIBS
++fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
 +$as_echo "$ac_cv_search_crypt" >&6; }
 +ac_res=$ac_cv_search_crypt
 +if test "$ac_res" != no; then
 +  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- 
- fi
- 
- 
--echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
--echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
++
++fi
++
++
 +{ $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
 +$as_echo_n "checking for connect in -lsocket... " >&6; }
- if test "${ac_cv_lib_socket_connect+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${ac_cv_lib_socket_connect+set}" = set; then
 +  $as_echo_n "(cached) " >&6
  else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-#line 16733 "configure"
 -#include "confdefs.h"
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsocket  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
+-#if HAVE_DLFCN_H
+-#include <dlfcn.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.  */
--char connect ();
--#ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
- #  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
+ #endif
 +char connect ();
- int
- main ()
- {
--connect ();
++int
++main ()
++{
 +return connect ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -11762,9 +23494,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -11776,86 +23506,110 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 test "$cross_compiling" = yes ||
 +	 $as_test_x conftest$ac_exeext
 +       }; then
-   ac_cv_lib_socket_connect=yes
- else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
++  ac_cv_lib_socket_connect=yes
++else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_socket_connect=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
+ 
+-#include <stdio.h>
++	ac_cv_lib_socket_connect=no
++fi
+ 
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
+-#endif
 +rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
--echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
++LIBS=$ac_check_lib_save_LIBS
++fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
 +$as_echo "$ac_cv_lib_socket_connect" >&6; }
- if test $ac_cv_lib_socket_connect = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBSOCKET 1
-@@ -17913,61 +19581,71 @@
- fi
++if test $ac_cv_lib_socket_connect = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBSOCKET 1
++_ACEOF
  
+-/* 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
++  LIBS="-lsocket $LIBS"
  
--echo "$as_me:$LINENO: checking for getservbyname in -lbind" >&5
--echo $ECHO_N "checking for getservbyname in -lbind... $ECHO_C" >&6
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
++fi
+ 
+-void fnord() { int i=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;
+-      /* dlclose (self); */
+-    }
 +{ $as_echo "$as_me:$LINENO: checking for getservbyname in -lbind" >&5
 +$as_echo_n "checking for getservbyname in -lbind... " >&6; }
- if test "${ac_cv_lib_bind_getservbyname+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${ac_cv_lib_bind_getservbyname+set}" = set; then
 +  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbind  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lbind  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
+-    exit (status);
 +/* 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.  */
--char getservbyname ();
--#ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
- #  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
 +char getservbyname ();
- int
- main ()
- {
--getservbyname ();
++int
++main ()
++{
 +return getservbyname ();
-   ;
-   return 0;
++  ;
++  return 0;
  }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -11866,7 +23620,18 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  (eval "$ac_link") 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 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_unknown|x*) lt_cv_dlopen_self_static=no ;;
+-    esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self_static=no
+-  fi
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -11878,86 +23643,78 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 test "$cross_compiling" = yes ||
 +	 $as_test_x conftest$ac_exeext
 +       }; then
-   ac_cv_lib_bind_getservbyname=yes
- else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
++  ac_cv_lib_bind_getservbyname=yes
++else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
- ac_cv_lib_bind_getservbyname=no
++	ac_cv_lib_bind_getservbyname=no
  fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
+-rm -fr conftest*
+ 
 +rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_bind_getservbyname" >&5
--echo "${ECHO_T}$ac_cv_lib_bind_getservbyname" >&6
++LIBS=$ac_check_lib_save_LIBS
++fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bind_getservbyname" >&5
 +$as_echo "$ac_cv_lib_bind_getservbyname" >&6; }
- if test $ac_cv_lib_bind_getservbyname = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBBIND 1
-@@ -17978,61 +19656,71 @@
++if test $ac_cv_lib_bind_getservbyname = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBBIND 1
++_ACEOF
++
++  LIBS="-lbind $LIBS"
+ 
  fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+-    fi
  
+-    CPPFLAGS="$save_CPPFLAGS"
+-    LDFLAGS="$save_LDFLAGS"
+-    LIBS="$save_LIBS"
+-    ;;
+-  esac
  
--echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
--echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+-  case $lt_cv_dlopen_self in
+-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+-  *) enable_dlopen_self=unknown ;;
+-  esac
 +{ $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
 +$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
- if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
 +  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lnsl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
+-  case $lt_cv_dlopen_self_static in
+-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+-  *) enable_dlopen_self_static=unknown ;;
+-  esac
 +/* 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.  */
--char gethostbyname ();
--#ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
- #  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
 +char gethostbyname ();
- int
- main ()
- {
--gethostbyname ();
++int
++main ()
++{
 +return gethostbyname ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -11966,9 +23723,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -11980,132 +23735,243 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 test "$cross_compiling" = yes ||
 +	 $as_test_x conftest$ac_exeext
 +       }; then
-   ac_cv_lib_nsl_gethostbyname=yes
- else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
++  ac_cv_lib_nsl_gethostbyname=yes
++else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
- ac_cv_lib_nsl_gethostbyname=no
++	ac_cv_lib_nsl_gethostbyname=no
  fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
+ 
 +rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
++LIBS=$ac_check_lib_save_LIBS
++fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
 +$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
- if test $ac_cv_lib_nsl_gethostbyname = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBNSL 1
-@@ -18043,44 +19731,49 @@
- fi
++if test $ac_cv_lib_nsl_gethostbyname = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBNSL 1
++_ACEOF
  
+-# The else clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+-  # 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
+-  # Now quote all the things that may contain metacharacters while being
+-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+-  # variables and quote the copies for generation of the libtool script.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+-    deplibs_check_method reload_flag reload_cmds need_locks \
+-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+-    lt_cv_sys_global_symbol_to_c_name_address \
+-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
+-    compiler_GCJ \
+-    CC_GCJ \
+-    LD_GCJ \
+-    lt_prog_compiler_wl_GCJ \
+-    lt_prog_compiler_pic_GCJ \
+-    lt_prog_compiler_static_GCJ \
+-    lt_prog_compiler_no_builtin_flag_GCJ \
+-    export_dynamic_flag_spec_GCJ \
+-    thread_safe_flag_spec_GCJ \
+-    whole_archive_flag_spec_GCJ \
+-    enable_shared_with_static_runtimes_GCJ \
+-    old_archive_cmds_GCJ \
+-    old_archive_from_new_cmds_GCJ \
+-    predep_objects_GCJ \
+-    postdep_objects_GCJ \
+-    predeps_GCJ \
+-    postdeps_GCJ \
+-    compiler_lib_search_path_GCJ \
+-    archive_cmds_GCJ \
+-    archive_expsym_cmds_GCJ \
+-    postinstall_cmds_GCJ \
+-    postuninstall_cmds_GCJ \
+-    old_archive_from_expsyms_cmds_GCJ \
+-    allow_undefined_flag_GCJ \
+-    no_undefined_flag_GCJ \
+-    export_symbols_cmds_GCJ \
+-    hardcode_libdir_flag_spec_GCJ \
+-    hardcode_libdir_flag_spec_ld_GCJ \
+-    hardcode_libdir_separator_GCJ \
+-    hardcode_automatic_GCJ \
+-    module_cmds_GCJ \
+-    module_expsym_cmds_GCJ \
+-    lt_cv_prog_compiler_c_o_GCJ \
+-    exclude_expsyms_GCJ \
+-    include_expsyms_GCJ; do
+-
+-    case $var in
+-    old_archive_cmds_GCJ | \
+-    old_archive_from_new_cmds_GCJ | \
+-    archive_cmds_GCJ | \
+-    archive_expsym_cmds_GCJ | \
+-    module_cmds_GCJ | \
+-    module_expsym_cmds_GCJ | \
+-    old_archive_from_expsyms_cmds_GCJ | \
+-    export_symbols_cmds_GCJ | \
+-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+-    postinstall_cmds | postuninstall_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+-      # Double-quote double-evaled strings.
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+-      ;;
+-    *)
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+-      ;;
+-    esac
+-  done
++  LIBS="-lnsl $LIBS"
  
--echo "$as_me:$LINENO: checking for X" >&5
--echo $ECHO_N "checking for X... $ECHO_C" >&6
+-  case $lt_echo in
+-  *'\$0 --fallback-echo"')
+-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+-    ;;
+-  esac
++fi
+ 
+-cfgfile="$ofile"
+ 
+-  cat <<__EOF__ >> "$cfgfile"
+-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
 +{ $as_echo "$as_me:$LINENO: checking for X" >&5
 +$as_echo_n "checking for X... " >&6; }
  
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
  
--# Check whether --with-x or --without-x was given.
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
 +# Check whether --with-x was given.
- if test "${with_x+set}" = set; then
--  withval="$with_x"
++if test "${with_x+set}" = set; then
 +  withval=$with_x;
 +fi
- 
--fi;
- # $have_x is `yes', `no', `disabled', or empty when we do not yet know.
- if test "x$with_x" = xno; then
-   # The user explicitly disabled X.
-   have_x=disabled
- else
--  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
--    # Both variables are already set.
--    have_x=yes
--  else
--    if test "${ac_cv_have_x+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++
++# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
++if test "x$with_x" = xno; then
++  # The user explicitly disabled X.
++  have_x=disabled
++else
 +  case $x_includes,$x_libraries in #(
 +    *\'*) { { $as_echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
 +$as_echo "$as_me: error: Cannot use X directory names containing '" >&2;}
 +   { (exit 1); exit 1; }; };; #(
 +    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
 +  $as_echo_n "(cached) " >&6
- else
-   # One or both of the vars are not set, and there is no cached value.
- ac_x_includes=no ac_x_libraries=no
--rm -fr conftest.dir
++else
++  # One or both of the vars are not set, and there is no cached value.
++ac_x_includes=no ac_x_libraries=no
 +rm -f -r conftest.dir
- if mkdir conftest.dir; then
-   cd conftest.dir
--  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-   cat >Imakefile <<'_ACEOF'
--acfindx:
--	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
++if mkdir conftest.dir; then
++  cd conftest.dir
++  cat >Imakefile <<'_ACEOF'
 +incroot:
 +	@echo incroot='${INCROOT}'
 +usrlibdir:
 +	@echo usrlibdir='${USRLIBDIR}'
 +libdir:
 +	@echo libdir='${LIBDIR}'
- _ACEOF
--  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
++_ACEOF
 +  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
-     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
++    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 +    for ac_var in incroot usrlibdir libdir; do
 +      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
 +    done
-     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
--    for ac_extension in a so sl; do
--      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
--         test -f $ac_im_libdir/libX11.$ac_extension; then
++    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
 +    for ac_extension in a so sl dylib la dll; do
 +      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
 +	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
-         ac_im_usrlibdir=$ac_im_libdir; break
-       fi
-     done
-@@ -18088,7 +19781,7 @@
-     # bogus both because they are the default anyway, and because
-     # using them would break gcc on systems where it needs fixed includes.
-     case $ac_im_incroot in
--	/usr/include) ;;
++	ac_im_usrlibdir=$ac_im_libdir; break
++      fi
++    done
++    # Screen out bogus values from the imake configuration.  They are
++    # bogus both because they are the default anyway, and because
++    # using them would break gcc on systems where it needs fixed includes.
++    case $ac_im_incroot in
 +	/usr/include) ac_x_includes= ;;
- 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-     esac
-     case $ac_im_usrlibdir in
-@@ -18097,7 +19790,7 @@
-     esac
-   fi
-   cd ..
--  rm -fr conftest.dir
++	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
++    esac
++    case $ac_im_usrlibdir in
++	/usr/lib | /lib) ;;
++	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
++    esac
++  fi
++  cd ..
 +  rm -f -r conftest.dir
- fi
- 
- # Standard set of common directories for X headers.
-@@ -18138,42 +19831,47 @@
- /usr/openwin/share/include'
++fi
  
- if test "$ac_x_includes" = no; then
--  # Guess where to find include files, by looking for Intrinsic.h.
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
++# Standard set of common directories for X headers.
++# Check X11 before X11Rn because it is often a symlink to the current release.
++ac_x_header_dirs='
++/usr/X11/include
++/usr/X11R6/include
++/usr/X11R5/include
++/usr/X11R4/include
+ 
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
++/usr/include/X11
++/usr/include/X11R6
++/usr/include/X11R5
++/usr/include/X11R4
+ 
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$archive_cmds_need_lc_GCJ
++/usr/local/X11/include
++/usr/local/X11R6/include
++/usr/local/X11R5/include
++/usr/local/X11R4/include
+ 
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
++/usr/local/include/X11
++/usr/local/include/X11R6
++/usr/local/include/X11R5
++/usr/local/include/X11R4
+ 
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
++/usr/X386/include
++/usr/x386/include
++/usr/XFree86/include/X11
+ 
+-# The host system.
+-host_alias=$host_alias
+-host=$host
++/usr/include
++/usr/local/include
++/usr/unsupported/include
++/usr/athena/include
++/usr/local/x11r5/include
++/usr/lpp/Xamples/include
+ 
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
++/usr/openwin/include
++/usr/openwin/share/include'
+ 
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
++if test "$ac_x_includes" = no; then
 +  # Guess where to find include files, by looking for Xlib.h.
-   # First, try using that file with no special directory specified.
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
--#include <X11/Intrinsic.h>
++  # First, try using that file with no special directory specified.
++  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
@@ -12119,87 +23985,60 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
--  egrep -v '^ *\+' conftest.er1 >conftest.err
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
++  rm -f conftest.er1
++  cat conftest.err >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } >/dev/null && {
 +	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       }; then
-   # We can compile using X headers with no special include directory.
- ac_x_includes=
- else
--  echo "$as_me: failed program was:" >&5
--  cat conftest.$ac_ext >&5
++  # We can compile using X headers with no special include directory.
++ac_x_includes=
++else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
-   for ac_dir in $ac_x_header_dirs; do
--  if test -r "$ac_dir/X11/Intrinsic.h"; then
+ 
+-# A C compiler.
+-LTCC=$lt_LTCC
++  for ac_dir in $ac_x_header_dirs; do
 +  if test -r "$ac_dir/X11/Xlib.h"; then
-     ac_x_includes=$ac_dir
-     break
-   fi
- done
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- fi # $ac_x_includes = no
++    ac_x_includes=$ac_dir
++    break
++  fi
++done
++fi
  
-@@ -18182,75 +19880,88 @@
-   # See if we find them without any special options.
-   # Don't add to $LIBS permanently.
-   ac_save_LIBS=$LIBS
--  LIBS="-lXt $LIBS"
+-# A language-specific compiler.
+-CC=$lt_compiler_GCJ
++rm -f conftest.err conftest.$ac_ext
++fi # $ac_x_includes = no
+ 
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_GCJ
++if test "$ac_x_libraries" = no; then
++  # Check for the libraries.
++  # See if we find them without any special options.
++  # Don't add to $LIBS permanently.
++  ac_save_LIBS=$LIBS
 +  LIBS="-lX11 $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
--#include <X11/Intrinsic.h>
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
++  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#include <X11/Xlib.h>
- int
- main ()
- {
--XtMalloc (0)
++int
++main ()
++{
 +XrmInitialize ()
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -12208,9 +24047,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -12222,114 +24059,102 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 test "$cross_compiling" = yes ||
 +	 $as_test_x conftest$ac_exeext
 +       }; then
-   LIBS=$ac_save_LIBS
- # We can link X programs with no special library path.
- ac_x_libraries=
- else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
++  LIBS=$ac_save_LIBS
++# We can link X programs with no special library path.
++ac_x_libraries=
++else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
- LIBS=$ac_save_LIBS
--for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+ 
+-# An ERE matcher.
+-EGREP=$lt_EGREP
++	LIBS=$ac_save_LIBS
 +for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
- do
-   # Don't even attempt the hair of trying to link an X program!
--  for ac_extension in a so sl; do
--    if test -r $ac_dir/libXt.$ac_extension; then
++do
++  # Don't even attempt the hair of trying to link an X program!
 +  for ac_extension in a so sl dylib la dll; do
 +    if test -r "$ac_dir/libX11.$ac_extension"; then
-       ac_x_libraries=$ac_dir
-       break 2
-     fi
-   done
- done
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
++      ac_x_libraries=$ac_dir
++      break 2
++    fi
++  done
++done
++fi
+ 
+-# The linker used to build libraries.
+-LD=$lt_LD_GCJ
 +rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
- fi # $ac_x_libraries = no
++fi # $ac_x_libraries = no
  
--if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
--  # Didn't find X anywhere.  Cache the known absence of X.
--  ac_cv_have_x="have_x=no"
--else
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
 +case $ac_x_includes,$ac_x_libraries in #(
 +  no,* | *,no | *\'*)
 +    # Didn't find X, or a directory has "'" in its name.
 +    ac_cv_have_x="have_x=no";; #(
 +  *)
-   # Record where we found X for the cache.
-   ac_cv_have_x="have_x=yes \
--	        ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
--fi
--fi
--
++    # Record where we found X for the cache.
++    ac_cv_have_x="have_x=yes\
 +	ac_x_includes='$ac_x_includes'\
 +	ac_x_libraries='$ac_x_libraries'"
 +esac
-   fi
++fi
 +;; #(
 +    *) have_x=yes;;
 +  esac
-   eval "$ac_cv_have_x"
- fi # $with_x != no
++  eval "$ac_cv_have_x"
++fi # $with_x != no
  
- if test "$have_x" != yes; then
--  echo "$as_me:$LINENO: result: $have_x" >&5
--echo "${ECHO_T}$have_x" >&6
+-# A BSD-compatible nm program.
+-NM=$lt_NM
++if test "$have_x" != yes; then
 +  { $as_echo "$as_me:$LINENO: result: $have_x" >&5
 +$as_echo "$have_x" >&6; }
-   no_x=yes
- else
-   # If each of the values was on the command line, it overrides each guess.
-@@ -18258,60 +19969,77 @@
-   test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
-   # Update the cache value to reflect the command line values.
-   ac_cv_have_x="have_x=yes \
--		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
--  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
--echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
++  no_x=yes
++else
++  # If each of the values was on the command line, it overrides each guess.
++  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
++  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
++  # Update the cache value to reflect the command line values.
++  ac_cv_have_x="have_x=yes\
 +	ac_x_includes='$x_includes'\
 +	ac_x_libraries='$x_libraries'"
 +  { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
 +$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
- fi
++fi
  
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+-# A symbol stripping program
+-STRIP=$STRIP
 +{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 +$as_echo_n "checking for ANSI C header files... " >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${ac_cv_header_stdc+set}" = set; then
 +  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++else
++  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
- #include <stdlib.h>
- #include <stdarg.h>
- #include <string.h>
- #include <float.h>
++#include <stdlib.h>
++#include <stdarg.h>
++#include <string.h>
++#include <float.h>
  
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
 +int
 +main ()
 +{
-+
+ 
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
 +  ;
 +  return 0;
 +}
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++_ACEOF
 +rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
@@ -12339,115 +24164,126 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
--  egrep -v '^ *\+' conftest.er1 >conftest.err
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
++  rm -f conftest.er1
++  cat conftest.err >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-   ac_cv_header_stdc=yes
- else
--  echo "$as_me: failed program was:" >&5
--  cat conftest.$ac_ext >&5
++  ac_cv_header_stdc=yes
++else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
-   ac_cv_header_stdc=no
- fi
--rm -f conftest.err conftest.$ac_ext
-+
+ 
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
++	ac_cv_header_stdc=no
++fi
+ 
+-# Used on cygwin: assembler.
+-AS="$AS"
 +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 >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
++if test $ac_cv_header_stdc = yes; then
++  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
++  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
- #include <string.h>
++#include <string.h>
  
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  egrep "memchr" >/dev/null 2>&1; then
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 +  $EGREP "memchr" >/dev/null 2>&1; then
-   :
- else
-   ac_cv_header_stdc=no
-@@ -18323,13 +20051,16 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++  :
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
+ 
+-# How to pass a linker flag through the compiler.
+-wl=$lt_lt_prog_compiler_wl_GCJ
++fi
+ 
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
++if test $ac_cv_header_stdc = yes; then
++  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
++  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
- #include <stdlib.h>
++#include <stdlib.h>
  
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  egrep "free" >/dev/null 2>&1; then
+-# Old archive suffix (normally "a").
+-libext="$libext"
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 +  $EGREP "free" >/dev/null 2>&1; then
-   :
- else
-   ac_cv_header_stdc=no
-@@ -18344,14 +20075,19 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++  :
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
+ 
+-# Shared library suffix (normally ".so").
+-shrext='$shrext'
++fi
+ 
+-# Executable file suffix (normally "").
+-exeext="$exeext"
++if test $ac_cv_header_stdc = yes; then
++  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
++  if test "$cross_compiling" = yes; then
++  :
++else
++  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
- #include <ctype.h>
++#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') \
++#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))
-@@ -18365,35 +20101,50 @@
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
-         || toupper (i) != TOUPPER (i))
--      exit(2);
--  exit (0);
++		     || ('j' <= (c) && (c) <= 'r') \
++		     || ('s' <= (c) && (c) <= 'z'))
++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
++#endif
+ 
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_lt_prog_compiler_pic_GCJ
+-pic_mode=$pic_mode
++#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
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
++}
++_ACEOF
++rm -f conftest$ac_exeext
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -12456,12 +24292,9 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  ac_status=$?
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
@@ -12469,88 +24302,80 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  ac_status=$?
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
++  (exit $ac_status); }; }; then
++  :
++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
-+
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ 
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
++( exit $ac_status )
++ac_cv_header_stdc=no
++fi
 +rm -rf conftest.dSYM
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6
++fi
+ 
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
+ 
+-# Must we lock files when doing compilation ?
+-need_locks=$lt_need_locks
++fi
++fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
 +$as_echo "$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
++if test $ac_cv_header_stdc = yes; then
  
- cat >>confdefs.h <<\_ACEOF
-@@ -18402,29 +20153,26 @@
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
++cat >>confdefs.h <<\_ACEOF
++#define STDC_HEADERS 1
++_ACEOF
  
- fi
+-# Do we need a version for libraries?
+-need_version=$need_version
++fi
  
--echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
--echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
 +{ $as_echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
 +$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
- if test "${ac_cv_header_sys_wait_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${ac_cv_header_sys_wait_h+set}" = set; then
 +  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++else
++  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
- #include <sys/types.h>
- #include <sys/wait.h>
- #ifndef WEXITSTATUS
--# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
++#include <sys/types.h>
++#include <sys/wait.h>
++#ifndef WEXITSTATUS
 +# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
- #endif
- #ifndef WIFEXITED
- # define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
- #endif
++#endif
++#ifndef WIFEXITED
++# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
++#endif
  
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
- int
- main ()
- {
-@@ -18436,27 +20184,35 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
++int
++main ()
++{
++  int s;
++  wait (&s);
++  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -12559,9 +24384,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -12570,71 +24393,63 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-   ac_cv_header_sys_wait_h=yes
- else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
++  ac_cv_header_sys_wait_h=yes
++else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_header_sys_wait_h=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
+ 
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
++	ac_cv_header_sys_wait_h=no
++fi
+ 
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_lt_prog_compiler_static_GCJ
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
--echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
++fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
 +$as_echo "$ac_cv_header_sys_wait_h" >&6; }
- if test $ac_cv_header_sys_wait_h = yes; then
++if test $ac_cv_header_sys_wait_h = yes; then
  
- cat >>confdefs.h <<\_ACEOF
-@@ -18465,24 +20221,21 @@
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_SYS_WAIT_H 1
++_ACEOF
  
- fi
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
++fi
  
--echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
--echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
 +{ $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
 +$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
- if test "${ac_cv_header_time+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${ac_cv_header_time+set}" = set; then
 +  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++else
++  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
- #include <sys/types.h>
- #include <sys/time.h>
- #include <time.h>
++#include <sys/types.h>
++#include <sys/time.h>
++#include <time.h>
  
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
- int
- main ()
- {
-@@ -18493,27 +20246,35 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
++int
++main ()
++{
++if ((struct tm *) 0)
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -12643,9 +24458,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -12654,75 +24467,152 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-   ac_cv_header_time=yes
- else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
++  ac_cv_header_time=yes
++else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_header_time=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
+ 
+-# Library versioning type.
+-version_type=$version_type
++	ac_cv_header_time=no
++fi
+ 
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
--echo "${ECHO_T}$ac_cv_header_time" >&6
++fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
 +$as_echo "$ac_cv_header_time" >&6; }
- if test $ac_cv_header_time = yes; then
++if test $ac_cv_header_time = yes; then
  
- cat >>confdefs.h <<\_ACEOF
-@@ -18547,111 +20308,142 @@
- 	curses.h ncurses.h sgtty.h term.h termio.h termios.h \
+-# 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
++cat >>confdefs.h <<\_ACEOF
++#define TIME_WITH_SYS_TIME 1
++_ACEOF
  
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
++fi
+ 
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_old_archive_cmds_GCJ
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+ 
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
+ 
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
+ 
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_archive_cmds_GCJ
+-archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
+ 
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_module_cmds_GCJ
+-module_expsym_cmds=$lt_module_expsym_cmds_GCJ
+ 
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
+ 
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=$lt_predep_objects_GCJ
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=$lt_postdep_objects_GCJ
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_predeps_GCJ
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$lt_postdeps_GCJ
+-
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+ 
+-# 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
+ 
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag_GCJ
+ 
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_no_undefined_flag_GCJ
+ 
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
+ 
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
+ 
+-# 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
+ 
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
+ 
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
+ 
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+ 
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$hardcode_action_GCJ
++for ac_header in fcntl.h syslog.h unistd.h utmp.h utmpx.h \
++	sys/file.h sys/ioctl.h sys/time.h sys/types.h sys/param.h \
++	malloc.h strings.h memory.h \
++	curses.h ncurses.h sgtty.h term.h termio.h termios.h \
+ 
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
++do
 +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 +$as_echo_n "checking for $ac_header... " >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  $as_echo_n "(cached) " >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++fi
 +ac_res=`eval 'as_val=${'$as_ac_Header'}
 +		 $as_echo "$as_val"'`
 +	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++else
++  # Is the header compilable?
 +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
++$ac_includes_default
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -12731,9 +24621,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -12742,40 +24630,58 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
++  ac_header_compiler=yes
++else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
+ 
+-# 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_GCJ
++	ac_header_compiler=no
++fi
+ 
+-# If ld is used when linking, flag to hardcode \$libdir into
+-# a binary during linking. This must work even if \$libdir does
+-# not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
+-
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
+-
+-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_direct=$hardcode_direct_GCJ
+-
+-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_minus_L=$hardcode_minus_L_GCJ
+-
+-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+-# the resulting binary.
+-hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
+-
+-# 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_GCJ
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +$as_echo "$ac_header_compiler" >&6; }
  
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+-# Variables whose values should be saved in libtool wrapper scripts and
+-# restored at relink time.
+-variables_saved_for_relink="$variables_saved_for_relink"
++# Is the header present?
 +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++#include <$ac_header>
++_ACEOF
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -12784,57 +24690,34 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
--  egrep -v '^ *\+' conftest.er1 >conftest.err
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
++  rm -f conftest.er1
++  cat conftest.err >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } >/dev/null && {
 +	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       }; then
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
--  cat conftest.$ac_ext >&5
++  ac_header_preproc=yes
++else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
+ 
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$link_all_deplibs_GCJ
++  ac_header_preproc=no
++fi
+ 
+-# Compile-time system search path for libraries
+-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++rm -f conftest.err conftest.$ac_ext
 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +$as_echo "$ac_header_preproc" >&6; }
  
- # So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc in
--  yes:no )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
--  no:yes )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
+-# Run-time system search path for libraries
+-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++# So?  What about this header?
 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 +  yes:no: )
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
@@ -12856,80 +24739,68 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+
+ 
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_GCJ"
 +    ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++esac
 +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 +$as_echo_n "checking for $ac_header... " >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  $as_echo_n "(cached) " >&6
- else
--  eval "$as_ac_Header=$ac_header_preproc"
++else
 +  eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++fi
 +ac_res=`eval 'as_val=${'$as_ac_Header'}
 +		 $as_echo "$as_val"'`
 +	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
  
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
+-# Set to yes if exported symbols are required.
+-always_export_symbols=$always_export_symbols_GCJ
++fi
 +if test `eval 'as_val=${'$as_ac_Header'}
 +		 $as_echo "$as_val"'` = yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
++_ACEOF
  
- fi
-@@ -18659,26 +20451,22 @@
- done
+-# The commands to list exported symbols.
+-export_symbols_cmds=$lt_export_symbols_cmds_GCJ
++fi
+ 
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_cmds
++done
  
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_exclude_expsyms_GCJ
  
--echo "$as_me:$LINENO: checking for mode_t" >&5
--echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
+-# Symbols that must always be exported.
+-include_expsyms=$lt_include_expsyms_GCJ
 +{ $as_echo "$as_me:$LINENO: checking for mode_t" >&5
 +$as_echo_n "checking for mode_t... " >&6; }
- if test "${ac_cv_type_mode_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${ac_cv_type_mode_t+set}" = set; then
 +  $as_echo_n "(cached) " >&6
- else
++else
 +  ac_cv_type_mode_t=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
- $ac_includes_default
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
- int
- main ()
- {
--if ((mode_t *) 0)
--  return 0;
- if (sizeof (mode_t))
-   return 0;
-   ;
-@@ -18686,27 +20474,77 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
++$ac_includes_default
++int
++main ()
++{
++if (sizeof (mode_t))
++       return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -12938,12 +24809,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -12977,9 +24843,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -12992,76 +24856,76 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
-   ac_cv_type_mode_t=yes
+ 
+-# ### END LIBTOOL TAG CONFIG: $tagname
++	ac_cv_type_mode_t=yes
 +fi
-+
+ 
+-__EOF__
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_type_mode_t=no
++else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
+ 
+ 
+-else
+-  # If there is no Makefile yet, we rely on a make rule to execute
+-  # `config.status --recheck' to rerun these tests and create the
+-  # libtool script then.
+-  test -f Makefile && make "$ltmain"
  fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
+ 
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
--echo "${ECHO_T}$ac_cv_type_mode_t" >&6
++fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
 +$as_echo "$ac_cv_type_mode_t" >&6; }
- if test $ac_cv_type_mode_t = yes; then
-   :
- else
-@@ -18717,24 +20555,21 @@
++if test $ac_cv_type_mode_t = yes; then
++  :
++else
  
- 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
+-
+-CC="$lt_save_CC"
++cat >>confdefs.h <<_ACEOF
++#define mode_t int
++_ACEOF
  
--echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
--echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+-	else
+-	  tagname=""
+-	fi
+-	;;
++fi
+ 
+-      RC)
 +{ $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
 +$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
- if test "${ac_cv_header_time+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${ac_cv_header_time+set}" = set; then
 +  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++else
++  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
- #include <sys/types.h>
- #include <sys/time.h>
- #include <time.h>
++#include <sys/types.h>
++#include <sys/time.h>
++#include <time.h>
  
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
- int
- main ()
- {
-@@ -18745,27 +20580,35 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
++int
++main ()
++{
++if ((struct tm *) 0)
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -13070,9 +24934,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -13081,73 +24943,69 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-   ac_cv_header_time=yes
- else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
++  ac_cv_header_time=yes
++else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_header_time=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
+ 
++	ac_cv_header_time=no
++fi
+ 
+-# Source file extension for RC test sources.
+-ac_ext=rc
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
--echo "${ECHO_T}$ac_cv_header_time" >&6
++fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
 +$as_echo "$ac_cv_header_time" >&6; }
- if test $ac_cv_header_time = yes; then
++if test $ac_cv_header_time = yes; then
  
- cat >>confdefs.h <<\_ACEOF
-@@ -18775,31 +20618,27 @@
- fi
+-# Object file extension for compiled RC test sources.
+-objext=o
+-objext_RC=$objext
++cat >>confdefs.h <<\_ACEOF
++#define TIME_WITH_SYS_TIME 1
++_ACEOF
  
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++fi
  
--echo "$as_me:$LINENO: checking for socklen_t" >&5
--echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
+-# 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.
 +{ $as_echo "$as_me:$LINENO: checking for socklen_t" >&5
 +$as_echo_n "checking for socklen_t... " >&6; }
- if test "${ac_cv_type_socklen_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${ac_cv_type_socklen_t+set}" = set; then
 +  $as_echo_n "(cached) " >&6
- else
++else
 +  ac_cv_type_socklen_t=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  
- #if HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
- #include <sys/socket.h>
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
++#if HAVE_SYS_TYPES_H
++# include <sys/types.h>
++#endif
++#include <sys/socket.h>
  
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
- int
- main ()
- {
--if ((socklen_t *) 0)
--  return 0;
- if (sizeof (socklen_t))
-   return 0;
-   ;
-@@ -18807,27 +20646,82 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
++int
++main ()
++{
++if (sizeof (socklen_t))
++       return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -13156,12 +25014,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -13176,12 +25029,18 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
-+
+ 
 +#if HAVE_SYS_TYPES_H
 +# include <sys/types.h>
 +#endif
 +#include <sys/socket.h>
-+
+ 
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${RC-"windres"}
+-compiler=$CC
+-compiler_RC=$CC
+-lt_cv_prog_compiler_c_o_RC=yes
 +int
 +main ()
 +{
@@ -13200,9 +25059,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -13215,145 +25072,230 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
-   ac_cv_type_socklen_t=yes
+ 
+-# The else clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+-  # 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
+-  # Now quote all the things that may contain metacharacters while being
+-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+-  # variables and quote the copies for generation of the libtool script.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+-    deplibs_check_method reload_flag reload_cmds need_locks \
+-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+-    lt_cv_sys_global_symbol_to_c_name_address \
+-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
+-    compiler_RC \
+-    CC_RC \
+-    LD_RC \
+-    lt_prog_compiler_wl_RC \
+-    lt_prog_compiler_pic_RC \
+-    lt_prog_compiler_static_RC \
+-    lt_prog_compiler_no_builtin_flag_RC \
+-    export_dynamic_flag_spec_RC \
+-    thread_safe_flag_spec_RC \
+-    whole_archive_flag_spec_RC \
+-    enable_shared_with_static_runtimes_RC \
+-    old_archive_cmds_RC \
+-    old_archive_from_new_cmds_RC \
+-    predep_objects_RC \
+-    postdep_objects_RC \
+-    predeps_RC \
+-    postdeps_RC \
+-    compiler_lib_search_path_RC \
+-    archive_cmds_RC \
+-    archive_expsym_cmds_RC \
+-    postinstall_cmds_RC \
+-    postuninstall_cmds_RC \
+-    old_archive_from_expsyms_cmds_RC \
+-    allow_undefined_flag_RC \
+-    no_undefined_flag_RC \
+-    export_symbols_cmds_RC \
+-    hardcode_libdir_flag_spec_RC \
+-    hardcode_libdir_flag_spec_ld_RC \
+-    hardcode_libdir_separator_RC \
+-    hardcode_automatic_RC \
+-    module_cmds_RC \
+-    module_expsym_cmds_RC \
+-    lt_cv_prog_compiler_c_o_RC \
+-    exclude_expsyms_RC \
+-    include_expsyms_RC; do
+-
+-    case $var in
+-    old_archive_cmds_RC | \
+-    old_archive_from_new_cmds_RC | \
+-    archive_cmds_RC | \
+-    archive_expsym_cmds_RC | \
+-    module_cmds_RC | \
+-    module_expsym_cmds_RC | \
+-    old_archive_from_expsyms_cmds_RC | \
+-    export_symbols_cmds_RC | \
+-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+-    postinstall_cmds | postuninstall_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+-      # Double-quote double-evaled strings.
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+-      ;;
+-    *)
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+-      ;;
+-    esac
+-  done
++	ac_cv_type_socklen_t=yes
 +fi
-+
+ 
+-  case $lt_echo in
+-  *'\$0 --fallback-echo"')
+-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+-    ;;
+-  esac
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_type_socklen_t=no
++else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
+ 
+-cfgfile="$ofile"
+ 
+-  cat <<__EOF__ >> "$cfgfile"
+-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++fi
+ 
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
--echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
++fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
 +$as_echo "$ac_cv_type_socklen_t" >&6; }
- if test $ac_cv_type_socklen_t = yes; then
++if test $ac_cv_type_socklen_t = yes; then
  
- cat >>confdefs.h <<_ACEOF
-@@ -18846,20 +20740,23 @@
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
++cat >>confdefs.h <<_ACEOF
++#define HAVE_SOCKLEN_T 1
++_ACEOF
  
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
  
- if test $ac_cv_c_compiler_gnu = yes; then
--    echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
--echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
++else
+ 
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$archive_cmds_need_lc_RC
++cat >>confdefs.h <<\_ACEOF
++#define socklen_t int
++_ACEOF
+ 
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
++fi
+ 
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
+ 
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+ 
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
++if test $ac_cv_c_compiler_gnu = yes; then
 +    { $as_echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
 +$as_echo_n "checking whether $CC needs -traditional... " >&6; }
- if test "${ac_cv_prog_gcc_traditional+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${ac_cv_prog_gcc_traditional+set}" = set; then
 +  $as_echo_n "(cached) " >&6
- else
-     ac_pattern="Autoconf.*'x'"
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++else
++    ac_pattern="Autoconf.*'x'"
++  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
- #include <sgtty.h>
- Autoconf TIOCGETP
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  egrep "$ac_pattern" >/dev/null 2>&1; then
++#include <sgtty.h>
++Autoconf TIOCGETP
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 +  $EGREP "$ac_pattern" >/dev/null 2>&1; then
-   ac_cv_prog_gcc_traditional=yes
- else
-   ac_cv_prog_gcc_traditional=no
-@@ -18869,82 +20766,82 @@
++  ac_cv_prog_gcc_traditional=yes
++else
++  ac_cv_prog_gcc_traditional=no
++fi
++rm -f conftest*
  
-   if test $ac_cv_prog_gcc_traditional = no; then
-     cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
+ 
+-# A C compiler.
+-LTCC=$lt_LTCC
++  if test $ac_cv_prog_gcc_traditional = no; then
++    cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
- #include <termio.h>
- Autoconf TCGETA
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  egrep "$ac_pattern" >/dev/null 2>&1; then
++#include <termio.h>
++Autoconf TCGETA
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 +  $EGREP "$ac_pattern" >/dev/null 2>&1; then
-   ac_cv_prog_gcc_traditional=yes
- fi
- rm -f conftest*
++  ac_cv_prog_gcc_traditional=yes
++fi
++rm -f conftest*
  
-   fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
--echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
+-# A language-specific compiler.
+-CC=$lt_compiler_RC
++  fi
++fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
 +$as_echo "$ac_cv_prog_gcc_traditional" >&6; }
-   if test $ac_cv_prog_gcc_traditional = yes; then
-     CC="$CC -traditional"
-   fi
- fi
++  if test $ac_cv_prog_gcc_traditional = yes; then
++    CC="$CC -traditional"
++  fi
++fi
  
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_RC
  
--echo "$as_me:$LINENO: checking return type of signal handlers" >&5
--echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
+-# An ERE matcher.
+-EGREP=$lt_EGREP
 +{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5
 +$as_echo_n "checking return type of signal handlers... " >&6; }
- if test "${ac_cv_type_signal+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${ac_cv_type_signal+set}" = set; then
 +  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++else
++  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
- #include <sys/types.h>
- #include <signal.h>
--#ifdef signal
--# undef signal
--#endif
--#ifdef __cplusplus
--extern "C" void (*signal (int, void (*)(int)))(int);
--#else
--void (*signal ()) ();
--#endif
++#include <sys/types.h>
++#include <signal.h>
  
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
- int
- main ()
- {
--int i;
+-# The linker used to build libraries.
+-LD=$lt_LD_RC
++int
++main ()
++{
 +return *(signal (0, 0)) (0) == 1;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -13362,13 +25304,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_type_signal=void
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -13377,86 +25313,103 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
- ac_cv_type_signal=int
++  ac_cv_type_signal=int
 +else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
+ 
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
 +	ac_cv_type_signal=void
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
++fi
+ 
+-# A BSD-compatible nm program.
+-NM=$lt_NM
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
--echo "${ECHO_T}$ac_cv_type_signal" >&6
++fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
 +$as_echo "$ac_cv_type_signal" >&6; }
  
- cat >>confdefs.h <<_ACEOF
- #define RETSIGTYPE $ac_cv_type_signal
-@@ -18959,32 +20856,29 @@
+-# A symbol stripping program
+-STRIP=$STRIP
++cat >>confdefs.h <<_ACEOF
++#define RETSIGTYPE $ac_cv_type_signal
++_ACEOF
  
- fi
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
  
--echo "$as_me:$LINENO: checking for working memcmp" >&5
--echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
++if test "$ac_cv_type_signal" = void; then
+ 
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
++cat >>confdefs.h <<\_ACEOF
++#define RETSIGTYPE_VOID 1
++_ACEOF
+ 
+-# Used on cygwin: assembler.
+-AS="$AS"
++fi
+ 
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
 +{ $as_echo "$as_me:$LINENO: checking for working memcmp" >&5
 +$as_echo_n "checking for working memcmp... " >&6; }
- if test "${ac_cv_func_memcmp_working+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${ac_cv_func_memcmp_working+set}" = set; then
 +  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   ac_cv_func_memcmp_working=no
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
--
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
++else
++  if test "$cross_compiling" = yes; then
++  ac_cv_func_memcmp_working=no
++else
++  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +$ac_includes_default
- int
- main ()
- {
++int
++main ()
++{
  
-   /* Some versions of memcmp are not 8-bit clean.  */
--  char c0 = 0x40, c1 = 0x80, c2 = 0x81;
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
++  /* Some versions of memcmp are not 8-bit clean.  */
 +  char c0 = '\100', c1 = '\200', c2 = '\201';
-   if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
--    exit (1);
++  if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
 +    return 1;
  
-   /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
-      or more and with at least one buffer not starting on a 4-byte boundary.
-@@ -19000,9 +20894,9 @@
-         strcpy (a, "--------01111111");
-         strcpy (b, "--------10000000");
-         if (memcmp (a, b, 16) >= 0)
--          exit (1);
+-# How to pass a linker flag through the compiler.
+-wl=$lt_lt_prog_compiler_wl_RC
++  /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
++     or more and with at least one buffer not starting on a 4-byte boundary.
++     William Lewis provided this test program.   */
++  {
++    char foo[21];
++    char bar[21];
++    int i;
++    for (i = 0; i < 4; i++)
++      {
++	char *a = foo + i;
++	char *b = bar + i;
++	strcpy (a, "--------01111111");
++	strcpy (b, "--------10000000");
++	if (memcmp (a, b, 16) >= 0)
 +	  return 1;
-       }
--    exit (0);
++      }
 +    return 0;
-   }
++  }
  
-   ;
-@@ -19010,30 +20904,50 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -13465,12 +25418,9 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  ac_status=$?
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
@@ -13478,32 +25428,30 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  ac_status=$?
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_memcmp_working=yes
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_memcmp_working=yes
++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
-+
- ( exit $ac_status )
- ac_cv_func_memcmp_working=no
- fi
--rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ 
+-# Old archive suffix (normally "a").
+-libext="$libext"
++( exit $ac_status )
++ac_cv_func_memcmp_working=no
++fi
 +rm -rf conftest.dSYM
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
--echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6
--test $ac_cv_func_memcmp_working = no && LIBOBJS="$LIBOBJS memcmp.$ac_objext"
++fi
+ 
+-# Shared library suffix (normally ".so").
+-shrext='$shrext'
+ 
+-# Executable file suffix (normally "").
+-exeext="$exeext"
++fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
 +$as_echo "$ac_cv_func_memcmp_working" >&6; }
 +test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
@@ -13511,28 +25459,34 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
 + ;;
 +esac
-+
  
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_lt_prog_compiler_pic_RC
+-pic_mode=$pic_mode
  
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
  
-@@ -19041,95 +20955,116 @@
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
  
- for ac_func in getpgid getpgrp setpgrp wait3
- do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-# Must we lock files when doing compilation ?
+-need_locks=$lt_need_locks
+ 
+-# 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
++for ac_func in getpgid getpgrp setpgrp wait3
++do
 +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 +$as_echo_n "checking for $ac_func... " >&6; }
 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 +  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++else
++  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
@@ -13541,68 +25495,53 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 +   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 +#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.  */
+ 
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
++/* System header to define __stub macros and hopefully few prototypes,
 +    which can conflict with char $ac_func (); below.
 +    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +    <limits.h> exists even on freestanding compilers.  */
-+
+ 
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
- #include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char $ac_func ();
--char (*f) ();
++# include <assert.h>
++#endif
  
--#ifdef F77_DUMMY_MAIN
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
 +#undef $ac_func
-+
+ 
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_lt_prog_compiler_static_RC
 +/* 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
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
++#ifdef __cplusplus
++extern "C"
++#endif
 +char $ac_func ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
 +#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--f = $ac_func;
- #endif
++choke me
++#endif
  
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
 +int
 +main ()
 +{
 +return $ac_func ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -13611,9 +25550,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -13625,77 +25562,61 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 test "$cross_compiling" = yes ||
 +	 $as_test_x conftest$ac_exeext
 +       }; then
-   eval "$as_ac_var=yes"
- else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
++  eval "$as_ac_var=yes"
++else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
+ 
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
++	eval "$as_ac_var=no"
++fi
+ 
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
 +rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
--if test `eval echo '${'$as_ac_var'}'` = yes; then
++fi
 +ac_res=`eval 'as_val=${'$as_ac_var'}
 +		 $as_echo "$as_val"'`
 +	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
 +if test `eval 'as_val=${'$as_ac_var'}
 +		 $as_echo "$as_val"'` = yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
++_ACEOF
  
- fi
- done
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
++fi
++done
  
--echo "$as_me:$LINENO: checking whether getpgrp requires zero arguments" >&5
--echo $ECHO_N "checking whether getpgrp requires zero arguments... $ECHO_C" >&6
+-# Library versioning type.
+-version_type=$version_type
 +{ $as_echo "$as_me:$LINENO: checking whether getpgrp requires zero arguments" >&5
 +$as_echo_n "checking whether getpgrp requires zero arguments... " >&6; }
- if test "${ac_cv_func_getpgrp_void+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${ac_cv_func_getpgrp_void+set}" = set; then
 +  $as_echo_n "(cached) " >&6
- else
-   # Use it with a single arg.
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++else
++  # Use it with a single arg.
++cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
- $ac_includes_default
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
- int
- main ()
- {
-@@ -19139,28 +21074,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
++$ac_includes_default
++int
++main ()
++{
++getpgrp (0);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -13704,9 +25625,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -13715,80 +25634,72 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-   ac_cv_func_getpgrp_void=no
- else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
++  ac_cv_func_getpgrp_void=no
++else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_func_getpgrp_void=yes
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
+ 
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
++	ac_cv_func_getpgrp_void=yes
++fi
+ 
+-# 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
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_getpgrp_void" >&5
--echo "${ECHO_T}$ac_cv_func_getpgrp_void" >&6
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
++fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_getpgrp_void" >&5
 +$as_echo "$ac_cv_func_getpgrp_void" >&6; }
- if test $ac_cv_func_getpgrp_void = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -19169,64 +21112,73 @@
++if test $ac_cv_func_getpgrp_void = yes; then
+ 
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_old_archive_cmds_RC
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
++cat >>confdefs.h <<\_ACEOF
++#define GETPGRP_VOID 1
++_ACEOF
  
- fi
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
++fi
  
--echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5
--echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
 +{ $as_echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5
 +$as_echo_n "checking whether setpgrp takes no argument... " >&6; }
- if test "${ac_cv_func_setpgrp_void+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${ac_cv_func_setpgrp_void+set}" = set; then
 +  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot check setpgrp when cross compiling" >&5
--echo "$as_me: error: cannot check setpgrp when cross compiling" >&2;}
++else
++  if test "$cross_compiling" = yes; then
 +  { { $as_echo "$as_me:$LINENO: error: cannot check setpgrp when cross compiling" >&5
 +$as_echo "$as_me: error: cannot check setpgrp when cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
--#if HAVE_UNISTD_H
--# include <unistd.h>
--#endif
--
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +$ac_includes_default
- int
- main ()
- {
- /* If this system has a BSD-style setpgrp which takes arguments,
-   setpgrp(1, 1) will fail with ESRCH and return -1, in that case
-   exit successfully. */
--  exit (setpgrp (1,1) == -1 ? 0 : 1);
++int
++main ()
++{
++/* If this system has a BSD-style setpgrp which takes arguments,
++  setpgrp(1, 1) will fail with ESRCH and return -1, in that case
++  exit successfully. */
 +  return setpgrp (1,1) != -1;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -13797,12 +25708,9 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  ac_status=$?
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
@@ -13810,54 +25718,163 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  ac_status=$?
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_setpgrp_void=no
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_setpgrp_void=no
++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
-+
- ( exit $ac_status )
- ac_cv_func_setpgrp_void=yes
- fi
--rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ 
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_archive_cmds_RC
+-archive_expsym_cmds=$lt_archive_expsym_cmds_RC
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
++( exit $ac_status )
++ac_cv_func_setpgrp_void=yes
++fi
 +rm -rf conftest.dSYM
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_setpgrp_void" >&5
--echo "${ECHO_T}$ac_cv_func_setpgrp_void" >&6
++fi
+ 
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_module_cmds_RC
+-module_expsym_cmds=$lt_module_expsym_cmds_RC
+ 
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
++fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_setpgrp_void" >&5
 +$as_echo "$ac_cv_func_setpgrp_void" >&6; }
- if test $ac_cv_func_setpgrp_void = yes; then
++if test $ac_cv_func_setpgrp_void = yes; then
  
- cat >>confdefs.h <<\_ACEOF
-@@ -19260,74 +21212,98 @@
- 	gethostname select socket closesocket setsockopt send recv \
- 	getdtablesize getrlimit syslog vsyslog setenv snprintf
- do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=$lt_predep_objects_RC
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=$lt_postdep_objects_RC
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_predeps_RC
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$lt_postdeps_RC
+-
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
++cat >>confdefs.h <<\_ACEOF
++#define SETPGRP_VOID 1
++_ACEOF
+ 
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
++fi
+ 
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
+ 
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag_RC
+ 
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_no_undefined_flag_RC
+ 
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
+ 
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
+ 
+-# 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
+ 
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
+ 
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
+ 
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+ 
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$hardcode_action_RC
+ 
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
+ 
+-# 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_RC
+ 
+-# If ld is used when linking, flag to hardcode \$libdir into
+-# a binary during linking. This must work even if \$libdir does
+-# not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
+-
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
+-
+-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_direct=$hardcode_direct_RC
+-
+-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_minus_L=$hardcode_minus_L_RC
+-
+-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+-# the resulting binary.
+-hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
+-
+-# 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_RC
+ 
+-# Variables whose values should be saved in libtool wrapper scripts and
+-# restored at relink time.
+-variables_saved_for_relink="$variables_saved_for_relink"
+ 
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$link_all_deplibs_RC
+ 
+-# 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
+ 
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_RC"
+ 
+-# Set to yes if exported symbols are required.
+-always_export_symbols=$always_export_symbols_RC
++for ac_func in random drand48 fchmod getopt killpg \
++	FD_SET \
++	gethostname select socket closesocket setsockopt send recv \
++	getdtablesize getrlimit syslog vsyslog setenv snprintf
++do
 +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 +$as_echo_n "checking for $ac_func... " >&6; }
 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 +  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++else
++  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
@@ -13866,68 +25883,52 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 +   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 +#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.  */
+ 
+-# The commands to list exported symbols.
+-export_symbols_cmds=$lt_export_symbols_cmds_RC
++/* System header to define __stub macros and hopefully few prototypes,
 +    which can conflict with char $ac_func (); below.
 +    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +    <limits.h> exists even on freestanding compilers.  */
-+
+ 
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_cmds
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
- #include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char $ac_func ();
--char (*f) ();
++# include <assert.h>
++#endif
  
--#ifdef F77_DUMMY_MAIN
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_exclude_expsyms_RC
 +#undef $ac_func
-+
+ 
+-# Symbols that must always be exported.
+-include_expsyms=$lt_include_expsyms_RC
 +/* 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
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
++#ifdef __cplusplus
++extern "C"
++#endif
 +char $ac_func ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
 +#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--f = $ac_func;
- #endif
++choke me
++#endif
  
+-# ### END LIBTOOL TAG CONFIG: $tagname
 +int
 +main ()
 +{
 +return $ac_func ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -13936,9 +25937,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -13950,54 +25949,92 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 test "$cross_compiling" = yes ||
 +	 $as_test_x conftest$ac_exeext
 +       }; then
-   eval "$as_ac_var=yes"
- else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
++  eval "$as_ac_var=yes"
++else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
+ 
+-__EOF__
++	eval "$as_ac_var=no"
++fi
+ 
 +rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
--if test `eval echo '${'$as_ac_var'}'` = yes; then
++fi
 +ac_res=`eval 'as_val=${'$as_ac_var'}
 +		 $as_echo "$as_val"'`
 +	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
 +if test `eval 'as_val=${'$as_ac_var'}
 +		 $as_echo "$as_val"'` = yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
++_ACEOF
  
+-else
+-  # If there is no Makefile yet, we rely on a make rule to execute
+-  # `config.status --recheck' to rerun these tests and create the
+-  # libtool script then.
+-  test -f Makefile && make "$ltmain"
  fi
-@@ -19346,153 +21322,1151 @@
- for ac_func in bcopy bzero bcmp index rindex \
- 	memcpy memmove memset strchr strrchr
- do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++done
+ 
+ 
+-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
+ 
+-CC="$lt_save_CC"
+ 
+-	;;
+ 
+-      *)
+-	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
+-echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
+-   { (exit 1); exit 1; }; }
+-	;;
+-      esac
+ 
+-      # Append the new tag name to the list of available tags.
+-      if test -n "$tagname" ; then
+-      available_tags="$available_tags $tagname"
+-    fi
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
+ 
+-  # Now substitute the updated list of available tags.
+-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+-    mv "${ofile}T" "$ofile"
+-    chmod +x "$ofile"
+-  else
+-    rm -f "${ofile}T"
+-    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
+-echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
+-   { (exit 1); exit 1; }; }
+-  fi
+-fi
+ 
+ 
+ 
+-# This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++for ac_func in bcopy bzero bcmp index rindex \
++	memcpy memmove memset strchr strrchr
++do
 +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 +$as_echo_n "checking for $ac_func... " >&6; }
 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 +  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++else
++  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
@@ -14006,32 +26043,28 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 +   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 +#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.  */
+ 
+-# Prevent multiple expansion
++/* System header to define __stub macros and hopefully few prototypes,
 +    which can conflict with char $ac_func (); below.
 +    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +    <limits.h> exists even on freestanding compilers.  */
-+
+ 
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
- #include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error.  */
++# include <assert.h>
 +#endif
-+
+ 
 +#undef $ac_func
-+
+ 
 +/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char $ac_func ();
--char (*f) ();
++#ifdef __cplusplus
++extern "C"
++#endif
++char $ac_func ();
 +/* The GNU C library defines this for functions which it implements
 +    to always fail with ENOSYS.  Some functions are actually named
 +    something starting with __ and the normal name is an alias.  */
@@ -14039,7 +26072,6 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +choke me
 +#endif
  
--#ifdef F77_DUMMY_MAIN
 +int
 +main ()
 +{
@@ -14073,10 +26105,10 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
+ 
 +	eval "$as_ac_var=no"
 +fi
-+
+ 
 +rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
@@ -14090,11 +26122,11 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
-+
+ 
 +fi
 +done
-+
-+
+ 
+ 
 +if test "${ac_cv_header_netdb_h+set}" = set; then
 +  { $as_echo "$as_me:$LINENO: checking for netdb.h" >&5
 +$as_echo_n "checking for netdb.h... " >&6; }
@@ -14138,14 +26170,14 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
+ 
 +	ac_header_compiler=no
 +fi
-+
+ 
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +$as_echo "$ac_header_compiler" >&6; }
-+
+ 
 +# Is the header present?
 +{ $as_echo "$as_me:$LINENO: checking netdb.h presence" >&5
 +$as_echo_n "checking netdb.h presence... " >&6; }
@@ -14178,14 +26210,14 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
+ 
 +  ac_header_preproc=no
 +fi
-+
+ 
 +rm -f conftest.err conftest.$ac_ext
 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +$as_echo "$ac_header_preproc" >&6; }
-+
+ 
 +# So?  What about this header?
 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 +  yes:no: )
@@ -14208,7 +26240,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +$as_echo "$as_me: WARNING: netdb.h: proceeding with the preprocessor's result" >&2;}
 +    { $as_echo "$as_me:$LINENO: WARNING: netdb.h: in the future, the compiler will take precedence" >&5
 +$as_echo "$as_me: WARNING: netdb.h: in the future, the compiler will take precedence" >&2;}
-+
+ 
 +    ;;
 +esac
 +{ $as_echo "$as_me:$LINENO: checking for netdb.h" >&5
@@ -14220,11 +26252,11 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_netdb_h" >&5
 +$as_echo "$ac_cv_header_netdb_h" >&6; }
-+
+ 
 +fi
-+
-+
-+
+ 
+ 
+ 
 +for ac_func in getaddrinfo
 +do
 +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -14242,26 +26274,44 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 +   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 +#define $ac_func innocuous_$ac_func
-+
+ 
 +/* System header to define __stub macros and hopefully few prototypes,
 +    which can conflict with char $ac_func (); below.
 +    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +    <limits.h> exists even on freestanding compilers.  */
-+
+ 
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
 +# include <assert.h>
 +#endif
-+
+ 
+-echo "$as_me:$LINENO: checking for library containing crypt" >&5
+-echo $ECHO_N "checking for library containing crypt... $ECHO_C" >&6
+-if test "${ac_cv_search_crypt+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
+-ac_cv_search_crypt=no
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
 +#undef $ac_func
-+
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* 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
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char crypt ();
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 +char $ac_func ();
 +/* The GNU C library defines this for functions which it implements
@@ -14274,12 +26324,21 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  int
  main ()
  {
+-crypt ();
 +return $ac_func ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -14288,7 +26347,10 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_search_crypt="none required"
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -14301,13 +26363,23 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 $as_test_x conftest$ac_exeext
 +       }; then
 +  eval "$as_ac_var=yes"
-+else
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	eval "$as_ac_var=no"
-+fi
-+
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-if test "$ac_cv_search_crypt" = no; then
+-  for ac_lib in crypt; do
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-    cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
@@ -14360,23 +26432,29 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.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
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char crypt ();
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
 +char $ac_func ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
 +#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--f = $ac_func;
++choke me
  #endif
- 
-+int
-+main ()
-+{
++
+ int
+ main ()
+ {
+-crypt ();
 +return $ac_func ();
    ;
    return 0;
@@ -14402,6 +26480,8 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
    ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
+-  ac_cv_search_crypt="-l$ac_lib"
+-break
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -14413,59 +26493,61 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 test "$cross_compiling" = yes ||
 +	 $as_test_x conftest$ac_exeext
 +       }; then
-   eval "$as_ac_var=yes"
++  eval "$as_ac_var=yes"
  else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-  done
+-fi
+-LIBS=$ac_func_search_save_LIBS
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
- eval "$as_ac_var=no"
++	eval "$as_ac_var=no"
  fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
+-echo "${ECHO_T}$ac_cv_search_crypt" >&6
+-if test "$ac_cv_search_crypt" != no; then
+-  test "$ac_cv_search_crypt" = "none required" || LIBS="$ac_cv_search_crypt $LIBS"
 +
 +rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
--if test `eval echo '${'$as_ac_var'}'` = yes; then
++fi
 +ac_res=`eval 'as_val=${'$as_ac_var'}
 +		 $as_echo "$as_val"'`
 +	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
 +if test `eval 'as_val=${'$as_ac_var'}
 +		 $as_echo "$as_val"'` = yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
++_ACEOF
  
  fi
- done
++done
  
  
--JS_SUPPORTOBJS=
--
--
--for ac_func in mkdir vasprintf
-+for ac_func in getnameinfo
- do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
+-echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+-if test "${ac_cv_lib_socket_connect+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
++for ac_func in getnameinfo
++do
 +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 +$as_echo_n "checking for $ac_func... " >&6; }
 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 +  $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsocket  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
++  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
@@ -14475,17 +26557,16 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 +#define $ac_func innocuous_$ac_func
 +
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.  */
++/* System header to define __stub macros and hopefully few prototypes,
 +    which can conflict with char $ac_func (); below.
 +    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +    <limits.h> exists even on freestanding compilers.  */
-+
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
- #include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error.  */
++# include <assert.h>
 +#endif
 +
 +#undef $ac_func
@@ -14498,25 +26579,38 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  #endif
 -/* We use char because int might match the return type of a gcc2
 -   builtin and then its argument prototype would still apply.  */
- char $ac_func ();
--char (*f) ();
+-char connect ();
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
++char $ac_func ();
 +/* The GNU C library defines this for functions which it implements
 +    to always fail with ENOSYS.  Some functions are actually named
 +    something starting with __ and the normal name is an alias.  */
 +#if defined __stub_$ac_func || defined __stub___$ac_func
 +choke me
-+#endif
- 
--#ifdef F77_DUMMY_MAIN
-+int
-+main ()
-+{
+ #endif
++
+ int
+ main ()
+ {
+-connect ();
 +return $ac_func ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -14525,7 +26619,10 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_socket_connect=yes
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -14538,12 +26635,21 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 $as_test_x conftest$ac_exeext
 +       }; then
 +  eval "$as_ac_var=yes"
-+else
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_lib_socket_connect=no
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	eval "$as_ac_var=no"
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+-if test $ac_cv_lib_socket_connect = yes; then
 +
 +rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -14555,14 +26661,21 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +$as_echo "$ac_res" >&6; }
 +if test `eval 'as_val=${'$as_ac_var'}
 +		 $as_echo "$as_val"'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBSOCKET 1
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
+ _ACEOF
+ 
+-  LIBS="-lsocket $LIBS"
+-
+ fi
 +done
-+
-+
+ 
+ 
+-echo "$as_me:$LINENO: checking for getservbyname in -lbind" >&5
+-echo $ECHO_N "checking for getservbyname in -lbind... $ECHO_C" >&6
+-if test "${ac_cv_lib_bind_getservbyname+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +for ac_func in gai_strerror
 +do
 +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -14570,7 +26683,12 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +$as_echo_n "checking for $ac_func... " >&6; }
 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 +  $as_echo_n "(cached) " >&6
-+else
+ else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lbind  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -14591,15 +26709,23 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +#else
 +# include <assert.h>
 +#endif
-+
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +#undef $ac_func
 +
 +/* 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
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char getservbyname ();
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 +char $ac_func ();
 +/* The GNU C library defines this for functions which it implements
@@ -14612,12 +26738,21 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  int
  main ()
  {
+-getservbyname ();
 +return $ac_func ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -14626,7 +26761,10 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_bind_getservbyname=yes
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -14639,12 +26777,21 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 $as_test_x conftest$ac_exeext
 +       }; then
 +  eval "$as_ac_var=yes"
-+else
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_lib_bind_getservbyname=no
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	eval "$as_ac_var=no"
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_bind_getservbyname" >&5
+-echo "${ECHO_T}$ac_cv_lib_bind_getservbyname" >&6
+-if test $ac_cv_lib_bind_getservbyname = yes; then
 +
 +rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -14656,36 +26803,65 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +$as_echo "$ac_res" >&6; }
 +if test `eval 'as_val=${'$as_ac_var'}
 +		 $as_echo "$as_val"'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBBIND 1
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
+ _ACEOF
+ 
+-  LIBS="-lbind $LIBS"
+-
+ fi
 +done
-+
+ 
+-
+-echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_storage" >&5
 +$as_echo_n "checking for struct sockaddr_storage... " >&6; }
 +if test "${ac_cv_type_struct_sockaddr_storage+set}" = set; then
 +  $as_echo_n "(cached) " >&6
-+else
+ else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lnsl  $LIBS"
 +  ac_cv_type_struct_sockaddr_storage=no
-+cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#include <sys/socket.h>
-+
-+int
-+main ()
-+{
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char gethostbyname ();
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+-gethostbyname ();
 +if (sizeof (struct sockaddr_storage))
 +       return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
@@ -14695,7 +26871,12 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -14730,7 +26911,10 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_nsl_gethostbyname=yes
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -14740,34 +26924,135 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
 +  :
-+else
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_lib_nsl_gethostbyname=no
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+-if test $ac_cv_lib_nsl_gethostbyname = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBNSL 1
+-_ACEOF
+-
+-  LIBS="-lnsl $LIBS"
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
+ 
 +	ac_cv_type_struct_sockaddr_storage=yes
-+fi
-+
+ fi
+ 
+-
+-echo "$as_me:$LINENO: checking for X" >&5
+-echo $ECHO_N "checking for X... $ECHO_C" >&6
+-
+-
+-# Check whether --with-x or --without-x was given.
+-if test "${with_x+set}" = set; then
+-  withval="$with_x"
+-
+-fi;
+-# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
+-if test "x$with_x" = xno; then
+-  # The user explicitly disabled X.
+-  have_x=disabled
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+else
+ else
+-  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
+-    # Both variables are already set.
+-    have_x=yes
+-  else
+-    if test "${ac_cv_have_x+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  # One or both of the vars are not set, and there is no cached value.
+-ac_x_includes=no ac_x_libraries=no
+-rm -fr conftest.dir
+-if mkdir conftest.dir; then
+-  cd conftest.dir
+-  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
+-  cat >Imakefile <<'_ACEOF'
+-acfindx:
+-	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+-_ACEOF
+-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
+-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+-    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+-    for ac_extension in a so sl; do
+-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
+-         test -f $ac_im_libdir/libX11.$ac_extension; then
+-        ac_im_usrlibdir=$ac_im_libdir; break
+-      fi
+-    done
+-    # Screen out bogus values from the imake configuration.  They are
+-    # bogus both because they are the default anyway, and because
+-    # using them would break gcc on systems where it needs fixed includes.
+-    case $ac_im_incroot in
+-	/usr/include) ;;
+-	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
+-    esac
+-    case $ac_im_usrlibdir in
+-	/usr/lib | /lib) ;;
+-	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
+-    esac
+-  fi
+-  cd ..
+-  rm -fr conftest.dir
+-fi
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
+ 
+-# Standard set of common directories for X headers.
+-# Check X11 before X11Rn because it is often a symlink to the current release.
+-ac_x_header_dirs='
+-/usr/X11/include
+-/usr/X11R6/include
+-/usr/X11R5/include
+-/usr/X11R4/include
+ 
+-/usr/include/X11
+-/usr/include/X11R6
+-/usr/include/X11R5
+-/usr/include/X11R4
 +fi
-+
+ 
+-/usr/local/X11/include
+-/usr/local/X11R6/include
+-/usr/local/X11R5/include
+-/usr/local/X11R4/include
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_storage" >&5
 +$as_echo "$ac_cv_type_struct_sockaddr_storage" >&6; }
 +if test $ac_cv_type_struct_sockaddr_storage = yes; then
-+
+ 
+-/usr/local/include/X11
+-/usr/local/include/X11R6
+-/usr/local/include/X11R5
+-/usr/local/include/X11R4
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_STRUCT_SOCKADDR_STORAGE 1
 +_ACEOF
-+
-+
+ 
+-/usr/X386/include
+-/usr/x386/include
+-/usr/XFree86/include/X11
+ 
+-/usr/include
+-/usr/local/include
+-/usr/unsupported/include
+-/usr/athena/include
+-/usr/local/x11r5/include
+-/usr/lpp/Xamples/include
 +fi
-+
+ 
+-/usr/openwin/include
+-/usr/openwin/share/include'
 +{ $as_echo "$as_me:$LINENO: checking for struct addrinfo" >&5
 +$as_echo_n "checking for struct addrinfo... " >&6; }
 +if test "${ac_cv_type_struct_addrinfo+set}" = set; then
@@ -14781,7 +27066,14 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#include <netdb.h>
-+
+ 
+-if test "$ac_x_includes" = no; then
+-  # Guess where to find include files, by looking for Intrinsic.h.
+-  # First, try using that file with no special directory specified.
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <X11/Intrinsic.h>
 +int
 +main ()
 +{
@@ -14790,7 +27082,9 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  ;
 +  return 0;
 +}
-+_ACEOF
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
@@ -14800,9 +27094,53 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
+   ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
 +  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
+   rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  # We can compile using X headers with no special include directory.
+-ac_x_includes=
+-else
+-  echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  for ac_dir in $ac_x_header_dirs; do
+-  if test -r "$ac_dir/X11/Intrinsic.h"; then
+-    ac_x_includes=$ac_dir
+-    break
+-  fi
+-done
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-fi # $ac_x_includes = no
+-
+-if test "$ac_x_libraries" = no; then
+-  # Check for the libraries.
+-  # See if we find them without any special options.
+-  # Don't add to $LIBS permanently.
+-  ac_save_LIBS=$LIBS
+-  LIBS="-lXt $LIBS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <X11/Intrinsic.h>
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
 +  cat conftest.err >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && {
@@ -14817,15 +27155,25 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +/* end confdefs.h.  */
 +#include <netdb.h>
 +
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-XtMalloc (0)
 +if (sizeof ((struct addrinfo)))
 +	  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
@@ -14835,7 +27183,12 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  LIBS=$ac_save_LIBS
+-# We can link X programs with no special library path.
+-ac_x_libraries=
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -14845,23 +27198,45 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
 +  :
-+else
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-LIBS=$ac_save_LIBS
+-for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+-do
+-  # Don't even attempt the hair of trying to link an X program!
+-  for ac_extension in a so sl; do
+-    if test -r $ac_dir/libXt.$ac_extension; then
+-      ac_x_libraries=$ac_dir
+-      break 2
+-    fi
+-  done
+-done
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_cv_type_struct_addrinfo=yes
-+fi
-+
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-fi # $ac_x_libraries = no
+ 
+-if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
+-  # Didn't find X anywhere.  Cache the known absence of X.
+-  ac_cv_have_x="have_x=no"
+-else
+-  # Record where we found X for the cache.
+-  ac_cv_have_x="have_x=yes \
+-	        ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +
-+fi
+ fi
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_addrinfo" >&5
 +$as_echo "$ac_cv_type_struct_addrinfo" >&6; }
 +if test $ac_cv_type_struct_addrinfo = yes; then
@@ -14869,15 +27244,35 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_STRUCT_ADDRINFO 1
 +_ACEOF
-+
-+
-+fi
-+
+ 
+-  fi
+-  eval "$ac_cv_have_x"
+-fi # $with_x != no
+ 
+-if test "$have_x" != yes; then
+-  echo "$as_me:$LINENO: result: $have_x" >&5
+-echo "${ECHO_T}$have_x" >&6
+-  no_x=yes
+-else
+-  # If each of the values was on the command line, it overrides each guess.
+-  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
+-  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
+-  # Update the cache value to reflect the command line values.
+-  ac_cv_have_x="have_x=yes \
+-		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+-if test "${ac_cv_header_stdc+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking for struct in6_addr" >&5
 +$as_echo_n "checking for struct in6_addr... " >&6; }
 +if test "${ac_cv_type_struct_in6_addr+set}" = set; then
 +  $as_echo_n "(cached) " >&6
-+else
+ else
 +  ac_cv_type_struct_in6_addr=no
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
@@ -14914,14 +27309,20 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  cat >conftest.$ac_ext <<_ACEOF
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <stdlib.h>
+-#include <stdarg.h>
+-#include <string.h>
+-#include <float.h>
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#include <netinet/in.h>
-+
+ 
 +int
 +main ()
 +{
@@ -14930,7 +27331,9 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  ;
 +  return 0;
 +}
-+_ACEOF
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
@@ -14940,44 +27343,74 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
+   ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
 +  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-  else
+-    ac_cpp_err=
+-  fi
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
 +  :
-+else
+ else
+-  ac_cpp_err=yes
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_cv_type_struct_in6_addr=yes
-+fi
+ fi
+-if test -z "$ac_cpp_err"; then
+-  ac_cv_header_stdc=yes
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+else
+ else
+-  echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  ac_cv_header_stdc=no
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +
-+fi
-+
+ fi
+-rm -f conftest.err conftest.$ac_ext
+ 
+-if test $ac_cv_header_stdc = yes; then
+-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <string.h>
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_in6_addr" >&5
 +$as_echo "$ac_cv_type_struct_in6_addr" >&6; }
 +if test $ac_cv_type_struct_in6_addr = yes; then
-+
+ 
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_STRUCT_IN6_ADDR 1
-+_ACEOF
-+
-+
-+fi
+ _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.
 +{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_in6" >&5
 +$as_echo_n "checking for struct sockaddr_in6... " >&6; }
 +if test "${ac_cv_type_struct_sockaddr_in6+set}" = set; then
@@ -15019,14 +27452,17 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  cat >conftest.$ac_ext <<_ACEOF
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <stdlib.h>
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#include <netinet/in.h>
-+
+ 
 +int
 +main ()
 +{
@@ -15035,7 +27471,9 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  ;
 +  return 0;
 +}
-+_ACEOF
+ _ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "free" >/dev/null 2>&1; then
 +rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
@@ -15054,22 +27492,28 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-+  :
-+else
+   :
+ else
+-  ac_cv_header_stdc=no
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_cv_type_struct_sockaddr_in6=yes
-+fi
+ fi
+-rm -f conftest*
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
-+
-+fi
-+
+ 
+ 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
+-  :
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_in6" >&5
@@ -15094,8 +27538,14 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +$as_echo_n "checking for $ac_func... " >&6; }
 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 +  $as_echo_n "(cached) " >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <ctype.h>
+-#if ((' ' & 0x0FF) == 0x020)
+-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
@@ -15112,7 +27562,11 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +
 +#ifdef __STDC__
 +# include <limits.h>
-+#else
+ #else
+-# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
+-                     || ('j' <= (c) && (c) <= 'r') \
+-                     || ('s' <= (c) && (c) <= 'z'))
+-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
 +# include <assert.h>
 +#endif
 +
@@ -15125,33 +27579,37 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +extern "C"
 +#endif
 +char $ac_func ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
 +#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--f = $ac_func;
++choke me
  #endif
  
-+int
-+main ()
-+{
+-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+ int
+ main ()
+ {
+-  int i;
+-  for (i = 0; i < 256; i++)
+-    if (XOR (islower (i), ISLOWER (i))
+-        || toupper (i) != TOUPPER (i))
+-      exit(2);
+-  exit (0);
 +return $ac_func ();
-   ;
-   return 0;
++  ;
++  return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
++rm -f conftest.$ac_objext conftest$ac_exeext
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -15163,6 +27621,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
    ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
+-  :
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -15174,127 +27633,150 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	 test "$cross_compiling" = yes ||
 +	 $as_test_x conftest$ac_exeext
 +       }; then
-   eval "$as_ac_var=yes"
++  eval "$as_ac_var=yes"
  else
--  echo "$as_me: failed program was:" >&5
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
+-( exit $ac_status )
+-ac_cv_header_stdc=no
+-fi
+-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-fi
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
- eval "$as_ac_var=no"
++	eval "$as_ac_var=no"
  fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+-if test $ac_cv_header_stdc = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define STDC_HEADERS 1
 +rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
--if test `eval echo '${'$as_ac_var'}'` = yes; then
++fi
 +ac_res=`eval 'as_val=${'$as_ac_var'}
 +		 $as_echo "$as_val"'`
 +	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
 +if test `eval 'as_val=${'$as_ac_var'}
 +		 $as_echo "$as_val"'` = yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  
- else
-@@ -19504,26 +22478,25 @@
- 
++else
++  JS_SUPPORTOBJS="${JS_SUPPORTOBJS} ${ac_func}.o"
+ fi
++done
  
- WRAPLIB=
--echo "$as_me:$LINENO: checking whether to use libwrap" >&5
--echo $ECHO_N "checking whether to use libwrap... $ECHO_C" >&6
+-echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
+-echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
+-if test "${ac_cv_header_sys_wait_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++
++
++
++WRAPLIB=
 +{ $as_echo "$as_me:$LINENO: checking whether to use libwrap" >&5
 +$as_echo_n "checking whether to use libwrap... " >&6; }
- 
--# Check whether --with-libwrap or --without-libwrap was given.
++
 +# Check whether --with-libwrap was given.
- if test "${with_libwrap+set}" = set; then
--  withval="$with_libwrap"
--   case "$withval" in
++if test "${with_libwrap+set}" = set; then
 +  withval=$with_libwrap;  case "$withval" in
- 	  no)
--	    echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++	  no)
 +	    { $as_echo "$as_me:$LINENO: result: no" >&5
 +$as_echo "no" >&6; }
- 	    WRAP_TRY=no
- 	    ;;
- 	  yes)
--	    echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
++	    WRAP_TRY=no
++	    ;;
++	  yes)
 +	    { $as_echo "$as_me:$LINENO: result: yes" >&5
 +$as_echo "yes" >&6; }
- 	    WRAP_TRY=yes
- 	    ;;
- 	  *)
--	    echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
++	    WRAP_TRY=yes
++	    ;;
++	  *)
 +	    { $as_echo "$as_me:$LINENO: result: yes" >&5
 +$as_echo "yes" >&6; }
- 	    WRAP_TRY=yes
- 	    if test -d "$withval"; then
- 	      WRAPINCLUDES="-I$withval"
-@@ -19540,11 +22513,12 @@
- 	    ;;
- 	esac
++	    WRAP_TRY=yes
++	    if test -d "$withval"; then
++	      WRAPINCLUDES="-I$withval"
++	      if test -d $withval/include; then
++		WRAPINCLUDES="-I$withval/include $WRAPINCLUDES"
++	      fi
++	      WRAPLIB="-L$withval -lwrap"
++	      if test -d $withval/lib; then
++		WRAPLIB="-L$withval/lib $WRAPLIB"
++	      fi
++	    else
++	      WRAPINCLUDES="$withval"
++	    fi
++	    ;;
++	esac
  else
--  echo "$as_me:$LINENO: result: try to find" >&5
--echo "${ECHO_T}try to find" >&6
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <sys/types.h>
+-#include <sys/wait.h>
+-#ifndef WEXITSTATUS
+-# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
+-#endif
+-#ifndef WIFEXITED
+-# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+-#endif
 +  { $as_echo "$as_me:$LINENO: result: try to find" >&5
 +$as_echo "try to find" >&6; }
- 	 WRAP_TRY=auto
++	 WRAP_TRY=auto
  
--fi;
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
 +fi
 +
- # Link test for libwrap
- if test "$WRAP_TRY" = yes -o "$WRAP_TRY" = auto; then
-     OLDCFLAGS="$CFLAGS"
-@@ -19552,18 +22526,15 @@
-     OLDLIBS="$LIBS"
-     WRAPLIB=${WRAPLIB:-"-lwrap"}
-     LIBS="$WRAPLIB $OLDLIBS"
--    echo "$as_me:$LINENO: checking libwrap is working" >&5
--echo $ECHO_N "checking libwrap is working... $ECHO_C" >&6
++# Link test for libwrap
++if test "$WRAP_TRY" = yes -o "$WRAP_TRY" = auto; then
++    OLDCFLAGS="$CFLAGS"
++    CFLAGS="$WRAPINCLUDES $CFLAGS"
++    OLDLIBS="$LIBS"
++    WRAPLIB=${WRAPLIB:-"-lwrap"}
++    LIBS="$WRAPLIB $OLDLIBS"
 +    { $as_echo "$as_me:$LINENO: checking libwrap is working" >&5
 +$as_echo_n "checking libwrap is working... " >&6; }
-     cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++    cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
-  int allow_severity; int deny_severity;
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
++ int allow_severity; int deny_severity;
  int
  main ()
  {
-@@ -19573,19 +22544,28 @@
+-  int s;
+-  wait (&s);
+-  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
++ hosts_access();
+   ;
+   return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
+-         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
++rm -f conftest.$ac_objext conftest$ac_exeext
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -15306,8 +27788,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
    ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--   echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
+-  ac_cv_header_sys_wait_h=yes
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
@@ -15321,68 +27802,171 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +       }; then
 +   { $as_echo "$as_me:$LINENO: result: yes" >&5
 +$as_echo "yes" >&6; }
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBWRAP 1
-@@ -19593,13 +22573,14 @@
- 
- 
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_LIBWRAP 1
++_ACEOF
++
++
  else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-ac_cv_header_sys_wait_h=no
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	 { $as_echo "$as_me:$LINENO: result: no" >&5
 +$as_echo "no" >&6; }
- 		  if test "$WRAP_TRY" = yes; then
--		    { { echo "$as_me:$LINENO: error: Could not find libwrap. Please check config.log." >&5
--echo "$as_me: error: Could not find libwrap. Please check config.log." >&2;}
++		  if test "$WRAP_TRY" = yes; then
 +		    { { $as_echo "$as_me:$LINENO: error: Could not find libwrap. Please check config.log." >&5
 +$as_echo "$as_me: error: Could not find libwrap. Please check config.log." >&2;}
-    { (exit 1); exit 1; }; }
- 		  else
- 		    # recover old flag / clear needless WRAPLIB and continue
-@@ -19607,7 +22588,10 @@
- 		    WRAPLIB=
- 		  fi
++   { (exit 1); exit 1; }; }
++		  else
++		    # recover old flag / clear needless WRAPLIB and continue
++		    CFLAGS=$OLDCFLAGS
++		    WRAPLIB=
++		  fi
  fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-rm -f conftest.$ac_objext conftest.$ac_ext
 +
 +rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
-     # only jserver needs libwrap, recover LIBS also
-     LIBS=$OLDLIBS
++    # only jserver needs libwrap, recover LIBS also
++    LIBS=$OLDLIBS
  fi
-@@ -19665,6 +22649,7 @@
+-echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
+-if test $ac_cv_header_sys_wait_h = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SYS_WAIT_H 1
+-_ACEOF
+ 
++# mkdir -p Contrib/dic/gerodic in case builddir != srcdir
++dir=Contrib/dic/gerodic
++if test ! -d $dir; then
++  echo "creating $dir ..."
++  $ac_install_sh -d $dir
  fi
  
- ac_config_files="$ac_config_files ${makefiles_generic} ${makefiles_wnn} ${makefiles_wnn_dic} ${makefiles_cwnn} ${makefiles_cwnn_dic} ${makefiles_kwnn} ${makefiles_kwnn_dic}"
+-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+-if test "${ac_cv_header_time+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <sys/types.h>
+-#include <sys/time.h>
+-#include <time.h>
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
+-{
+-if ((struct tm *) 0)
+-return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_header_time=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_header_time=no
 +
- 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
-@@ -19675,7 +22660,7 @@
- # 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 overriden when
-+# `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.
++makefiles_generic="makerule.mk Makefile"
++
++
++if test "x${Wnn}" = "xWnn"; then
++  makefiles_wnn="Wnn/Makefile Wnn/conv/Makefile Wnn/include/Makefile \
++	Wnn/jd/Makefile Wnn/jd/rk/Makefile Wnn/jd/rk.vi/Makefile \
++	Wnn/jlib/Makefile Wnn/jlib.V3/Makefile Wnn/jserver/Makefile \
++	Wnn/jutil/Makefile Wnn/ld/Makefile Wnn/ld/rk/Makefile \
++	Wnn/romkan/Makefile Wnn/uum/Makefile \
++	Wnn/man/Makefile Wnn/man/2.env/Makefile Wnn/man/3.libwnn/Makefile \
++	Wnn/man/4.cmd/Makefile Wnn/man/6.jutil/Makefile \
++	Wnn/man/2.env/dic/Makefile Wnn/man/2.env/wnn/Makefile \
++	Wnn/man/3.libwnn/jl_lib/Makefile Wnn/man/3.libwnn/js_lib/Makefile \
++	Wnn/man/3.libwnn/misc_lib/Makefile Wnn/man/3.libwnn/rk_lib/Makefile"
++  makefiles_wnn_dic="Contrib/dic/gerodic/Makefile Wnn/pubdicplus/Makefile \
++	Wnn/wnncons/Makefile Wnn/wnncons/dic/Makefile"
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++
++
++if test "x$cWnn" = "xcWnn"; then
++  makefiles_cwnn="cWnn/Makefile cWnn/conv/Makefile cWnn/etc/Makefile \
++	cWnn/cd/Makefile cWnn/cd/rk/Makefile \
++	cWnn/cd/rk_p/Makefile cWnn/cd/rk_z/Makefile \
++	cWnn/td/Makefile cWnn/td/rk/Makefile \
++	cWnn/td/rk_z/Makefile cWnn/td/rk_p/Makefile \
++	cWnn/include/Makefile cWnn/jlib/Makefile \
++	cWnn/jserver/Makefile cWnn/jutil/Makefile \
++	cWnn/man/Makefile cWnn/man/1.intro/Makefile cWnn/man/2.env/Makefile \
++	cWnn/man/4.cmd/Makefile cWnn/man/6.jutil/Makefile \
++	cWnn/romkan/Makefile cWnn/uum/Makefile"
++  makefiles_cwnn_dic="cWnn/cdic/Makefile cWnn/tdic/Makefile"
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+-echo "${ECHO_T}$ac_cv_header_time" >&6
+-if test $ac_cv_header_time = yes; then
  
-@@ -19683,39 +22668,59 @@
+-cat >>confdefs.h <<\_ACEOF
+-#define TIME_WITH_SYS_TIME 1
+-_ACEOF
  
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
++if test "x$kWnn" = "xkWnn"; then
++  makefiles_kwnn="kWnn/Makefile kWnn/conv/Makefile kWnn/etc/Makefile \
++	kWnn/include/Makefile kWnn/jlib/Makefile kWnn/jutil/Makefile \
++	kWnn/jserver/Makefile kWnn/kd/Makefile kWnn/kd/rk/Makefile \
++	kWnn/romkan/Makefile kWnn/uum/Makefile"
++  makefiles_kwnn_dic="kWnn/kdic/Makefile"
+ fi
+ 
++ac_config_files="$ac_config_files ${makefiles_generic} ${makefiles_wnn} ${makefiles_wnn_dic} ${makefiles_cwnn} ${makefiles_cwnn_dic} ${makefiles_kwnn} ${makefiles_kwnn_dic}"
++
++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.
--{
++# 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
@@ -15400,74 +27984,48 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +    esac
 +  done
 +
-   (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
++  (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' does not quote correctly, so add quotes (double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \).
++      sed -n \
++	"s/'/'\\\\''/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
 +      ;; #(
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++    *)
++      # `set' quotes correctly as required by POSIX, so do not add quotes.
 +      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--} |
++      ;;
 +    esac |
 +    sort
 +) |
-   sed '
++  sed '
 +     /^ac_cv_env_/b end
-      t clear
-      : clear
-      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-      t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     t clear
++     :clear
++     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
++     t end
 +     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-      : end' >>confcache
--if cmp -s $cache_file confcache; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
++     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 +  if test -w "$cache_file"; then
 +    test "x$cache_file" != "x/dev/null" &&
 +      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
 +$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    echo "not updating unwritable cache $cache_file"
++    cat confcache >$cache_file
++  else
 +    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -19724,30 +22729,32 @@
- # Let make expand exec_prefix.
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
++  fi
++fi
++rm -f confcache
  
--# VPATH may cause trouble with some makes, so we remove $(srcdir),
--# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
--# trailing colons and then remove the whole line if VPATH becomes empty
--# (actually we leave an empty line to preserve line numbers).
--if test "x$srcdir" = x.; then
--  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
--s/:*\$(srcdir):*/:/;
--s/:*\${srcdir}:*/:/;
--s/:*@srcdir@:*/:/;
--s/^\([^=]*=[ 	]*\):*/\1/;
--s/:*$//;
--s/^[^=]*=[ 	]*$//;
--}'
--fi
--
- DEFS=-DHAVE_CONFIG_H
++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=
@@ -15481,112 +28039,61 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
 +done
 +LIBOBJS=$ac_libobjs
-+
+ 
 +LTLIBOBJS=$ac_ltlibobjs
-+
-+
  
- : ${CONFIG_STATUS=./config.status}
+ 
+ 
++: ${CONFIG_STATUS=./config.status}
 +ac_write_fail=0
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
--echo "$as_me: creating $CONFIG_STATUS" >&6;}
--cat >$CONFIG_STATUS <<_ACEOF
++ac_clean_files_save=$ac_clean_files
++ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 +{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
 +cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- #! $SHELL
- # Generated by $as_me.
- # Run this file to recreate the current configuration.
-@@ -19755,70 +22762,36 @@
- # configure, is in config.log if it exists.
++#! $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
++debug=false
 +ac_cs_recheck=false
 +ac_cs_silent=false
- SHELL=\${CONFIG_SHELL-$SHELL}
- _ACEOF
++SHELL=\${CONFIG_SHELL-$SHELL}
++_ACEOF
  
--cat >>$CONFIG_STATUS <<\_ACEOF
--
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- ## --------------------- ##
- ## M4sh Initialization.  ##
- ## --------------------- ##
++## --------------------- ##
++## M4sh Initialization.  ##
++## --------------------- ##
  
--# Be Bourne compatible
 +# 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=:
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
--  set -o posix
--fi
--
--# NLS nuisances.
--# Support unset when possible.
--if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
--  as_unset=unset
++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
--  as_unset=false
++else
 +  case `(set -o) 2>/dev/null` in
 +  *posix*) set -o posix ;;
 +esac
-+
- fi
  
--(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
--    { $as_unset LANG || test "${LANG+set}" != set; } ||
--      { LANG=C; export LANG; }
--(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
--    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
--      { LC_ALL=C; export LC_ALL; }
--(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
--    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
--      { LC_TIME=C; export LC_TIME; }
--(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
--    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
--      { LC_CTYPE=C; export LC_CTYPE; }
--(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
--    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
--      { LANGUAGE=C; export LANGUAGE; }
--(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
--    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
--      { LC_COLLATE=C; export LC_COLLATE; }
--(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
--    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
--      { LC_NUMERIC=C; export LC_NUMERIC; }
--(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
--    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
--      { LC_MESSAGES=C; export LC_MESSAGES; }
++fi
+ 
  
  
--# Name of the executable.
--as_me=`(basename "$0") 2>/dev/null ||
--$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
--	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)$' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X/"$0" |
--    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
--  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\/\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
  
--# PATH needs CR, and LINENO needs CR and PATH.
 +# PATH needs CR
- # Avoid depending upon Character Ranges.
- as_cr_letters='abcdefghijklmnopqrstuvwxyz'
- as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-@@ -19826,27 +22799,63 @@
- as_cr_digits='0123456789'
- as_cr_alnum=$as_cr_Letters$as_cr_digits
++# 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_nl='
 +'
@@ -15619,38 +28126,28 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  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
--  echo "#! /bin/sh" >conftest.sh
--  echo  "exit 0"   >>conftest.sh
--  chmod +x conftest.sh
--  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
-     PATH_SEPARATOR=:
+ 
++# 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
--  rm -f conftest.sh
-+
++fi
+ 
 +# Support unset when possible.
 +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
 +  as_unset=unset
 +else
 +  as_unset=false
- fi
++fi
  
+-for ac_header in fcntl.h syslog.h unistd.h utmp.h utmpx.h \
+-	sys/file.h sys/ioctl.h sys/time.h sys/types.h sys/param.h \
+-	malloc.h strings.h memory.h \
+-	curses.h ncurses.h sgtty.h term.h termio.h termios.h \
  
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
--  # Find who we are.  Look in the path if we contain no path at all
--  # relative or not.
 +# IFS
 +# We need space, tab and new line, in precisely that order.  Quoting is
 +# there to prevent editors from complaining about space-tab.
@@ -15659,38 +28156,37 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +IFS=" ""	$as_nl"
 +
 +# Find who we are.  Look in the path if we contain no directory separator.
-   case $0 in
-     *[\\/]* ) as_myself=$0 ;;
-     *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -19856,6 +22865,7 @@
-   test -z "$as_dir" && as_dir=.
-   test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
++case $0 in
++  *[\\/]* ) as_myself=$0 ;;
++  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
+ do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++  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
-@@ -19865,133 +22875,202 @@
-     as_myself=$0
-   fi
-   if test ! -f "$as_myself"; then
--    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
--echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
--   { (exit 1); exit 1; }; }
++
++     ;;
++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); exit 1; }
-   fi
--  case $CONFIG_SHELL in
--  '')
--    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for as_base in sh bash ksh sh5; do
--	 case $as_dir in
--	 /*)
--	   if ("$as_dir/$as_base" -c '
++fi
 +
 +# Work around bugs in pre-3.0 UWIN ksh.
 +for as_var in ENV MAIL MAILPATH
@@ -15710,16 +28206,66 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +if expr a : '\(a\)' >/dev/null 2>&1 &&
 +   test "X`expr 00001 : '.*\(...\)'`" = X001; then
 +  as_expr=expr
-+else
+ else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
 +  as_expr=false
 +fi
 +
 +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
 +  as_basename=basename
-+else
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_header_compiler=no
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +  as_basename=false
 +fi
-+
+ 
+-# Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <$ac_header>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-  else
+-    ac_cpp_err=
+-  fi
 +
 +# Name of the executable.
 +as_me=`$as_basename -- "$0" ||
@@ -15746,88 +28292,58 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +
 +
 +
-   as_lineno_1=$LINENO
-   as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-   test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
--	     CONFIG_SHELL=$as_dir/$as_base
--	     export CONFIG_SHELL
--	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
--	   fi;;
--	 esac
--       done
--done
--;;
--  esac
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
 +  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
- 
-   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-   # uniformly replaced by the line number.  The first 'sed' inserts a
--  # line-number line before each line; the second 'sed' does the real
--  # work.  The second script uses 'N' to pair each line-number line
--  # with the numbered line, and appends trailing '-' during
--  # substitution so that $LINENO is not a special case at line end.
++
++  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
++  # uniformly replaced by the line number.  The first 'sed' inserts a
 +  # line-number line after each line using $LINENO; the second 'sed'
 +  # does the real work.  The second script uses 'N' to pair each
 +  # line-number line with the line containing $LINENO, and appends
 +  # trailing '-' during substitution so that $LINENO is not a special
 +  # case at line end.
-   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
--  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
--  sed '=' <$as_myself |
++  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
 +  # scripts with optimization help from Paolo Bonzini.  Blame Lee
 +  # E. McMahon (1931-1989) for sed's syntax.  :-)
 +  sed -n '
 +    p
 +    /[$]LINENO/=
 +  ' <$as_myself |
-     sed '
++    sed '
 +      s/[$]LINENO.*/&-/
 +      t lineno
 +      b
 +      :lineno
-       N
--      s,$,-,
-       : loop
--      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      N
++      :loop
 +      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-       t loop
--      s,-$,,
--      s,^['$as_cr_digits']*\n,,
++      t loop
 +      s/-\n.*//
-     ' >$as_me.lineno &&
--  chmod +x $as_me.lineno ||
--    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
--echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
++    ' >$as_me.lineno &&
 +  chmod +x "$as_me.lineno" ||
 +    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-    { (exit 1); exit 1; }; }
- 
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
--  # original and so on.  Autoconf is especially sensible to this).
--  . ./$as_me.lineno
++   { (exit 1); exit 1; }; }
++
++  # Don't try to exec as it changes $[0], causing all sort of problems
++  # (the dirname of $[0] is not the place where we might find the
 +  # original and so on.  Autoconf is especially sensitive to this).
 +  . "./$as_me.lineno"
-   # Exit status is that of the last command.
-   exit
- }
- 
- 
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
--  *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T='	' ;;
--  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
--  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
--esac
++  # Exit status is that of the last command.
++  exit
++}
++
++
 +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
 +  as_dirname=dirname
-+else
+ else
+-  ac_cpp_err=yes
 +  as_dirname=false
-+fi
- 
--if expr a : '\(a\)' >/dev/null 2>&1; then
+ fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
++
 +ECHO_C= ECHO_N= ECHO_T=
 +case `echo -n x` in
 +-n*)
@@ -15840,26 +28356,43 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +esac
 +if expr a : '\(a\)' >/dev/null 2>&1 &&
 +   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
++  as_expr=expr
  else
-   as_expr=false
+-  echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  ac_header_preproc=no
++  as_expr=false
  fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
  
- rm -f conf$$ conf$$.exe conf$$.file
--echo >conf$$.file
--if ln -s conf$$.file conf$$ 2>/dev/null; then
--  # We could just check for DJGPP; but this test a) works b) is more generic
--  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
--  if test -f conf$$.exe; then
--    # Don't use ln at all; we don't have any links
--    as_ln_s='cp -p'
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+-  yes:no )
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
+-  no:yes )
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
+-esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++rm -f conf$$ conf$$.exe conf$$.file
 +if test -d conf$$.dir; then
 +  rm -f conf$$.dir/conf$$.file
-   else
--    as_ln_s='ln -s'
++else
 +  rm -f conf$$.dir
 +  mkdir conf$$.dir 2>/dev/null
-   fi
++fi
 +if (echo >conf$$.file) 2>/dev/null; then
 +  if ln -s conf$$.file conf$$ 2>/dev/null; then
 +    as_ln_s='ln -s'
@@ -15869,26 +28402,31 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +    # In both cases, we have to default to `cp -p'.
 +    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
 +      as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
-   as_ln_s=ln
++  elif ln conf$$.file conf$$ 2>/dev/null; then
++    as_ln_s=ln
++  else
++    as_ln_s='cp -p'
++  fi
  else
-   as_ln_s='cp -p'
- fi
--rm -f conf$$ conf$$.exe conf$$.file
-+else
+-  eval "$as_ac_Header=$ac_header_preproc"
 +  as_ln_s='cp -p'
-+fi
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 +rmdir conf$$.dir 2>/dev/null
  
--as_executable_p="test -f"
 +if mkdir -p . 2>/dev/null; then
 +  as_mkdir_p=:
 +else
 +  test -d ./-p && rmdir ./-p
 +  as_mkdir_p=false
-+fi
-+
+ fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+ 
 +if test -x / >/dev/null 2>&1; then
 +  as_test_x='test -x'
 +else
@@ -15909,122 +28447,242 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	???[sx]*):;;*)false;;esac;fi
 +    '\'' sh
 +  '
-+fi
+ fi
 +as_executable_p=$as_test_x
  
- # Sed expression to map a string onto a valid CPP name.
--as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+-done
++# 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="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
--
--
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" 	$as_nl"
++# Sed expression to map a string onto a valid variable name.
 +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
--# CDPATH.
--$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
+-echo "$as_me:$LINENO: checking for mode_t" >&5
+-echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
+-if test "${ac_cv_type_mode_t+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-$ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
+-{
+-if ((mode_t *) 0)
+-  return 0;
+-if (sizeof (mode_t))
+-  return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_type_mode_t=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_type_mode_t=no
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
+-echo "${ECHO_T}$ac_cv_type_mode_t" >&6
+-if test $ac_cv_type_mode_t = yes; then
+-  :
+-else
  
- exec 6>&1
+-cat >>confdefs.h <<_ACEOF
+-#define mode_t int
+-_ACEOF
++exec 6>&1
  
--# Open the log real soon, to keep \$[0] and so on meaningful, and to
+-fi
 +# 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.  Logging --version etc. is OK.
--exec 5>>config.log
--{
--  echo
--  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
--## Running $as_me. ##
--_ASBOX
--} >&5
--cat >&5 <<_CSEOF
--
++# report actual input values of CONFIG_FILES etc. instead of their
 +# values after options handling.
 +ac_log="
- This file was extended by $as_me, which was
--generated by GNU Autoconf 2.53.  Invocation command line was
++This file was extended by $as_me, which was
 +generated by GNU Autoconf 2.62.  Invocation command line was
  
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -19999,30 +23078,19 @@
-   CONFIG_COMMANDS = $CONFIG_COMMANDS
-   $ $0 $@
- 
--_CSEOF
--echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
--echo >&5
+-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+-if test "${ac_cv_header_time+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <sys/types.h>
+-#include <sys/time.h>
+-#include <time.h>
++  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
  
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- # Files that config.status was made for.
--if test -n "$ac_config_files"; then
--  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_headers"; then
--  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_links"; then
--  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
+-{
+-if ((struct tm *) 0)
+-return 0;
+-  ;
+-  return 0;
+-}
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_header_time=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_header_time=no
 -fi
--
--if test -n "$ac_config_commands"; then
--  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+-rm -f conftest.$ac_objext conftest.$ac_ext
 -fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+-echo "${ECHO_T}$ac_cv_header_time" >&6
+-if test $ac_cv_header_time = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define TIME_WITH_SYS_TIME 1
++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
-+_ACEOF
- 
+-fi
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
- current configuration.
-@@ -20030,7 +23098,8 @@
- Usage: $0 [OPTIONS] [FILE]...
++ac_cs_usage="\
++\`$as_me' instantiates files from templates according to the
++current configuration.
  
-   -h, --help       print this help, then exit
--  -V, --version    print version number, then exit
++Usage: $0 [OPTIONS] [FILE]...
+ 
+-echo "$as_me:$LINENO: checking for socklen_t" >&5
+-echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
+-if test "${ac_cv_type_socklen_t+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++  -h, --help       print this help, then exit
 +  -V, --version    print version number and configuration settings, then exit
 +  -q, --quiet      do not print progress messages
-   -d, --debug      don't remove temporary files
-       --recheck    update $as_me by reconfiguring in the same conditions
-   --file=FILE[:TEMPLATE]
-@@ -20045,97 +23114,127 @@
- $config_headers
++  -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
  
- Report bugs to <bug-autoconf@gnu.org>."
--_ACEOF
+-#if HAVE_SYS_TYPES_H
+-# include <sys/types.h>
+-#endif
+-#include <sys/socket.h>
++Configuration files:
++$config_files
++
++Configuration headers:
++$config_headers
++
++Configuration commands:
++$config_commands
++
++Report bugs to <bug-autoconf@gnu.org>."
  
--cat >>$CONFIG_STATUS <<_ACEOF
-+_ACEOF
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
+-{
+-if ((socklen_t *) 0)
+-  return 0;
+-if (sizeof (socklen_t))
+-  return 0;
+-  ;
+-  return 0;
+-}
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_type_socklen_t=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_type_socklen_t=no
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
+-echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
+-if test $ac_cv_type_socklen_t = yes; then
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- ac_cs_version="\\
- config.status
--configured by $0, generated by GNU Autoconf 2.53,
--  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
++ac_cs_version="\\
++config.status
 +configured by $0, generated by GNU Autoconf 2.62,
 +  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  
--Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
--Free Software Foundation, Inc.
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_SOCKLEN_T 1
 +Copyright (C) 2008 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
--srcdir=$srcdir
--INSTALL="$INSTALL"
++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'
@@ -16032,21 +28690,13 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +test -n "\$AWK" || AWK=awk
  _ACEOF
  
--cat >>$CONFIG_STATUS <<\_ACEOF
--# If no file are specified by the user, then we need to provide default
--# value.  By we need to know if files were specified by the user.
 +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[^=]*=\(.*\)'`
--    shift
--    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
--    shift
++ac_need_defaults=:
++while test $# != 0
++do
++  case $1 in
++  --*=*)
 +    ac_option=`expr "X$1" : 'X\([^=]*\)='`
 +    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
 +    ac_shift=:
@@ -16055,58 +28705,32 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +    ac_option=$1
 +    ac_optarg=$2
 +    ac_shift=shift
-     ;;
--  -*);;
--  *) # This is not an option, so the user has probably given explicit
--     # arguments.
--     ac_need_defaults=false;;
-   esac
++    ;;
++  esac
  
--  case $1 in
+-else
 +  case $ac_option in
-   # Handling of the options.
--_ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
--    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
--    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--  --version | --vers* | -V )
--    echo "$ac_cs_version"; exit 0 ;;
--  --he | --h)
--    # Conflict between --help and --header
--    { { echo "$as_me:$LINENO: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&2;}
--   { (exit 1); exit 1; }; };;
--  --help | --hel | -h )
--    echo "$ac_cs_usage"; exit 0 ;;
--  --debug | --d* | -d )
++  # 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 ;;
 +  --debug | --debu | --deb | --de | --d | -d )
-     debug=: ;;
-   --file | --fil | --fi | --f )
--    shift
--    CONFIG_FILES="$CONFIG_FILES $1"
++    debug=: ;;
++  --file | --fil | --fi | --f )
 +    $ac_shift
 +    case $ac_optarg in
 +    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
 +    esac
 +    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
-     ac_need_defaults=false;;
-   --header | --heade | --head | --hea )
--    shift
--    CONFIG_HEADERS="$CONFIG_HEADERS $1"
++    ac_need_defaults=false;;
++  --header | --heade | --head | --hea )
 +    $ac_shift
 +    case $ac_optarg in
 +    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
 +    esac
 +    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
-     ac_need_defaults=false;;
++    ac_need_defaults=false;;
 +  --he | --h)
 +    # Conflict between --help and --header
 +    { $as_echo "$as_me: error: ambiguous option: $1
@@ -16118,24 +28742,22 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  | -silent | --silent | --silen | --sile | --sil | --si | --s)
 +    ac_cs_silent=: ;;
  
-   # This is an error.
--  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&2;}
+-cat >>confdefs.h <<\_ACEOF
+-#define socklen_t int
+-_ACEOF
++  # This is an error.
 +  -*) { $as_echo "$as_me: error: unrecognized option: $1
 +Try \`$0 --help' for more information." >&2
-    { (exit 1); exit 1; }; } ;;
++   { (exit 1); exit 1; }; } ;;
  
--  *) ac_config_targets="$ac_config_targets $1" ;;
+-fi
 +  *) ac_config_targets="$ac_config_targets $1"
 +     ac_need_defaults=false ;;
  
-   esac
-   shift
- done
++  esac
++  shift
++done
  
--_ACEOF
 +ac_configure_extra_args=
 +
 +if $ac_cs_silent; then
@@ -16143,7 +28765,24 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  ac_configure_extra_args="$ac_configure_extra_args --silent"
 +fi
  
-+_ACEOF
+-if test $ac_cv_c_compiler_gnu = yes; then
+-    echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
+-echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
+-if test "${ac_cv_prog_gcc_traditional+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-    ac_pattern="Autoconf.*'x'"
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <sgtty.h>
+-Autoconf TIOCGETP
+ _ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "$ac_pattern" >/dev/null 2>&1; then
+-  ac_cv_prog_gcc_traditional=yes
+-else
+-  ac_cv_prog_gcc_traditional=no
 +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
@@ -16152,7 +28791,8 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  CONFIG_SHELL='$SHELL'
 +  export CONFIG_SHELL
 +  exec "\$@"
-+fi
+ fi
+-rm -f conftest*
  
 +_ACEOF
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -16165,104 +28805,496 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  $as_echo "$ac_log"
 +} >&5
  
-+_ACEOF
+-  if test $ac_cv_prog_gcc_traditional = no; then
+-    cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <termio.h>
+-Autoconf TCGETA
+ _ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "$ac_pattern" >/dev/null 2>&1; then
+-  ac_cv_prog_gcc_traditional=yes
+-fi
+-rm -f conftest*
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+_ACEOF
++#
++# INIT-COMMANDS
++#
  
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-  fi
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
+-echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
+-  if test $ac_cv_prog_gcc_traditional = yes; then
+-    CC="$CC -traditional"
+-  fi
+-fi
  
--cat >>$CONFIG_STATUS <<\_ACEOF
++# 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
+ 
+-echo "$as_me:$LINENO: checking return type of signal handlers" >&5
+-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
+-if test "${ac_cv_type_signal+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <sys/types.h>
+-#include <signal.h>
+-#ifdef signal
+-# undef signal
+-#endif
+-#ifdef __cplusplus
+-extern "C" void (*signal (int, void (*)(int)))(int);
+-#else
+-void (*signal ()) ();
+-#endif
++sed_quote_subst='$sed_quote_subst'
++double_quote_subst='$double_quote_subst'
++delay_variable_subst='$delay_variable_subst'
++macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
++macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
++enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
++enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
++pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
++enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
++host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
++host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
++host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
++build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
++build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
++build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
++SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
++Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
++GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
++EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
++FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
++LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
++NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
++LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
++max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
++ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
++exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
++lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
++lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
++lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
++reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
++reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
++deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
++file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
++AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
++AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
++STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
++RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
++old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
++CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
++compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
++GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
++objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
++SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
++ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
++MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
++need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
++DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
++NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
++LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
++OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
++OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
++libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
++shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
++enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
++export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
++whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
++allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
++no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
++inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
++link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
++fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
++always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
++export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
++include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
++prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
++variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
++need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
++need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
++version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
++runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
++shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
++shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
++libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
++library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
++soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
++postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
++sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
++sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
++enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
++enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
++enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
++old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
++striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
++
++LTCC='$LTCC'
++LTCFLAGS='$LTCFLAGS'
++compiler='$compiler_DEFAULT'
++
++# Quote evaled strings.
++for var in SED \
++GREP \
++EGREP \
++FGREP \
++LD \
++NM \
++LN_S \
++lt_SP2NL \
++lt_NL2SP \
++reload_flag \
++OBJDUMP \
++deplibs_check_method \
++file_magic_cmd \
++AR \
++AR_FLAGS \
++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 \
++SHELL \
++ECHO \
++lt_prog_compiler_no_builtin_flag \
++lt_prog_compiler_wl \
++lt_prog_compiler_pic \
++lt_prog_compiler_static \
++lt_cv_prog_compiler_c_o \
++need_locks \
++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_flag_spec_ld \
++hardcode_libdir_separator \
++fix_srcfile_path \
++exclude_expsyms \
++include_expsyms \
++file_list_spec \
++variables_saved_for_relink \
++libname_spec \
++library_names_spec \
++soname_spec \
++finish_eval \
++old_striplib \
++striplib; do
++    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
++    *[\\\\\\\`\\"\\\$]*)
++      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$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 \
++postinstall_cmds \
++postuninstall_cmds \
++finish_cmds \
++sys_lib_search_path_spec \
++sys_lib_dlsearch_path_spec; do
++    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
++    *[\\\\\\\`\\"\\\$]*)
++      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
++      ;;
++    *)
++      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
++      ;;
++    esac
++done
++
++# Fix-up fallback echo if it was mangled by the above quoting rules.
++case \$lt_ECHO in
++*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
++  ;;
++esac
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
+-{
+-int i;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_type_signal=void
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_type_signal=int
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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
+-echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
+-echo "${ECHO_T}$ac_cv_type_signal" >&6
+ 
+-cat >>confdefs.h <<_ACEOF
+-#define RETSIGTYPE $ac_cv_type_signal
+-_ACEOF
++
++    PACKAGE='$PACKAGE'
++    VERSION='$VERSION'
++    TIMESTAMP='$TIMESTAMP'
++    RM='$RM'
++    ofile='$ofile'
++
+ 
+ 
+-if test "$ac_cv_type_signal" = void; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define RETSIGTYPE_VOID 1
+ _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
--  # Handling of arguments.
++for ac_config_target in $ac_config_targets
++do
 +  case $ac_config_target in
 +    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-   "${makefiles_generic}" ) CONFIG_FILES="$CONFIG_FILES ${makefiles_generic}" ;;
-   "${makefiles_wnn}" ) CONFIG_FILES="$CONFIG_FILES ${makefiles_wnn}" ;;
-   "${makefiles_wnn_dic}" ) CONFIG_FILES="$CONFIG_FILES ${makefiles_wnn_dic}" ;;
-@@ -20143,13 +23242,14 @@
-   "${makefiles_cwnn_dic}" ) CONFIG_FILES="$CONFIG_FILES ${makefiles_cwnn_dic}" ;;
-   "${makefiles_kwnn}" ) CONFIG_FILES="$CONFIG_FILES ${makefiles_kwnn}" ;;
-   "${makefiles_kwnn_dic}" ) CONFIG_FILES="$CONFIG_FILES ${makefiles_kwnn_dic}" ;;
--  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
--  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
--echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
++    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
++    "${makefiles_generic}") CONFIG_FILES="$CONFIG_FILES ${makefiles_generic}" ;;
++    "${makefiles_wnn}") CONFIG_FILES="$CONFIG_FILES ${makefiles_wnn}" ;;
++    "${makefiles_wnn_dic}") CONFIG_FILES="$CONFIG_FILES ${makefiles_wnn_dic}" ;;
++    "${makefiles_cwnn}") CONFIG_FILES="$CONFIG_FILES ${makefiles_cwnn}" ;;
++    "${makefiles_cwnn_dic}") CONFIG_FILES="$CONFIG_FILES ${makefiles_cwnn_dic}" ;;
++    "${makefiles_kwnn}") CONFIG_FILES="$CONFIG_FILES ${makefiles_kwnn}" ;;
++    "${makefiles_kwnn_dic}") CONFIG_FILES="$CONFIG_FILES ${makefiles_kwnn_dic}" ;;
 +
 +  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 +$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
- done
- 
++   { (exit 1); exit 1; }; };;
++  esac
++done
++
 +
- # If the user did not use the arguments to specify the items to instantiate,
- # then the envvar interface is used.  Set only those that are not.
- # We use the long form for the default assignment because of an extremely
-@@ -20159,559 +23259,610 @@
-   test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
++# 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
  
--# Create a temporary directory, and hook for its removal unless debugging.
+-echo "$as_me:$LINENO: checking for working memcmp" >&5
+-echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6
+-if test "${ac_cv_func_memcmp_working+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test "$cross_compiling" = yes; then
+-  ac_cv_func_memcmp_working=no
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
 +# 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 ||
- {
--  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
++$debug ||
++{
 +  tmp=
 +  trap 'exit_status=$?
 +  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 +' 0
-   trap '{ (exit 1); exit 1; }' 1 2 13 15
- }
--
- # Create a (secure) tmp directory for tmp files.
--: ${TMPDIR=/tmp}
-+
++  trap '{ (exit 1); exit 1; }' 1 2 13 15
++}
++# Create a (secure) tmp directory for tmp files.
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
  {
--  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
 +  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-   test -n "$tmp" && test -d "$tmp"
- }  ||
- {
--  tmp=$TMPDIR/cs$$-$RANDOM
--  (umask 077 && mkdir $tmp)
++  test -n "$tmp" && test -d "$tmp"
++}  ||
++{
 +  tmp=./conf$$-$RANDOM
 +  (umask 077 && mkdir "$tmp")
- } ||
- {
--   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
++} ||
++{
 +   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-    { (exit 1); exit 1; }
- }
++   { (exit 1); exit 1; }
++}
  
+-  /* Some versions of memcmp are not 8-bit clean.  */
+-  char c0 = 0x40, c1 = 0x80, c2 = 0x81;
+-  if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
+-    exit (1);
 +# 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
-+
-+
+ 
+-  /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
+-     or more and with at least one buffer not starting on a 4-byte boundary.
+-     William Lewis provided this test program.   */
+-  {
+-    char foo[21];
+-    char bar[21];
+-    int i;
+-    for (i = 0; i < 4; i++)
+-      {
+-        char *a = foo + i;
+-        char *b = bar + i;
+-        strcpy (a, "--------01111111");
+-        strcpy (b, "--------10000000");
+-        if (memcmp (a, b, 16) >= 0)
+-          exit (1);
+-      }
+-    exit (0);
+-  }
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_memcmp_working=yes
 +ac_cr='
 '
 +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
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-( exit $ac_status )
+-ac_cv_func_memcmp_working=no
 +  ac_cs_awk_cr=$ac_cr
-+fi
-+
+ fi
+-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
+-echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6
+-test $ac_cv_func_memcmp_working = no && LIBOBJS="$LIBOBJS memcmp.$ac_objext"
+-
+ 
 +echo 'BEGIN {' >"$tmp/subs1.awk" &&
- _ACEOF
++_ACEOF
  
--cat >>$CONFIG_STATUS <<_ACEOF
  
--#
--# CONFIG_FILES section.
--#
 +{
 +  echo "cat >conf$$subs.awk <<_ACEOF" &&
 +  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
@@ -16279,105 +29311,28 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
 +   { (exit 1); exit 1; }; }
  
--# No need to generate the scripts if there are no CONFIG_FILES.
--# This happens for instance when ./config.status config.h
--if test -n "\$CONFIG_FILES"; then
--  # Protect against being on the right side of a sed subst in config.status.
--  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
--   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
--s,@SHELL@,$SHELL,;t t
--s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
--s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
--s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
--s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
--s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
--s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
--s,@exec_prefix@,$exec_prefix,;t t
--s,@prefix@,$prefix,;t t
--s,@program_transform_name@,$program_transform_name,;t t
--s,@bindir@,$bindir,;t t
--s,@sbindir@,$sbindir,;t t
--s,@libexecdir@,$libexecdir,;t t
--s,@datadir@,$datadir,;t t
--s,@sysconfdir@,$sysconfdir,;t t
--s,@sharedstatedir@,$sharedstatedir,;t t
--s,@localstatedir@,$localstatedir,;t t
--s,@libdir@,$libdir,;t t
--s,@includedir@,$includedir,;t t
--s,@oldincludedir@,$oldincludedir,;t t
--s,@infodir@,$infodir,;t t
--s,@mandir@,$mandir,;t t
--s,@build_alias@,$build_alias,;t t
--s,@host_alias@,$host_alias,;t t
--s,@target_alias@,$target_alias,;t t
--s,@DEFS@,$DEFS,;t t
--s,@ECHO_C@,$ECHO_C,;t t
--s,@ECHO_N@,$ECHO_N,;t t
--s,@ECHO_T@,$ECHO_T,;t t
--s,@LIBS@,$LIBS,;t t
--s,@build@,$build,;t t
--s,@build_cpu@,$build_cpu,;t t
--s,@build_vendor@,$build_vendor,;t t
--s,@build_os@,$build_os,;t t
--s,@host@,$host,;t t
--s,@host_cpu@,$host_cpu,;t t
--s,@host_vendor@,$host_vendor,;t t
--s,@host_os@,$host_os,;t t
--s,@SUBDIRS@,$SUBDIRS,;t t
--s,@WNNMANDIR@,$WNNMANDIR,;t t
--s,@Wnn@,$Wnn,;t t
--s,@JSERVER_SUBDIRS2@,$JSERVER_SUBDIRS2,;t t
--s,@cWnn@,$cWnn,;t t
--s,@kWnn@,$kWnn,;t t
--s,@WNNJLIB@,$WNNJLIB,;t t
--s,@DEPWNNJLIB@,$DEPWNNJLIB,;t t
--s,@HINSI_DATA@,$HINSI_DATA,;t t
--s,@CWNNJLIB@,$CWNNJLIB,;t t
--s,@DEPCWNNJLIB@,$DEPCWNNJLIB,;t t
--s,@CHINSI_DATA@,$CHINSI_DATA,;t t
--s,@THINSI_DATA@,$THINSI_DATA,;t t
--s,@KWNNJLIB@,$KWNNJLIB,;t t
--s,@DEPKWNNJLIB@,$DEPKWNNJLIB,;t t
--s,@KHINSI_DATA@,$KHINSI_DATA,;t t
--s,@ipv6@,$ipv6,;t t
--s,@unsafe_path@,$unsafe_path,;t t
--s,@CC@,$CC,;t t
--s,@CFLAGS@,$CFLAGS,;t t
--s,@LDFLAGS@,$LDFLAGS,;t t
--s,@CPPFLAGS@,$CPPFLAGS,;t t
--s,@ac_ct_CC@,$ac_ct_CC,;t t
--s,@EXEEXT@,$EXEEXT,;t t
--s,@OBJEXT@,$OBJEXT,;t t
--s,@CCOPTIONS@,$CCOPTIONS,;t t
--s,@CDEBUGFLAGS@,$CDEBUGFLAGS,;t t
--s,@INSTPGMFLAGS@,$INSTPGMFLAGS,;t t
--s,@CPP@,$CPP,;t t
--s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
--s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
--s,@INSTALL_DATA@,$INSTALL_DATA,;t t
--s,@LN_S@,$LN_S,;t t
--s,@SET_MAKE@,$SET_MAKE,;t t
--s,@EGREP@,$EGREP,;t t
--s,@ECHO@,$ECHO,;t t
--s,@AR@,$AR,;t t
--s,@ac_ct_AR@,$ac_ct_AR,;t t
--s,@RANLIB@,$RANLIB,;t t
--s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
--s,@STRIP@,$STRIP,;t t
--s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
--s,@CXX@,$CXX,;t t
--s,@CXXFLAGS@,$CXXFLAGS,;t t
--s,@ac_ct_CXX@,$ac_ct_CXX,;t t
--s,@CXXCPP@,$CXXCPP,;t t
--s,@F77@,$F77,;t t
--s,@FFLAGS@,$FFLAGS,;t t
--s,@ac_ct_F77@,$ac_ct_F77,;t t
--s,@LIBTOOL@,$LIBTOOL,;t t
--s,@LIBTOOL_DEPS@,$LIBTOOL_DEPS,;t t
--s,@LIBOBJS@,$LIBOBJS,;t t
--s,@JS_SUPPORTOBJS@,$JS_SUPPORTOBJS,;t t
--s,@WRAPLIB@,$WRAPLIB,;t t
--CEOF
+-for ac_func in getpgid getpgrp setpgrp wait3
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.  */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char $ac_func ();
+-char (*f) ();
 +  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
 +    break
 +  elif $ac_last_try; then
@@ -16390,9 +29345,26 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +done
 +rm -f conf$$subs.sh
  
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
+-{
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-f = $ac_func;
+-#endif
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
- _ACEOF
++_ACEOF
 +sed -n '
 +h
 +s/^/S["/; s/!.*/"]=/
@@ -16442,19 +29414,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +cat >>"\$tmp/subs1.awk" <<_ACAWK &&
 +  for (key in S) S_is_set[key] = 1
 +  FS = ""
- 
--  cat >>$CONFIG_STATUS <<\_ACEOF
--  # Split the substitutions into bite-sized pieces for seds with
--  # small command number limits, like on Digital OSF/1 and HP-UX.
--  ac_max_sed_lines=48
--  ac_sed_frag=1 # Number of current file.
--  ac_beg=1 # First line for current file.
--  ac_end=$ac_max_sed_lines # Line after last line for current file.
--  ac_more_lines=:
--  ac_sed_cmds=
--  while $ac_more_lines; do
--    if test $ac_beg -gt 1; then
--      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
++
 +}
 +{
 +  line = $ 0
@@ -16472,24 +29432,49 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +    } else
 +      len += 1 + keylen
 +  }
-+
+ 
+-  ;
+-  return 0;
 +  print line
-+}
+ }
 +
 +_ACAWK
-+_ACEOF
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_var=yes"
 +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
--      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$as_ac_var=no"
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +  cat
 +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
 +  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
 +$as_echo "$as_me: error: could not setup config files machinery" >&2;}
 +   { (exit 1); exit 1; }; }
-+_ACEOF
-+
+ _ACEOF
+ 
 +# VPATH may cause trouble with some makes, so we remove $(srcdir),
 +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 +# trailing colons and then remove the whole line if VPATH becomes empty
@@ -16503,18 +29488,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +s/:*$//
 +s/^[^=]*=[	 ]*$//
 +}'
-     fi
--    if test ! -s $tmp/subs.frag; then
--      ac_more_lines=false
--    else
--      # The purpose of the label and of the branching condition is to
--      # speed up the sed processing (if there are no `@' at all, there
--      # is no need to browse any of the substitutions).
--      # These are the two extra sed commands mentioned above.
--      (echo ':t
--  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
--      if test -z "$ac_sed_cmds"; then
--  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+ fi
 +
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +fi # test -n "$CONFIG_FILES"
@@ -16542,20 +29516,33 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
 +$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
 +   { (exit 1); exit 1; }; }
-       else
--  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
--      fi
--      ac_sed_frag=`expr $ac_sed_frag + 1`
--      ac_beg=$ac_end
--      ac_end=`expr $ac_end + $ac_max_sed_lines`
++  else
 +    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-     fi
-   done
--  if test -z "$ac_sed_cmds"; then
--    ac_sed_cmds=cat
--  fi
--fi # test -n "$CONFIG_FILES"
++  fi
+ done
  
+-echo "$as_me:$LINENO: checking whether getpgrp requires zero arguments" >&5
+-echo $ECHO_N "checking whether getpgrp requires zero arguments... $ECHO_C" >&6
+-if test "${ac_cv_func_getpgrp_void+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  # Use it with a single arg.
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-$ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
+-{
+-getpgrp (0);
+-  ;
+-  return 0;
 +# 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.
@@ -16630,35 +29617,50 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +      next
 +    }
 +  }
-+}
+ }
 +{ print }
 +_ACAWK
  _ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
--  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
--  case $ac_file in
--  - | *:- | *:-:* ) # input from stdin
--        cat >$tmp/stdin
--        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  * )   ac_file_in=$ac_file.in ;;
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_getpgrp_void=no
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_func_getpgrp_void=yes
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
 +$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
 +   { (exit 1); exit 1; }; }
 +fi # test -n "$CONFIG_HEADERS"
-+
-+
-+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    "
+ 
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_getpgrp_void" >&5
+-echo "${ECHO_T}$ac_cv_func_getpgrp_void" >&6
+-if test $ac_cv_func_getpgrp_void = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define GETPGRP_VOID 1
+-_ACEOF
++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
++  esac
 +  case $ac_mode$ac_tag in
 +  :[FHL]*:*);;
 +  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
@@ -16675,8 +29677,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  ac_file=$1
 +  shift
  
--  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
--  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+-fi
 +  case $ac_mode in
 +  :L) ac_source=$1;;
 +  :[FH])
@@ -16700,7 +29701,23 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
 +      ac_file_inputs="$ac_file_inputs '$ac_f'"
 +    done
-+
+ 
+-echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5
+-echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6
+-if test "${ac_cv_func_setpgrp_void+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot check setpgrp when cross compiling" >&5
+-echo "$as_me: error: cannot check setpgrp when cross compiling" >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#if HAVE_UNISTD_H
+-# include <unistd.h>
+-#endif
 +    # 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.  */
@@ -16728,18 +29745,26 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +    esac
 +    ;;
 +  esac
-+
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
+-{
+-/* If this system has a BSD-style setpgrp which takes arguments,
+-  setpgrp(1, 1) will fail with ESRCH and return -1, in that case
+-  exit successfully. */
+-  exit (setpgrp (1,1) == -1 ? 0 : 1);
+-  ;
+-  return 0;
 +  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 ||
--echo X"$ac_file" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
++$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\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
@@ -16758,36 +29783,18 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +	    s//\1/
 +	    q
 +	  }
-   	  s/.*/./; q'`
--  { case "$ac_dir" in
--  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
--  *)                      as_incr_dir=.;;
++	  s/.*/./; q'`
 +  { as_dir="$ac_dir"
 +  case $as_dir in #(
 +  -*) as_dir=./$as_dir;;
- esac
--as_dummy="$ac_dir"
--for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
--  case $as_mkdir_dir in
--    # Skip DOS drivespec
--    ?:) as_incr_dir=$as_mkdir_dir ;;
--    *)
--      as_incr_dir=$as_incr_dir/$as_mkdir_dir
--      test -d "$as_incr_dir" ||
--        mkdir "$as_incr_dir" ||
--	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
--   { (exit 1); exit 1; }; }
--    ;;
++  esac
 +  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
 +    as_dirs=
 +    while :; do
 +      case $as_dir in #(
 +      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
 +      *) as_qdir=$as_dir;;
-   esac
--done; }
--
++      esac
 +      as_dirs="'$as_qdir' $as_dirs"
 +      as_dir=`$as_dirname -- "$as_dir" ||
 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -16818,15 +29825,8 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
 +   { (exit 1); exit 1; }; }; }
-   ac_builddir=.
- 
--if test "$ac_dir" != .; then
--  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
--  # A "../" for each directory in $ac_dir_suffix.
--  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
--  ac_dir_suffix= ac_top_builddir=
--fi
++  ac_builddir=.
++
 +case "$ac_dir" in
 +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 +*)
@@ -16842,104 +29842,46 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +ac_abs_builddir=$ac_pwd$ac_dir_suffix
 +# for backward compatibility:
 +ac_top_builddir=$ac_top_build_prefix
- 
- case $srcdir in
--  .)  # No --srcdir option.  We are building in place.
++
++case $srcdir in
 +  .)  # We are building in place.
-     ac_srcdir=.
--    if test -z "$ac_top_builddir"; then
--       ac_top_srcdir=.
--    else
--       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
--    fi ;;
--  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_srcdir=.
 +    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 ;;
--  *) # Relative path.
--    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
--    ac_top_srcdir=$ac_top_builddir$srcdir ;;
++    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
--# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
--# absolute.
--ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
--ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
--ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
--ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
++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_builddir$INSTALL ;;
++
++  case $INSTALL in
++  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
 +  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-   esac
++  esac
 +_ACEOF
- 
--  if test x"$ac_file" != x-; then
--    { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--    rm -f "$ac_file"
--  fi
--  # Let's still pretend it is `configure' which instantiates (i.e., don't
--  # use $as_me), people would be surprised to read:
--  #    /* config.h.  Generated by config.status.  */
--  if test x"$ac_file" = x-; then
--    configure_input=
--  else
--    configure_input="$ac_file.  "
--  fi
--  configure_input=$configure_input"Generated from `echo $ac_file_in |
--                                     sed 's,.*/,,'` by configure."
++
 +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=
- 
--  # First look for the input files in the build tree, otherwise in the
--  # src tree.
--  ac_file_inputs=`IFS=:
--    for f in $ac_file_in; do
--      case $f in
--      -) echo $tmp/stdin ;;
--      [\\/$]*)
--         # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--         echo $f;;
--      *) # Relative
--         if test -f "$f"; then
--           # Build tree
--           echo $f
--         elif test -f "$srcdir/$f"; then
--           # Source tree
--           echo $srcdir/$f
--         else
--           # /dev/null tree
--           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--         fi;;
++
 +ac_sed_dataroot='
 +/datarootdir/ {
 +  p
 +  q
-+}
+ }
 +/@datadir@/p
 +/@docdir@/p
 +/@infodir@/p
@@ -16960,41 +29902,46 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +  s&@localedir@&$localedir&g
 +  s&@mandir@&$mandir&g
 +    s&\\\${datarootdir}&$datarootdir&g' ;;
-       esac
--    done` || { (exit 1); exit 1; }
++esac
  _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
--  sed "$ac_vpsub
-+
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_setpgrp_void=no
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-( exit $ac_status )
+-ac_cv_func_setpgrp_void=yes
+-fi
+-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_setpgrp_void" >&5
+-echo "${ECHO_T}$ac_cv_func_setpgrp_void" >&6
+-if test $ac_cv_func_setpgrp_void = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define SETPGRP_VOID 1
 +# 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
++$extrasub
  _ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- :t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--s,@configure_input@,$configure_input,;t t
--s,@srcdir@,$ac_srcdir,;t t
--s,@abs_srcdir@,$ac_abs_srcdir,;t t
--s,@top_srcdir@,$ac_top_srcdir,;t t
--s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
--s,@builddir@,$ac_builddir,;t t
--s,@abs_builddir@,$ac_abs_builddir,;t t
--s,@top_builddir@,$ac_top_builddir,;t t
--s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
--s,@INSTALL@,$ac_INSTALL,;t t
--" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
--  rm -f $tmp/stdin
--  if test x"$ac_file" != x-; then
--    mv $tmp/out $ac_file
--  else
--    cat $tmp/out
--    rm -f $tmp/out
--  fi
++: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
@@ -17013,9 +29960,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +$as_echo "$as_me: error: could not create $ac_file" >&2;}
 +   { (exit 1); exit 1; }; }
  
--done
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
+-fi
 +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
 +  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
 +  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
@@ -17034,14 +29979,1766 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 +   { (exit 1); exit 1; }; }
 + ;;
 +  :H)
- #
--# CONFIG_HEADER section.
++  #
++  # CONFIG_HEADER
++  #
++  if test x"$ac_file" != x-; then
++    {
++      $as_echo "/* $configure_input  */" \
++      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
++    } >"$tmp/config.h" \
++      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
++$as_echo "$as_me: error: could not create $ac_file" >&2;}
++   { (exit 1); exit 1; }; }
++    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
++      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
++$as_echo "$as_me: $ac_file is unchanged" >&6;}
++    else
++      rm -f "$ac_file"
++      mv "$tmp/config.h" "$ac_file" \
++	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
++$as_echo "$as_me: error: could not create $ac_file" >&2;}
++   { (exit 1); exit 1; }; }
++    fi
++  else
++    $as_echo "/* $configure_input  */" \
++      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
++      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
++$as_echo "$as_me: error: could not create -" >&2;}
++   { (exit 1); exit 1; }; }
++  fi
++ ;;
+ 
++  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
++$as_echo "$as_me: executing $ac_file commands" >&6;}
++ ;;
++  esac
+ 
+ 
++  case $ac_file$ac_mode in
++    "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 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=""
+ 
++# ### 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
+ 
++# 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//"
+ 
+-for ac_func in random drand48 fchmod getopt killpg \
+-	FD_SET \
+-	gethostname select socket closesocket setsockopt send recv \
+-	getdtablesize getrlimit syslog vsyslog setenv snprintf
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.  */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char $ac_func ();
+-char (*f) ();
++# A grep program that handles long lines.
++GREP=$lt_GREP
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
+-{
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-f = $ac_func;
+-#endif
++# An ERE matcher.
++EGREP=$lt_EGREP
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$as_ac_var=no"
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
++# A literal string matcher.
++FGREP=$lt_FGREP
+ 
+-fi
+-done
++# 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
+ 
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
+ 
++# An object symbol dumper.
++OBJDUMP=$lt_OBJDUMP
+ 
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
+ 
+-for ac_func in bcopy bzero bcmp index rindex \
+-	memcpy memmove memset strchr strrchr
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.  */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char $ac_func ();
+-char (*f) ();
++# Command to use when deplibs_check_method == "file_magic".
++file_magic_cmd=$lt_file_magic_cmd
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
+-{
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-f = $ac_func;
+-#endif
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$as_ac_var=no"
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
++# A symbol stripping program.
++STRIP=$lt_STRIP
+ 
+-fi
+-done
++# 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
+ 
++# A C compiler.
++LTCC=$lt_CC
+ 
+-JS_SUPPORTOBJS=
++# 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
+ 
+-for ac_func in mkdir vasprintf
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.  */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char $ac_func ();
+-char (*f) ();
++# Transform the output of nm in a proper C declaration.
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
+-{
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-f = $ac_func;
+-#endif
++# 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
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$as_ac_var=no"
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
++# 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
+ 
+-else
+-  JS_SUPPORTOBJS="${JS_SUPPORTOBJS} ${ac_func}.o"
+-fi
+-done
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
+ 
++# An echo program that does not interpret backslashes.
++ECHO=$lt_ECHO
+ 
++# 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
+ 
+-WRAPLIB=
+-echo "$as_me:$LINENO: checking whether to use libwrap" >&5
+-echo $ECHO_N "checking whether to use libwrap... $ECHO_C" >&6
++# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
++DSYMUTIL=$lt_DSYMUTIL
+ 
+-# Check whether --with-libwrap or --without-libwrap was given.
+-if test "${with_libwrap+set}" = set; then
+-  withval="$with_libwrap"
+-   case "$withval" in
+-	  no)
+-	    echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-	    WRAP_TRY=no
+-	    ;;
+-	  yes)
+-	    echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-	    WRAP_TRY=yes
+-	    ;;
+-	  *)
+-	    echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-	    WRAP_TRY=yes
+-	    if test -d "$withval"; then
+-	      WRAPINCLUDES="-I$withval"
+-	      if test -d $withval/include; then
+-		WRAPINCLUDES="-I$withval/include $WRAPINCLUDES"
+-	      fi
+-	      WRAPLIB="-L$withval -lwrap"
+-	      if test -d $withval/lib; then
+-		WRAPLIB="-L$withval/lib $WRAPLIB"
+-	      fi
+-	    else
+-	      WRAPINCLUDES="$withval"
+-	    fi
+-	    ;;
+-	esac
+-else
+-  echo "$as_me:$LINENO: result: try to find" >&5
+-echo "${ECHO_T}try to find" >&6
+-	 WRAP_TRY=auto
++# Tool to change global to local symbols on Mac OS X.
++NMEDIT=$lt_NMEDIT
+ 
+-fi;
+-# Link test for libwrap
+-if test "$WRAP_TRY" = yes -o "$WRAP_TRY" = auto; then
+-    OLDCFLAGS="$CFLAGS"
+-    CFLAGS="$WRAPINCLUDES $CFLAGS"
+-    OLDLIBS="$LIBS"
+-    WRAPLIB=${WRAPLIB:-"-lwrap"}
+-    LIBS="$WRAPLIB $OLDLIBS"
+-    echo "$as_me:$LINENO: checking libwrap is working" >&5
+-echo $ECHO_N "checking libwrap is working... $ECHO_C" >&6
+-    cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+- int allow_severity; int deny_severity;
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
+-{
+- hosts_access();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-   echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++# Tool to manipulate fat objects and archives on Mac OS X.
++LIPO=$lt_LIPO
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBWRAP 1
+-_ACEOF
++# 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
+ 
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-		  if test "$WRAP_TRY" = yes; then
+-		    { { echo "$as_me:$LINENO: error: Could not find libwrap. Please check config.log." >&5
+-echo "$as_me: error: Could not find libwrap. Please check config.log." >&2;}
+-   { (exit 1); exit 1; }; }
+-		  else
+-		    # recover old flag / clear needless WRAPLIB and continue
+-		    CFLAGS=$OLDCFLAGS
+-		    WRAPLIB=
+-		  fi
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-    # only jserver needs libwrap, recover LIBS also
+-    LIBS=$OLDLIBS
+-fi
++# 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
+ 
+-# mkdir -p Contrib/dic/gerodic in case builddir != srcdir
+-dir=Contrib/dic/gerodic
+-if test ! -d $dir; then
+-  echo "creating $dir ..."
+-  $ac_install_sh -d $dir
+-fi
++# 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
+ 
+-makefiles_generic="makerule.mk Makefile"
++# Shared library path variable.
++shlibpath_var=$shlibpath_var
+ 
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+ 
+-if test "x${Wnn}" = "xWnn"; then
+-  makefiles_wnn="Wnn/Makefile Wnn/conv/Makefile Wnn/include/Makefile \
+-	Wnn/jd/Makefile Wnn/jd/rk/Makefile Wnn/jd/rk.vi/Makefile \
+-	Wnn/jlib/Makefile Wnn/jlib.V3/Makefile Wnn/jserver/Makefile \
+-	Wnn/jutil/Makefile Wnn/ld/Makefile Wnn/ld/rk/Makefile \
+-	Wnn/romkan/Makefile Wnn/uum/Makefile \
+-	Wnn/man/Makefile Wnn/man/2.env/Makefile Wnn/man/3.libwnn/Makefile \
+-	Wnn/man/4.cmd/Makefile Wnn/man/6.jutil/Makefile \
+-	Wnn/man/2.env/dic/Makefile Wnn/man/2.env/wnn/Makefile \
+-	Wnn/man/3.libwnn/jl_lib/Makefile Wnn/man/3.libwnn/js_lib/Makefile \
+-	Wnn/man/3.libwnn/misc_lib/Makefile Wnn/man/3.libwnn/rk_lib/Makefile"
+-  makefiles_wnn_dic="Contrib/dic/gerodic/Makefile Wnn/pubdicplus/Makefile \
+-	Wnn/wnncons/Makefile Wnn/wnncons/dic/Makefile"
+-fi
++# 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
+ 
+-if test "x$cWnn" = "xcWnn"; then
+-  makefiles_cwnn="cWnn/Makefile cWnn/conv/Makefile cWnn/etc/Makefile \
+-	cWnn/cd/Makefile cWnn/cd/rk/Makefile \
+-	cWnn/cd/rk_p/Makefile cWnn/cd/rk_z/Makefile \
+-	cWnn/td/Makefile cWnn/td/rk/Makefile \
+-	cWnn/td/rk_z/Makefile cWnn/td/rk_p/Makefile \
+-	cWnn/include/Makefile cWnn/jlib/Makefile \
+-	cWnn/jserver/Makefile cWnn/jutil/Makefile \
+-	cWnn/man/Makefile cWnn/man/1.intro/Makefile cWnn/man/2.env/Makefile \
+-	cWnn/man/4.cmd/Makefile cWnn/man/6.jutil/Makefile \
+-	cWnn/romkan/Makefile cWnn/uum/Makefile"
+-  makefiles_cwnn_dic="cWnn/cdic/Makefile cWnn/tdic/Makefile"
+-fi
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
+ 
++# Command to use after installation of a shared archive.
++postinstall_cmds=$lt_postinstall_cmds
+ 
+-if test "x$kWnn" = "xkWnn"; then
+-  makefiles_kwnn="kWnn/Makefile kWnn/conv/Makefile kWnn/etc/Makefile \
+-	kWnn/include/Makefile kWnn/jlib/Makefile kWnn/jutil/Makefile \
+-	kWnn/jserver/Makefile kWnn/kd/Makefile kWnn/kd/rk/Makefile \
+-	kWnn/romkan/Makefile kWnn/uum/Makefile"
+-  makefiles_kwnn_dic="kWnn/kdic/Makefile"
+-fi
++# Command to use after uninstallation of a shared archive.
++postuninstall_cmds=$lt_postuninstall_cmds
+ 
+-ac_config_files="$ac_config_files ${makefiles_generic} ${makefiles_wnn} ${makefiles_wnn_dic} ${makefiles_cwnn} ${makefiles_cwnn_dic} ${makefiles_kwnn} ${makefiles_kwnn_dic}"
+-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 overriden when
+-# loading this file, other *unset* `ac_cv_foo' will be assigned the
+-# following values.
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
+ 
+-_ACEOF
++# As "finish_cmds", except a single script fragment to be evaled but
++# not shown.
++finish_eval=$lt_finish_eval
+ 
+-# The following way of writing the cache mishandles newlines in values,
+-# but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
+-# Ultrix sh set writes to stderr and can't be redirected directly,
+-# and sets the high bit in the cache file unless we assign to the vars.
+-{
+-  (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+-      sed -n \
+-        "s/'/'\\\\''/g;
+-    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
+-    *)
+-      # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+-      ;;
+-    esac;
+-} |
+-  sed '
+-     t clear
+-     : clear
+-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+-     t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if cmp -s $cache_file confcache; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
+-  else
+-    echo "not updating unwritable cache $cache_file"
+-  fi
+-fi
+-rm -f confcache
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
+ 
+-test "x$prefix" = xNONE && prefix=$ac_default_prefix
+-# Let make expand exec_prefix.
+-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
++# Compile-time system search path for libraries.
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+ 
+-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+-# trailing colons and then remove the whole line if VPATH becomes empty
+-# (actually we leave an empty line to preserve line numbers).
+-if test "x$srcdir" = x.; then
+-  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
+-s/:*\$(srcdir):*/:/;
+-s/:*\${srcdir}:*/:/;
+-s/:*@srcdir@:*/:/;
+-s/^\([^=]*=[ 	]*\):*/\1/;
+-s/:*$//;
+-s/^[^=]*=[ 	]*$//;
+-}'
+-fi
++# Run-time system search path for libraries.
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+-DEFS=-DHAVE_CONFIG_H
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
+ 
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
+ 
+-: ${CONFIG_STATUS=./config.status}
+-ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+-echo "$as_me: creating $CONFIG_STATUS" >&6;}
+-cat >$CONFIG_STATUS <<_ACEOF
+-#! $SHELL
+-# Generated by $as_me.
+-# Run this file to recreate the current configuration.
+-# Compiler output produced by configure, useful for debugging
+-# configure, is in config.log if it exists.
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
+ 
+-debug=false
+-SHELL=\${CONFIG_SHELL-$SHELL}
+-_ACEOF
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF
+ 
+-## --------------------- ##
+-## M4sh Initialization.  ##
+-## --------------------- ##
++# The linker used to build libraries.
++LD=$lt_LD
+ 
+-# Be Bourne compatible
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+-  emulate sh
+-  NULLCMD=:
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
+-fi
++# Commands used to build an old-style archive.
++old_archive_cmds=$lt_old_archive_cmds
+ 
+-# NLS nuisances.
+-# Support unset when possible.
+-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+-  as_unset=unset
+-else
+-  as_unset=false
+-fi
++# A language specific compiler.
++CC=$lt_compiler
+ 
+-(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
+-    { $as_unset LANG || test "${LANG+set}" != set; } ||
+-      { LANG=C; export LANG; }
+-(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
+-    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
+-      { LC_ALL=C; export LC_ALL; }
+-(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
+-    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
+-      { LC_TIME=C; export LC_TIME; }
+-(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
+-    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
+-      { LC_CTYPE=C; export LC_CTYPE; }
+-(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
+-    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
+-      { LANGUAGE=C; export LANGUAGE; }
+-(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
+-    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
+-      { LC_COLLATE=C; export LC_COLLATE; }
+-(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
+-    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
+-      { LC_NUMERIC=C; export LC_NUMERIC; }
+-(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
+-    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
+-      { LC_MESSAGES=C; export LC_MESSAGES; }
++# 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
+ 
+-# Name of the executable.
+-as_me=`(basename "$0") 2>/dev/null ||
+-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+-	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)$' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X/"$0" |
+-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\/\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl
+ 
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic
+ 
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conftest.sh
+-  echo  "exit 0"   >>conftest.sh
+-  chmod +x conftest.sh
+-  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
+-    PATH_SEPARATOR=';'
+-  else
+-    PATH_SEPARATOR=:
+-  fi
+-  rm -f conftest.sh
+-fi
++# 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
+ 
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+-  # Find who we are.  Look in the path if we contain no path at all
+-  # relative or not.
+-  case $0 in
+-    *[\\/]* ) as_myself=$0 ;;
+-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc
+ 
+-       ;;
+-  esac
+-  # We did not find ourselves, most probably we were run as `sh COMMAND'
+-  # in which case we are not to be found in the path.
+-  if test "x$as_myself" = x; then
+-    as_myself=$0
+-  fi
+-  if test ! -f "$as_myself"; then
+-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+-   { (exit 1); exit 1; }; }
+-  fi
+-  case $CONFIG_SHELL in
+-  '')
+-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for as_base in sh bash ksh sh5; do
+-	 case $as_dir in
+-	 /*)
+-	   if ("$as_dir/$as_base" -c '
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+-	     CONFIG_SHELL=$as_dir/$as_base
+-	     export CONFIG_SHELL
+-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+-	   fi;;
+-	 esac
+-       done
+-done
+-;;
+-  esac
++# Whether or not to disallow shared libs when runtime libs are static.
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+ 
+-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+-  # uniformly replaced by the line number.  The first 'sed' inserts a
+-  # line-number line before each line; the second 'sed' does the real
+-  # work.  The second script uses 'N' to pair each line-number line
+-  # with the numbered line, and appends trailing '-' during
+-  # substitution so that $LINENO is not a special case at line end.
+-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+-  sed '=' <$as_myself |
+-    sed '
+-      N
+-      s,$,-,
+-      : loop
+-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+-      t loop
+-      s,-$,,
+-      s,^['$as_cr_digits']*\n,,
+-    ' >$as_me.lineno &&
+-  chmod +x $as_me.lineno ||
+-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+-   { (exit 1); exit 1; }; }
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+ 
+-  # Don't try to exec as it changes $[0], causing all sort of problems
+-  # (the dirname of $[0] is not the place where we might find the
+-  # original and so on.  Autoconf is especially sensible to this).
+-  . ./$as_me.lineno
+-  # Exit status is that of the last command.
+-  exit
+-}
++# 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
+ 
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+-  *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T='	' ;;
+-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+-esac
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+ 
+-if expr a : '\(a\)' >/dev/null 2>&1; then
+-  as_expr=expr
+-else
+-  as_expr=false
+-fi
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+ 
+-rm -f conf$$ conf$$.exe conf$$.file
+-echo >conf$$.file
+-if ln -s conf$$.file conf$$ 2>/dev/null; then
+-  # We could just check for DJGPP; but this test a) works b) is more generic
+-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+-  if test -f conf$$.exe; then
+-    # Don't use ln at all; we don't have any links
+-    as_ln_s='cp -p'
+-  else
+-    as_ln_s='ln -s'
+-  fi
+-elif ln conf$$.file conf$$ 2>/dev/null; then
+-  as_ln_s=ln
+-else
+-  as_ln_s='cp -p'
+-fi
+-rm -f conf$$ conf$$.exe conf$$.file
++# Commands used to build a shared archive.
++archive_cmds=$lt_archive_cmds
++archive_expsym_cmds=$lt_archive_expsym_cmds
+ 
+-as_executable_p="test -f"
++# 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
+ 
+-# Sed expression to map a string onto a valid CPP name.
+-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
++# Whether we are building with GNU ld or not.
++with_gnu_ld=$lt_with_gnu_ld
+ 
+-# Sed expression to map a string onto a valid variable name.
+-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
++# 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
+ 
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" 	$as_nl"
++# 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
+ 
+-# CDPATH.
+-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
++# If ld is used when linking, flag to hardcode \$libdir into a binary
++# during linking.  This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
+ 
+-exec 6>&1
++# Whether we need a single "-rpath" flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator
+ 
+-# Open the log real soon, to keep \$[0] and so on meaningful, and to
+-# report actual input values of CONFIG_FILES etc. instead of their
+-# values after options handling.  Logging --version etc. is OK.
+-exec 5>>config.log
+-{
+-  echo
+-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+-## Running $as_me. ##
+-_ASBOX
+-} >&5
+-cat >&5 <<_CSEOF
++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
++# DIR into the resulting binary.
++hardcode_direct=$hardcode_direct
+ 
+-This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.53.  Invocation command line was
++# 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
+ 
+-  CONFIG_FILES    = $CONFIG_FILES
+-  CONFIG_HEADERS  = $CONFIG_HEADERS
+-  CONFIG_LINKS    = $CONFIG_LINKS
+-  CONFIG_COMMANDS = $CONFIG_COMMANDS
+-  $ $0 $@
++# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
++# into the resulting binary.
++hardcode_minus_L=$hardcode_minus_L
+ 
+-_CSEOF
+-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+-echo >&5
+-_ACEOF
++# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
++# into the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var
+ 
+-# Files that config.status was made for.
+-if test -n "$ac_config_files"; then
+-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+-fi
++# 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
+ 
+-if test -n "$ac_config_headers"; then
+-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+-fi
++# Set to yes if linker adds runtime paths of dependent libraries
++# to runtime path list.
++inherit_rpath=$inherit_rpath
+ 
+-if test -n "$ac_config_links"; then
+-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+-fi
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs
+ 
+-if test -n "$ac_config_commands"; then
+-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+-fi
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF
++# Set to "yes" if exported symbols are required.
++always_export_symbols=$always_export_symbols
+ 
+-ac_cs_usage="\
+-\`$as_me' instantiates files from templates according to the
+-current configuration.
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds
+ 
+-Usage: $0 [OPTIONS] [FILE]...
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms
+ 
+-  -h, --help       print this help, then exit
+-  -V, --version    print version number, then exit
+-  -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
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms
+ 
+-Configuration files:
+-$config_files
++# Commands necessary for linking programs (against libraries) with templates.
++prelink_cmds=$lt_prelink_cmds
+ 
+-Configuration headers:
+-$config_headers
++# Specify filename containing input files.
++file_list_spec=$lt_file_list_spec
+ 
+-Report bugs to <bug-autoconf@gnu.org>."
+-_ACEOF
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action
+ 
+-cat >>$CONFIG_STATUS <<_ACEOF
+-ac_cs_version="\\
+-config.status
+-configured by $0, generated by GNU Autoconf 2.53,
+-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
++# ### END LIBTOOL CONFIG
+ 
+-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+-Free Software Foundation, Inc.
+-This config.status script is free software; the Free Software Foundation
+-gives unlimited permission to copy, distribute and modify it."
+-srcdir=$srcdir
+-INSTALL="$INSTALL"
+-_ACEOF
++_LT_EOF
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-# If no file are specified by the user, then we need to provide default
+-# value.  By we need to know if files were specified by the user.
+-ac_need_defaults=:
+-while test $# != 0
+-do
+-  case $1 in
+-  --*=*)
+-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+-    shift
+-    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
+-    shift
++  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
+     ;;
+-  -*);;
+-  *) # This is not an option, so the user has probably given explicit
+-     # arguments.
+-     ac_need_defaults=false;;
+   esac
+ 
+-  case $1 in
+-  # Handling of the options.
+-_ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF
+-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+-    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
+-    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-  --version | --vers* | -V )
+-    echo "$ac_cs_version"; exit 0 ;;
+-  --he | --h)
+-    # Conflict between --help and --header
+-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&2;}
+-   { (exit 1); exit 1; }; };;
+-  --help | --hel | -h )
+-    echo "$ac_cs_usage"; exit 0 ;;
+-  --debug | --d* | -d )
+-    debug=: ;;
+-  --file | --fil | --fi | --f )
+-    shift
+-    CONFIG_FILES="$CONFIG_FILES $1"
+-    ac_need_defaults=false;;
+-  --header | --heade | --head | --hea )
+-    shift
+-    CONFIG_HEADERS="$CONFIG_HEADERS $1"
+-    ac_need_defaults=false;;
+-
+-  # This is an error.
+-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&2;}
+-   { (exit 1); exit 1; }; } ;;
+-
+-  *) ac_config_targets="$ac_config_targets $1" ;;
+ 
+-  esac
+-  shift
+-done
++ltmain="$ac_aux_dir/ltmain.sh"
+ 
+-_ACEOF
+ 
++  # 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 '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
++    || (rm -f "$cfgfile"; exit 1)
+ 
++  case $xsi_shell in
++  yes)
++    cat << \_LT_EOF >> "$cfgfile"
+ 
++# 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 ()
++{
++  case ${1} in
++    */*) func_dirname_result="${1%/*}${2}" ;;
++    *  ) func_dirname_result="${3}" ;;
++  esac
++}
+ 
++# func_basename file
++func_basename ()
++{
++  func_basename_result="${1##*/}"
++}
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-for ac_config_target in $ac_config_targets
+-do
+-  case "$ac_config_target" in
+-  # Handling of arguments.
+-  "${makefiles_generic}" ) CONFIG_FILES="$CONFIG_FILES ${makefiles_generic}" ;;
+-  "${makefiles_wnn}" ) CONFIG_FILES="$CONFIG_FILES ${makefiles_wnn}" ;;
+-  "${makefiles_wnn_dic}" ) CONFIG_FILES="$CONFIG_FILES ${makefiles_wnn_dic}" ;;
+-  "${makefiles_cwnn}" ) CONFIG_FILES="$CONFIG_FILES ${makefiles_cwnn}" ;;
+-  "${makefiles_cwnn_dic}" ) CONFIG_FILES="$CONFIG_FILES ${makefiles_cwnn_dic}" ;;
+-  "${makefiles_kwnn}" ) CONFIG_FILES="$CONFIG_FILES ${makefiles_kwnn}" ;;
+-  "${makefiles_kwnn_dic}" ) CONFIG_FILES="$CONFIG_FILES ${makefiles_kwnn_dic}" ;;
+-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+-   { (exit 1); exit 1; }; };;
++# 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 ()
++{
++  case ${1} in
++    */*) func_dirname_result="${1%/*}${2}" ;;
++    *  ) func_dirname_result="${3}" ;;
+   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
+-fi
++  func_basename_result="${1##*/}"
++}
+ 
+-# Create a temporary directory, and hook for its removal unless debugging.
+-$debug ||
++# 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_stripname ()
+ {
+-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+-  trap '{ (exit 1); exit 1; }' 1 2 13 15
++  # 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}"}
+ }
+ 
+-# Create a (secure) tmp directory for tmp files.
+-: ${TMPDIR=/tmp}
++# func_opt_split
++func_opt_split ()
+ {
+-  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
+-  test -n "$tmp" && test -d "$tmp"
+-}  ||
++  func_opt_split_opt=${1%%=*}
++  func_opt_split_arg=${1#*=}
++}
++
++# func_lo2o object
++func_lo2o ()
+ {
+-  tmp=$TMPDIR/cs$$-$RANDOM
+-  (umask 077 && mkdir $tmp)
+-} ||
++  case ${1} in
++    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
++    *)    func_lo2o_result=${1} ;;
++  esac
++}
++
++# func_xform libobj-or-source
++func_xform ()
+ {
+-   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+-   { (exit 1); exit 1; }
++  func_xform_result=${1%.*}.lo
+ }
+ 
+-_ACEOF
++# func_arith arithmetic-term...
++func_arith ()
++{
++  func_arith_result=$(( $* ))
++}
+ 
+-cat >>$CONFIG_STATUS <<_ACEOF
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
++{
++  func_len_result=${#1}
++}
+ 
 -#
+-# CONFIG_FILES section.
+-#
++_LT_EOF
++    ;;
++  *) # Bourne compatible functions.
++    cat << \_LT_EOF >> "$cfgfile"
+ 
+-# No need to generate the scripts if there are no CONFIG_FILES.
+-# This happens for instance when ./config.status config.h
+-if test -n "\$CONFIG_FILES"; then
+-  # Protect against being on the right side of a sed subst in config.status.
+-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+-s,@SHELL@,$SHELL,;t t
+-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
+-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+-s,@exec_prefix@,$exec_prefix,;t t
+-s,@prefix@,$prefix,;t t
+-s,@program_transform_name@,$program_transform_name,;t t
+-s,@bindir@,$bindir,;t t
+-s,@sbindir@,$sbindir,;t t
+-s,@libexecdir@,$libexecdir,;t t
+-s,@datadir@,$datadir,;t t
+-s,@sysconfdir@,$sysconfdir,;t t
+-s,@sharedstatedir@,$sharedstatedir,;t t
+-s,@localstatedir@,$localstatedir,;t t
+-s,@libdir@,$libdir,;t t
+-s,@includedir@,$includedir,;t t
+-s,@oldincludedir@,$oldincludedir,;t t
+-s,@infodir@,$infodir,;t t
+-s,@mandir@,$mandir,;t t
+-s,@build_alias@,$build_alias,;t t
+-s,@host_alias@,$host_alias,;t t
+-s,@target_alias@,$target_alias,;t t
+-s,@DEFS@,$DEFS,;t t
+-s,@ECHO_C@,$ECHO_C,;t t
+-s,@ECHO_N@,$ECHO_N,;t t
+-s,@ECHO_T@,$ECHO_T,;t t
+-s,@LIBS@,$LIBS,;t t
+-s,@build@,$build,;t t
+-s,@build_cpu@,$build_cpu,;t t
+-s,@build_vendor@,$build_vendor,;t t
+-s,@build_os@,$build_os,;t t
+-s,@host@,$host,;t t
+-s,@host_cpu@,$host_cpu,;t t
+-s,@host_vendor@,$host_vendor,;t t
+-s,@host_os@,$host_os,;t t
+-s,@SUBDIRS@,$SUBDIRS,;t t
+-s,@WNNMANDIR@,$WNNMANDIR,;t t
+-s,@Wnn@,$Wnn,;t t
+-s,@JSERVER_SUBDIRS2@,$JSERVER_SUBDIRS2,;t t
+-s,@cWnn@,$cWnn,;t t
+-s,@kWnn@,$kWnn,;t t
+-s,@WNNJLIB@,$WNNJLIB,;t t
+-s,@DEPWNNJLIB@,$DEPWNNJLIB,;t t
+-s,@HINSI_DATA@,$HINSI_DATA,;t t
+-s,@CWNNJLIB@,$CWNNJLIB,;t t
+-s,@DEPCWNNJLIB@,$DEPCWNNJLIB,;t t
+-s,@CHINSI_DATA@,$CHINSI_DATA,;t t
+-s,@THINSI_DATA@,$THINSI_DATA,;t t
+-s,@KWNNJLIB@,$KWNNJLIB,;t t
+-s,@DEPKWNNJLIB@,$DEPKWNNJLIB,;t t
+-s,@KHINSI_DATA@,$KHINSI_DATA,;t t
+-s,@ipv6@,$ipv6,;t t
+-s,@unsafe_path@,$unsafe_path,;t t
+-s,@CC@,$CC,;t t
+-s,@CFLAGS@,$CFLAGS,;t t
+-s,@LDFLAGS@,$LDFLAGS,;t t
+-s,@CPPFLAGS@,$CPPFLAGS,;t t
+-s,@ac_ct_CC@,$ac_ct_CC,;t t
+-s,@EXEEXT@,$EXEEXT,;t t
+-s,@OBJEXT@,$OBJEXT,;t t
+-s,@CCOPTIONS@,$CCOPTIONS,;t t
+-s,@CDEBUGFLAGS@,$CDEBUGFLAGS,;t t
+-s,@INSTPGMFLAGS@,$INSTPGMFLAGS,;t t
+-s,@CPP@,$CPP,;t t
+-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+-s,@LN_S@,$LN_S,;t t
+-s,@SET_MAKE@,$SET_MAKE,;t t
+-s,@EGREP@,$EGREP,;t t
+-s,@ECHO@,$ECHO,;t t
+-s,@AR@,$AR,;t t
+-s,@ac_ct_AR@,$ac_ct_AR,;t t
+-s,@RANLIB@,$RANLIB,;t t
+-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+-s,@STRIP@,$STRIP,;t t
+-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
+-s,@CXX@,$CXX,;t t
+-s,@CXXFLAGS@,$CXXFLAGS,;t t
+-s,@ac_ct_CXX@,$ac_ct_CXX,;t t
+-s,@CXXCPP@,$CXXCPP,;t t
+-s,@F77@,$F77,;t t
+-s,@FFLAGS@,$FFLAGS,;t t
+-s,@ac_ct_F77@,$ac_ct_F77,;t t
+-s,@LIBTOOL@,$LIBTOOL,;t t
+-s,@LIBTOOL_DEPS@,$LIBTOOL_DEPS,;t t
+-s,@LIBOBJS@,$LIBOBJS,;t t
+-s,@JS_SUPPORTOBJS@,$JS_SUPPORTOBJS,;t t
+-s,@WRAPLIB@,$WRAPLIB,;t t
+-CEOF
+-
+-_ACEOF
 -
+-  cat >>$CONFIG_STATUS <<\_ACEOF
+-  # Split the substitutions into bite-sized pieces for seds with
+-  # small command number limits, like on Digital OSF/1 and HP-UX.
+-  ac_max_sed_lines=48
+-  ac_sed_frag=1 # Number of current file.
+-  ac_beg=1 # First line for current file.
+-  ac_end=$ac_max_sed_lines # Line after last line for current file.
+-  ac_more_lines=:
+-  ac_sed_cmds=
+-  while $ac_more_lines; do
+-    if test $ac_beg -gt 1; then
+-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+-    else
+-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+-    fi
+-    if test ! -s $tmp/subs.frag; then
+-      ac_more_lines=false
+-    else
+-      # The purpose of the label and of the branching condition is to
+-      # speed up the sed processing (if there are no `@' at all, there
+-      # is no need to browse any of the substitutions).
+-      # These are the two extra sed commands mentioned above.
+-      (echo ':t
+-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+-      if test -z "$ac_sed_cmds"; then
+-  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+-      else
+-  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+-      fi
+-      ac_sed_frag=`expr $ac_sed_frag + 1`
+-      ac_beg=$ac_end
+-      ac_end=`expr $ac_end + $ac_max_sed_lines`
+-    fi
+-  done
+-  if test -z "$ac_sed_cmds"; then
+-    ac_sed_cmds=cat
++# 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 ()
++{
++  # Extract subdirectory from the argument.
++  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
++  if test "X$func_dirname_result" = "X${1}"; then
++    func_dirname_result="${3}"
++  else
++    func_dirname_result="$func_dirname_result${2}"
+   fi
+-fi # test -n "$CONFIG_FILES"
++}
+ 
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+-  case $ac_file in
+-  - | *:- | *:-:* ) # input from stdin
+-        cat >$tmp/stdin
+-        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  * )   ac_file_in=$ac_file.in ;;
+-  esac
++# func_basename file
++func_basename ()
++{
++  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
++}
+ 
+-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-         X"$ac_file" : 'X\(//\)[^/]' \| \
+-         X"$ac_file" : 'X\(//\)$' \| \
+-         X"$ac_file" : 'X\(/\)' \| \
+-         .     : '\(.\)' 2>/dev/null ||
+-echo X"$ac_file" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-  { case "$ac_dir" in
+-  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+-  *)                      as_incr_dir=.;;
+-esac
+-as_dummy="$ac_dir"
+-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+-  case $as_mkdir_dir in
+-    # Skip DOS drivespec
+-    ?:) as_incr_dir=$as_mkdir_dir ;;
+-    *)
+-      as_incr_dir=$as_incr_dir/$as_mkdir_dir
+-      test -d "$as_incr_dir" ||
+-        mkdir "$as_incr_dir" ||
+-	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
+-   { (exit 1); exit 1; }; }
+-    ;;
++
++# 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 "X${3}" \
++           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
++    *)  func_stripname_result=`$ECHO "X${3}" \
++           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+   esac
+-done; }
++}
+ 
+-  ac_builddir=.
++# sed scripts:
++my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
++my_sed_long_arg='1s/^-[^=]*=//'
+ 
+-if test "$ac_dir" != .; then
+-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+-  # A "../" for each directory in $ac_dir_suffix.
+-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+-  ac_dir_suffix= ac_top_builddir=
+-fi
++# func_opt_split
++func_opt_split ()
++{
++  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
++  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
++}
+ 
+-case $srcdir in
+-  .)  # No --srcdir option.  We are building in place.
+-    ac_srcdir=.
+-    if test -z "$ac_top_builddir"; then
+-       ac_top_srcdir=.
+-    else
+-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+-    fi ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute path.
+-    ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir ;;
+-  *) # Relative path.
+-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+-esac
+-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+-# absolute.
+-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+-ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
+-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
++# func_lo2o object
++func_lo2o ()
++{
++  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
++}
+ 
++# func_xform libobj-or-source
++func_xform ()
++{
++  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
++}
+ 
+-  case $INSTALL in
+-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+-  esac
++# func_arith arithmetic-term...
++func_arith ()
++{
++  func_arith_result=`expr "$@"`
++}
+ 
+-  if test x"$ac_file" != x-; then
+-    { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+-    rm -f "$ac_file"
+-  fi
+-  # Let's still pretend it is `configure' which instantiates (i.e., don't
+-  # use $as_me), people would be surprised to read:
+-  #    /* config.h.  Generated by config.status.  */
+-  if test x"$ac_file" = x-; then
+-    configure_input=
+-  else
+-    configure_input="$ac_file.  "
+-  fi
+-  configure_input=$configure_input"Generated from `echo $ac_file_in |
+-                                     sed 's,.*/,,'` by configure."
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
++{
++  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
++}
+ 
+-  # First look for the input files in the build tree, otherwise in the
+-  # src tree.
+-  ac_file_inputs=`IFS=:
+-    for f in $ac_file_in; do
+-      case $f in
+-      -) echo $tmp/stdin ;;
+-      [\\/$]*)
+-         # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-         echo $f;;
+-      *) # Relative
+-         if test -f "$f"; then
+-           # Build tree
+-           echo $f
+-         elif test -f "$srcdir/$f"; then
+-           # Source tree
+-           echo $srcdir/$f
+-         else
+-           # /dev/null tree
+-           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-         fi;;
+-      esac
+-    done` || { (exit 1); exit 1; }
+-_ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF
+-  sed "$ac_vpsub
+-$extrasub
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-:t
+-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+-s,@configure_input@,$configure_input,;t t
+-s,@srcdir@,$ac_srcdir,;t t
+-s,@abs_srcdir@,$ac_abs_srcdir,;t t
+-s,@top_srcdir@,$ac_top_srcdir,;t t
+-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+-s,@builddir@,$ac_builddir,;t t
+-s,@abs_builddir@,$ac_abs_builddir,;t t
+-s,@top_builddir@,$ac_top_builddir,;t t
+-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
+-s,@INSTALL@,$ac_INSTALL,;t t
+-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+-  rm -f $tmp/stdin
+-  if test x"$ac_file" != x-; then
+-    mv $tmp/out $ac_file
+-  else
+-    cat $tmp/out
+-    rm -f $tmp/out
+-  fi
++_LT_EOF
++esac
+ 
+-done
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
++case $lt_shell_append in
++  yes)
++    cat << \_LT_EOF >> "$cfgfile"
+ 
+-#
+-# CONFIG_HEADER section.
+-#
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
++{
++  eval "$1+=\$2"
++}
++_LT_EOF
++    ;;
++  *)
++    cat << \_LT_EOF >> "$cfgfile"
+ 
 -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
 -# NAME is the cpp macro being defined and VALUE is the value it is being given.
-+  # CONFIG_HEADER
- #
+-#
 -# ac_d sets the value in "#define NAME VALUE" lines.
 -ac_dA='s,^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
 -ac_dB='[ 	].*$,\1#\2'
@@ -17052,7 +31749,13 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -ac_uB='$,\1#\2define\3'
 -ac_uC=' '
 -ac_uD=',;t'
--
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
++{
++  eval "$1=\$$1\$2"
++}
+ 
 -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
 -  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
 -  case $ac_file in
@@ -17063,11 +31766,13 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
 -        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
 -  * )   ac_file_in=$ac_file.in ;;
--  esac
--
++_LT_EOF
++    ;;
+   esac
+ 
 -  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
 -echo "$as_me: creating $ac_file" >&6;}
--
+ 
 -  # First look for the input files in the build tree, otherwise in the
 -  # src tree.
 -  ac_file_inputs=`IFS=:
@@ -17078,14 +31783,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         # Absolute (can't be DOS-style, as IFS=:)
 -         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
 -echo "$as_me: error: cannot find input file: $f" >&2;}
-+  if test x"$ac_file" != x-; then
-+    {
-+      $as_echo "/* $configure_input  */" \
-+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-+    } >"$tmp/config.h" \
-+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-+$as_echo "$as_me: error: could not create $ac_file" >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
 -         echo $f;;
 -      *) # Relative
 -         if test -f "$f"; then
@@ -17094,26 +31792,24 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -         elif test -f "$srcdir/$f"; then
 -           # Source tree
 -           echo $srcdir/$f
-+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-+$as_echo "$as_me: $ac_file is unchanged" >&6;}
-          else
+-         else
 -           # /dev/null tree
 -           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
 -echo "$as_me: error: cannot find input file: $f" >&2;}
-+      rm -f "$ac_file"
-+      mv "$tmp/config.h" "$ac_file" \
-+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-+$as_echo "$as_me: error: could not create $ac_file" >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
 -         fi;;
 -      esac
 -    done` || { (exit 1); exit 1; }
 -  # Remove the trailing spaces.
 -  sed 's/[ 	]*$//' $ac_file_inputs >$tmp/in
--
++  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
++    || (rm -f "$cfgfile"; exit 1)
+ 
 -_ACEOF
--
++  mv -f "$cfgfile" "$ofile" ||
++    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
++  chmod +x "$ofile"
+ 
 -# Transform confdefs.h into two sed scripts, `conftest.defines' and
 -# `conftest.undefs', that substitutes the proper values into
 -# config.h.in to produce config.h.  The first handles `#define'
@@ -17215,14 +31911,14 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -    echo "/* Generated by configure.  */" >$tmp/config.h
 -  else
 -    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-   fi
+-  fi
 -  cat $tmp/in >>$tmp/config.h
 -  rm -f $tmp/in
 -  if test x"$ac_file" != x-; then
 -    if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
 -      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
 -echo "$as_me: $ac_file is unchanged" >&6;}
-     else
+-    else
 -      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
 -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 -         X"$ac_file" : 'X\(//\)[^/]' \| \
@@ -17250,17 +31946,11 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -        mkdir "$as_incr_dir" ||
 -	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
 -echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
-+    $as_echo "/* $configure_input  */" \
-+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-+$as_echo "$as_me: error: could not create -" >&2;}
-    { (exit 1); exit 1; }; }
-+  fi
-     ;;
-+
-+
-   esac
+-   { (exit 1); exit 1; }; }
+-    ;;
+-  esac
 -done; }
++ ;;
  
 -      rm -f $ac_file
 -      mv $tmp/config.h $ac_file
@@ -17271,6 +31961,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
 -  fi
 -done
 -_ACEOF
++  esac
 +done # for ac_tag
  
 -cat >>$CONFIG_STATUS <<\_ACEOF
@@ -17288,7 +31979,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  
  # configure is writing to config.log, and then calls config.status.
  # config.status does its own redirection, appending to config.log.
-@@ -20723,11 +23874,18 @@
+@@ -20723,11 +16286,18 @@ ac_clean_files=$ac_clean_files_save
  # need to make the FD available again.
  if test "$no_create" != yes; then
    ac_cs_success=:
diff --git a/japanese/FreeWnn-lib/files/patch-configure.in b/japanese/FreeWnn-lib/files/patch-configure.in
index a42d80adb85f..a977481b6084 100644
--- a/japanese/FreeWnn-lib/files/patch-configure.in
+++ b/japanese/FreeWnn-lib/files/patch-configure.in
@@ -3,10 +3,10 @@ Index: configure.in
 RCS file: /home/cvs/private/hrs/freewnn/configure.in,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
+diff -u -p -r1.1.1.1 -r1.2
 --- configure.in	20 Dec 2008 07:13:30 -0000	1.1.1.1
 +++ configure.in	2 Jan 2009 21:09:32 -0000	1.2
-@@ -422,6 +422,16 @@
+@@ -422,6 +422,16 @@ dnl for bcopy/index -> memcpy/strchr con
  AC_CHECK_FUNCS(bcopy bzero bcmp index rindex \
  	memcpy memmove memset strchr strrchr)
  
diff --git a/japanese/FreeWnn-lib/files/patch-kWnn-etc-Makefile.in b/japanese/FreeWnn-lib/files/patch-kWnn-etc-Makefile.in
index 5b11ec95acd8..34e4c7db5afe 100644
--- a/japanese/FreeWnn-lib/files/patch-kWnn-etc-Makefile.in
+++ b/japanese/FreeWnn-lib/files/patch-kWnn-etc-Makefile.in
@@ -3,10 +3,10 @@ Index: kWnn/etc/Makefile.in
 RCS file: /home/cvs/private/hrs/freewnn/kWnn/etc/Makefile.in,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
+diff -u -p -r1.1.1.1 -r1.2
 --- kWnn/etc/Makefile.in	20 Dec 2008 07:13:30 -0000	1.1.1.1
 +++ kWnn/etc/Makefile.in	2 Jan 2009 21:09:35 -0000	1.2
-@@ -35,10 +35,12 @@
+@@ -35,10 +35,12 @@ top_builddir = ../..
  INCLUDES = -I$(KWNNINCLUDESRC) -I$(TOP)
  DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF)
  
@@ -21,7 +21,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  OBJS2= getopt.o getopt1.o
  
  all::
-@@ -199,6 +201,18 @@
+@@ -199,6 +201,18 @@ includes:: getopt1.c
  
  depend:: getopt1.c
  
diff --git a/japanese/FreeWnn-lib/files/patch-kWnn-include-Makefile.in b/japanese/FreeWnn-lib/files/patch-kWnn-include-Makefile.in
index 249c5a9f3fd9..17c99ac73a71 100644
--- a/japanese/FreeWnn-lib/files/patch-kWnn-include-Makefile.in
+++ b/japanese/FreeWnn-lib/files/patch-kWnn-include-Makefile.in
@@ -3,10 +3,10 @@ Index: kWnn/include/Makefile.in
 RCS file: /home/cvs/private/hrs/freewnn/kWnn/include/Makefile.in,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
+diff -u -p -r1.1.1.1 -r1.2
 --- kWnn/include/Makefile.in	20 Dec 2008 07:13:30 -0000	1.1.1.1
 +++ kWnn/include/Makefile.in	2 Jan 2009 21:09:35 -0000	1.2
-@@ -36,7 +36,8 @@
+@@ -36,7 +36,8 @@ INSTALL      = @INSTALL@
  
  HEADERS = jllib.h jslib.h msg.h rk_spclval.h wnnerror.h commonhd.h cplib.h
  LINKS = wnn_config.h copyright.h demcom.h hinsi_file.h jd_sock.h jdata.h \
@@ -16,7 +16,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  LINKS2 = getopt.h
  
  all:: $(HEADERS) $(LINKS) $(LINKS2)
-@@ -257,6 +258,18 @@
+@@ -257,6 +258,18 @@ includes:: getopt.h
  
  depend:: getopt.h
  
diff --git a/japanese/FreeWnn-lib/files/patch-kWnn-jlib-Makefile.in b/japanese/FreeWnn-lib/files/patch-kWnn-jlib-Makefile.in
index 6307c79abb96..64ecf86b77f5 100644
--- a/japanese/FreeWnn-lib/files/patch-kWnn-jlib-Makefile.in
+++ b/japanese/FreeWnn-lib/files/patch-kWnn-jlib-Makefile.in
@@ -3,10 +3,10 @@ Index: kWnn/jlib/Makefile.in
 RCS file: /home/cvs/private/hrs/freewnn/kWnn/jlib/Makefile.in,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
-diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
+diff -u -p -r1.1.1.1 -r1.2
 --- kWnn/jlib/Makefile.in	20 Dec 2008 07:13:30 -0000	1.1.1.1
 +++ kWnn/jlib/Makefile.in	2 Jan 2009 21:09:35 -0000	1.2
-@@ -61,13 +61,15 @@
+@@ -61,13 +61,15 @@ SRC7= $(KWNNETCSRC)/py_table.c
  OBJ7= py_table.o
  SRC8= $(KWNNETCSRC)/zy_table.c
  OBJ8= zy_table.o
@@ -24,7 +24,7 @@ diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2
  OTHER_SRCS = $(WNNETCSRC)/mkdir.c
  OTHER_OBJS = mkdir.o
  SRCS= $(SRC1) $(SRC3) $(LOCAL_ETCSRCS) $(OTHER_SRCS)
-@@ -163,6 +165,9 @@
+@@ -163,6 +165,9 @@ $(OBJ7) : $(SRC7)
  $(OBJ8) : $(SRC8)
  	$(LT_CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
  
diff --git a/japanese/FreeWnn-lib/files/patch-kWnn-jserver-Makefile.in b/japanese/FreeWnn-lib/files/patch-kWnn-jserver-Makefile.in
new file mode 100644
index 000000000000..ab7a4e1254be
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-kWnn-jserver-Makefile.in
@@ -0,0 +1,37 @@
+Index: kWnn/jserver/Makefile.in
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/kWnn/jserver/Makefile.in,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- kWnn/jserver/Makefile.in	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ kWnn/jserver/Makefile.in	2 Jan 2009 21:09:35 -0000	1.2
+@@ -80,13 +80,17 @@ SRC20= $(KWNNETCSRC)/getopt.c
+ OBJ20= getopt.o
+ SRC21= $(KWNNETCSRC)/getopt1.c
+ OBJ21= getopt1.o
++SRC22= $(KWNNETCSRC)/fake-rfc2553.c
++OBJ22= fake-rfc2553.o
+ OBJSUPPORT = @JS_SUPPORTOBJS@
+ 
+ SRCS= $(SRC0) $(SRC1) $(SRC3) $(SRC4) $(SRC5) $(SRC6) $(SRC7) $(SRCGETHINSI) \
+-    $(SRC9) $(SRC10) $(SRC11) $(SRC12) $(SRC13) $(SRCS14) $(SRC20) $(SRC21)
++    $(SRC9) $(SRC10) $(SRC11) $(SRC12) $(SRC13) $(SRCS14) $(SRC20) $(SRC21) \
++	$(SRC22)
+ 
+ OBJS= $(OBJ0) $(OBJ1) $(OBJ3) $(OBJ4) $(OBJ5) $(OBJ6) $(OBJ7) $(OBJGETHINSI) \
+     $(OBJ9) $(OBJ10) $(OBJ11) $(OBJ12) $(OBJ13) $(OBJ14) $(OBJ20) $(OBJ21) \
++	$(OBJ22) \
+     $(OBJSUPPORT)
+ 
+ all:: $(HDRS) $(SRC0) $(SRC1) kserver
+@@ -572,6 +576,9 @@ $(OBJ20) : $(SRC20) $(KWNNINCLUDESRC)/ge
+ $(OBJ21) : $(SRC21) $(KWNNINCLUDESRC)/getopt.h
+ 	$(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
+ 
++$(OBJ22) : $(SRC22)
++	$(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
++
+ mkdir.o : $(WNNETCSRC)/mkdir.c
+ 	$(CC) -c $(CFLAGS)  $?
+ 
diff --git a/japanese/FreeWnn-lib/files/patch-kWnn-kd-kserverrc b/japanese/FreeWnn-lib/files/patch-kWnn-kd-kserverrc
index 9849fdf099e8..7297703cce63 100644
--- a/japanese/FreeWnn-lib/files/patch-kWnn-kd-kserverrc
+++ b/japanese/FreeWnn-lib/files/patch-kWnn-kd-kserverrc
@@ -3,7 +3,7 @@ Index: kWnn/kd/kserverrc
 RCS file: /home/cvs/private/hrs/freewnn/kWnn/kd/kserverrc,v
 retrieving revision 1.1.1.1
 retrieving revision 1.3
-diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.3
+diff -u -p -r1.1.1.1 -r1.3
 --- kWnn/kd/kserverrc	20 Dec 2008 07:13:30 -0000	1.1.1.1
 +++ kWnn/kd/kserverrc	2 Jan 2009 21:56:38 -0000	1.3
 @@ -29,6 +29,9 @@
diff --git a/japanese/FreeWnn-lib/files/patch-kWnn-romkan-Makefile.in b/japanese/FreeWnn-lib/files/patch-kWnn-romkan-Makefile.in
new file mode 100644
index 000000000000..eda267ee5b15
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-kWnn-romkan-Makefile.in
@@ -0,0 +1,17 @@
+Index: kWnn/romkan/Makefile.in
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/kWnn/romkan/Makefile.in,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- kWnn/romkan/Makefile.in	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ kWnn/romkan/Makefile.in	2 Jan 2010 12:10:16 -0000	1.2
+@@ -48,7 +48,7 @@ includes::
+ 
+ .c.o:
+ 	$(RM) $@
+-	$(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $<
++	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(_NOOP_) $<
+ 
+ clean::
+ 	$(RM) -r .libs
diff --git a/japanese/FreeWnn-lib/files/patch-ltmain.sh b/japanese/FreeWnn-lib/files/patch-ltmain.sh
new file mode 100644
index 000000000000..251ddc4cc43c
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-ltmain.sh
@@ -0,0 +1,13815 @@
+Index: ltmain.sh
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/ltmain.sh,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- ltmain.sh	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ ltmain.sh	2 Jan 2010 12:04:45 -0000	1.2
+@@ -1,538 +1,1055 @@
+-# ltmain.sh - Provide generalized library-building support services.
+-# NOTE: Changing this file will not affect anything until you rerun configure.
+-#
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
+-# Free Software Foundation, Inc.
+-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+-#
+-# This program is free software; you can redistribute it and/or modify
++# Generated from ltmain.m4sh.
++
++# ltmain.sh (GNU libtool) 2.2.6
++# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 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.
+ #
+-# This program is distributed in the hope that it will be useful, but
++# 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 this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# 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.
+ #
+-# 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.
++#     --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
++#     --tag=TAG            use configuration variables from tag TAG
++# -v, --verbose            print informational messages (default)
++#     --version            print version information
++# -h, --help               print short or long 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.
++# 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.2.6
++#       automake:		$automake_version
++#       autoconf:		$autoconf_version
++#
++# Report bugs to <bug-libtool@gnu.org>.
+ 
+-# Check that we have a working $echo.
+-if test "X$1" = X--no-reexec; then
+-  # Discard the --no-reexec flag, and continue.
+-  shift
+-elif test "X$1" = X--fallback-echo; then
+-  # Avoid inline document here, it may be left over
+-  :
+-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+-  # Yippee, $echo works!
+-  :
++PROGRAM=ltmain.sh
++PACKAGE=libtool
++VERSION=2.2.6
++TIMESTAMP=""
++package_revision=1.3012
++
++# 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
+-  # Restart under the correct shell, and then maybe $echo will work.
+-  exec $SHELL "$0" --no-reexec ${1+"$@"}
++  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
+ 
+-if test "X$1" = X--fallback-echo; then
+-  # used as fallback echo
+-  shift
+-  cat <<EOF
+-$*
+-EOF
+-  exit 0
+-fi
++# NLS nuisances: We save the old values to restore during execute mode.
++# Only set LANG and LC_ALL to C if already set.
++# These must not be set unconditionally because not all systems understand
++# e.g. LANG=C (notably SCO).
++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
+ 
+-# The name of this program.
+-progname=`$echo "$0" | ${SED} 's%^.*/%%'`
+-modename="$progname"
++$lt_unset CDPATH
+ 
+-# Constants.
+-PROGRAM=ltmain.sh
+-PACKAGE=libtool
+-VERSION=1.5
+-TIMESTAMP=" (1.1220 2003/04/05 19:32:58)"
+ 
+-default_mode=
+-help="Try \`$progname --help' for more information."
+-magic="%%%MAGIC variable%%%"
+-mkdir="mkdir"
+-mv="mv -f"
+-rm="rm -f"
++
++
++
++: ${CP="cp -f"}
++: ${ECHO="echo"}
++: ${EGREP="/usr/bin/grep -E"}
++: ${FGREP="/usr/bin/grep -F"}
++: ${GREP="/usr/bin/grep"}
++: ${LN_S="ln -s"}
++: ${MAKE="make"}
++: ${MKDIR="mkdir"}
++: ${MV="mv -f"}
++: ${RM="rm -f"}
++: ${SED="/opt/local/bin/gsed"}
++: ${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_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 "X${1}" | $Xsed -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 "X${1}" | $Xsed -e "$basename"`
++}
++
++# Generated shell functions inserted here.
++
++# 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"
++
++# The name of this program:
++# In the unlikely event $progname began with a '-', it would play havoc with
++# func_echo (imagine progname=-n), so we prepend ./ in that case:
++func_dirname_and_basename "$progpath"
++progname=$func_basename_result
++case $progname in
++  -*) progname=./$progname ;;
++esac
++
++# 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=:
++     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'
+-# test EBCDIC or ASCII
+-case `echo A|od -x` in
+- *[Cc]1*) # EBCDIC based system
+-  SP2NL="tr '\100' '\n'"
+-  NL2SP="tr '\r\n' '\100\100'"
+-  ;;
+- *) # Assume ASCII based system
+-  SP2NL="tr '\040' '\012'"
+-  NL2SP="tr '\015\012' '\040\040'"
+-  ;;
+-esac
++sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+ 
+-# NLS nuisances.
+-# Only set LANG and LC_ALL to C if already set.
+-# These must not be set unconditionally because not all systems understand
+-# e.g. LANG=C (notably SCO).
+-# We save the old values to restore during execute mode.
+-if test "${LC_ALL+set}" = set; then
+-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+-fi
+-if test "${LANG+set}" = set; then
+-  save_LANG="$LANG"; LANG=C; export LANG
+-fi
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\(["`\\]\)/\\\1/g'
+ 
+-# Make sure IFS has a sensible default
+-: ${IFS=" 	"}
++# 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${mode+: }$mode: $*"
++}
+ 
+-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+-  $echo "$modename: not configured to build any kind of library" 1>&2
+-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+-  exit 1
+-fi
++# func_verbose arg...
++# Echo program name prefixed message in verbose mode only.
++func_verbose ()
++{
++    $opt_verbose && func_echo ${1+"$@"}
+ 
+-# Global variables.
+-mode=$default_mode
+-nonopt=
+-prev=
+-prevopt=
+-run=
+-show="$echo"
+-show_help=
+-execute_dlfiles=
+-lo2o="s/\\.lo\$/.${objext}/"
+-o2lo="s/\\.${objext}\$/.lo/"
++    # 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:
++    :
++}
+ 
+-#####################################
+-# Shell function definitions:
+-# This seems to be the best place for them
++# func_error arg...
++# Echo program name prefixed message to standard error.
++func_error ()
++{
++    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
++}
+ 
+-# 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.
+-win32_libid () {
+-  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
+-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+-      grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+-      win32_nmres=`eval $NM -f posix -A $1 | \
+-	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
+-      if test "X$win32_nmres" = "Ximport" ; then
+-        win32_libid_type="x86 archive import"
+-      else
+-        win32_libid_type="x86 archive static"
+-      fi
+-    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_warning arg...
++# Echo program name prefixed warning message to standard error.
++func_warning ()
++{
++    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
++
++    # bash bug again:
++    :
+ }
+ 
+-# End of Shell function definitions
+-#####################################
++# func_fatal_error arg...
++# Echo program name prefixed message to standard error, and exit.
++func_fatal_error ()
++{
++    func_error ${1+"$@"}
++    exit $EXIT_FAILURE
++}
+ 
+-# Parse our command line options once, thoroughly.
+-while test "$#" -gt 0
+-do
+-  arg="$1"
+-  shift
++# 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
+ 
+-  case $arg in
+-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
+-  *) optarg= ;;
+-  esac
+ 
+-  # If the previous option needs an argument, assign it.
+-  if test -n "$prev"; then
+-    case $prev in
+-    execute_dlfiles)
+-      execute_dlfiles="$execute_dlfiles $arg"
+-      ;;
+-    tag)
+-      tagname="$arg"
++# func_grep expression filename
++# Check whether EXPRESSION matches any line of FILENAME, without output.
++func_grep ()
++{
++    $GREP "$1" "$2" >/dev/null 2>&1
++}
+ 
+-      # Check whether tagname contains only valid characters
+-      case $tagname in
+-      *[!-_A-Za-z0-9,/]*)
+-	$echo "$progname: invalid tag name: $tagname" 1>&2
+-	exit 1
+-	;;
+-      esac
+ 
+-      case $tagname in
+-      CC)
+-	# Don't test for the "default" C tag, as we know, it's there, but
+-	# not specially marked.
+-	;;
+-      *)
+-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
+-	  taglist="$taglist $tagname"
+-	  # Evaluate the configuration.
+-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
+-	else
+-	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
+-	fi
+-	;;
+-      esac
+-      ;;
+-    *)
+-      eval "$prev=\$arg"
+-      ;;
+-    esac
++# 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=
+ 
+-    prev=
+-    prevopt=
+-    continue
+-  fi
++    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+ 
+-  # Have we seen a non-optional argument yet?
+-  case $arg in
+-  --help)
+-    show_help=yes
+-    ;;
++      # Protect directory names starting with `-'
++      case $my_directory_path in
++        -*) my_directory_path="./$my_directory_path" ;;
++      esac
+ 
+-  --version)
+-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+-    $echo
+-    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
+-    $echo "This is free software; see the source for copying conditions.  There is NO"
+-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+-    exit 0
+-    ;;
++      # 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"
+ 
+-  --config)
+-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
+-    # Now print the configurations for the tags.
+-    for tagname in $taglist; do
+-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
+-    done
+-    exit 0
+-    ;;
++        # If the last portion added has no slash in it, the list is done
++        case $my_directory_path in */*) ;; *) break ;; esac
+ 
+-  --debug)
+-    $echo "$progname: enabling shell trace mode"
+-    set -x
+-    ;;
++        # ...otherwise throw away the child directory and loop
++        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
++      done
++      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+ 
+-  --dry-run | -n)
+-    run=:
+-    ;;
++      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"
+ 
+-  --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"
++      # 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
+-    exit 0
+-    ;;
++}
+ 
+-  --finish) mode="finish" ;;
+ 
+-  --mode) prevopt="--mode" prev=mode ;;
+-  --mode=*) mode="$optarg" ;;
++# 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}"
+ 
+-  --preserve-dup-deps) duplicate_deps="yes" ;;
++    if test "$opt_dry_run" = ":"; then
++      # Return a directory name, but don't create it in dry-run mode
++      my_tmpdir="${my_template}-$$"
++    else
+ 
+-  --quiet | --silent)
+-    show=:
+-    ;;
++      # If mktemp works, use that first and foremost
++      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+ 
+-  --tag) prevopt="--tag" prev=tag ;;
+-  --tag=*)
+-    set tag "$optarg" ${1+"$@"}
+-    shift
+-    prev=tag
+-    ;;
++      if test ! -d "$my_tmpdir"; then
++        # Failing that, at least try and use $RANDOM to avoid a race
++        my_tmpdir="${my_template}-${RANDOM-0}$$"
+ 
+-  -dlopen)
+-    prevopt="-dlopen"
+-    prev=execute_dlfiles
+-    ;;
++        save_mktempdir_umask=`umask`
++        umask 0077
++        $MKDIR "$my_tmpdir"
++        umask $save_mktempdir_umask
++      fi
+ 
+-  -*)
+-    $echo "$modename: unrecognized option \`$arg'" 1>&2
+-    $echo "$help" 1>&2
+-    exit 1
+-    ;;
++      # 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
+ 
+-  *)
+-    nonopt="$arg"
+-    break
+-    ;;
+-  esac
+-done
++    $ECHO "X$my_tmpdir" | $Xsed
++}
+ 
+-if test -n "$prevopt"; then
+-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+-  $echo "$help" 1>&2
+-  exit 1
+-fi
+ 
+-# 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_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 "X$1" | $Xsed -e "$sed_quote_subst"` ;;
++      *)
++        func_quote_for_eval_unquoted_result="$1" ;;
++    esac
+ 
+-if test -z "$show_help"; then
++    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
++}
+ 
+-  # Infer the operation mode.
+-  if test -z "$mode"; then
+-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+-    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
+-    case $nonopt in
+-    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+-      mode=link
+-      for arg
+-      do
+-	case $arg in
+-	-c)
+-	   mode=compile
+-	   break
+-	   ;;
+-	esac
+-      done
+-      ;;
+-    *db | *dbx | *strace | *truss)
+-      mode=execute
+-      ;;
+-    *install*|cp|mv)
+-      mode=install
+-      ;;
+-    *rm)
+-      mode=uninstall
+-      ;;
+-    *)
+-      # If we have no mode, but dlfiles were specified, then do execute mode.
+-      test -n "$execute_dlfiles" && mode=execute
+ 
+-      # Just use the default operation mode.
+-      if test -z "$mode"; then
+-	if test -n "$nonopt"; then
+-	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
+-	else
+-	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
+-	fi
+-      fi
+-      ;;
++# 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 "X$1" | $Xsed \
++	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
++      *)
++        my_arg="$1" ;;
+     esac
+-  fi
+ 
+-  # Only execute mode is allowed to have -dlopen flags.
+-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
+-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+-    $echo "$help" 1>&2
+-    exit 1
+-  fi
++    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
+ 
+-  # Change the help message to a mode-specific one.
+-  generic_help="$help"
+-  help="Try \`$modename --help --mode=$mode' for more information."
++    func_quote_for_expand_result="$my_arg"
++}
+ 
+-  # These modes are in order of execution frequency so that they run quickly.
+-  case $mode in
+-  # libtool compile mode
+-  compile)
+-    modename="$modename: compile"
+-    # Get the compilation command and the source file.
+-    base_compile=
+-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+-    suppress_output=
+-    arg_mode=normal
+-    libobj=
+ 
+-    for arg
+-    do
+-      case "$arg_mode" in
+-      arg  )
+-	# do not "continue".  Instead, add this to base_compile
+-	lastarg="$arg"
+-	arg_mode=normal
+-	;;
++# 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-:}"
+ 
+-      target )
+-	libobj="$arg"
+-	arg_mode=normal
+-	continue
+-	;;
++    ${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
++}
+ 
+-      normal )
+-	# Accept any command-line options.
+-	case $arg in
+-	-o)
+-	  if test -n "$libobj" ; then
+-	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+-	    exit 1
+-	  fi
+-	  arg_mode=target
+-	  continue
+-	  ;;
+ 
+-	-static)
+-	  build_old_libs=yes
+-	  continue
+-	  ;;
++# 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-:}"
+ 
+-	-prefer-pic)
+-	  pic_mode=yes
+-	  continue
+-	  ;;
++    ${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
++}
+ 
+-	-prefer-non-pic)
+-	  pic_mode=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,*)
+-	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+-	  lastarg=
+-	  save_ifs="$IFS"; IFS=','
+-	  for arg in $args; do
+-	    IFS="$save_ifs"
+ 
+-	    # Double-quote args containing other shell metacharacters.
+-	    # Many Bourne shells cannot handle close brackets correctly
+-	    # in scan sets, so we specify it separately.
+-	    case $arg in
+-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+-	      arg="\"$arg\""
+-	      ;;
+-	    esac
+-	    lastarg="$lastarg $arg"
+-	  done
+-	  IFS="$save_ifs"
+-	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+ 
+-	  # Add the arguments to base_compile.
+-	  base_compile="$base_compile $lastarg"
+-	  continue
+-	  ;;
++# func_version
++# Echo version message to standard output and exit.
++func_version ()
++{
++    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
++        s/^# //
++	s/^# *$//
++        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
++        p
++     }' < "$progpath"
++     exit $?
++}
+ 
+-	* )
+-	  # 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
++# func_usage
++# Echo short help message to standard output and exit.
++func_usage ()
++{
++    $SED -n '/^# Usage:/,/# -h/ {
++        s/^# //
++	s/^# *$//
++	s/\$progname/'$progname'/
++	p
++    }' < "$progpath"
++    $ECHO
++    $ECHO "run \`$progname --help | more' for full usage"
++    exit $?
++}
+ 
+-      # Aesthetically quote the previous argument.
+-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
++# func_help
++# Echo long help message to standard output and exit.
++func_help ()
++{
++    $SED -n '/^# Usage:/,/# Report bugs to/ {
++        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 --version) 2>/dev/null |$SED 1q`"'/
++	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
++	p
++     }' < "$progpath"
++    exit $?
++}
+ 
+-      case $lastarg in
+-      # Double-quote args containing other shell metacharacters.
+-      # Many Bourne shells cannot handle close brackets correctly
+-      # in scan sets, so we specify it separately.
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+-	lastarg="\"$lastarg\""
+-	;;
+-      esac
++# func_missing_arg argname
++# Echo program name prefixed message to standard error and set global
++# exit_cmd.
++func_missing_arg ()
++{
++    func_error "missing argument for $1"
++    exit_cmd=exit
++}
+ 
+-      base_compile="$base_compile $lastarg"
+-    done # for arg
++exit_cmd=:
+ 
+-    case $arg_mode in
+-    arg)
+-      $echo "$modename: you must specify an argument for -Xcompile"
+-      exit 1
+-      ;;
+-    target)
+-      $echo "$modename: you must specify a target with \`-o'" 1>&2
+-      exit 1
++
++
++
++
++# Check that we have a working $ECHO.
++if test "X$1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X$1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
++  # Yippee, $ECHO works!
++  :
++else
++  # Restart under the correct shell, and then maybe $ECHO will work.
++  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
++fi
++
++if test "X$1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++$*
++EOF
++  exit $EXIT_SUCCESS
++fi
++
++magic="%%%MAGIC variable%%%"
++magic_exe="%%%MAGIC EXE variable%%%"
++
++# Global variables.
++# $mode is unset
++nonopt=
++execute_dlfiles=
++preserve_args=
++lo2o="s/\\.lo\$/.${objext}/"
++o2lo="s/\\.${objext}\$/.lo/"
++extracted_archives=
++extracted_serial=0
++
++opt_dry_run=false
++opt_duplicate_deps=false
++opt_silent=false
++opt_debug=:
++
++# 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_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) ;;
+     *)
+-      # Get the name of the library object.
+-      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
++      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
++  esac
++}
+ 
+-    # Recognize several different file suffixes.
+-    # If the user specifies -o file.o, it is replaced with file.lo
+-    xform='[cCFSifmso]'
+-    case $libobj in
+-    *.ada) xform=ada ;;
+-    *.adb) xform=adb ;;
+-    *.ads) xform=ads ;;
+-    *.asm) xform=asm ;;
+-    *.c++) xform=c++ ;;
+-    *.cc) xform=cc ;;
+-    *.ii) xform=ii ;;
+-    *.class) xform=class ;;
+-    *.cpp) xform=cpp ;;
+-    *.cxx) xform=cxx ;;
+-    *.f90) xform=f90 ;;
+-    *.for) xform=for ;;
+-    *.java) xform=java ;;
++# Parse options once, thoroughly.  This comes as soon as possible in
++# the script to make things like `libtool --version' happen quickly.
++{
++
++  # 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
++
++  # Parse non-mode specific arguments:
++  while test "$#" -gt 0; do
++    opt="$1"
++    shift
++
++    case $opt in
++      --config)		func_config					;;
++
++      --debug)		preserve_args="$preserve_args $opt"
++			func_echo "enabling shell trace mode"
++			opt_debug='set -x'
++			$opt_debug
++			;;
++
++      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
++			execute_dlfiles="$execute_dlfiles $1"
++			shift
++			;;
++
++      --dry-run | -n)	opt_dry_run=:					;;
++      --features)       func_features					;;
++      --finish)		mode="finish"					;;
++
++      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
++			case $1 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
++
++			mode="$1"
++			shift
++			;;
++
++      --preserve-dup-deps)
++			opt_duplicate_deps=:				;;
++
++      --quiet|--silent)	preserve_args="$preserve_args $opt"
++			opt_silent=:
++			;;
++
++      --verbose| -v)	preserve_args="$preserve_args $opt"
++			opt_silent=false
++			;;
++
++      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
++			preserve_args="$preserve_args $opt $1"
++			func_enable_tag "$1"	# tagname is set here
++			shift
++			;;
++
++      # Separate optargs to long options:
++      -dlopen=*|--mode=*|--tag=*)
++			func_opt_split "$opt"
++			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
++			shift
++			;;
++
++      -\?|-h)		func_usage					;;
++      --help)		opt_help=:					;;
++      --version)	func_version					;;
++
++      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
++
++      *)		nonopt="$opt"
++			break
++			;;
+     esac
++  done
+ 
+-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+ 
+-    case $libobj in
+-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
++  case $host in
++    *cygwin* | *mingw* | *pw32* | *cegcc*)
++      # don't eliminate duplications in $postdeps and $predeps
++      opt_duplicate_compiler_generated_deps=:
++      ;;
+     *)
+-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+-      exit 1
++      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
+       ;;
++  esac
++
++  # Having warned about all mis-specified options, bail out if
++  # anything was wrong.
++  $exit_cmd $EXIT_FAILURE
++}
++
++# 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
++}
++
++
++## ----------- ##
++##    Main.    ##
++## ----------- ##
++
++$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
++
++  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
++
++
++  # Darwin sucks
++  eval std_shrext=\"$shrext_cmds\"
++
++
++  # Only execute mode is allowed to have -dlopen flags.
++  if test -n "$execute_dlfiles" && test "$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=$mode' for more information."
++}
++
++
++# 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_ltwrapper_scriptname_result=""
++    if func_ltwrapper_executable_p "$1"; then
++	func_dirname_and_basename "$1" "" "."
++	func_stripname '' '.exe' "$func_basename_result"
++	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
++    fi
++}
++
++# 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_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
++
++    # FreeBSD-specific: where we install compilers with non-standard names
++    tag_compilers_CC="*cc cc* *gcc gcc*"
++    tag_compilers_CXX="*c++ c++* *g++ g++*"
++    base_compiler=`set -- "$@"; echo $1`
++
++    # If $tagname isn't set, then try to infer if the default "CC" tag applies
++    if test -z "$tagname"; then
++      for zp in $tag_compilers_CC; do
++        case $base_compiler in
++	 $zp) tagname="CC"; break;;
++	esac
++      done
++    fi
+ 
+-    # 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.
+     if test -n "$available_tags" && test -z "$tagname"; then
+-      case $base_compile in
++      CC_quoted=
++      for arg in $CC; do
++        func_quote_for_eval "$arg"
++	CC_quoted="$CC_quoted $func_quote_for_eval_result"
++      done
++      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 "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
++      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+       # 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$" < "$0" > /dev/null; then
++	  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' < $0`"
+-	    case "$base_compile " in
+-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
++	    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_quote_for_eval "$arg"
++	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
++	    done
++	    case "$@ " in
++	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+ 	      # The compiler in the base compile command matches
+ 	      # the one in the tagged configuration.
+ 	      # Assume this is the tagged configuration we want.
+@@ -540,81 +1057,285 @@ if test -z "$show_help"; then
+ 	      break
+ 	      ;;
+ 	    esac
+-	  fi
++
++	    # FreeBSD-specific: try compilers based on inferred tag
++	    if test -z "$tagname"; then
++	      eval "tag_compilers=\$tag_compilers_${z}"
++	      if test -n "$tag_compilers"; then
++		for zp in $tag_compilers; do
++		  case $base_compiler in   
++		    $zp) tagname=$z; break;;
++		  esac
++		done
++		if test -n "$tagname"; then
++		  break
++		fi
++	      fi
++            fi
++          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
+-	  $echo "$modename: unable to infer tagged configuration"
+-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+-	  exit 1
+-#        else
+-#          $echo "$modename: using $tagname tagged configuration"
++	  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
++}
+ 
+-    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+-    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+-    if test "X$xdir" = "X$obj"; then
+-      xdir=
+-    else
+-      xdir=$xdir/
+-    fi
+-    lobj=${xdir}$objdir/$objname
+ 
+-    if test -z "$base_compile"; then
+-      $echo "$modename: you must specify a compilation command" 1>&2
+-      $echo "$help" 1>&2
+-      exit 1
++
++# 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
+ 
+-    # Delete any leftover library objects.
+     if test "$build_old_libs" = yes; then
+-      removelist="$obj $lobj $libobj ${libobj}T"
++      write_oldobj=\'${3}\'
+     else
+-      removelist="$lobj $libobj ${libobj}T"
++      write_oldobj=none
+     fi
+ 
+-    $run $rm $removelist
+-    trap "$run $rm $removelist; exit 1" 1 2 15
++    $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.
+ 
+-    # On Cygwin there's no "real" PIC flag so we must build both object types
+-    case $host_os in
+-    cygwin* | mingw* | pw32* | os2*)
+-      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
++# Name of the PIC object.
++pic_object=$write_lobj
+ 
+-    # 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 "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+-      lockfile="$output_obj.lock"
+-      removelist="$removelist $output_obj $lockfile"
+-      trap "$run $rm $removelist; exit 1" 1 2 15
+-    else
+-      output_obj=
+-      need_locks=no
++# Name of the non-PIC object
++non_pic_object=$write_oldobj
++
++EOF
++      $MV "${write_libobj}T" "${write_libobj}"
++    }
++}
++
++# 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)
++          pie_flag="$pie_flag $arg"
++	  continue
++	  ;;
++
++	-shared | -static | -prefer-pic | -prefer-non-pic)
++	  later="$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_quote_for_eval "$arg"
++	    lastarg="$lastarg $func_quote_for_eval_result"
++	  done
++	  IFS="$save_ifs"
++	  func_stripname ' ' '' "$lastarg"
++	  lastarg=$func_stripname_result
++
++	  # Add the arguments to base_compile.
++	  base_compile="$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_quote_for_eval "$lastarg"
++      base_compile="$base_compile $func_quote_for_eval_result"
++    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 | *.obj | *.sx)
++      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 "X$srcfile" | $Xsed -e 's%^.*/%%' -e '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 $run ln "$0" "$lockfile" 2>/dev/null; do
+-	$show "Waiting for $lockfile to be removed"
++      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 "\
++	$ECHO "\
+ *** ERROR, $lockfile exists and contains:
+ `cat $lockfile 2>/dev/null`
+ 
+@@ -625,29 +1346,22 @@ repeat this compilation, it may succeed,
+ avoid parallel builds (make -j) in this platform, or get a better
+ compiler."
+ 
+-	$run $rm $removelist
+-	exit 1
++	$opt_dry_run || $RM $removelist
++	exit $EXIT_FAILURE
+       fi
+-      $echo $srcfile > "$lockfile"
++      removelist="$removelist $output_obj"
++      $ECHO "$srcfile" > "$lockfile"
+     fi
+ 
++    $opt_dry_run || $RM $removelist
++    removelist="$removelist $lockfile"
++    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
++
+     if test -n "$fix_srcfile_path"; then
+       eval srcfile=\"$fix_srcfile_path\"
+     fi
+-
+-    $run $rm "$libobj" "${libobj}T"
+-
+-    # Create a libtool object file (analogous to a ".la" file),
+-    # but don't create it if we're doing a dry run.
+-    test -z "$run" && cat > ${libobj}T <<EOF
+-# $libobj - a libtool object file
+-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+-#
+-# Please DO NOT delete this file!
+-# It is necessary for linking the library.
+-
+-# Name of the PIC object.
+-EOF
++    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
+@@ -655,38 +1369,25 @@ EOF
+       fbsd_hideous_sh_bug=$base_compile
+ 
+       if test "$pic_mode" != no; then
+-	command="$base_compile $srcfile $pic_flag"
++	command="$base_compile $qsrcfile $pic_flag"
+       else
+ 	# Don't build PIC code
+-	command="$base_compile $srcfile"
++	command="$base_compile $qsrcfile"
+       fi
+ 
+-      if test ! -d "${xdir}$objdir"; then
+-	$show "$mkdir ${xdir}$objdir"
+-	$run $mkdir ${xdir}$objdir
+-	status=$?
+-	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
+-	  exit $status
+-	fi
+-      fi
++      func_mkdir_p "$xdir$objdir"
+ 
+       if test -z "$output_obj"; then
+ 	# Place PIC objects in $objdir
+ 	command="$command -o $lobj"
+       fi
+ 
+-      $run $rm "$lobj" "$output_obj"
+-
+-      $show "$command"
+-      if $run eval "$command"; then :
+-      else
+-	test -n "$output_obj" && $run $rm $removelist
+-	exit 1
+-      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 "\
++	$ECHO "\
+ *** ERROR, $lockfile contains:
+ `cat $lockfile 2>/dev/null`
+ 
+@@ -700,45 +1401,29 @@ repeat this compilation, it may succeed,
+ avoid parallel builds (make -j) in this platform, or get a better
+ compiler."
+ 
+-	$run $rm $removelist
+-	exit 1
++	$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
+-	$show "$mv $output_obj $lobj"
+-	if $run $mv $output_obj $lobj; then :
+-	else
+-	  error=$?
+-	  $run $rm $removelist
+-	  exit $error
+-	fi
++	func_show_eval '$MV "$output_obj" "$lobj"' \
++	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+       fi
+ 
+-      # Append the name of the PIC object to the libtool object file.
+-      test -z "$run" && cat >> ${libobj}T <<EOF
+-pic_object='$objdir/$objname'
+-
+-EOF
+-
+       # Allow error messages only from the first compilation.
+-      suppress_output=' >/dev/null 2>&1'
+-    else
+-      # No PIC object so indicate it doesn't exist in the libtool
+-      # object file.
+-      test -z "$run" && cat >> ${libobj}T <<EOF
+-pic_object=none
+-
+-EOF
++      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 $srcfile"
++	command="$base_compile $qsrcfile$pie_flag"
+       else
+-	command="$base_compile $srcfile $pic_flag"
++	command="$base_compile $qsrcfile $pic_flag"
+       fi
+       if test "$compiler_c_o" = yes; then
+ 	command="$command -o $obj"
+@@ -746,17 +1431,12 @@ EOF
+ 
+       # Suppress compiler output if we already did a PIC compilation.
+       command="$command$suppress_output"
+-      $run $rm "$obj" "$output_obj"
+-      $show "$command"
+-      if $run eval "$command"; then :
+-      else
+-	$run $rm $removelist
+-	exit 1
+-      fi
++      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 "\
++	$ECHO "\
+ *** ERROR, $lockfile contains:
+ `cat $lockfile 2>/dev/null`
+ 
+@@ -770,5112 +1450,6798 @@ repeat this compilation, it may succeed,
+ avoid parallel builds (make -j) in this platform, or get a better
+ compiler."
+ 
+-	$run $rm $removelist
+-	exit 1
++	$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
+-	$show "$mv $output_obj $obj"
+-	if $run $mv $output_obj $obj; then :
+-	else
+-	  error=$?
+-	  $run $rm $removelist
+-	  exit $error
+-	fi
++	func_show_eval '$MV "$output_obj" "$obj"' \
++	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+       fi
++    fi
+ 
+-      # Append the name of the non-PIC object the libtool object file.
+-      # Only append if the libtool object file exists.
+-      test -z "$run" && cat >> ${libobj}T <<EOF
+-# Name of the non-PIC object.
+-non_pic_object='$objname'
++    $opt_dry_run || {
++      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+ 
+-EOF
+-    else
+-      # Append the name of the non-PIC object the libtool object file.
+-      # Only append if the libtool object file exists.
+-      test -z "$run" && cat >> ${libobj}T <<EOF
+-# Name of the non-PIC object.
+-non_pic_object=none
++      # Unlock the critical section if it was locked
++      if test "$need_locks" != no; then
++	removelist=$lockfile
++        $RM "$lockfile"
++      fi
++    }
+ 
+-EOF
+-    fi
++    exit $EXIT_SUCCESS
++}
+ 
+-    $run $mv "${libobj}T" "${libobj}"
++$opt_help || {
++test "$mode" = compile && func_mode_compile ${1+"$@"}
++}
+ 
+-    # Unlock the critical section if it was locked
+-    if test "$need_locks" != no; then
+-      $run $rm "$lockfile"
+-    fi
++func_mode_help ()
++{
++    # We need to display help for each of the modes.
++    case $mode in
++      "")
++        # Generic help is extracted from the usage comments
++        # at the start of this file.
++        func_help
++        ;;
+ 
+-    exit 0
+-    ;;
++      clean)
++        $ECHO \
++"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+ 
+-  # libtool link mode
+-  link | relink)
+-    modename="$modename: link"
+-    case $host in
+-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+-      # 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
++Remove files from the build directory.
+ 
+-      # 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"
++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.
+ 
+-    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=
++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."
++        ;;
+ 
+-    avoid_version=no
+-    dlfiles=
+-    dlprefiles=
+-    dlself=no
+-    export_dynamic=no
+-    export_symbols=
+-    export_symbols_regex=
+-    generated=
+-    libobjs=
+-    ltlibs=
+-    module=no
+-    no_install=no
+-    objs=
+-    non_pic_objects=
+-    prefer_static_libs=no
+-    preload=no
+-    prev=
+-    prevarg=
+-    release=
+-    rpath=
+-    xrpath=
+-    perm_rpath=
+-    temp_rpath=
+-    thread_safe=no
+-    vinfo=
+-    vinfo_number=no
++      compile)
++      $ECHO \
++"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+ 
+-    # We need to know -static, to get the right output filenames.
+-    for arg
+-    do
+-      case $arg in
+-      -all-static | -static)
+-	if test "X$arg" = "X-all-static"; then
+-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+-	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+-	  fi
+-	  if test -n "$link_static_flag"; then
+-	    dlopen_self=$dlopen_self_static
+-	  fi
+-	else
+-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+-	    dlopen_self=$dlopen_self_static
+-	  fi
+-	fi
+-	build_libtool_libs=no
+-	build_old_libs=yes
+-	prefer_static_libs=yes
+-	break
+-	;;
+-      esac
+-    done
++Compile a source file into a libtool library object.
+ 
+-    # See if our shared archives depend on static archives.
+-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
++This mode accepts the following additional options:
+ 
+-    # Go through the arguments, transforming them on the way.
+-    while test "$#" -gt 0; do
+-      arg="$1"
+-      base_compile="$base_compile $arg"
+-      shift
+-      case $arg in
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+-	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
+-	;;
+-      *) qarg=$arg ;;
+-      esac
+-      libtool_args="$libtool_args $qarg"
++  -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 building PIC objects only
++  -prefer-non-pic   try to building 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
+ 
+-      # If the previous option needs an argument, assign it.
+-      if test -n "$prev"; then
+-	case $prev in
+-	output)
+-	  compile_command="$compile_command @OUTPUT@"
+-	  finalize_command="$finalize_command @OUTPUT@"
+-	  ;;
+-	esac
++COMPILE-COMMAND is a command to be used in creating a \`standard' object file
++from the given SOURCEFILE.
+ 
+-	case $prev in
+-	dlfiles|dlprefiles)
+-	  if test "$preload" = no; then
+-	    # Add the symbol object into the linking commands.
+-	    compile_command="$compile_command @SYMFILE@"
+-	    finalize_command="$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
+-	      dlfiles="$dlfiles $arg"
+-	    else
+-	      dlprefiles="$dlprefiles $arg"
+-	    fi
+-	    prev=
+-	    continue
+-	    ;;
+-	  esac
+-	  ;;
+-	expsyms)
+-	  export_symbols="$arg"
+-	  if test ! -f "$arg"; then
+-	    $echo "$modename: symbol file \`$arg' does not exist"
+-	    exit 1
+-	  fi
+-	  prev=
+-	  continue
+-	  ;;
+-	expsyms_regex)
+-	  export_symbols_regex="$arg"
+-	  prev=
+-	  continue
+-	  ;;
+-	inst_prefix)
+-	  inst_prefix_dir="$arg"
+-	  prev=
+-	  continue
+-	  ;;
+-	release)
+-	  release="-$arg"
+-	  prev=
+-	  continue
+-	  ;;
+-	objectlist)
+-	  if test -f "$arg"; then
+-	    save_arg=$arg
+-	    moreargs=
+-	    for fil in `cat $save_arg`
+-	    do
+-#	      moreargs="$moreargs $fil"
+-	      arg=$fil
+-	      # A libtool-controlled object.
++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'."
++        ;;
+ 
+-	      # Check to see that this really is a libtool object.
+-	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+-		pic_object=
+-		non_pic_object=
++      execute)
++        $ECHO \
++"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+ 
+-		# Read the .lo file
+-		# If there is no directory component, then add one.
+-		case $arg in
+-		*/* | *\\*) . $arg ;;
+-		*) . ./$arg ;;
+-		esac
++Automatically set library path, then run a program.
+ 
+-		if test -z "$pic_object" || \
+-		   test -z "$non_pic_object" ||
+-		   test "$pic_object" = none && \
+-		   test "$non_pic_object" = none; then
+-		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+-		  exit 1
+-		fi
++This mode accepts the following additional options:
+ 
+-		# Extract subdirectory from the argument.
+-		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+-		if test "X$xdir" = "X$arg"; then
+-		  xdir=
+-		else
+-		  xdir="$xdir/"
+-		fi
++  -dlopen FILE      add the directory containing FILE to the library path
+ 
+-		if test "$pic_object" != none; then
+-		  # Prepend the subdirectory the object is found in.
+-		  pic_object="$xdir$pic_object"
++This mode sets the library path environment variable according to \`-dlopen'
++flags.
+ 
+-		  if test "$prev" = dlfiles; then
+-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+-		      dlfiles="$dlfiles $pic_object"
+-		      prev=
+-		      continue
+-		    else
+-		      # If libtool objects are unsupported, then we need to preload.
+-		      prev=dlprefiles
+-		    fi
+-		  fi
++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.
+ 
+-		  # CHECK ME:  I think I busted this.  -Ossama
+-		  if test "$prev" = dlprefiles; then
+-		    # Preload the old-style object.
+-		    dlprefiles="$dlprefiles $pic_object"
+-		    prev=
+-		  fi
++Then, COMMAND is executed, with ARGS as arguments."
++        ;;
+ 
+-		  # A PIC object.
+-		  libobjs="$libobjs $pic_object"
+-		  arg="$pic_object"
+-		fi
++      finish)
++        $ECHO \
++"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+ 
+-		# 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"
++Complete the installation of libtool libraries.
+ 
+-		  # A standard non-PIC object
+-		  non_pic_objects="$non_pic_objects $non_pic_object"
+-		  if test -z "$pic_object" || test "$pic_object" = none ; then
+-		    arg="$non_pic_object"
+-		  fi
+-		fi
+-	      else
+-		# Only an error if not doing a dry-run.
+-		if test -z "$run"; then
+-		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+-		  exit 1
+-		else
+-		  # Dry-run case.
++Each LIBDIR is a directory that contains libtool libraries.
+ 
+-		  # Extract subdirectory from the argument.
+-		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+-		  if test "X$xdir" = "X$arg"; then
+-		    xdir=
+-		  else
+-		    xdir="$xdir/"
+-		  fi
++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."
++        ;;
+ 
+-		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+-		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+-		  libobjs="$libobjs $pic_object"
+-		  non_pic_objects="$non_pic_objects $non_pic_object"
+-		fi
+-	      fi
+-	    done
+-	  else
+-	    $echo "$modename: link input file \`$save_arg' does not exist"
+-	    exit 1
+-	  fi
+-	  arg=$save_arg
+-	  prev=
+-	  continue
+-	  ;;
+-	rpath | xrpath)
+-	  # We need an absolute path.
+-	  case $arg in
+-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+-	  *)
+-	    $echo "$modename: only absolute run-paths are allowed" 1>&2
+-	    exit 1
+-	    ;;
+-	  esac
+-	  if test "$prev" = rpath; then
+-	    case "$rpath " in
+-	    *" $arg "*) ;;
+-	    *) rpath="$rpath $arg" ;;
+-	    esac
+-	  else
+-	    case "$xrpath " in
+-	    *" $arg "*) ;;
+-	    *) xrpath="$xrpath $arg" ;;
+-	    esac
+-	  fi
+-	  prev=
+-	  continue
+-	  ;;
+-	xcompiler)
+-	  compiler_flags="$compiler_flags $qarg"
+-	  prev=
+-	  compile_command="$compile_command $qarg"
+-	  finalize_command="$finalize_command $qarg"
+-	  continue
+-	  ;;
+-	xlinker)
+-	  linker_flags="$linker_flags $qarg"
+-	  compiler_flags="$compiler_flags $wl$qarg"
+-	  prev=
+-	  compile_command="$compile_command $wl$qarg"
+-	  finalize_command="$finalize_command $wl$qarg"
+-	  continue
+-	  ;;
+-	xcclinker)
+-	  linker_flags="$linker_flags $qarg"
+-	  compiler_flags="$compiler_flags $qarg"
+-	  prev=
+-	  compile_command="$compile_command $qarg"
+-	  finalize_command="$finalize_command $qarg"
+-	  continue
+-	  ;;
+-	*)
+-	  eval "$prev=\"\$arg\""
+-	  prev=
+-	  continue
+-	  ;;
+-	esac
+-      fi # test -n "$prev"
++      install)
++        $ECHO \
++"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+ 
+-      prevarg="$arg"
++Install executables or libraries.
+ 
+-      case $arg in
+-      -all-static)
+-	if test -n "$link_static_flag"; then
+-	  compile_command="$compile_command $link_static_flag"
+-	  finalize_command="$finalize_command $link_static_flag"
+-	fi
+-	continue
+-	;;
++INSTALL-COMMAND is the installation command.  The first component should be
++either the \`install' or \`cp' program.
+ 
+-      -allow-undefined)
+-	# FIXME: remove this flag sometime in the future.
+-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
+-	continue
+-	;;
++The following components of INSTALL-COMMAND are treated specially:
+ 
+-      -avoid-version)
+-	avoid_version=yes
+-	continue
+-	;;
++  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+ 
+-      -dlopen)
+-	prev=dlfiles
+-	continue
+-	;;
++The rest of the components are interpreted as arguments to that command (only
++BSD-compatible install options are recognized)."
++        ;;
+ 
+-      -dlpreopen)
+-	prev=dlprefiles
+-	continue
+-	;;
++      link)
++        $ECHO \
++"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+ 
+-      -export-dynamic)
+-	export_dynamic=yes
+-	continue
+-	;;
++Link object files or libraries together to form another library, or to
++create an executable program.
+ 
+-      -export-symbols | -export-symbols-regex)
+-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+-	  $echo "$modename: more than one -exported-symbols argument is not allowed"
+-	  exit 1
+-	fi
+-	if test "X$arg" = "X-export-symbols"; then
+-	  prev=expsyms
+-	else
+-	  prev=expsyms_regex
+-	fi
+-	continue
+-	;;
++LINK-COMMAND is a command using the C compiler that you would use to create
++a program from several object files.
+ 
+-      -inst-prefix-dir)
+-	prev=inst_prefix
+-	continue
+-	;;
++The following components of LINK-COMMAND are treated specially:
+ 
+-      # 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*)
+-	  compile_command="$compile_command $arg"
+-	  finalize_command="$finalize_command $arg"
+-	  ;;
+-	esac
+-	continue
+-	;;
++  -all-static       do not do any dynamic linking at all
++  -avoid-version    do not add a version suffix if possible
++  -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
+ 
+-      -L*)
+-	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
+-	# We need an absolute path.
+-	case $dir in
+-	[\\/]* | [A-Za-z]:[\\/]*) ;;
+-	*)
+-	  absdir=`cd "$dir" && pwd`
+-	  if test -z "$absdir"; then
+-	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+-	    exit 1
+-	  fi
+-	  dir="$absdir"
+-	  ;;
+-	esac
+-	case "$deplibs " in
+-	*" -L$dir "*) ;;
+-	*)
+-	  deplibs="$deplibs -L$dir"
+-	  lib_search_path="$lib_search_path $dir"
+-	  ;;
+-	esac
+-	case $host in
+-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+-	  case :$dllsearchpath: in
+-	  *":$dir:"*) ;;
+-	  *) dllsearchpath="$dllsearchpath:$dir";;
+-	  esac
+-	  ;;
+-	esac
+-	continue
+-	;;
++All other options (arguments beginning with \`-') are ignored.
+ 
+-      -l*)
+-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+-	  case $host in
+-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
+-	    # These systems don't actually have a C or math library (as such)
+-	    continue
+-	    ;;
+-	  *-*-mingw* | *-*-os2*)
+-	    # These systems don't actually have a C library (as such)
+-	    test "X$arg" = "X-lc" && continue
+-	    ;;
+-	  *-*-openbsd* | *-*-freebsd*)
+-	    # 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
+-	    deplibs="$deplibs -framework System"
+-	    continue
+-	  esac
+-	elif test "X$arg" = "X-lc_r"; then
+-	 case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
+-	   # Do not include libc_r directly, use -pthread flag.
+-	   continue
+-	   ;;
+-	 esac
+-	fi
+-	deplibs="$deplibs $arg"
+-	continue
+-	;;
++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.
+ 
+-      -module)
+-	module=yes
+-	continue
+-	;;
++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.
+ 
+-      # gcc -m* arguments should be passed to the linker via $compiler_flags
+-      # in order to pass architecture information to the linker
+-      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
+-      # but this is not reliable with gcc because gcc may use -mfoo to
+-      # select a different linker, different libraries, etc, while
+-      # -Wl,-mfoo simply passes -mfoo to the linker.
+-      -m*)
+-	# Unknown arguments in both finalize_command and compile_command need
+-	# to be aesthetically quoted because they are evaled later.
+-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+-	case $arg in
+-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+-	  arg="\"$arg\""
+-	  ;;
+-	esac
+-        compile_command="$compile_command $arg"
+-        finalize_command="$finalize_command $arg"
+-        if test "$with_gcc" = "yes" ; then
+-          compiler_flags="$compiler_flags $arg"
+-        fi
+-        continue
++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."
+         ;;
+ 
+-      -shrext)
+-	prev=shrext
+-	continue
+-	;;
++      uninstall)
++        $ECHO \
++"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+ 
+-      -no-fast-install)
+-	fast_install=no
+-	continue
+-	;;
++Remove libraries from an installation directory.
+ 
+-      -no-install)
+-	case $host in
+-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+-	  # The PATH hackery in wrapper scripts is required on Windows
+-	  # in order for the loader to find any dlls it needs.
+-	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
+-	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+-	  fast_install=no
+-	  ;;
+-	*) no_install=yes ;;
+-	esac
+-	continue
+-	;;
++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.
+ 
+-      -no-undefined)
+-	allow_undefined=no
+-	continue
+-	;;
++If FILE is a libtool library, all the files associated with it are deleted.
++Otherwise, only FILE itself is deleted using RM."
++        ;;
+ 
+-      -objectlist)
+-	prev=objectlist
+-	continue
+-	;;
++      *)
++        func_fatal_help "invalid operation mode \`$mode'"
++        ;;
++    esac
+ 
+-      -o) prev=output ;;
++    $ECHO
++    $ECHO "Try \`$progname --help' for more information about other modes."
+ 
+-      -release)
+-	prev=release
+-	continue
+-	;;
++    exit $?
++}
+ 
+-      -rpath)
+-	prev=rpath
+-	continue
+-	;;
++  # Now that we've collected a possible --mode arg, show help if necessary
++  $opt_help && func_mode_help
+ 
+-      -R)
+-	prev=xrpath
+-	continue
+-	;;
+ 
+-      -R*)
+-	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
+-	# We need an absolute path.
+-	case $dir in
+-	[\\/]* | [A-Za-z]:[\\/]*) ;;
+-	*)
+-	  $echo "$modename: only absolute run-paths are allowed" 1>&2
+-	  exit 1
+-	  ;;
+-	esac
+-	case "$xrpath " in
+-	*" $dir "*) ;;
+-	*) xrpath="$xrpath $dir" ;;
+-	esac
+-	continue
+-	;;
++# 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"
+ 
+-      -static)
+-	# 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
+-	;;
++    # Handle -dlopen flags immediately.
++    for file in $execute_dlfiles; do
++      test -f "$file" \
++	|| func_fatal_help "\`$file' is not a file"
+ 
+-      -thread-safe)
+-	thread_safe=yes
+-	continue
+-	;;
++      dir=
++      case $file in
++      *.la)
++	# 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"
+ 
+-      -version-info)
+-	prev=vinfo
+-	continue
+-	;;
+-      -version-number)
+-	prev=vinfo
+-	vinfo_number=yes
+-	continue
+-	;;
++	# Read the libtool library.
++	dlname=
++	library_names=
++	func_source "$file"
+ 
+-      -Wc,*)
+-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
+-	arg=
+-	save_ifs="$IFS"; IFS=','
+-	for flag in $args; do
+-	  IFS="$save_ifs"
+-	  case $flag in
+-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+-	    flag="\"$flag\""
+-	    ;;
+-	  esac
+-	  arg="$arg $wl$flag"
+-	  compiler_flags="$compiler_flags $flag"
+-	done
+-	IFS="$save_ifs"
+-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
++	# 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
++	  dir="$dir/$objdir"
++	else
++	  if test ! -f "$dir/$dlname"; then
++	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
++	  fi
++	fi
+ 	;;
+ 
+-      -Wl,*)
+-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+-	arg=
+-	save_ifs="$IFS"; IFS=','
+-	for flag in $args; do
+-	  IFS="$save_ifs"
+-	  case $flag in
+-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+-	    flag="\"$flag\""
+-	    ;;
+-	  esac
+-	  arg="$arg $wl$flag"
+-	  compiler_flags="$compiler_flags $wl$flag"
+-	  linker_flags="$linker_flags $flag"
+-	done
+-	IFS="$save_ifs"
+-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
++      *.lo)
++	# Just add the directory containing the .lo file.
++	func_dirname "$file" "" "."
++	dir="$func_dirname_result"
+ 	;;
+ 
+-      -Xcompiler)
+-	prev=xcompiler
++      *)
++	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+ 	continue
+ 	;;
++      esac
+ 
+-      -Xlinker)
+-	prev=xlinker
+-	continue
+-	;;
++      # Get the absolute pathname.
++      absdir=`cd "$dir" && pwd`
++      test -n "$absdir" && dir="$absdir"
+ 
+-      -XCClinker)
+-	prev=xcclinker
+-	continue
+-	;;
++      # 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
+ 
+-      # Some other compiler flag.
+-      -* | +*)
+-	# Unknown arguments in both finalize_command and compile_command need
+-	# to be aesthetically quoted because they are evaled later.
+-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+-	case $arg in
+-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+-	  arg="\"$arg\""
+-	  ;;
+-	esac
+-	;;
++    # This variable tells wrapper scripts just to set shlibpath_var
++    # rather than running their programs.
++    libtool_execute_magic="$magic"
+ 
+-      *.$objext)
+-	# A standard object.
+-	objs="$objs $arg"
++    # Check if any of the arguments is a wrapper script.
++    args=
++    for file
++    do
++      case $file in
++      -*) ;;
++      *)
++	# 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_quote_for_eval "$file"
++      args="$args $func_quote_for_eval_result"
++    done
+ 
+-      *.lo)
+-	# A libtool-controlled object.
+-
+-	# Check to see that this really is a libtool object.
+-	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+-	  pic_object=
+-	  non_pic_object=
+-
+-	  # Read the .lo file
+-	  # If there is no directory component, then add one.
+-	  case $arg in
+-	  */* | *\\*) . $arg ;;
+-	  *) . ./$arg ;;
+-	  esac
+-
+-	  if test -z "$pic_object" || \
+-	     test -z "$non_pic_object" ||
+-	     test "$pic_object" = none && \
+-	     test "$non_pic_object" = none; then
+-	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+-	    exit 1
+-	  fi
+-
+-	  # Extract subdirectory from the argument.
+-	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+-	  if test "X$xdir" = "X$arg"; then
+-	    xdir=
+- 	  else
+-	    xdir="$xdir/"
+-	  fi
+-
+-	  if test "$pic_object" != none; then
+-	    # Prepend the subdirectory the object is found in.
+-	    pic_object="$xdir$pic_object"
++    if test "X$opt_dry_run" = Xfalse; then
++      if test -n "$shlibpath_var"; then
++	# Export the shlibpath_var.
++	eval "export $shlibpath_var"
++      fi
+ 
+-	    if test "$prev" = dlfiles; then
+-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+-		dlfiles="$dlfiles $pic_object"
+-		prev=
+-		continue
++      # 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
+-		# If libtool objects are unsupported, then we need to preload.
+-		prev=dlprefiles
+-	      fi
+-	    fi
++		$lt_unset $lt_var
++	      fi"
++      done
+ 
+-	    # CHECK ME:  I think I busted this.  -Ossama
+-	    if test "$prev" = dlprefiles; then
+-	      # Preload the old-style object.
+-	      dlprefiles="$dlprefiles $pic_object"
+-	      prev=
+-	    fi
++      # 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
++}
+ 
+-	    # A PIC object.
+-	    libobjs="$libobjs $pic_object"
+-	    arg="$pic_object"
+-	  fi
++test "$mode" = execute && func_mode_execute ${1+"$@"}
+ 
+-	  # 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
+-	    non_pic_objects="$non_pic_objects $non_pic_object"
+-	    if test -z "$pic_object" || test "$pic_object" = none ; then
+-	      arg="$non_pic_object"
+-	    fi
+-	  fi
+-	else
+-	  # Only an error if not doing a dry-run.
+-	  if test -z "$run"; then
+-	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+-	    exit 1
+-	  else
+-	    # Dry-run case.
++# func_mode_finish arg...
++func_mode_finish ()
++{
++    $opt_debug
++    libdirs="$nonopt"
++    admincmds=
+ 
+-	    # Extract subdirectory from the argument.
+-	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+-	    if test "X$xdir" = "X$arg"; then
+-	      xdir=
+-	    else
+-	      xdir="$xdir/"
+-	    fi
++    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
++      for dir
++      do
++	libdirs="$libdirs $dir"
++      done
+ 
+-	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+-	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+-	    libobjs="$libobjs $pic_object"
+-	    non_pic_objects="$non_pic_objects $non_pic_object"
+-	  fi
++      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
+-	;;
+-
+-      *.$libext)
+-	# An archive.
+-	deplibs="$deplibs $arg"
+-	old_deplibs="$old_deplibs $arg"
+-	continue
+-	;;
+-
+-      *.la)
+-	# A libtool-controlled library.
+-
+-	if test "$prev" = dlfiles; then
+-	  # This library was specified with -dlopen.
+-	  dlfiles="$dlfiles $arg"
+-	  prev=
+-	elif test "$prev" = dlprefiles; then
+-	  # The library was specified with -dlpreopen.
+-	  dlprefiles="$dlprefiles $arg"
+-	  prev=
+-	else
+-	  deplibs="$deplibs $arg"
++	if test -n "$finish_eval"; then
++	  # Do the single finish_eval.
++	  eval cmds=\"$finish_eval\"
++	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
++       $cmds"
+ 	fi
+-	continue
+-	;;
++      done
++    fi
+ 
+-      # Some other compiler argument.
+-      *)
+-	# Unknown arguments in both finalize_command and compile_command need
+-	# to be aesthetically quoted because they are evaled later.
+-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+-	case $arg in
+-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+-	  arg="\"$arg\""
+-	  ;;
+-	esac
+-	;;
+-      esac # arg
++    # Exit here if they wanted silent mode.
++    $opt_silent && exit $EXIT_SUCCESS
+ 
+-      # Now actually substitute the argument into the commands.
+-      if test -n "$arg"; then
+-	compile_command="$compile_command $arg"
+-	finalize_command="$finalize_command $arg"
+-      fi
+-    done # argument parsing loop
++    $ECHO "X----------------------------------------------------------------------" | $Xsed
++    $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\"
+ 
+-    if test -n "$prev"; then
+-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+-      $echo "$help" 1>&2
+-      exit 1
++      $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
+ 
+-    # 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 link
+-    # command doesn't match the default compiler.
+-    if test -n "$available_tags" && test -z "$tagname"; then
+-      case $base_compile 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 "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
+-      # 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$" < "$0" > /dev/null; then
+-	    # Evaluate the configuration.
+-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+-	    case $base_compile in
+-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+-	      # The compiler in $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
+-	  $echo "$modename: unable to infer tagged configuration"
+-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+-	  exit 1
+-#       else
+-#         $echo "$modename: using $tagname tagged configuration"
+-	fi
++    $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."
+ 	;;
+-      esac
+-    fi
++      *)
++        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
++        ;;
++    esac
++    $ECHO "X----------------------------------------------------------------------" | $Xsed
++    exit $EXIT_SUCCESS
++}
+ 
+-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+-      eval arg=\"$export_dynamic_flag_spec\"
+-      compile_command="$compile_command $arg"
+-      finalize_command="$finalize_command $arg"
+-    fi
++test "$mode" = finish && func_mode_finish ${1+"$@"}
+ 
+-    oldlibs=
+-    # calculate the name of the file, without its directory
+-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
+-    libobjs_save="$libobjs"
+ 
+-    if test -n "$shlibpath_var"; then
+-      # get the directories listed in $shlibpath_var
+-      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
++# 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.
++       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
++      # Aesthetically quote it.
++      func_quote_for_eval "$nonopt"
++      install_prog="$func_quote_for_eval_result "
++      arg=$1
++      shift
+     else
+-      shlib_search_path=
++      install_prog=
++      arg=$nonopt
+     fi
+-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+ 
+-    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
+-    if test "X$output_objdir" = "X$output"; then
+-      output_objdir="$objdir"
+-    else
+-      output_objdir="$output_objdir/$objdir"
+-    fi
+-    # Create the object directory.
+-    if test ! -d "$output_objdir"; then
+-      $show "$mkdir $output_objdir"
+-      $run $mkdir $output_objdir
+-      status=$?
+-      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
+-	exit $status
++    # The real first argument should be the name of the installation program.
++    # Aesthetically quote it.
++    func_quote_for_eval "$arg"
++    install_prog="$install_prog$func_quote_for_eval_result"
++
++    # We need to accept at least all the BSD install flags.
++    dest=
++    files=
++    opts=
++    prev=
++    install_type=
++    isdir=no
++    stripme=
++    for arg
++    do
++      if test -n "$dest"; then
++	files="$files $dest"
++	dest=$arg
++	continue
+       fi
+-    fi
+ 
+-    # Determine the type of output
+-    case $output in
+-    "")
+-      $echo "$modename: you must specify an output file" 1>&2
+-      $echo "$help" 1>&2
+-      exit 1
+-      ;;
+-    *.$libext) linkmode=oldlib ;;
+-    *.lo | *.$objext) linkmode=obj ;;
+-    *.la) linkmode=lib ;;
+-    *) linkmode=prog ;; # Anything else should be a program.
+-    esac
++      case $arg in
++      -d) isdir=yes ;;
++      -f)
++	case " $install_prog " in
++	*[\\\ /]cp\ *) ;;
++	*) prev=$arg ;;
++	esac
++	;;
++      -g | -m | -o)
++	prev=$arg
++	;;
++      -s)
++	stripme=" -s"
++	continue
++	;;
++      -*)
++	;;
++      *)
++	# If the previous option needed an argument, then skip it.
++	if test -n "$prev"; then
++	  prev=
++	else
++	  dest=$arg
++	  continue
++	fi
++	;;
++      esac
+ 
+-    case $host in
+-    *cygwin* | *mingw* | *pw32*)
+-      # don't eliminate duplcations in $postdeps and $predeps
+-      duplicate_compiler_generated_deps=yes
+-      ;;
++      # Aesthetically quote the argument.
++      func_quote_for_eval "$arg"
++      install_prog="$install_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 -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]:[\\/]*) ;;
+     *)
+-      duplicate_compiler_generated_deps=$duplicate_deps
++      for file in $files; do
++	case $file in
++	*.lo) ;;
++	*)
++	  func_fatal_help "\`$destdir' must be an absolute directory name"
++	  ;;
++	esac
++      done
+       ;;
+     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 test "X$duplicate_deps" = "Xyes" ; then
+-	case "$libs " in
+-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+-	esac
+-      fi
+-      libs="$libs $deplib"
+-    done
++    # This variable tells wrapper scripts just to set variables rather
++    # than running their programs.
++    libtool_install_magic="$magic"
+ 
+-    if test "$linkmode" = lib; then
+-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
++    staticlibs=
++    future_libdirs=
++    current_libdirs=
++    for file in $files; do
+ 
+-      # 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 test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
+-	for pre_post_dep in $predeps $postdeps; do
+-	  case "$pre_post_deps " in
+-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
++      # Do each installation.
++      case $file in
++      *.$libext)
++	# Do the static libraries later.
++	staticlibs="$staticlibs $file"
++	;;
++
++      *.la)
++	# 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 "*) ;;
++	  *) current_libdirs="$current_libdirs $libdir" ;;
+ 	  esac
+-	  pre_post_deps="$pre_post_deps $pre_post_dep"
+-	done
+-      fi
+-      pre_post_deps=
+-    fi
++	else
++	  # Note the libdir as a future libdir.
++	  case "$future_libdirs " in
++	  *" $libdir "*) ;;
++	  *) future_libdirs="$future_libdirs $libdir" ;;
++	  esac
++	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 link"
+-	for file in $dlfiles $dlprefiles; do
+-	  case $file in
+-	  *.la) ;;
+-	  *)
+-	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+-	    exit 1
++	func_dirname "$file" "/" ""
++	dir="$func_dirname_result"
++	dir="$dir$objdir"
++
++	if test -n "$relink_command"; then
++	  # Determine the prefix the user has applied to our future dir.
++	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -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 "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++	  else
++	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "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_prog $dir/$srcname $destdir/$realname" \
++	      'exit $?'
++	  tstripme="$stripme"
++	  case $host_os in
++	  cygwin* | mingw* | pw32* | cegcc*)
++	    case $realname in
++	    *.dll.a)
++	      tstripme=""
++	      ;;
++	    esac
+ 	    ;;
+ 	  esac
+-	done
+-	;;
+-    prog)
+-	compile_deplibs=
+-	finalize_deplibs=
+-	alldeplibs=no
+-	newdlfiles=
+-	newdlprefiles=
+-	passes="conv scan dlopen dlpreopen link"
++	  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" && staticlibs="$staticlibs $dir/$old_library"
+ 	;;
+-    *)  passes="conv"
++
++      *.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
+ 	;;
+-    esac
+-    for pass in $passes; do
+-      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" ;;
++
++      *)
++	# 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
+-      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
+-	-l*)
+-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+-	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+-	    continue
+-	  fi
+-	  if test "$pass" = conv; then
+-	    deplibs="$deplib $deplibs"
+-	    continue
+-	  fi
+-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+-	    # Search the libtool library
+-	    lib="$searchdir/lib${name}.la"
+-	    if test -f "$lib"; then
+-	      found=yes
+-	      break
+-	    fi
+-	  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"
++
++	# 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
+-	      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 (${SED} -e '2q' $lib |
+-                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+-		  library_names=
+-		  old_library=
+-		  case $lib in
+-		  */* | *\\*) . $lib ;;
+-		  *) . ./$lib ;;
+-		  esac
+-		  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
+-		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+-		    test "X$ladir" = "X$lib" && ladir="."
+-		    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
++	      func_stripname '' '.exe' "$file"
++	      wrapper=$func_stripname_result
+ 	    fi
+-	  fi
+-	  ;; # -l
+-	-L*)
+-	  case $linkmode in
+-	  lib)
+-	    deplibs="$deplib $deplibs"
+-	    test "$pass" = conv && continue
+-	    newdependency_libs="$deplib $newdependency_libs"
+-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    ;;
+-	  prog)
+-	    if test "$pass" = conv; then
+-	      deplibs="$deplib $deplibs"
+-	      continue
++	*)
++	    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
+-	    if test "$pass" = scan; then
+-	      deplibs="$deplib $deplibs"
+-	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+-	    else
+-	      compile_deplibs="$deplib $compile_deplibs"
+-	      finalize_deplibs="$deplib $finalize_deplibs"
++	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e '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
+-	    ;;
+-	  *)
+-	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+-	    ;;
+-	  esac # linkmode
+-	  continue
+-	  ;; # -L
+-	-R*)
+-	  if test "$pass" = link; then
+-	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+-	    # Make sure the xrpath contains only unique directories.
+-	    case "$xrpath " in
+-	    *" $dir "*) ;;
+-	    *) xrpath="$xrpath $dir" ;;
+-	    esac
+-	  fi
+-	  deplibs="$deplib $deplibs"
+-	  continue
+-	  ;;
+-	*.la) lib="$deplib" ;;
+-	*.$libext)
+-	  if test "$pass" = conv; then
+-	    deplibs="$deplib $deplibs"
+-	    continue
++	  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 "X$relink_command" | $Xsed -e '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 "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+ 	  fi
+-	  case $linkmode in
+-	  lib)
+-	    if test "$deplibs_check_method" != pass_all; 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 used here."
+-	    else
+-	      $echo
+-	      $echo "*** Warning: Linking the shared library $output against the"
+-	      $echo "*** static library $deplib is not portable!"
+-	      deplibs="$deplib $deplibs"
+-	    fi
+-	    continue
++	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
+ 	    ;;
+-	  prog)
+-	    if test "$pass" != link; then
+-	      deplibs="$deplib $deplibs"
+-	    else
+-	      compile_deplibs="$deplib $compile_deplibs"
+-	      finalize_deplibs="$deplib $finalize_deplibs"
+-	    fi
+-	    continue
++	  *.exe:*)
++	    destfile=$destfile.exe
+ 	    ;;
+-	  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.
+-	      newdlprefiles="$newdlprefiles $deplib"
+-	      compile_deplibs="$deplib $compile_deplibs"
+-	      finalize_deplibs="$deplib $finalize_deplibs"
+-	    else
+-	      newdlfiles="$newdlfiles $deplib"
+-	    fi
+-	  fi
+-	  continue
+-	  ;;
+-	%DEPLIBS%)
+-	  alldeplibs=yes
+-	  continue
++	  *:*.exe)
++	    func_stripname '' '.exe' "$destfile"
++	    destfile=$func_stripname_result
++	    ;;
++	  esac
+ 	  ;;
+-	esac # case $deplib
+-	if test "$found" = yes || test -f "$lib"; then :
+-	else
+-	  $echo "$modename: cannot find the library \`$lib'" 1>&2
+-	  exit 1
++	esac
++	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
++	$opt_dry_run || if test -n "$outputname"; then
++	  ${RM}r "$tmpdir"
+ 	fi
++	;;
++      esac
++    done
+ 
+-	# Check to see that this really is a libtool archive.
+-	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+-	else
+-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-	  exit 1
+-	fi
++    for file in $staticlibs; do
++      func_basename "$file"
++      name="$func_basename_result"
+ 
+-	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+-	test "X$ladir" = "X$lib" && ladir="."
++      # Set up the ranlib parameters.
++      oldlib="$destdir/$name"
+ 
+-	dlname=
+-	dlopen=
+-	dlpreopen=
+-	libdir=
+-	library_names=
+-	old_library=
+-	# If the library was installed with an old release of libtool,
+-	# it will not redefine variables installed, or shouldnotlink
+-	installed=yes
+-	shouldnotlink=no
++      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+ 
+-	# Read the .la file
+-	case $lib in
+-	*/* | *\\*) . $lib ;;
+-	*) . ./$lib ;;
+-	esac
++      if test -n "$stripme" && test -n "$old_striplib"; then
++	func_show_eval "$old_striplib $oldlib" 'exit $?'
++      fi
+ 
+-	if test "$linkmode,$pass" = "lib,link" ||
+-	   test "$linkmode,$pass" = "prog,scan" ||
+-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+-	fi
++      # Do each command in the postinstall commands.
++      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
++    done
+ 
+-	if test "$pass" = conv; then
+-	  # Only check for convenience libraries
+-	  deplibs="$lib $deplibs"
+-	  if test -z "$libdir"; then
+-	    if test -z "$old_library"; then
+-	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+-	      exit 1
+-	    fi
+-	    # It is a libtool convenience library, so add in its objects.
+-	    convenience="$convenience $ladir/$objdir/$old_library"
+-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+-	    tmp_libs=
+-	    for deplib in $dependency_libs; do
+-	      deplibs="$deplib $deplibs"
+-              if test "X$duplicate_deps" = "Xyes" ; then
+-	        case "$tmp_libs " in
+-	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+-	        esac
+-              fi
+-	      tmp_libs="$tmp_libs $deplib"
+-	    done
+-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
+-	    exit 1
+-	  fi
+-	  continue
+-	fi # $pass = conv
++    test -n "$future_libdirs" && \
++      func_warning "remember to run \`$progname --finish$future_libdirs'"
+ 
+-    
+-	# Get the name of the library we link against.
+-	linklib=
+-	for l in $old_library $library_names; do
+-	  linklib="$l"
+-	done
+-	if test -z "$linklib"; then
+-	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+-	  exit 1
+-	fi
++    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
++}
+ 
+-	# This library was specified with -dlopen.
+-	if test "$pass" = dlopen; then
+-	  if test -z "$libdir"; then
+-	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+-	    exit 1
+-	  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.
+-	    dlprefiles="$dlprefiles $lib $dependency_libs"
+-	  else
+-	    newdlfiles="$newdlfiles $lib"
+-	  fi
+-	  continue
+-	fi # $pass = dlopen
++test "$mode" = install && func_mode_install ${1+"$@"}
+ 
+-	# 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
+-	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
+-	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
+-	    abs_ladir="$ladir"
+-	  fi
+-	  ;;
+-	esac
+-	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+ 
+-	# Find the relevant object directory and library name.
+-	if test "X$installed" = Xyes; then
+-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+-	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
+-	    dir="$ladir"
+-	    absdir="$abs_ladir"
+-	    libdir="$abs_ladir"
+-	  else
+-	    dir="$libdir"
+-	    absdir="$libdir"
+-	  fi
+-	else
+-	  dir="$ladir/$objdir"
+-	  absdir="$abs_ladir/$objdir"
+-	  # Remove this search path later
+-	  notinst_path="$notinst_path $abs_ladir"
+-	fi # $installed = yes
+-	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
++# 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
+ 
+-	# This library was specified with -dlpreopen.
+-	if test "$pass" = dlpreopen; then
+-	  if test -z "$libdir"; then
+-	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+-	    exit 1
+-	  fi
+-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
+-	  # are required to link).
+-	  if test -n "$old_library"; then
+-	    newdlprefiles="$newdlprefiles $dir/$old_library"
+-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
+-	  elif test -n "$dlname"; then
+-	    newdlprefiles="$newdlprefiles $dir/$dlname"
+-	  else
+-	    newdlprefiles="$newdlprefiles $dir/$linklib"
+-	  fi
+-	fi # $pass = dlpreopen
++    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"
+ 
+-	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
++	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+ 
+-    
+-	if test "$linkmode" = prog && test "$pass" != link; then
+-	  newlib_search_path="$newlib_search_path $ladir"
+-	  deplibs="$lib $deplibs"
++	# Parse the name list into a source file.
++	func_verbose "creating $output_objdir/$my_dlsyms"
+ 
+-	  linkalldeplibs=no
+-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
+-	     test "$build_libtool_libs" = no; then
+-	    linkalldeplibs=yes
+-	  fi
++	$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 */
+ 
+-	  tmp_libs=
+-	  for deplib in $dependency_libs; do
+-	    case $deplib in
+-	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+-	    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 test "X$duplicate_deps" = "Xyes" ; then
+-	      case "$tmp_libs " in
+-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+-	      esac
+-	    fi
+-	    tmp_libs="$tmp_libs $deplib"
+-	  done # for deplib
+-	  continue
+-	fi # $linkmode = prog...
++#ifdef __cplusplus
++extern \"C\" {
++#endif
+ 
+-	if test "$linkmode,$pass" = "prog,link"; then
+-	  if test -n "$library_names" &&
+-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+-	    # We need to hardcode the library path
+-	    if test -n "$shlibpath_var"; then
+-	      # Make sure the rpath contains only unique directories.
+-	      case "$temp_rpath " in
+-	      *" $dir "*) ;;
+-	      *" $absdir "*) ;;
+-	      *) temp_rpath="$temp_rpath $dir" ;;
+-	      esac
+-	    fi
++/* External symbol declarations for the compiler. */\
++"
+ 
+-	    # 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 "*) ;;
+-	      *) compile_rpath="$compile_rpath $absdir"
++	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 "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++	  for progfile in $progfiles; do
++	    func_verbose "extracting global C symbols from \`$progfile'"
++	    $opt_dry_run || eval "$NM $progfile | $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
+-	      ;;
+-	    esac
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $libdir "*) ;;
+-	    *)
+-	      case "$finalize_rpath " in
+-	      *" $libdir "*) ;;
+-	      *) finalize_rpath="$finalize_rpath $libdir"
++	    }
++	  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
+-	      ;;
+-	    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
+-	if test -n "$library_names" &&
+-	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+-	  if test "$installed" = no; then
+-	    notinst_deplibs="$notinst_deplibs $lib"
+-	    need_relink=yes
++	for dlprefile in $dlprefiles; do
++	  func_verbose "extracting global C symbols from \`$dlprefile'"
++	  func_basename "$dlprefile"
++	  name="$func_basename_result"
++	  $opt_dry_run || {
++	    eval '$ECHO ": $name " >> "$nlist"'
++	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
++	  }
++	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
+-	  # This is a shared library
+-	
+-      # Warn about portability, can't link against -module's on some systems (darwin)
+-      if 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 "*) ;;
+-	      *) compile_rpath="$compile_rpath $absdir"
+-	      esac
+-	      ;;
+-	    esac
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $libdir "*) ;;
+-	    *)
+-	      case "$finalize_rpath " in
+-	      *" $libdir "*) ;;
+-	      *) finalize_rpath="$finalize_rpath $libdir"
+-	      esac
+-	      ;;
+-	    esac
++
++	  # 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 -n "$old_archive_from_expsyms_cmds"; then
+-	    # figure out the soname
+-	    set dummy $library_names
+-	    realname="$2"
+-	    shift; 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*)
+-		major=`expr $current - $age`
+-		versuffix="-$major"
+-		;;
+-	      esac
+-	      eval soname=\"$soname_spec\"
+-	    else
+-	      soname="$realname"
+-	    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
+ 
+-	    # Make a new name for the extract_expsyms_cmds to use
+-	    soroot="$soname"
+-	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
+-	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
++	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+ 
+-	    # If the library has no export list, then create one now
+-	    if test -f "$output_objdir/$soname-def"; then :
+-	    else
+-	      $show "extracting exported symbol list from \`$soname'"
+-	      save_ifs="$IFS"; IFS='~'
+-	      eval cmds=\"$extract_expsyms_cmds\"
+-	      for cmd in $cmds; do
+-		IFS="$save_ifs"
+-		$show "$cmd"
+-		$run eval "$cmd" || exit $?
+-	      done
+-	      IFS="$save_ifs"
+-	    fi
++/* The mapping between symbol names and symbols.  */
++typedef struct {
++  const char *name;
++  void *address;
++} lt_dlsymlist;
++"
++	  case $host in
++	  *cygwin* | *mingw* | *cegcc* )
++	    $ECHO >> "$output_objdir/$my_dlsyms" "\
++/* DATA imports from DLLs on WIN32 con't be const, because
++   runtime relocations are performed -- see ld's documentation
++   on pseudo-relocs.  */"
++	    lt_dlsym_const= ;;
++	  *osf5*)
++	    echo >> "$output_objdir/$my_dlsyms" "\
++/* This system does not cope well with relocations in const data */"
++	    lt_dlsym_const= ;;
++	  *)
++	    lt_dlsym_const=const ;;
++	  esac
+ 
+-	    # Create $newlib
+-	    if test -f "$output_objdir/$newlib"; then :; else
+-	      $show "generating import library for \`$soname'"
+-	      save_ifs="$IFS"; IFS='~'
+-	      eval cmds=\"$old_archive_from_expsyms_cmds\"
+-	      for cmd in $cmds; do
+-		IFS="$save_ifs"
+-		$show "$cmd"
+-		$run eval "$cmd" || exit $?
+-	      done
+-	      IFS="$save_ifs"
+-	    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"
++	  $ECHO >> "$output_objdir/$my_dlsyms" "\
++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 },"
+ 
+-	  if test "$linkmode" = prog || test "$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* ) add_dir="-L$dir" ;;
+-		  *-*-darwin* )
+-		    # if the lib is a module then we can not link against it, someone
+-		    # is ignoring the new warnings I added
+-		    if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; 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 
+-		    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; then
+-		add="$dir/$linklib"
+-	      elif test "$hardcode_minus_L" = yes; then
+-		add_dir="-L$dir"
+-		# Try looking first in the location we're being installed to.
+-		if test -n "$inst_prefix_dir"; then
+-		  case "$libdir" in
+-		    [\\/]*)
+-		      add_dir="-L$inst_prefix_dir$libdir $add_dir"
+-		      ;;
+-		  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
++	  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}
++};
+ 
+-	    if test "$lib_linked" != yes; then
+-	      $echo "$modename: configuration error: unsupported hardcode properties"
+-	      exit 1
+-	    fi
++/* 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
+ 
+-	    if test -n "$add_shlibpath"; then
+-	      case :$compile_shlibpath: in
+-	      *":$add_shlibpath:"*) ;;
+-	      *) compile_shlibpath="$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:"*) ;;
+-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+-		esac
+-	      fi
+-	    fi
+-	  fi
++#ifdef __cplusplus
++}
++#endif\
++"
++	} # !$opt_dry_run
+ 
+-	  if test "$linkmode" = prog || test "$mode" = relink; then
+-	    add_shlibpath=
+-	    add_dir=
+-	    add=
+-	    # Finalize command for both is simple: just hardcode it.
+-	    if test "$hardcode_direct" = yes; 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:"*) ;;
+-	      *) finalize_shlibpath="$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
+-		  [\\/]*)
+-		    add_dir="-L$inst_prefix_dir$libdir $add_dir"
+-		    ;;
+-		esac
+-	      fi
+-	      add="-l$name"
++	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) ;;
++	  *) symtab_cflags="$symtab_cflags $arg" ;;
++	  esac
++	done
+ 
+-	    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.
++	# 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 $?'
+ 
+-	    # 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
++	# 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 "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
++	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ 	  else
+-	    convenience="$convenience $dir/$old_library"
+-	    old_convenience="$old_convenience $dir/$old_library"
+-	    deplibs="$dir/$old_library $deplibs"
+-	    link_static=yes
++	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
++	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ 	  fi
+-	fi # link shared/static library?
++	  ;;
++	*)
++	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
++	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
++	  ;;
++	esac
++	;;
++      *-*-freebsd*)
++	# FreeBSD doesn't need this...
++	;;
++      *)
++	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 "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
++      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
++    fi
++}
+ 
+-	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*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
+-		   case " $xrpath " in
+-		   *" $temp_xrpath "*) ;;
+-		   *) xrpath="$xrpath $temp_xrpath";;
+-		   esac;;
+-	      *) temp_deplibs="$temp_deplibs $libdir";;
+-	      esac
+-	    done
+-	    dependency_libs="$temp_deplibs"
+-	  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.
++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
++    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
++       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
++      win32_nmres=`eval $NM -f posix -A $1 |
++	$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"
++}
+ 
+-	  newlib_search_path="$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"
+-	    if test "X$duplicate_deps" = "Xyes" ; then
+-	      case "$tmp_libs " in
+-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+-	      esac
+-	    fi
+-	    tmp_libs="$tmp_libs $deplib"
+-	  done
+ 
+-	  if test "$link_all_deplibs" != no; then
+-	    # Add the search paths of all dependency libraries
+-	    for deplib in $dependency_libs; do
+-	      case $deplib in
+-	      -L*) path="$deplib" ;;
+-	      *.la)
+-		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
+-		test "X$dir" = "X$deplib" && dir="."
+-		# We need an absolute path.
+-		case $dir in
+-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+-		*)
+-		  absdir=`cd "$dir" && pwd`
+-		  if test -z "$absdir"; then
+-		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
+-		    absdir="$dir"
+-		  fi
+-		  ;;
+-		esac
+-		if grep "^installed=no" $deplib > /dev/null; then
+-		  path="$absdir/$objdir"
+-		else
+-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+-		  if test -z "$libdir"; then
+-		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+-		    exit 1
+-		  fi
+-		  if test "$absdir" != "$libdir"; then
+-		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+-		  fi
+-		  path="$absdir"
+-		fi
+-		depdepl=
+-		case $host in
+-		*-*-darwin*)
+-		  # we do not want to link against static libs, but need to link against shared
+-		  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 "$path/$depdepl" ; then
+-		      depdepl="$path/$depdepl"
+-		   fi
+-		    newlib_search_path="$newlib_search_path $path"
+-		    path=""
+-		  fi
+-		  ;;
+-		*)
+-		path="-L$path"
+-		;;
+-		esac 
+-		
+-		;;
+-		  -l*)
+-		case $host in
+-		*-*-darwin*)
+-		 # Again, we only want to link against shared libraries
+-		 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+-		 for tmp in $newlib_search_path ; do
+-		     if test -f "$tmp/lib$tmp_libs.dylib" ; then
+-		       eval depdepl="$tmp/lib$tmp_libs.dylib"
+-		       break
+-		     fi  
+-         done
+-         path=""
+-		  ;;
+-		*) continue ;;
+-		esac  		  
+-		;;
+-	      *) continue ;;
+-	      esac
+-	      case " $deplibs " in
+-	      *" $depdepl "*) ;;
+-	      *) deplibs="$deplibs $depdepl" ;;
+-	      esac	      
+-	      case " $deplibs " in
+-	      *" $path "*) ;;
+-	      *) deplibs="$deplibs $path" ;;
+-	      esac
+-	    done
+-	  fi # link_all_deplibs != no
+-	fi # linkmode = lib
+-      done # for deplib in $libs
+-      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 "*) ;;
+-	    *) lib_search_path="$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 "*) ;;
+-	      *) tmp_libs="$tmp_libs $deplib" ;;
+-	      esac
+-	      ;;
+-	    *) tmp_libs="$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
+-	  tmp_libs="$tmp_libs $i"
+-	fi
+-      done
+-      dependency_libs=$tmp_libs
+-    done # for pass
+-    if test "$linkmode" = prog; then
+-      dlfiles="$newdlfiles"
+-      dlprefiles="$newdlprefiles"
++# 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"
++    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
++    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
++}
+ 
+-    case $linkmode in
+-    oldlib)
+-      if test -n "$deplibs"; then
+-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
+-      fi
+-
+-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+-	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+-      fi
+-
+-      if test -n "$rpath"; then
+-	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
+-      fi
+-
+-      if test -n "$xrpath"; then
+-	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
+-      fi
+-
+-      if test -n "$vinfo"; then
+-	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
+-      fi
+-
+-      if test -n "$release"; then
+-	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
+-      fi
+ 
+-      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+-	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
+-      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"
+ 
+-      # Now set the variables for building old libraries.
+-      build_libtool_libs=no
+-      oldlibs="$output"
+-      objs="$objs$old_deplibs"
+-      ;;
++      func_mkdir_p "$my_xdir"
+ 
+-    lib)
+-      # Make sure we only generate libraries of the form `libNAME.la'.
+-      case $outputname in
+-      lib*)
+-	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+-	eval shared_ext=\"$shrext\"
+-	eval libname=\"$libname_spec\"
++      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 | $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
+ 	;;
+       *)
+-	if test "$module" = no; then
+-	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+-	  $echo "$help" 1>&2
+-	  exit 1
+-	fi
+-	if test "$need_lib_prefix" != no; then
+-	  # Add the "lib" prefix for modules if required
+-	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+-	  eval shared_ext=\"$shrext\"
+-	  eval libname=\"$libname_spec\"
+-	else
+-	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+-	fi
++        func_extract_an_archive "$my_xdir" "$my_xabs"
+ 	;;
+       esac
++      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
++    done
+ 
+-      if test -n "$objs"; then
+-	if test "$deplibs_check_method" != pass_all; then
+-	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+-	  exit 1
+-	else
+-	  $echo
+-	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
+-	  $echo "*** objects $objs is not portable!"
+-	  libobjs="$libobjs $objs"
+-	fi
+-      fi
++    func_extract_archives_result="$my_oldobjs"
++}
+ 
+-      if test "$dlself" != no; then
+-	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
+-      fi
+ 
+-      set dummy $rpath
+-      if test "$#" -gt 2; then
+-	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+-      fi
+-      install_libdir="$2"
+ 
+-      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
++# func_emit_wrapper_part1 [arg=no]
++#
++# Emit the first part of a libtool wrapper script on stdout.
++# For more information, see the description associated with
++# func_emit_wrapper(), below.
++func_emit_wrapper_part1 ()
++{
++	func_emit_wrapper_part1_arg1=no
++	if test -n "$1" ; then
++	  func_emit_wrapper_part1_arg1=$1
+ 	fi
+ 
+-	if test -n "$vinfo"; then
+-	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
+-	fi
++	$ECHO "\
++#! $SHELL
+ 
+-	if test -n "$release"; then
+-	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
+-	fi
+-      else
++# $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.
+ 
+-	# Parse the version information argument.
+-	save_ifs="$IFS"; IFS=':'
+-	set dummy $vinfo 0 0 0
+-	IFS="$save_ifs"
++# 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='$sed_quote_subst'
+ 
+-	if test -n "$8"; then
+-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
+-	  $echo "$help" 1>&2
+-	  exit 1
+-	fi
++# 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
+ 
+-	# 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="$2"
+-	  number_minor="$3"
+-	  number_revision="$4"
+-	  #
+-	  # 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
+-	  darwin|linux|osf|windows)
+-	    current=`expr $number_major + $number_minor`
+-	    age="$number_minor"
+-	    revision="$number_revision"
+-	    ;;
+-	  freebsd-aout|freebsd-elf|sunos)
+-	    current="$number_major"
+-	    revision="$number_minor"
+-	    age="0"
+-	    ;;
+-	  irix|nonstopux)
+-	    current=`expr $number_major + $number_minor - 1`
+-	    age="$number_minor"
+-	    revision="$number_minor"
+-	    ;;
+-	  esac
+-	  ;;
+-	no)
+-	  current="$2"
+-	  revision="$3"
+-	  age="$4"
+-	  ;;
+-	esac
++# 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
+ 
+-	# 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]) ;;
+-	*)
+-	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
+-	  ;;
+-	esac
++relink_command=\"$relink_command\"
+ 
+-	case $revision in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+-	*)
+-	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
+-	  ;;
+-	esac
++# 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
++    ECHO=\"$qecho\"
++    file=\"\$0\"
++    # Make sure echo works.
++    if test \"X\$1\" = X--no-reexec; then
++      # Discard the --no-reexec flag, and continue.
++      shift
++    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
++      # Yippee, \$ECHO works!
++      :
++    else
++      # Restart under the correct shell, and then maybe \$ECHO will work.
++      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
++    fi
++  fi\
++"
++	$ECHO "\
+ 
+-	case $age in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+-	*)
+-	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
+-	  ;;
+-	esac
++  # Find the directory that this script lives in.
++  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
++  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+ 
+-	if test "$age" -gt "$current"; then
+-	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
+-	fi
++  # 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 \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+ 
+-	# Calculate the version variables.
+-	major=
+-	versuffix=
+-	verstring=
+-	case $version_type in
+-	none) ;;
++    # 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
+ 
+-	darwin)
+-	  # Like Linux, but with the current version available in
+-	  # verstring for coding it into the library header
+-	  major=.`expr $current - $age`
+-	  versuffix="$major.$age.$revision"
+-	  # Darwin ld doesn't like 0 for these options...
+-	  minor_current=`expr $current + 1`
+-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+-	  ;;
++    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
++    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
++  done
++"
++}
++# end: func_emit_wrapper_part1
+ 
+-	freebsd-aout)
+-	  major=".$current"
+-	  versuffix=".$current.$revision";
+-	  ;;
++# func_emit_wrapper_part2 [arg=no]
++#
++# Emit the second part of a libtool wrapper script on stdout.
++# For more information, see the description associated with
++# func_emit_wrapper(), below.
++func_emit_wrapper_part2 ()
++{
++	func_emit_wrapper_part2_arg1=no
++	if test -n "$1" ; then
++	  func_emit_wrapper_part2_arg1=$1
++	fi
++
++	$ECHO "\
++
++  # Usually 'no', except on cygwin/mingw when embedded into
++  # the cwrapper.
++  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_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 \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
++    $objdir )   thisdir=. ;;
++    esac
++  fi
+ 
+-	freebsd-elf)
+-	  major=".$current"
+-	  versuffix=".$current";
+-	  ;;
++  # Try to get the absolute directory name.
++  absdir=\`cd \"\$thisdir\" && pwd\`
++  test -n \"\$absdir\" && thisdir=\"\$absdir\"
++"
+ 
+-	irix | nonstopux)
+-	  major=`expr $current - $age + 1`
++	if test "$fast_install" = yes; then
++	  $ECHO "\
++  program=lt-'$outputname'$exeext
++  progdir=\"\$thisdir/$objdir\"
+ 
+-	  case $version_type in
+-	    nonstopux) verstring_prefix=nonstopux ;;
+-	    *)         verstring_prefix=sgi ;;
+-	  esac
+-	  verstring="$verstring_prefix$major.$revision"
++  if test ! -f \"\$progdir/\$program\" ||
++     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
++       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+ 
+-	  # Add in all the interfaces that we are compatible with.
+-	  loop=$revision
+-	  while test "$loop" -ne 0; do
+-	    iface=`expr $revision - $loop`
+-	    loop=`expr $loop - 1`
+-	    verstring="$verstring_prefix$major.$iface:$verstring"
+-	  done
++    file=\"\$\$-\$program\"
+ 
+-	  # Before this point, $major must not contain `.'.
+-	  major=.$major
+-	  versuffix="$major.$revision"
+-	  ;;
++    if test ! -d \"\$progdir\"; then
++      $MKDIR \"\$progdir\"
++    else
++      $RM \"\$progdir/\$file\"
++    fi"
+ 
+-	linux)
+-	  major=.`expr $current - $age`
+-	  versuffix="$major.$age.$revision"
+-	  ;;
++	  $ECHO "\
+ 
+-	osf)
+-	  major=.`expr $current - $age`
+-	  versuffix=".$current.$age.$revision"
+-	  verstring="$current.$age.$revision"
++    # 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
+ 
+-	  # Add in all the interfaces that we are compatible with.
+-	  loop=$age
+-	  while test "$loop" -ne 0; do
+-	    iface=`expr $current - $loop`
+-	    loop=`expr $loop - 1`
+-	    verstring="$verstring:${iface}.0"
+-	  done
++    $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
+ 
+-	  # Make executables depend on our current version.
+-	  verstring="$verstring:${current}.0"
+-	  ;;
++	$ECHO "\
+ 
+-	sunos)
+-	  major=".$current"
+-	  versuffix=".$current.$revision"
+-	  ;;
++  if test -f \"\$progdir/\$program\"; then"
+ 
+-	windows)
+-	  # Use '-' rather than '.', since we only want one
+-	  # extension on DOS 8.3 filesystems.
+-	  major=`expr $current - $age`
+-	  versuffix="-$major"
++	# 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 \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
++
++    export $shlibpath_var
++"
++	fi
++
++	# fixup the dll searchpath if we need to.
++	if test -n "$dllsearchpath"; then
++	  $ECHO "\
++    # Add the dll search path components to the executable PATH
++    PATH=$dllsearchpath:\$PATH
++"
++	fi
++
++	$ECHO "\
++    if test \"\$libtool_execute_magic\" != \"$magic\"; then
++      # Run the actual program with our arguments.
++"
++	case $host in
++	# Backslashes separate directories on plain windows
++	*-*-mingw | *-*-os2* | *-cegcc*)
++	  $ECHO "\
++      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
++"
+ 	  ;;
+ 
+ 	*)
+-	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
+-	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+-	  exit 1
++	  $ECHO "\
++      exec \"\$progdir/\$program\" \${1+\"\$@\"}
++"
+ 	  ;;
+ 	esac
++	$ECHO "\
++      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
++      exit 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\
++"
++}
++# end: func_emit_wrapper_part2
+ 
+-	# 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=""
++# 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=no
++	if test -n "$1" ; then
++	  func_emit_wrapper_arg1=$1
+ 	fi
+ 
+-	# Check to see if the archive will have undefined symbols.
+-	if test "$allow_undefined" = yes; then
+-	  if test "$allow_undefined_flag" = unsupported; then
+-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+-	    build_libtool_libs=no
+-	    build_old_libs=yes
+-	  fi
+-	else
+-	  # Don't allow undefined symbols.
+-	  allow_undefined_flag="$no_undefined_flag"
+-	fi
+-      fi
++	# split this up so that func_emit_cwrapperexe_src
++	# can call each part independently.
++	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
++	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
++}
+ 
+-      if test "$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)
+-	       ;;
+-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+-	       removelist="$removelist $p"
+-	       ;;
+-	    *) ;;
+-	  esac
+-	done
+-	if test -n "$removelist"; then
+-	  $show "${rm}r $removelist"
+-	  $run ${rm}r $removelist
+-	fi
+-      fi
+ 
+-      # Now set the variables for building old libraries.
+-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
++# func_to_host_path arg
++#
++# Convert paths to host format when used with build tools.
++# Intended for use with "native" mingw (where libtool itself
++# is running under the msys shell), or in the following cross-
++# build environments:
++#    $build          $host
++#    mingw (msys)    mingw  [e.g. native]
++#    cygwin          mingw
++#    *nix + wine     mingw
++# where wine is equipped with the `winepath' executable.
++# In the native mingw case, the (msys) shell automatically
++# converts paths for any non-msys applications it launches,
++# but that facility isn't available from inside the cwrapper.
++# Similar accommodations are necessary for $host mingw and
++# $build cygwin.  Calling this function does no harm for other
++# $host/$build combinations not listed above.
++#
++# ARG is the path (on $build) that should be converted to
++# the proper representation for $host. The result is stored
++# in $func_to_host_path_result.
++func_to_host_path ()
++{
++  func_to_host_path_result="$1"
++  if test -n "$1" ; then
++    case $host in
++      *mingw* )
++        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
++        case $build in
++          *mingw* ) # actually, msys
++            # awkward: cmd appends spaces to result
++            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
++            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
++              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
++            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
++              $SED -e "$lt_sed_naive_backslashify"`
++            ;;
++          *cygwin* )
++            func_to_host_path_tmp1=`cygpath -w "$1"`
++            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
++              $SED -e "$lt_sed_naive_backslashify"`
++            ;;
++          * )
++            # 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_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
++            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
++              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
++                $SED -e "$lt_sed_naive_backslashify"`
++            else
++              # Allow warning below.
++              func_to_host_path_result=""
++            fi
++            ;;
++        esac
++        if test -z "$func_to_host_path_result" ; then
++          func_error "Could not determine host path corresponding to"
++          func_error "  '$1'"
++          func_error "Continuing, but uninstalled executables may not work."
++          # Fallback:
++          func_to_host_path_result="$1"
++        fi
++        ;;
++    esac
++  fi
++}
++# end: func_to_host_path
+ 
+-	# Transform .lo files to .o files.
+-	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+-      fi
++# func_to_host_pathlist arg
++#
++# Convert pathlists to host format when used with build tools.
++# See func_to_host_path(), above. This function supports the
++# following $build/$host combinations (but does no harm for
++# combinations not listed here):
++#    $build          $host
++#    mingw (msys)    mingw  [e.g. native]
++#    cygwin          mingw
++#    *nix + wine     mingw
++#
++# 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.
++#
++# ARG is a pathlist (on $build) that should be converted to
++# the proper representation on $host. The result is stored
++# in $func_to_host_pathlist_result.
++func_to_host_pathlist ()
++{
++  func_to_host_pathlist_result="$1"
++  if test -n "$1" ; then
++    case $host in
++      *mingw* )
++        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
++        # 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_to_host_pathlist_tmp2="$1"
++        # Once set for this call, this variable should not be
++        # reassigned. It is used in tha fallback case.
++        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
++          $SED -e 's|^:*||' -e 's|:*$||'`
++        case $build in
++          *mingw* ) # Actually, msys.
++            # Awkward: cmd appends spaces to result.
++            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
++            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
++              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
++            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
++              $SED -e "$lt_sed_naive_backslashify"`
++            ;;
++          *cygwin* )
++            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
++            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
++              $SED -e "$lt_sed_naive_backslashify"`
++            ;;
++          * )
++            # unfortunately, winepath doesn't convert pathlists
++            func_to_host_pathlist_result=""
++            func_to_host_pathlist_oldIFS=$IFS
++            IFS=:
++            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
++              IFS=$func_to_host_pathlist_oldIFS
++              if test -n "$func_to_host_pathlist_f" ; then
++                func_to_host_path "$func_to_host_pathlist_f"
++                if test -n "$func_to_host_path_result" ; then
++                  if test -z "$func_to_host_pathlist_result" ; then
++                    func_to_host_pathlist_result="$func_to_host_path_result"
++                  else
++                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
++                  fi
++                fi
++              fi
++              IFS=:
++            done
++            IFS=$func_to_host_pathlist_oldIFS
++            ;;
++        esac
++        if test -z "$func_to_host_pathlist_result" ; then
++          func_error "Could not determine the host path(s) corresponding to"
++          func_error "  '$1'"
++          func_error "Continuing, but uninstalled executables may not work."
++          # Fallback. This may break if $1 contains DOS-style drive
++          # specifications. The fix is not to complicate the expression
++          # below, but for the user to provide a working wine installation
++          # with winepath so that path translation in the cross-to-mingw
++          # case works properly.
++          lt_replace_pathsep_nix_to_dos="s|:|;|g"
++          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
++            $SED -e "$lt_replace_pathsep_nix_to_dos"`
++        fi
++        # Now, add the leading and trailing path separators back
++        case "$1" in
++          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
++            ;;
++        esac
++        case "$1" in
++          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
++            ;;
++        esac
++        ;;
++    esac
++  fi
++}
++# end: func_to_host_pathlist
+ 
+-      # Eliminate all temporary directories.
+-      for path in $notinst_path; do
+-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
+-	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
+-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
+-      done
++# 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
+ 
+-      if test -n "$xrpath"; then
+-	# If the user specified any rpath flags, then add them.
+-	temp_xrpath=
+-	for libdir in $xrpath; do
+-	  temp_xrpath="$temp_xrpath -R$libdir"
+-	  case "$finalize_rpath " in
+-	  *" $libdir "*) ;;
+-	  *) finalize_rpath="$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
++/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
++   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+ 
+-      # 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 "*) ;;
+-	*) dlfiles="$dlfiles $lib" ;;
+-	esac
+-      done
++   The $output program cannot be directly executed until all the libtool
++   libraries that it depends on are installed.
+ 
+-      # Make sure dlprefiles contains only unique files
+-      old_dlprefiles="$dlprefiles"
+-      dlprefiles=
+-      for lib in $old_dlprefiles; do
+-	case "$dlprefiles " in
+-	*" $lib "*) ;;
+-	*) dlprefiles="$dlprefiles $lib" ;;
+-	esac
+-      done
++   This wrapper executable should never be moved out of the build directory.
++   If it is, it will not operate correctly.
+ 
+-      if test "$build_libtool_libs" = yes; then
+-	if test -n "$rpath"; then
+-	  case $host in
+-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+-	    # these systems don't actually have a c library (as such)!
+-	    ;;
+-	  *-*-rhapsody* | *-*-darwin1.[012])
+-	    # Rhapsody C library is in the System framework
+-	    deplibs="$deplibs -framework System"
+-	    ;;
+-	  *-*-netbsd*)
+-	    # Don't link with libc until the a.out ld.so is fixed.
+-	    ;;
+-	  *-*-openbsd* | *-*-freebsd*)
+-	    # Do not include libc due to us having libc/libc_r.
+-	    test "X$arg" = "X-lc" && continue
+-	    ;;
+- 	  *)
+-	    # Add libc to deplibs on all other systems if necessary.
+-	    if test "$build_libtool_need_lc" = "yes"; then
+-	      deplibs="$deplibs -lc"
+-	    fi
+-	    ;;
+-	  esac
+-	fi
++   Currently, it simply execs the wrapper *script* "$SHELL $output",
++   but could eventually absorb all of the scripts functionality and
++   exec $objdir/$outputname directly.
++*/
++EOF
++	    cat <<"EOF"
++#include <stdio.h>
++#include <stdlib.h>
++#ifdef _MSC_VER
++# include <direct.h>
++# include <process.h>
++# include <io.h>
++# define setmode _setmode
++#else
++# include <unistd.h>
++# include <stdint.h>
++# ifdef __CYGWIN__
++#  include <io.h>
++#  define HAVE_SETENV
++#  ifdef __STRICT_ANSI__
++char *realpath (const char *, char *);
++int putenv (char *);
++int setenv (const char *, const char *, int);
++#  endif
++# 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>
+ 
+-	# 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.
+-	  $rm conftest.c
+-	  cat > conftest.c <<EOF
+-	  int main() { return 0; }
++#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
++
++#ifdef _MSC_VER
++# define S_IXUSR _S_IEXEC
++# define stat _stat
++# ifndef _INTPTR_T_DEFINED
++#  define intptr_t int
++# endif
++#endif
++
++#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 */
++
++#ifdef __CYGWIN__
++# define FOPEN_WB "wb"
++#endif
++
++#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)
++
++#undef LTWRAPPER_DEBUGPRINTF
++#if defined DEBUGWRAPPER
++# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
++static void
++ltwrapper_debugprintf (const char *fmt, ...)
++{
++    va_list args;
++    va_start (args, fmt);
++    (void) vfprintf (stderr, fmt, args);
++    va_end (args);
++}
++#else
++# define LTWRAPPER_DEBUGPRINTF(args)
++#endif
++
++const char *program_name = NULL;
++
++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_fatal (const char *message, ...);
++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_opt_process_env_set (const char *arg);
++void lt_opt_process_env_prepend (const char *arg);
++void lt_opt_process_env_append (const char *arg);
++int lt_split_name_value (const char *arg, char** name, char** value);
++void lt_update_exe_path (const char *name, const char *value);
++void lt_update_lib_path (const char *name, const char *value);
++
++static const char *script_text_part1 =
+ EOF
+-	  $rm conftest
+-	  $LTCC -o conftest conftest.c $deplibs
+-	  if test "$?" -eq 0 ; then
+-	    ldd_output=`ldd conftest`
+-	    for i in $deplibs; do
+-	      name="`expr $i : '-l\(.*\)'`"
+-	      # If $name is empty we are operating on a -L argument.
+-              if test "$name" != "" && test "$name" -ne "0"; then
+-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+-		  case " $predeps $postdeps " in
+-		  *" $i "*)
+-		    newdeplibs="$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
+-		  deplib_match=$2
+-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+-		    newdeplibs="$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
+-	      else
+-		newdeplibs="$newdeplibs $i"
+-	      fi
+-	    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
+-	      name="`expr $i : '-l\(.*\)'`"
+-	      # If $name is empty we are operating on a -L argument.
+-              if test "$name" != "" && test "$name" != "0"; then
+-		$rm conftest
+-		$LTCC -o conftest conftest.c $i
+-		# Did it work?
+-		if test "$?" -eq 0 ; then
+-		  ldd_output=`ldd conftest`
+-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+-		    case " $predeps $postdeps " in
+-		    *" $i "*)
+-		      newdeplibs="$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
+-		    deplib_match=$2
+-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+-		      newdeplibs="$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_emit_wrapper_part1 yes |
++	        $SED -e 's/\([\\"]\)/\\\1/g' \
++	             -e 's/^/  "/' -e 's/$/\\n"/'
++	    echo ";"
++	    cat <<EOF
++
++static const char *script_text_part2 =
++EOF
++	    func_emit_wrapper_part2 yes |
++	        $SED -e 's/\([\\"]\)/\\\1/g' \
++	             -e 's/^/  "/' -e 's/$/\\n"/'
++	    echo ";"
++
++	    cat <<EOF
++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_pathlist "$temp_rpath"
++	      cat <<EOF
++const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
++EOF
++	    else
++	      cat <<"EOF"
++const char * LIB_PATH_VALUE   = "";
++EOF
++	    fi
++
++	    if test -n "$dllsearchpath"; then
++              func_to_host_pathlist "$dllsearchpath:"
++	      cat <<EOF
++const char * EXE_PATH_VARNAME = "PATH";
++const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_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-"
++#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
++
++static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
++static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
++
++static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
++
++static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
++static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
++  /* argument is putenv-style "foo=bar", value of foo is set to bar */
++
++static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
++static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
++  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
++
++static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
++static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
++  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
++
++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]));
++  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
++  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
++
++  /* very simple arg parsing; don't want to rely on getopt */
++  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"
++	  printf ("%s", script_text_part1);
++	  printf ("%s", script_text_part2);
++	  return 0;
++	}
++    }
++
++  newargz = XMALLOC (char *, argc + 1);
++  tmp_pathspec = find_executable (argv[0]);
++  if (tmp_pathspec == NULL)
++    lt_fatal ("Couldn't find %s", argv[0]);
++  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
++			  tmp_pathspec));
++
++  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
++  LTWRAPPER_DEBUGPRINTF (("(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;
++
++  LTWRAPPER_DEBUGPRINTF (("(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 */
++  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
++  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
++
++  newargc=0;
++  for (i = 1; i < argc; i++)
++    {
++      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
++        {
++          if (argv[i][env_set_opt_len] == '=')
++            {
++              const char *p = argv[i] + env_set_opt_len + 1;
++              lt_opt_process_env_set (p);
++            }
++          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
++            {
++              lt_opt_process_env_set (argv[++i]); /* don't copy */
++            }
++          else
++            lt_fatal ("%s missing required argument", env_set_opt);
++          continue;
++        }
++      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
++        {
++          if (argv[i][env_prepend_opt_len] == '=')
++            {
++              const char *p = argv[i] + env_prepend_opt_len + 1;
++              lt_opt_process_env_prepend (p);
++            }
++          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
++            {
++              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
++            }
++          else
++            lt_fatal ("%s missing required argument", env_prepend_opt);
++          continue;
++        }
++      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
++        {
++          if (argv[i][env_append_opt_len] == '=')
++            {
++              const char *p = argv[i] + env_append_opt_len + 1;
++              lt_opt_process_env_append (p);
++            }
++          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
++            {
++              lt_opt_process_env_append (argv[++i]); /* don't copy */
++            }
++          else
++            lt_fatal ("%s missing required argument", env_append_opt);
++          continue;
++        }
++      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 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 ("Unrecognized option in %s namespace: '%s'",
++                    ltwrapper_option_prefix, argv[i]);
++        }
++      /* otherwise ... */
++      newargz[++newargc] = xstrdup (argv[i]);
++    }
++  newargz[++newargc] = NULL;
++
++  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
++  for (i = 0; i < newargc; i++)
++    {
++      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
++    }
++
++EOF
++
++	    case $host_os in
++	      mingw*)
++		cat <<"EOF"
++  /* execv doesn't actually work on mingw as expected on unix */
++  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
++  if (rval == -1)
++    {
++      /* failed to start process */
++      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, 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 ("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;
++
++  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
++			  path ? (*path ? path : "EMPTY!") : "NULL!"));
++  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;
++
++  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
++			  path ? (*path ? path : "EMPTY!") : "NULL!"));
++  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;
++
++  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
++			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
++
++  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 ("getcwd failed");
++		  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
+-		newdeplibs="$newdeplibs $i"
+-	      fi
+-	    done
++		{
++		  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 ("getcwd failed");
++  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)
++    {
++      LTWRAPPER_DEBUGPRINTF (("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
++	{
++	  char *errstr = strerror (errno);
++	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
++	}
++    }
++  XFREE (tmp_pathspec);
++
++  if (!has_symlinks)
++    {
++      return xstrdup (pathspec);
++    }
++
++  tmp_pathspec = realpath (pathspec, buf);
++  if (tmp_pathspec == 0)
++    {
++      lt_fatal ("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;
++}
++
++static void
++lt_error_core (int exit_status, const char *mode,
++	       const char *message, va_list ap)
++{
++  fprintf (stderr, "%s: %s: ", program_name, mode);
++  vfprintf (stderr, message, ap);
++  fprintf (stderr, ".\n");
++
++  if (exit_status >= 0)
++    exit (exit_status);
++}
++
++void
++lt_fatal (const char *message, ...)
++{
++  va_list ap;
++  va_start (ap, message);
++  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
++  va_end (ap);
++}
++
++void
++lt_setenv (const char *name, const char *value)
++{
++  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
++                          (name ? name : "<NULL>"),
++                          (value ? value : "<NULL>")));
++  {
++#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;
++}
++
++int
++lt_split_name_value (const char *arg, char** name, char** value)
++{
++  const char *p;
++  int len;
++  if (!arg || !*arg)
++    return 1;
++
++  p = strchr (arg, (int)'=');
++
++  if (!p)
++    return 1;
++
++  *value = xstrdup (++p);
++
++  len = strlen (arg) - strlen (*value);
++  *name = XMALLOC (char, len);
++  strncpy (*name, arg, len-1);
++  (*name)[len - 1] = '\0';
++
++  return 0;
++}
++
++void
++lt_opt_process_env_set (const char *arg)
++{
++  char *name = NULL;
++  char *value = NULL;
++
++  if (lt_split_name_value (arg, &name, &value) != 0)
++    {
++      XFREE (name);
++      XFREE (value);
++      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
++    }
++
++  lt_setenv (name, value);
++  XFREE (name);
++  XFREE (value);
++}
++
++void
++lt_opt_process_env_prepend (const char *arg)
++{
++  char *name = NULL;
++  char *value = NULL;
++  char *new_value = NULL;
++
++  if (lt_split_name_value (arg, &name, &value) != 0)
++    {
++      XFREE (name);
++      XFREE (value);
++      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
++    }
++
++  new_value = lt_extend_str (getenv (name), value, 0);
++  lt_setenv (name, new_value);
++  XFREE (new_value);
++  XFREE (name);
++  XFREE (value);
++}
++
++void
++lt_opt_process_env_append (const char *arg)
++{
++  char *name = NULL;
++  char *value = NULL;
++  char *new_value = NULL;
++
++  if (lt_split_name_value (arg, &name, &value) != 0)
++    {
++      XFREE (name);
++      XFREE (value);
++      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
++    }
++
++  new_value = lt_extend_str (getenv (name), value, 1);
++  lt_setenv (name, new_value);
++  XFREE (new_value);
++  XFREE (name);
++  XFREE (value);
++}
++
++void
++lt_update_exe_path (const char *name, const char *value)
++{
++  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
++                          (name ? name : "<NULL>"),
++                          (value ? value : "<NULL>")));
++
++  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)
++{
++  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
++                          (name ? name : "<NULL>"),
++                          (value ? value : "<NULL>")));
++
++  if (name && *name && value && *value)
++    {
++      char *new_value = lt_extend_str (getenv (name), value, 0);
++      lt_setenv (name, new_value);
++      XFREE (new_value);
++    }
++}
++
++
++EOF
++}
++# end: func_emit_cwrapperexe_src
++
++# 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
++    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
++	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
++	      dlfiles="$dlfiles $arg"
++	    else
++	      dlprefiles="$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 "*) ;;
++		*) deplibs="$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
++#	      moreargs="$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
++		      dlfiles="$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.
++		    dlprefiles="$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 "*) ;;
++	    *) rpath="$rpath $arg" ;;
++	    esac
++	  else
++	    case "$xrpath " in
++	    *" $arg "*) ;;
++	    *) xrpath="$xrpath $arg" ;;
++	    esac
++	  fi
++	  prev=
++	  continue
++	  ;;
++	shrext)
++	  shrext_cmds="$arg"
++	  prev=
++	  continue
++	  ;;
++	weak)
++	  weak_libs="$weak_libs $arg"
++	  prev=
++	  continue
++	  ;;
++	xcclinker)
++	  linker_flags="$linker_flags $qarg"
++	  compiler_flags="$compiler_flags $qarg"
++	  prev=
++	  func_append compile_command " $qarg"
++	  func_append finalize_command " $qarg"
++	  continue
++	  ;;
++	xcompiler)
++	  compiler_flags="$compiler_flags $qarg"
++	  prev=
++	  func_append compile_command " $qarg"
++	  func_append finalize_command " $qarg"
++	  continue
++	  ;;
++	xlinker)
++	  linker_flags="$linker_flags $qarg"
++	  compiler_flags="$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
++	;;
++
++      -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"
++	dir=$func_stripname_result
++	if test -z "$dir"; 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
++	# 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 "*) ;;
++	*)
++	  deplibs="$deplibs -L$dir"
++	  lib_search_path="$lib_search_path $dir"
++	  ;;
++	esac
++	case $host in
++	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
++	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
++	  case :$dllsearchpath: in
++	  *":$dir:"*) ;;
++	  ::) dllsearchpath=$dir;;
++	  *) dllsearchpath="$dllsearchpath:$dir";;
++	  esac
++	  case :$dllsearchpath: in
++	  *":$testbindir:"*) ;;
++	  ::) dllsearchpath=$testbindir;;
++	  *) dllsearchpath="$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*)
++	    # 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
++	    deplibs="$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
++	deplibs="$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)
++	compiler_flags="$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)
++	compiler_flags="$compiler_flags $arg"
++	func_append compile_command " $arg"
++	func_append finalize_command " $arg"
++	case "$new_inherited_linker_flags " in
++	    *" $arg "*) ;;
++	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
++	esac
++	deplibs="$deplibs $arg"
++	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_fatal_error "only absolute run-paths are allowed"
++	  ;;
++	esac
++	case "$xrpath " in
++	*" $dir "*) ;;
++	*) xrpath="$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"
++	  arg="$arg $wl$func_quote_for_eval_result"
++	  compiler_flags="$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"
++	  arg="$arg $wl$func_quote_for_eval_result"
++	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
++	  linker_flags="$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"
++	;;
++
++      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
++      # -r[0-9][0-9]* specifies the processor on the SGI compiler
++      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
++      # +DA*, +DD* enable 64-bit mode on the HP compiler
++      # -q* pass through compiler args for the IBM compiler
++      # -m*, -t[45]*, -txscale* pass through architecture-specific
++      # compiler args for GCC
++      # -F/path gives path to uninstalled frameworks, gcc on darwin
++      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
++      # @file GCC response files
++      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++        func_quote_for_eval "$arg"
++	arg="$func_quote_for_eval_result"
++        func_append compile_command " $arg"
++        func_append finalize_command " $arg"
++        compiler_flags="$compiler_flags $arg"
++        continue
++        ;;
++
++      # Some other compiler flag.
++      -* | +*)
++        func_quote_for_eval "$arg"
++	arg="$func_quote_for_eval_result"
++	;;
++
++      *.$objext)
++	# A standard object.
++	objs="$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
+-	  ;;
+-	file_magic*)
+-	  set dummy $deplibs_check_method
+-	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+-	  for a_deplib in $deplibs; do
+-	    name="`expr $a_deplib : '-l\(.*\)'`"
+-	    # If $name is empty we are operating on a -L argument.
+-            if test "$name" != "" && test  "$name" != "0"; then
+-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+-		case " $predeps $postdeps " in
+-		*" $a_deplib "*)
+-		  newdeplibs="$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
+-		      # 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 "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+-			esac
+-		      done
+-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
+-			 | ${SED} 10q \
+-			 | $EGREP "$file_magic_regex" > /dev/null; then
+-			newdeplibs="$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
++
++	  # 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
++		dlfiles="$dlfiles $pic_object"
++		prev=
++		continue
++	      else
++		# If libtool objects are unsupported, then we need to preload.
++		prev=dlprefiles
+ 	      fi
+-	    else
+-	      # Add a -L argument.
+-	      newdeplibs="$newdeplibs $a_deplib"
+ 	    fi
+-	  done # Gone through all deplibs.
+-	  ;;
+-	match_pattern*)
+-	  set dummy $deplibs_check_method
+-	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+-	  for a_deplib in $deplibs; do
+-	    name="`expr $a_deplib : '-l\(.*\)'`"
+-	    # If $name is empty we are operating on a -L argument.
+-	    if test -n "$name" && test "$name" != "0"; then
+-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+-		case " $predeps $postdeps " in
+-		*" $a_deplib "*)
+-		  newdeplibs="$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
+-		      newdeplibs="$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
+-	    else
+-	      # Add a -L argument.
+-	      newdeplibs="$newdeplibs $a_deplib"
++
++	    # CHECK ME:  I think I busted this.  -Ossama
++	    if test "$prev" = dlprefiles; then
++	      # Preload the old-style object.
++	      dlprefiles="$dlprefiles $pic_object"
++	      prev=
+ 	    fi
+-	  done # Gone through all deplibs.
+-	  ;;
+-	none | unknown | *)
+-	  newdeplibs=""
+-	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
+-	    -e '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 "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
+-	    done
++
++	    # A PIC object.
++	    func_append libobjs " $pic_object"
++	    arg="$pic_object"
+ 	  fi
+-	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
+-	    | grep . >/dev/null; then
+-	    $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."
++
++	  # 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
+-	    $echo "*** All declared inter-library dependencies are being dropped."
+-	    droppeddeps=yes
++	  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.
++	deplibs="$deplibs $arg"
++	old_deplibs="$old_deplibs $arg"
++	continue
++	;;
++
++      *.la)
++	# A libtool-controlled library.
++
++	if test "$prev" = dlfiles; then
++	  # This library was specified with -dlopen.
++	  dlfiles="$dlfiles $arg"
++	  prev=
++	elif test "$prev" = dlprefiles; then
++	  # The library was specified with -dlpreopen.
++	  dlprefiles="$dlprefiles $arg"
++	  prev=
++	else
++	  deplibs="$deplibs $arg"
++	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 \"X\${$shlibpath_var}\" \| \$Xsed -e \'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"
++    # 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_duplicate_deps ; then
++	case "$libs " in
++	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ 	esac
+-	versuffix=$versuffix_save
+-	major=$major_save
+-	release=$release_save
+-	libname=$libname_save
+-	name=$name_save
++      fi
++      libs="$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 "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
++	  esac
++	  pre_post_deps="$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
+ 
+-	case $host in
+-	*-*-rhapsody* | *-*-darwin1.[012])
+-	  # On Rhapsody replace the C library is the System framework
+-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+-	  ;;
++    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=
++	  case $lib in
++	  *.la)	func_source "$lib" ;;
++	  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."
++	  # Collect preopened libtool deplibs, except any this library
++	  # has declared as weak libs
++	  for deplib in $dependency_libs; do
++            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
++	    case " $weak_libs " in
++	    *" $deplib_base "*) ;;
++	    *) deplibs="$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)
++	  if test "$linkmode,$pass" = "prog,link"; then
++	    compile_deplibs="$deplib $compile_deplibs"
++	    finalize_deplibs="$deplib $finalize_deplibs"
++	  else
++	    compiler_flags="$compiler_flags $deplib"
++	  fi
++
++	  case $linkmode in
++	  lib)
++	    deplibs="$deplib $deplibs"
++	    test "$pass" = conv && continue
++	    newdependency_libs="$deplib $newdependency_libs"
++	    ;;
++	  prog)
++	    if test "$pass" = conv; then
++	      deplibs="$deplib $deplibs"
++	      continue
+ 	    fi
+-	    if test "$build_old_libs" = no; then
+-	      oldlibs="$output_objdir/$libname.$libext"
+-	      build_libtool_libs=module
+-	      build_old_libs=yes
++	    if test "$pass" = scan; then
++	      deplibs="$deplib $deplibs"
+ 	    else
+-	      build_libtool_libs=no
++	      compile_deplibs="$deplib $compile_deplibs"
++	      finalize_deplibs="$deplib $finalize_deplibs"
+ 	    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."
++	    ;;
++	  *)
++	    ;;
++	  esac # linkmode
+ 
+-	    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
++	  continue
++	  ;;
++	-l*)
++	  if test "$linkmode" != lib && test "$linkmode" != prog; then
++	    func_warning "\`-l' is ignored for archives/objects"
++	    continue
+ 	  fi
+-	fi
+-	# Done checking deplibs!
+-	deplibs=$newdeplibs
+-      fi
+-
+-      # 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
+-	if test "$hardcode_into_libs" = yes; then
+-	  # Hardcode the library paths
+-	  hardcode_libdirs=
+-	  dep_rpath=
+-	  rpath="$finalize_rpath"
+-	  test "$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
+-		if test -z "$hardcode_libdirs"; then
+-		  hardcode_libdirs="$libdir"
++	  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
+-		  # Just accumulate the unique libdirs.
+-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+-		    ;;
+-		  *)
+-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+-		    ;;
+-		  esac
++		  found=no
+ 		fi
+-	      else
+-		eval flag=\"$hardcode_libdir_flag_spec\"
+-		dep_rpath="$dep_rpath $flag"
++		break 2
+ 	      fi
+-	    elif test -n "$runpath_var"; then
+-	      case "$perm_rpath " in
+-	      *" $libdir "*) ;;
+-	      *) perm_rpath="$perm_rpath $libdir" ;;
+-	      esac
+-	    fi
++	    done
+ 	  done
+-	  # Substitute the hardcoded libdirs into the rpath.
+-	  if test -n "$hardcode_libdir_separator" &&
+-	     test -n "$hardcode_libdirs"; then
+-	    libdir="$hardcode_libdirs"
+-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
+-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
++	  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
+-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
++	      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
+-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+-	    # We should set the runpath_var.
+-	    rpath=
+-	    for dir in $perm_rpath; do
+-	      rpath="$rpath$dir:"
+-	    done
+-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
++	  ;; # -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 "*) ;;
++		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
++		esac
++	    fi
+ 	  fi
+-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+-	fi
+-
+-	shlibpath="$finalize_shlibpath"
+-	test "$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\"
+-	eval library_names=\"$library_names_spec\"
+-	set dummy $library_names
+-	realname="$2"
+-	shift; 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"
+-	for link
+-	do
+-	  linknames="$linknames $link"
+-	done
+-
+-	# Use standard objects if they are pic
+-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+-
+-	# Prepare the list of exported symbols
+-	if test -z "$export_symbols"; then
+-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+-	    $show "generating symbol list for \`$libname.la'"
+-	    export_symbols="$output_objdir/$libname.exp"
+-	    $run $rm $export_symbols
+-	    eval cmds=\"$export_symbols_cmds\"
+-	    save_ifs="$IFS"; IFS='~'
+-	    for cmd in $cmds; do
+-	      IFS="$save_ifs"
+-	      if len=`expr "X$cmd" : ".*"` &&
+-	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+-	        $show "$cmd"
+-	        $run eval "$cmd" || exit $?
+-	        skipped_export=false
++	  continue
++	  ;;
++	-L*)
++	  case $linkmode in
++	  lib)
++	    deplibs="$deplib $deplibs"
++	    test "$pass" = conv && continue
++	    newdependency_libs="$deplib $newdependency_libs"
++	    func_stripname '-L' '' "$deplib"
++	    newlib_search_path="$newlib_search_path $func_stripname_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"
++	    newlib_search_path="$newlib_search_path $func_stripname_result"
++	    ;;
++	  *)
++	    func_warning "\`-L' is ignored for archives/objects"
++	    ;;
++	  esac # linkmode
++	  continue
++	  ;; # -L
++	-R*)
++	  if test "$pass" = link; then
++	    func_stripname '-R' '' "$deplib"
++	    dir=$func_stripname_result
++	    # Make sure the xrpath contains only unique directories.
++	    case "$xrpath " in
++	    *" $dir "*) ;;
++	    *) xrpath="$xrpath $dir" ;;
++	    esac
++	  fi
++	  deplibs="$deplib $deplibs"
++	  continue
++	  ;;
++	*.la) lib="$deplib" ;;
++	*.$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 \"X$deplib\"" 2>/dev/null | $Xsed -e 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
+-	        # The command line is too long to execute in one step.
+-	        $show "using reloadable object file for export list..."
+-	        skipped_export=:
++		$ECHO
++		$ECHO "*** Warning: Linking the shared library $output against the"
++		$ECHO "*** static library $deplib is not portable!"
++		deplibs="$deplib $deplibs"
+ 	      fi
+-	    done
+-	    IFS="$save_ifs"
+-	    if test -n "$export_symbols_regex"; then
+-	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
+-	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+-	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
+-	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
++	      ;;
++	    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.
++	      newdlprefiles="$newdlprefiles $deplib"
++	      compile_deplibs="$deplib $compile_deplibs"
++	      finalize_deplibs="$deplib $finalize_deplibs"
++	    else
++	      newdlfiles="$newdlfiles $deplib"
+ 	    fi
+ 	  fi
+-	fi
++	  continue
++	  ;;
++	%DEPLIBS%)
++	  alldeplibs=yes
++	  continue
++	  ;;
++	esac # case $deplib
+ 
+-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+-	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
++	if test "$found" = yes || test -f "$lib"; then :
++	else
++	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
+ 	fi
+ 
+-	tmp_deplibs=
+-	for test_deplib in $deplibs; do
+-		case " $convenience " in
+-		*" $test_deplib "*) ;;
+-		*) 
+-			tmp_deplibs="$tmp_deplibs $test_deplib"
+-			;;
+-		esac
+-	done
+-	deplibs="$tmp_deplibs" 
+-
+-	if test -n "$convenience"; then
+-	  if test -n "$whole_archive_flag_spec"; then
+-	    save_libobjs=$libobjs
+-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+-	  else
+-	    gentop="$output_objdir/${outputname}x"
+-	    $show "${rm}r $gentop"
+-	    $run ${rm}r "$gentop"
+-	    $show "$mkdir $gentop"
+-	    $run $mkdir "$gentop"
+-	    status=$?
+-	    if test "$status" -ne 0 && test ! -d "$gentop"; then
+-	      exit $status
+-	    fi
+-	    generated="$generated $gentop"
++	# 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"
+ 
+-	    for xlib in $convenience; do
+-	      # Extract the objects.
+-	      case $xlib in
+-	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+-	      *) xabs=`pwd`"/$xlib" ;;
+-	      esac
+-	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+-	      xdir="$gentop/$xlib"
++	func_dirname "$lib" "" "."
++	ladir="$func_dirname_result"
+ 
+-	      $show "${rm}r $xdir"
+-	      $run ${rm}r "$xdir"
+-	      $show "$mkdir $xdir"
+-	      $run $mkdir "$xdir"
+-	      status=$?
+-	      if test "$status" -ne 0 && test ! -d "$xdir"; then
+-		exit $status
+-	      fi
+-	      # We will extract separately just the conflicting names and we will no
+-	      # longer touch any unique names. It is faster to leave these extract
+-	      # automatically by $AR in one run.
+-	      $show "(cd $xdir && $AR x $xabs)"
+-	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+-		:
+-	      else
+-		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+-		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+-		$AR t "$xabs" | sort | uniq -cd | while read -r count name
+-		do
+-		  i=1
+-		  while test "$i" -le "$count"
+-		  do
+-		   # Put our $i before any first dot (extension)
+-		   # Never overwrite any file
+-		   name_to="$name"
+-		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+-		   do
+-		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+-		   done
+-		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+-		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+-		   i=`expr $i + 1`
+-		  done
+-		done
+-	      fi
++	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=
+ 
+-	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+-	    done
+-	  fi
+-	fi
+ 
+-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+-	  eval flag=\"$thread_safe_flag_spec\"
+-	  linker_flags="$linker_flags $flag"
+-	fi
++	# Read the .la file
++	func_source "$lib"
+ 
+-	# Make a backup of the uninstalled library when relinking
+-	if test "$mode" = relink; then
+-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
++	# Convert "-framework foo" to "foo.ltframework"
++	if test -n "$inherited_linker_flags"; then
++	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e '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 "*) ;;
++	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
++	    esac
++	  done
+ 	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 cmds=\"$module_expsym_cmds\"
+-	  else
+-	    eval cmds=\"$module_cmds\"
+-	  fi
+-	else
+-	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+-	  eval cmds=\"$archive_expsym_cmds\"
+-	else
+-	  eval cmds=\"$archive_cmds\"
+-	  fi
++	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e '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" && dlfiles="$dlfiles $dlopen"
++	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+ 	fi
+ 
+-	if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
+-	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+-	  :
+-	else
+-	  # The command line is too long to link in one step, link piecewise.
+-	  $echo "creating reloadable object files..."
+-
+-	  # 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
++	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.
++	    convenience="$convenience $ladir/$objdir/$old_library"
++	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
++	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
++	    func_fatal_error "\`$lib' is not a convenience library"
+ 	  fi
+-	  save_output=$output
+-
+-	  # Clear the reloadable object creation command queue and
+-	  # initialize k to one.
+-	  test_cmds=
+-	  concat_cmds=
+-	  objlist=
+-	  delfiles=
+-	  last_robj=
+-	  k=1
+-	  output=$output_objdir/$save_output-${k}.$objext
+-	  # Loop over the list of objects to be linked.
+-	  for obj in $save_libobjs
+-	  do
+-	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+-	    if test "X$objlist" = X ||
+-	       { len=`expr "X$test_cmds" : ".*"` &&
+-		 test "$len" -le "$max_cmd_len"; }; then
+-	      objlist="$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.
+-		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+-	      else
+-		# All subsequent reloadable object files will link in
+-		# the last one created.
+-		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+-	      fi
+-	      last_robj=$output_objdir/$save_output-${k}.$objext
+-	      k=`expr $k + 1`
+-	      output=$output_objdir/$save_output-${k}.$objext
+-	      objlist=$obj
+-	      len=1
++	  tmp_libs=
++	  for deplib in $dependency_libs; do
++	    deplibs="$deplib $deplibs"
++	    if $opt_duplicate_deps ; then
++	      case "$tmp_libs " in
++	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	      esac
+ 	    fi
++	    tmp_libs="$tmp_libs $deplib"
+ 	  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~
+-	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+-
+-	  if ${skipped_export-false}; then
+-	    $show "generating symbol list for \`$libname.la'"
+-	    export_symbols="$output_objdir/$libname.exp"
+-	    $run $rm $export_symbols
+-	    libobjs=$output
+-	    # Append the command to create the export file.
+-	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+-          fi
+-
+-	  # Set up a command to remove the reloadale object files
+-	  # after they are used.
+-	  i=0
+-	  while test "$i" -lt "$k"
+-	  do
+-	    i=`expr $i + 1`
+-	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
+-	  done
+-
+-	  $echo "creating a temporary reloadable object file: $output"
++	  continue
++	fi # $pass = conv
+ 
+-	  # Loop through the commands generated above and execute them.
+-	  save_ifs="$IFS"; IFS='~'
+-	  for cmd in $concat_cmds; do
+-	    IFS="$save_ifs"
+-	    $show "$cmd"
+-	    $run eval "$cmd" || exit $?
+-	  done
+-	  IFS="$save_ifs"
+ 
+-	  libobjs=$output
+-	  # Restore the value of output.
+-	  output=$save_output
++	# Get the name of the library we link against.
++	linklib=
++	for l in $old_library $library_names; do
++	  linklib="$l"
++	done
++	if test -z "$linklib"; then
++	  func_fatal_error "cannot find name of link library for \`$lib'"
++	fi
+ 
+-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
++	# 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
+-	  # Expand the library linking commands again to reset the
+-	  # value of $libobjs for piecewise linking.
+-
+-	  # Do each of the archive commands.
+-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+-	    eval cmds=\"$archive_expsym_cmds\"
++	  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.
++	    dlprefiles="$dlprefiles $lib $dependency_libs"
+ 	  else
+-	    eval cmds=\"$archive_cmds\"
++	    newdlfiles="$newdlfiles $lib"
+ 	  fi
++	  continue
++	fi # $pass = dlopen
+ 
+-	  # Append the command to remove the reloadable object files
+-	  # to the just-reset $cmds.
+-	  eval cmds=\"\$cmds~$rm $delfiles\"
+-	fi
+-	save_ifs="$IFS"; IFS='~'
+-	for cmd in $cmds; do
+-	  IFS="$save_ifs"
+-	  $show "$cmd"
+-	  $run eval "$cmd" || exit $?
+-	done
+-	IFS="$save_ifs"
+-
+-	# Restore the uninstalled library and exit
+-	if test "$mode" = relink; then
+-	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+-	  exit 0
+-	fi
+-
+-	# Create links to the real library.
+-	for linkname in $linknames; do
+-	  if test "$realname" != "$linkname"; then
+-	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
+-	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
++	# 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
+-	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 "$deplibs"; then
+-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
+-      fi
+-
+-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+-	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+-      fi
+-
+-      if test -n "$rpath"; then
+-	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
+-      fi
+-
+-      if test -n "$xrpath"; then
+-	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
+-      fi
++	  ;;
++	esac
++	func_basename "$lib"
++	laname="$func_basename_result"
+ 
+-      if test -n "$vinfo"; then
+-	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
+-      fi
++	# Find the relevant object directory and library name.
++	if test "X$installed" = Xyes; then
++	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++	    func_warning "library \`$lib' was moved."
++	    dir="$ladir"
++	    absdir="$abs_ladir"
++	    libdir="$abs_ladir"
++	  else
++	    dir="$libdir"
++	    absdir="$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
++	    notinst_path="$notinst_path $abs_ladir"
++	  else
++	    dir="$ladir/$objdir"
++	    absdir="$abs_ladir/$objdir"
++	    # Remove this search path later
++	    notinst_path="$notinst_path $abs_ladir"
++	  fi
++	fi # $installed = yes
++	func_stripname 'lib' '.la' "$laname"
++	name=$func_stripname_result
+ 
+-      if test -n "$release"; then
+-	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
+-      fi
++	# 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
++	  # Prefer using a static library (so that no silly _DYNAMIC symbols
++	  # are required to link).
++	  if test -n "$old_library"; then
++	    newdlprefiles="$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" && \
++		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
++	  # Otherwise, use the dlname, so that lt_dlopen finds it.
++	  elif test -n "$dlname"; then
++	    newdlprefiles="$newdlprefiles $dir/$dlname"
++	  else
++	    newdlprefiles="$newdlprefiles $dir/$linklib"
++	  fi
++	fi # $pass = dlpreopen
+ 
+-      case $output in
+-      *.lo)
+-	if test -n "$objs$old_deplibs"; then
+-	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+-	  exit 1
++	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
+-	libobj="$output"
+-	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+-	;;
+-      *)
+-	libobj=
+-	obj="$output"
+-	;;
+-      esac
+ 
+-      # Delete the old objects.
+-      $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
+-      wl=
++	if test "$linkmode" = prog && test "$pass" != link; then
++	  newlib_search_path="$newlib_search_path $ladir"
++	  deplibs="$lib $deplibs"
+ 
+-      if test -n "$convenience"; then
+-	if test -n "$whole_archive_flag_spec"; then
+-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+-	else
+-	  gentop="$output_objdir/${obj}x"
+-	  $show "${rm}r $gentop"
+-	  $run ${rm}r "$gentop"
+-	  $show "$mkdir $gentop"
+-	  $run $mkdir "$gentop"
+-	  status=$?
+-	  if test "$status" -ne 0 && test ! -d "$gentop"; then
+-	    exit $status
++	  linkalldeplibs=no
++	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
++	     test "$build_libtool_libs" = no; then
++	    linkalldeplibs=yes
+ 	  fi
+-	  generated="$generated $gentop"
+ 
+-	  for xlib in $convenience; do
+-	    # Extract the objects.
+-	    case $xlib in
+-	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+-	    *) xabs=`pwd`"/$xlib" ;;
++	  tmp_libs=
++	  for deplib in $dependency_libs; do
++	    case $deplib in
++	    -L*) func_stripname '-L' '' "$deplib"
++	         newlib_search_path="$newlib_search_path $func_stripname_result"
++		 ;;
+ 	    esac
+-	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+-	    xdir="$gentop/$xlib"
+-
+-	    $show "${rm}r $xdir"
+-	    $run ${rm}r "$xdir"
+-	    $show "$mkdir $xdir"
+-	    $run $mkdir "$xdir"
+-	    status=$?
+-	    if test "$status" -ne 0 && test ! -d "$xdir"; then
+-	      exit $status
+-	    fi
+-	    # We will extract separately just the conflicting names and we will no
+-	    # longer touch any unique names. It is faster to leave these extract
+-	    # automatically by $AR in one run.
+-	    $show "(cd $xdir && $AR x $xabs)"
+-	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+-	      :
++	    # Need to link against all dependency_libs?
++	    if test "$linkalldeplibs" = yes; then
++	      deplibs="$deplib $deplibs"
+ 	    else
+-	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+-	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+-	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
+-	      do
+-		i=1
+-		while test "$i" -le "$count"
+-		do
+-		 # Put our $i before any first dot (extension)
+-		 # Never overwrite any file
+-		 name_to="$name"
+-		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+-		 do
+-		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+-		 done
+-		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+-		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+-		 i=`expr $i + 1`
+-		done
+-	      done
++	      # Need to hardcode shared library paths
++	      # or/and link against static libraries
++	      newdependency_libs="$deplib $newdependency_libs"
+ 	    fi
++	    if $opt_duplicate_deps ; then
++	      case "$tmp_libs " in
++	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	      esac
++	    fi
++	    tmp_libs="$tmp_libs $deplib"
++	  done # for deplib
++	  continue
++	fi # $linkmode = prog...
+ 
+-	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+-	  done
+-	fi
+-      fi
+-
+-      # Create the old-style object.
+-      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
++	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:"*) ;;
++	      *) temp_rpath="$temp_rpath$absdir:" ;;
++	      esac
++	    fi
+ 
+-      output="$obj"
+-      eval cmds=\"$reload_cmds\"
+-      save_ifs="$IFS"; IFS='~'
+-      for cmd in $cmds; do
+-	IFS="$save_ifs"
+-	$show "$cmd"
+-	$run eval "$cmd" || exit $?
+-      done
+-      IFS="$save_ifs"
++	    # 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 "*) ;;
++	      *) compile_rpath="$compile_rpath $absdir"
++	      esac
++	      ;;
++	    esac
++	    case " $sys_lib_dlsearch_path " in
++	    *" $libdir "*) ;;
++	    *)
++	      case "$finalize_rpath " in
++	      *" $libdir "*) ;;
++	      *) finalize_rpath="$finalize_rpath $libdir"
++	      esac
++	      ;;
++	    esac
++	  fi # $linkmode,$pass = prog,link...
+ 
+-      # Exit if we aren't doing a library object file.
+-      if test -z "$libobj"; then
+-	if test -n "$gentop"; then
+-	  $show "${rm}r $gentop"
+-	  $run ${rm}r $gentop
++	  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
+ 
+-	exit 0
+-      fi
+-
+-      if test "$build_libtool_libs" != yes; then
+-	if test -n "$gentop"; then
+-	  $show "${rm}r $gentop"
+-	  $run ${rm}r $gentop
++	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
++	      notinst_deplibs="$notinst_deplibs $lib"
++	      need_relink=no
++	    ;;
++	  *)
++	    if test "$installed" = no; then
++	      notinst_deplibs="$notinst_deplibs $lib"
++	      need_relink=yes
++	    fi
++	    ;;
++	  esac
++	  # This is a shared library
+ 
+-	# Create an invalid libtool object if no PIC, so that we don't
+-	# accidentally link it into a program.
+-	# $show "echo timestamp > $libobj"
+-	# $run eval "echo timestamp > $libobj" || exit $?
+-	exit 0
+-      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"
+-	eval cmds=\"$reload_cmds\"
+-	save_ifs="$IFS"; IFS='~'
+-	for cmd in $cmds; do
+-	  IFS="$save_ifs"
+-	  $show "$cmd"
+-	  $run eval "$cmd" || exit $?
+-	done
+-	IFS="$save_ifs"
+-      fi
+-
+-      if test -n "$gentop"; then
+-	$show "${rm}r $gentop"
+-	$run ${rm}r $gentop
+-      fi
++	  # 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 "*) ;;
++	      *) compile_rpath="$compile_rpath $absdir"
++	      esac
++	      ;;
++	    esac
++	    case " $sys_lib_dlsearch_path " in
++	    *" $libdir "*) ;;
++	    *)
++	      case "$finalize_rpath " in
++	      *" $libdir "*) ;;
++	      *) finalize_rpath="$finalize_rpath $libdir"
++	      esac
++	      ;;
++	    esac
++	  fi
+ 
+-      exit 0
+-      ;;
++	  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
+ 
+-    prog)
+-      case $host in
+-	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
+-      esac
+-      if test -n "$vinfo"; then
+-	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
+-      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 test -n "$release"; then
+-	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
+-      fi
++	    # 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
+ 
+-      if test "$preload" = yes; then
+-	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
+-	   test "$dlopen_self_static" = unknown; then
+-	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
+-	fi
+-      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"
+ 
+-      case $host in
+-      *-*-rhapsody* | *-*-darwin1.[012])
+-	# On Rhapsody replace the C library is the System framework
+-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+-	;;
+-      esac
++	  if test "$linkmode" = prog || test "$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$dir"
++		# Try looking first in the location we're being installed to.
++		if test -n "$inst_prefix_dir"; then
++		  case $libdir in
++		    [\\/]*)
++		      add_dir="$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
+ 
+-      case $host in
+-      *darwin*)
+-        # Don't allow lazy linking, it breaks C++ global constructors
+-        if test "$tagname" = CXX ; then
+-        compile_command="$compile_command ${wl}-bind_at_load"
+-        finalize_command="$finalize_command ${wl}-bind_at_load"
+-        fi
+-        ;;
+-      esac
++	    if test "$lib_linked" != yes; then
++	      func_fatal_configuration "unsupported hardcode properties"
++	    fi
+ 
+-      compile_command="$compile_command $compile_deplibs"
+-      finalize_command="$finalize_command $finalize_deplibs"
++	    if test -n "$add_shlibpath"; then
++	      case :$compile_shlibpath: in
++	      *":$add_shlibpath:"*) ;;
++	      *) compile_shlibpath="$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:"*) ;;
++		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
++		esac
++	      fi
++	    fi
++	  fi
+ 
+-      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 "*) ;;
+-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+-	  esac
+-	done
+-      fi
++	  if test "$linkmode" = prog || test "$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:"*) ;;
++	      *) finalize_shlibpath="$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
++		  [\\/]*)
++		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
++		    ;;
++		esac
++	      fi
++	      add="-l$name"
++	    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"
++	    if test "$linkmode" = prog; then
++	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
++	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+ 	    else
+-	      # Just accumulate the unique libdirs.
+-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+-		;;
+-	      *)
+-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+-		;;
+-	      esac
++	      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
+-	    eval flag=\"$hardcode_libdir_flag_spec\"
+-	    rpath="$rpath $flag"
++	    compile_deplibs="-l$name -L$dir $compile_deplibs"
++	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+ 	  fi
+-	elif test -n "$runpath_var"; then
+-	  case "$perm_rpath " in
+-	  *" $libdir "*) ;;
+-	  *) perm_rpath="$perm_rpath $libdir" ;;
+-	  esac
+-	fi
+-	case $host in
+-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+-	  case :$dllsearchpath: in
+-	  *":$libdir:"*) ;;
+-	  *) dllsearchpath="$dllsearchpath:$libdir";;
+-	  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"
++	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.
+ 
+-      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"*)
+-		;;
+-	      *)
+-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+-		;;
+-	      esac
++	    # 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
+-	    eval flag=\"$hardcode_libdir_flag_spec\"
+-	    rpath="$rpath $flag"
++	    deplibs="$dir/$old_library $deplibs"
++	    link_static=yes
+ 	  fi
+-	elif test -n "$runpath_var"; then
+-	  case "$finalize_perm_rpath " in
+-	  *" $libdir "*) ;;
+-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+-	  esac
++	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 "*) ;;
++		   *) xrpath="$xrpath $temp_xrpath";;
++		   esac;;
++	      *) temp_deplibs="$temp_deplibs $libdir";;
++	      esac
++	    done
++	    dependency_libs="$temp_deplibs"
++	  fi
++
++	  newlib_search_path="$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"
++	    if $opt_duplicate_deps ; then
++	      case "$tmp_libs " in
++	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	      esac
++	    fi
++	    tmp_libs="$tmp_libs $deplib"
++	  done
++
++	  if test "$link_all_deplibs" != no; then
++	    # Add the search paths of all dependency libraries
++	    for deplib in $dependency_libs; do
++	      case $deplib in
++	      -L*) path="$deplib" ;;
++	      *.la)
++	        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
++		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
++		      linker_flags="$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 "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ 	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 "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++      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 "*) ;;
++	    *) lib_search_path="$lib_search_path $dir" ;;
++	    esac
++	  done
++	  newlib_search_path=
++	fi
+ 
+-      dlsyms=
+-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+-	if test -n "$NM" && test -n "$global_symbol_pipe"; then
+-	  dlsyms="${outputname}S.c"
++	if test "$linkmode,$pass" != "prog,link"; then
++	  vars="deplibs"
+ 	else
+-	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
++	  vars="compile_deplibs finalize_deplibs"
+ 	fi
+-      fi
+-
+-      if test -n "$dlsyms"; then
+-	case $dlsyms in
+-	"") ;;
+-	*.c)
+-	  # Discover the nlist of each of the dlfiles.
+-	  nlist="$output_objdir/${outputname}.nm"
+-
+-	  $show "$rm $nlist ${nlist}S ${nlist}T"
+-	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
+-
+-	  # Parse the name list into a source file.
+-	  $show "creating $output_objdir/$dlsyms"
+-
+-	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
+-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
+-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
+-
+-#ifdef __cplusplus
+-extern \"C\" {
+-#endif
+-
+-/* Prevent the only kind of declaration conflicts we can make. */
+-#define lt_preloaded_symbols some_other_symbol
+-
+-/* External symbol declarations for the compiler. */\
+-"
+-
+-	  if test "$dlself" = yes; then
+-	    $show "generating symbol list for \`$output'"
+-
+-	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
+-
+-	    # Add our own program objects to the symbol list.
+-	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+-	    for arg in $progfiles; do
+-	      $show "extracting global C symbols from \`$arg'"
+-	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+-	    done
+-
+-	    if test -n "$exclude_expsyms"; then
+-	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+-	      $run eval '$mv "$nlist"T "$nlist"'
+-	    fi
+-
+-	    if test -n "$export_symbols_regex"; then
+-	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+-	      $run eval '$mv "$nlist"T "$nlist"'
+-	    fi
+-
+-	    # Prepare the list of exported symbols
+-	    if test -z "$export_symbols"; then
+-	      export_symbols="$output_objdir/$output.exp"
+-	      $run $rm $export_symbols
+-	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+-	    else
+-	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+-	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
+-	      $run eval 'mv "$nlist"T "$nlist"'
+-	    fi
+-	  fi
+-
+-	  for arg in $dlprefiles; do
+-	    $show "extracting global C symbols from \`$arg'"
+-	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
+-	    $run eval '$echo ": $name " >> "$nlist"'
+-	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
++	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
+-
+-	  if test -z "$run"; then
+-	    # 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/$dlsyms"'
+-	    else
+-	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
+-	    fi
+-
+-	    $echo >> "$output_objdir/$dlsyms" "\
+-
+-#undef lt_preloaded_symbols
+-
+-#if defined (__STDC__) && __STDC__
+-# define lt_ptr void *
+-#else
+-# define lt_ptr char *
+-# define const
+-#endif
+-
+-/* The mapping between symbol names and symbols. */
+-const struct {
+-  const char *name;
+-  lt_ptr address;
+-}
+-lt_preloaded_symbols[] =
+-{\
+-"
+-
+-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
+-
+-	    $echo >> "$output_objdir/$dlsyms" "\
+-  {0, (lt_ptr) 0}
+-};
+-
+-/* This works around a problem in FreeBSD linker */
+-#ifdef FREEBSD_WORKAROUND
+-static const void *lt_preloaded_setup() {
+-  return lt_preloaded_symbols;
+-}
+-#endif
+-
+-#ifdef __cplusplus
+-}
+-#endif\
+-"
+-	  fi
+-
+-	  pic_flag_for_symtable=
+-	  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*)
+-	    case "$compile_command " in
+-	    *" -static "*) ;;
+-	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
+-	    esac;;
+-	  *-*-hpux*)
+-	    case "$compile_command " in
+-	    *" -static "*) ;;
+-	    *) pic_flag_for_symtable=" $pic_flag";;
++	  tmp_libs=
++	  for deplib in $new_libs; do
++	    case $deplib in
++	    -L*)
++	      case " $tmp_libs " in
++	      *" $deplib "*) ;;
++	      *) tmp_libs="$tmp_libs $deplib" ;;
++	      esac
++	      ;;
++	    *) tmp_libs="$tmp_libs $deplib" ;;
+ 	    esac
+-	  esac
+-
+-	  # Now compile the dynamic symbol file.
+-	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+-	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+-
+-	  # Clean up the generated files.
+-	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+-	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
+-
+-	  # Transform the symbol file into the correct name.
+-	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+-	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+-	  ;;
+-	*)
+-	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+-	  exit 1
++	  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
+-      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.
++	if test -n "$i" ; then
++	  tmp_libs="$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
+ 
+-	# Nullify the symbol file.
+-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
++    case $linkmode in
++    oldlib)
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	func_warning "\`-dlopen' is ignored for archives"
+       fi
+ 
+-      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+-	# Replace the output file specification.
+-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+-	link_command="$compile_command$compile_rpath"
++      case " $deplibs" in
++      *\ -l* | *\ -L*)
++	func_warning "\`-l' and \`-L' are ignored for archives" ;;
++      esac
+ 
+-	# We have no uninstalled library dependencies, so finalize right now.
+-	$show "$link_command"
+-	$run eval "$link_command"
+-	status=$?
++      test -n "$rpath" && \
++	func_warning "\`-rpath' is ignored for archives"
+ 
+-	# Delete the generated files.
+-	if test -n "$dlsyms"; then
+-	  $show "$rm $output_objdir/${outputname}S.${objext}"
+-	  $run $rm "$output_objdir/${outputname}S.${objext}"
+-	fi
++      test -n "$xrpath" && \
++	func_warning "\`-R' is ignored for archives"
+ 
+-	exit $status
+-      fi
++      test -n "$vinfo" && \
++	func_warning "\`-version-info/-version-number' is ignored for archives"
+ 
+-      if test -n "$shlibpath_var"; then
+-	# We should set the shlibpath_var
+-	rpath=
+-	for dir in $temp_rpath; do
+-	  case $dir in
+-	  [\\/]* | [A-Za-z]:[\\/]*)
+-	    # Absolute path.
+-	    rpath="$rpath$dir:"
+-	    ;;
+-	  *)
+-	    # Relative path: add a thisdir entry.
+-	    rpath="$rpath\$thisdir/$dir:"
+-	    ;;
+-	  esac
+-	done
+-	temp_rpath="$rpath"
+-      fi
++      test -n "$release" && \
++	func_warning "\`-release' is ignored for archives"
+ 
+-      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
++      test -n "$export_symbols$export_symbols_regex" && \
++	func_warning "\`-export-symbols' is ignored for archives"
+ 
+-      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
+-	    rpath="$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
+-	    rpath="$rpath$dir:"
+-	  done
+-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+-	fi
+-      fi
++      # Now set the variables for building old libraries.
++      build_libtool_libs=no
++      oldlibs="$output"
++      objs="$objs$old_deplibs"
++      ;;
+ 
+-      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 "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+-	# Delete the old output file.
+-	$run $rm $output
+-	# Link the executable and exit
+-	$show "$link_command"
+-	$run eval "$link_command" || exit $?
+-	exit 0
+-      fi
++    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 "$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"
++	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
+ 
+-	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
+-	$echo "$modename: \`$output' will be relinked during installation" 1>&2
+-      else
+-	if test "$fast_install" != no; then
+-	  link_command="$finalize_var$compile_command$finalize_rpath"
+-	  if test "$fast_install" = yes; then
+-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+-	  else
+-	    # fast_install is set to needless
+-	    relink_command=
+-	  fi
++      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
+-	  link_command="$compile_var$compile_command$compile_rpath"
+-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
++	  $ECHO
++	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
++	  $ECHO "*** objects $objs is not portable!"
++	  libobjs="$libobjs $objs"
+ 	fi
+       fi
+ 
+-      # Replace the output file specification.
+-      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
++      test "$dlself" != no && \
++	func_warning "\`-dlopen self' is ignored for libtool libraries"
+ 
+-      # Delete the old output files.
+-      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
++      set dummy $rpath
++      shift
++      test "$#" -gt 1 && \
++	func_warning "ignoring multiple \`-rpath's for a libtool library"
+ 
+-      $show "$link_command"
+-      $run eval "$link_command" || exit $?
++      install_libdir="$1"
+ 
+-      # Now create the wrapper script.
+-      $show "creating $output"
++      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
+ 
+-      # 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}\" || 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
+-	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+-	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
+-	  fi
+-	done
+-	relink_command="(cd `pwd`; $relink_command)"
+-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+-      fi
++	test -n "$vinfo" && \
++	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+ 
+-      # Quote $echo for shipping.
+-      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
+-	case $0 in
+-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
+-	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
+-	esac
+-	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
++	test -n "$release" && \
++	  func_warning "\`-release' is ignored for convenience libraries"
+       else
+-	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
+-      fi
+ 
+-      # Only actually do things if our run command is non-null.
+-      if test -z "$run"; then
+-	# win32 will think the script is a binary if it has
+-	# a .exe suffix, so we strip it off here.
+-	case $output in
+-	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
+-	esac
+-	# test for cygwin because mv fails w/o .exe extensions
+-	case $host in
+-	  *cygwin*)
+-	    exeext=.exe
+-	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
+-	  *) exeext= ;;
++	# 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
++	  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|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
+-	case $host in
+-	  *cygwin* | *mingw* )
+-	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
+-	    cwrapper=`$echo ${output}.exe`
+-	    $rm $cwrappersource $cwrapper
+-	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
+ 
+-	    cat > $cwrappersource <<EOF
++	# 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
+ 
+-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+-   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
++	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
+ 
+-   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.
++	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
+ 
+-   Currently, it simply execs the wrapper *script* "/bin/sh $output",
+-   but could eventually absorb all of the scripts functionality and
+-   exec $objdir/$outputname directly.
+-*/
+-EOF
+-	    cat >> $cwrappersource<<"EOF"
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <unistd.h>
+-#include <malloc.h>
+-#include <stdarg.h>
+-#include <assert.h>
++	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
+ 
+-#if defined(PATH_MAX)
+-# define LT_PATHMAX PATH_MAX
+-#elif defined(MAXPATHLEN)
+-# define LT_PATHMAX MAXPATHLEN
+-#else
+-# define LT_PATHMAX 1024
+-#endif
++	# Calculate the version variables.
++	major=
++	versuffix=
++	verstring=
++	case $version_type in
++	none) ;;
+ 
+-#ifndef DIR_SEPARATOR
+-#define DIR_SEPARATOR '/'
+-#endif
++	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"
++	  ;;
+ 
+-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+-  defined (__OS2__)
+-#define HAVE_DOS_BASED_FILE_SYSTEM
+-#ifndef DIR_SEPARATOR_2 
+-#define DIR_SEPARATOR_2 '\\'
+-#endif
+-#endif
++	freebsd-aout)
++	  major=".$current"
++	  versuffix=".$current.$revision";
++	  ;;
+ 
+-#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 */
++	freebsd-elf)
++	  major=".$current"
++	  versuffix=".$current"
++	  ;;
+ 
+-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+-#define XFREE(stale) do { \
+-  if (stale) { free ((void *) stale); stale = 0; } \
+-} while (0)
++	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
+ 
+-const char *program_name = NULL;
++	  case $version_type in
++	    nonstopux) verstring_prefix=nonstopux ;;
++	    *)         verstring_prefix=sgi ;;
++	  esac
++	  verstring="$verstring_prefix$major.$revision"
+ 
+-void * xmalloc (size_t num);
+-char * xstrdup (const char *string);
+-char * basename (const char *name);
+-char * fnqualify(const char *path);
+-char * strendzap(char *str, const char *pat);
+-void lt_fatal (const char *message, ...);
++	  # 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
+ 
+-int
+-main (int argc, char *argv[])
+-{
+-  char **newargz;
+-  int i;
+-  
+-  program_name = (char *) xstrdup ((char *) basename (argv[0]));
+-  newargz = XMALLOC(char *, argc+2);
+-EOF
++	  # Before this point, $major must not contain `.'.
++	  major=.$major
++	  versuffix="$major.$revision"
++	  ;;
+ 
+-	    cat >> $cwrappersource <<EOF
+-  newargz[0] = "$SHELL";
+-EOF
++	linux)
++	  func_arith $current - $age
++	  major=.$func_arith_result
++	  versuffix="$major.$age.$revision"
++	  ;;
+ 
+-	    cat >> $cwrappersource <<"EOF"
+-  newargz[1] = fnqualify(argv[0]);
+-  /* we know the script has the same name, without the .exe */
+-  /* so make sure newargz[1] doesn't end in .exe */
+-  strendzap(newargz[1],".exe"); 
+-  for (i = 1; i < argc; i++)
+-    newargz[i+1] = xstrdup(argv[i]);
+-  newargz[argc+1] = NULL;
+-EOF
++	osf)
++	  func_arith $current - $age
++	  major=.$func_arith_result
++	  versuffix=".$current.$age.$revision"
++	  verstring="$current.$age.$revision"
+ 
+-	    cat >> $cwrappersource <<EOF
+-  execv("$SHELL",newargz);
+-EOF
++	  # 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
+ 
+-	    cat >> $cwrappersource <<"EOF"
+-}
++	  # Make executables depend on our current version.
++	  verstring="$verstring:${current}.0"
++	  ;;
+ 
+-void *
+-xmalloc (size_t num)
+-{
+-  void * p = (void *) malloc (num);
+-  if (!p)
+-    lt_fatal ("Memory exhausted");
++	qnx)
++	  major=".$current"
++	  versuffix=".$current"
++	  ;;
+ 
+-  return p;
+-}
++	sunos)
++	  major=".$current"
++	  versuffix=".$current.$revision"
++	  ;;
+ 
+-char * 
+-xstrdup (const char *string)
+-{
+-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
+-;
+-}
++	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"
++	  ;;
+ 
+-char *
+-basename (const char *name)
+-{
+-  const char *base;
++	*)
++	  func_fatal_configuration "unknown library version type \`$version_type'"
++	  ;;
++	esac
+ 
+-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+-  /* Skip over the disk name in MSDOS pathnames. */
+-  if (isalpha (name[0]) && name[1] == ':') 
+-    name += 2;
+-#endif
++	# 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
+ 
+-  for (base = name; *name; name++)
+-    if (IS_DIR_SEPARATOR (*name))
+-      base = name + 1;
+-  return (char *) base;
+-}
++	# Remove version info from name if versioning should be avoided
++	if test "$avoid_version" = yes && test "$need_version" = no; then
++	  major=
++	  versuffix=
++	  verstring=""
++	fi
+ 
+-char * 
+-fnqualify(const char *path)
+-{
+-  size_t size;
+-  char *p;
+-  char tmp[LT_PATHMAX + 1];
++	# 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
+ 
+-  assert(path != NULL);
++      fi
+ 
+-  /* Is it qualified already? */
+-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+-  if (isalpha (path[0]) && path[1] == ':')
+-    return xstrdup (path);
+-#endif
+-  if (IS_DIR_SEPARATOR (path[0]))
+-    return xstrdup (path);
++      func_generate_dlsyms "$libname" "$libname" "yes"
++      libobjs="$libobjs $symfileobj"
++      test "X$libobjs" = "X " && libobjs=
+ 
+-  /* prepend the current directory */
+-  /* doesn't handle '~' */
+-  if (getcwd (tmp, LT_PATHMAX) == NULL)
+-    lt_fatal ("getcwd failed");
+-  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
+-  p = XMALLOC(char, size);
+-  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
+-  return p;
+-}
++      if test "$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
++	       removelist="$removelist $p"
++	       ;;
++	    *) ;;
++	  esac
++	done
++	test -n "$removelist" && \
++	  func_show_eval "${RM}r \$removelist"
++      fi
+ 
+-char *
+-strendzap(char *str, const char *pat) 
+-{
+-  size_t len, patlen;
++      # Now set the variables for building old libraries.
++      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
++	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+ 
+-  assert(str != NULL);
+-  assert(pat != NULL);
++	# Transform .lo files to .o files.
++	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
++      fi
+ 
+-  len = strlen(str);
+-  patlen = strlen(pat);
++      # Eliminate all temporary directories.
++      #for path in $notinst_path; do
++      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
++      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
++      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
++      #done
+ 
+-  if (patlen <= len)
+-  {
+-    str += len - patlen;
+-    if (strcmp(str, pat) == 0)
+-      *str = '\0';
+-  }
+-  return str;
+-}
++      if test -n "$xrpath"; then
++	# If the user specified any rpath flags, then add them.
++	temp_xrpath=
++	for libdir in $xrpath; do
++	  temp_xrpath="$temp_xrpath -R$libdir"
++	  case "$finalize_rpath " in
++	  *" $libdir "*) ;;
++	  *) finalize_rpath="$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
+ 
+-static void
+-lt_error_core (int exit_status, const char * mode, 
+-          const char * message, va_list ap)
+-{
+-  fprintf (stderr, "%s: %s: ", program_name, mode);
+-  vfprintf (stderr, message, ap);
+-  fprintf (stderr, ".\n");
++      # 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 "*) ;;
++	*) dlfiles="$dlfiles $lib" ;;
++	esac
++      done
+ 
+-  if (exit_status >= 0)
+-    exit (exit_status);
+-}
++      # Make sure dlprefiles contains only unique files
++      old_dlprefiles="$dlprefiles"
++      dlprefiles=
++      for lib in $old_dlprefiles; do
++	case "$dlprefiles " in
++	*" $lib "*) ;;
++	*) dlprefiles="$dlprefiles $lib" ;;
++	esac
++      done
+ 
+-void
+-lt_fatal (const char *message, ...)
+-{
+-  va_list ap;
+-  va_start (ap, message);
+-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+-  va_end (ap);
+-}
++      if test "$build_libtool_libs" = yes; then
++	if test -n "$rpath"; then
++	  case $host in
++	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
++	    # these systems don't actually have a c library (as such)!
++	    ;;
++	  *-*-rhapsody* | *-*-darwin1.[012])
++	    # Rhapsody C library is in the System framework
++	    deplibs="$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
++	      deplibs="$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
+-	  # we should really use a build-platform specific compiler
+-	  # here, but OTOH, the wrappers (shell script and this C one)
+-	  # are only useful if you want to execute the "real" binary.
+-	  # Since the "real" binary is built for $host, then this
+-	  # wrapper might as well be built for $host, too.
+-	  $run $LTCC -s -o $cwrapper $cwrappersource
++	  $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 "*)
++		    newdeplibs="$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
++		    newdeplibs="$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
++		;;
++	      *)
++		newdeplibs="$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 "*)
++		      newdeplibs="$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
++		      newdeplibs="$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
++		;;
++	      *)
++		newdeplibs="$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 "*)
++		  newdeplibs="$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
++		      # 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 "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
++			esac
++		      done
++		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
++			 $SED -e 10q |
++			 $EGREP "$file_magic_regex" > /dev/null; then
++			newdeplibs="$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.
++	      newdeplibs="$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 "*)
++		  newdeplibs="$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 \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
++		       $EGREP "$match_pattern_regex" > /dev/null; then
++		      newdeplibs="$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.
++	      newdeplibs="$newdeplibs $a_deplib"
++	      ;;
++	    esac
++	  done # Gone through all deplibs.
++	  ;;
++	none | unknown | *)
++	  newdeplibs=""
++	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
++	      -e 's/ -lc$//' -e '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 "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
++	    done
++	  fi
++	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
++	     $GREP . >/dev/null; then
++	    $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
++	  fi
+ 	  ;;
+ 	esac
+-	$rm $output
+-	trap "$rm $output; exit 1" 1 2 15
+-
+-	$echo > $output "\
+-#! $SHELL
+-
+-# $output - temporary wrapper script for $objdir/$outputname
+-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+-#
+-# 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.
+-Xsed='${SED} -e 1s/^X//'
+-sed_quote_subst='$sed_quote_subst'
+-
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
+-
+-relink_command=\"$relink_command\"
+-
+-# This environment variable determines our operation mode.
+-if test \"\$libtool_install_magic\" = \"$magic\"; then
+-  # install mode needs the following variable:
+-  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
+-    echo=\"$qecho\"
+-    file=\"\$0\"
+-    # Make sure echo works.
+-    if test \"X\$1\" = X--no-reexec; then
+-      # Discard the --no-reexec flag, and continue.
+-      shift
+-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
+-      # Yippee, \$echo works!
+-      :
+-    else
+-      # Restart under the correct shell, and then maybe \$echo will work.
+-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+-    fi
+-  fi\
+-"
+-	$echo >> $output "\
++	versuffix=$versuffix_save
++	major=$major_save
++	release=$release_save
++	libname=$libname_save
++	name=$name_save
+ 
+-  # Find the directory that this script lives in.
+-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
++	case $host in
++	*-*-rhapsody* | *-*-darwin1.[012])
++	  # On Rhapsody replace the C library with the System framework
++	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++	  ;;
++	esac
+ 
+-  # 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 \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
++	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 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\" ;;
++	    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 "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
++	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
++	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
++	  ;;
+       esac
+-    fi
+-
+-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+-  done
+-
+-  # Try to get the absolute directory name.
+-  absdir=\`cd \"\$thisdir\" && pwd\`
+-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+-"
+-
+-	if test "$fast_install" = yes; then
+-	  $echo >> $output "\
+-  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 >> $output "\
++      # 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 "*)
++	    new_libs="$new_libs -L$path/$objdir" ;;
++	  esac
++	  ;;
++	esac
++      done
++      for deplib in $deplibs; do
++	case $deplib in
++	-L*)
++	  case " $new_libs " in
++	  *" $deplib "*) ;;
++	  *) new_libs="$new_libs $deplib" ;;
++	  esac
++	  ;;
++	*) new_libs="$new_libs $deplib" ;;
++	esac
++      done
++      deplibs="$new_libs"
+ 
+-    # 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
++      # All the library-specific variables (install_libdir is set above).
++      library_names=
++      old_library=
++      dlname=
+ 
+-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+-    { $rm \"\$progdir/\$program\";
+-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+-    $rm \"\$progdir/\$file\"
+-  fi"
+-	else
+-	  $echo >> $output "\
+-  program='$outputname'
+-  progdir=\"\$thisdir/$objdir\"
+-"
++      # Test again, we may have decided not to build it any more
++      if test "$build_libtool_libs" = yes; then
++	if test "$hardcode_into_libs" = yes; then
++	  # Hardcode the library paths
++	  hardcode_libdirs=
++	  dep_rpath=
++	  rpath="$finalize_rpath"
++	  test "$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
++		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"*)
++		    ;;
++		  *)
++		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++		    ;;
++		  esac
++		fi
++	      else
++		eval flag=\"$hardcode_libdir_flag_spec\"
++		dep_rpath="$dep_rpath $flag"
++	      fi
++	    elif test -n "$runpath_var"; then
++	      case "$perm_rpath " in
++	      *" $libdir "*) ;;
++	      *) perm_rpath="$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"
++	    if test -n "$hardcode_libdir_flag_spec_ld"; then
++	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
++	    else
++	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
++	    fi
++	  fi
++	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
++	    # We should set the runpath_var.
++	    rpath=
++	    for dir in $perm_rpath; do
++	      rpath="$rpath$dir:"
++	    done
++	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
++	  fi
++	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+ 	fi
+ 
+-	$echo >> $output "\
+-
+-  if test -f \"\$progdir/\$program\"; then"
+-
+-	# Export our shlibpath_var if we have one.
+-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+-	  $echo >> $output "\
+-    # 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 \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+-
+-    export $shlibpath_var
+-"
++	shlibpath="$finalize_shlibpath"
++	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
++	if test -n "$shlibpath"; then
++	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+ 	fi
+ 
+-	# fixup the dll searchpath if we need to.
+-	if test -n "$dllsearchpath"; then
+-	  $echo >> $output "\
+-    # Add the dll search path components to the executable PATH
+-    PATH=$dllsearchpath:\$PATH
+-"
++	# 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
+ 
+-	$echo >> $output "\
+-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+-      # Run the actual program with our arguments.
+-"
+-	case $host in
+-	# Backslashes separate directories on plain windows
+-	*-*-mingw | *-*-os2*)
+-	  $echo >> $output "\
+-      exec \$progdir\\\\\$program \${1+\"\$@\"}
+-"
+-	  ;;
++	lib="$output_objdir/$realname"
++	linknames=
++	for link
++	do
++	  linknames="$linknames $link"
++	done
+ 
+-	*)
+-	  $echo >> $output "\
+-      exec \$progdir/\$program \${1+\"\$@\"}
+-"
++	# Use standard objects if they are pic
++	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$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"
++	  delfiles="$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
+-	$echo >> $output "\
+-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+-      exit 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\
+-"
+-	chmod +x $output
+-      fi
+-      exit 0
+-      ;;
+-    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"
+-	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"
++	# 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 cmd in $cmds; do
++	      IFS="$save_ifs"
++	      eval cmd=\"$cmd\"
++	      func_len " $cmd"
++	      len=$func_len_result
++	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
++		func_show_eval "$cmd" 'exit $?'
++		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
+-	addlibs="$old_convenience"
+-      fi
+ 
+-      if test -n "$addlibs"; then
+-	gentop="$output_objdir/${outputname}x"
+-	$show "${rm}r $gentop"
+-	$run ${rm}r "$gentop"
+-	$show "$mkdir $gentop"
+-	$run $mkdir "$gentop"
+-	status=$?
+-	if test "$status" -ne 0 && test ! -d "$gentop"; then
+-	  exit $status
++	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 "X$include_expsyms" | $Xsed | $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
++	  delfiles="$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
+-	generated="$generated $gentop"
+ 
+-	# Add in members from convenience archives.
+-	for xlib in $addlibs; do
+-	  # Extract the objects.
+-	  case $xlib in
+-	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+-	  *) xabs=`pwd`"/$xlib" ;;
++	tmp_deplibs=
++	for test_deplib in $deplibs; do
++	  case " $convenience " in
++	  *" $test_deplib "*) ;;
++	  *)
++	    tmp_deplibs="$tmp_deplibs $test_deplib"
++	    ;;
+ 	  esac
+-	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+-	  xdir="$gentop/$xlib"
++	done
++	deplibs="$tmp_deplibs"
+ 
+-	  $show "${rm}r $xdir"
+-	  $run ${rm}r "$xdir"
+-	  $show "$mkdir $xdir"
+-	  $run $mkdir "$xdir"
+-	  status=$?
+-	  if test "$status" -ne 0 && test ! -d "$xdir"; then
+-	    exit $status
+-	  fi
+-	  # We will extract separately just the conflicting names and we will no
+-	  # longer touch any unique names. It is faster to leave these extract
+-	  # automatically by $AR in one run.
+-	  $show "(cd $xdir && $AR x $xabs)"
+-	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+-	    :
++	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
+-	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+-	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+-	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
+-	    do
+-	      i=1
+-	      while test "$i" -le "$count"
+-	      do
+-	       # Put our $i before any first dot (extension)
+-	       # Never overwrite any file
+-	       name_to="$name"
+-	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+-	       do
+-		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+-	       done
+-	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+-	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+-	       i=`expr $i + 1`
+-	      done
+-	    done
++	    gentop="$output_objdir/${outputname}x"
++	    generated="$generated $gentop"
++
++	    func_extract_archives $gentop $convenience
++	    libobjs="$libobjs $func_extract_archives_result"
++	    test "X$libobjs" = "X " && libobjs=
+ 	  fi
++	fi
+ 
+-	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+-	done
+-      fi
++	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
++	  eval flag=\"$thread_safe_flag_spec\"
++	  linker_flags="$linker_flags $flag"
++	fi
+ 
+-      # Do each command in the archive commands.
+-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+-	eval cmds=\"$old_archive_from_new_cmds\"
+-      else
+-	eval cmds=\"$old_archive_cmds\"
++	# Make a backup of the uninstalled library when relinking
++	if test "$mode" = relink; then
++	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
++	fi
+ 
+-	if len=`expr "X$cmds" : ".*"` &&
+-	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+-	  :
+-	else
+-	  # the command line is too long to link in one step, link in parts
+-	  $echo "using piecewise archive linking..."
+-	  save_RANLIB=$RANLIB
+-	  RANLIB=:
+-	  objlist=
+-	  concat_cmds=
+-	  save_oldobjs=$oldobjs
+-	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
+-	  # encoded into archives.  This makes 'ar r' malfunction in
+-	  # this piecewise linking case whenever conflicting object
+-	  # names appear in distinct ar calls; check, warn and compensate.
+-	    if (for obj in $save_oldobjs
+-	    do
+-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
+-	    done | sort | sort -uc >/dev/null 2>&1); then
+-	    :
++	# 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
+-	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
+-	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
+-	    AR_FLAGS=cq
++	    eval test_cmds=\"$module_cmds\"
++	    cmds=$module_cmds
+ 	  fi
+-	  # Is there a better way of finding the last object in the list?
+-	  for obj in $save_oldobjs
+-	  do
+-	    last_oldobj=$obj
+-	  done  
+-	  for obj in $save_oldobjs
+-	  do
+-	    oldobjs="$objlist $obj"
+-	    objlist="$objlist $obj"
+-	    eval test_cmds=\"$old_archive_cmds\"
+-	    if len=`expr "X$test_cmds" : ".*"` &&
+-	       test "$len" -le "$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=
+-	    fi
+-	  done
+-	  RANLIB=$save_RANLIB
+-	  oldobjs=$objlist
+-	  if test "X$oldobjs" = "X" ; then
+-	    eval cmds=\"\$concat_cmds\"
++	else
++	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
++	    eval test_cmds=\"$archive_expsym_cmds\"
++	    cmds=$archive_expsym_cmds
+ 	  else
+-	    eval cmds=\"\$concat_cmds~$old_archive_cmds\"
++	    eval test_cmds=\"$archive_cmds\"
++	    cmds=$archive_cmds
+ 	  fi
+ 	fi
+-      fi
+-      save_ifs="$IFS"; IFS='~'
+-      for cmd in $cmds; do
+-	IFS="$save_ifs"
+-	$show "$cmd"
+-	$run eval "$cmd" || exit $?
+-      done
+-      IFS="$save_ifs"
+-    done
+ 
+-    if test -n "$generated"; then
+-      $show "${rm}r$generated"
+-      $run ${rm}r$generated
+-    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.
+ 
+-    # Now create the libtool archive.
+-    case $output in
+-    *.la)
+-      old_library=
+-      test "$build_old_libs" = yes && old_library="$libname.$libext"
+-      $show "creating $output"
++	  # 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
++	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
+ 
+-      # 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}\" || 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
+-	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+-	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
+-	fi
+-      done
+-      # Quote the link command for shipping.
+-      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
+-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++	  # Clear the reloadable object creation command queue and
++	  # initialize k to one.
++	  test_cmds=
++	  concat_cmds=
++	  objlist=
++	  last_robj=
++	  k=1
+ 
+-      # Only create the output if not a dry run.
+-      if test -z "$run"; then
+-	for installed in no yes; do
+-	  if test "$installed" = yes; then
+-	    if test -z "$install_libdir"; then
+-	      break
++	  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
++	      $ECHO "$obj" >> $output
++	    done
++	    $ECHO ')' >> $output
++	    delfiles="$delfiles $output"
++	  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
+-	    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)
+-		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+-		if test -z "$libdir"; then
+-		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+-		  exit 1
+-		fi
+-		newdependency_libs="$newdependency_libs $libdir/$name"
+-		;;
+-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+-	      esac
++	    for obj
++	    do
++	      $ECHO "$obj" >> $output
+ 	    done
+-	    dependency_libs="$newdependency_libs"
+-	    newdlfiles=
+-	    for lib in $dlfiles; do
+-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+-	      if test -z "$libdir"; then
+-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-		exit 1
++	    delfiles="$delfiles $output"
++	    output=$firstobj\"$file_list_spec$output\"
++	  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.
++		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
++		  else
++		    # All subsequent reloadable object files will link in
++		    # the last one created.
++		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$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~
++	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
++	      if test -n "$last_robj"; then
++	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+ 	      fi
+-	      newdlfiles="$newdlfiles $libdir/$name"
+-	    done
+-	    dlfiles="$newdlfiles"
+-	    newdlprefiles=
+-	    for lib in $dlprefiles; do
+-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+-	      if test -z "$libdir"; then
+-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-		exit 1
++	      delfiles="$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
+-	      newdlprefiles="$newdlprefiles $libdir/$name"
++	    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 "$mode" = relink; then
++		  ( cd "$output_objdir" && \
++		    $RM "${realname}T" && \
++		    $MV "${realname}U" "$realname" )
++		fi
++
++		exit $lt_exit
++	      }
+ 	    done
+-	    dlprefiles="$newdlprefiles"
++	    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 "X$include_expsyms" | $Xsed | $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
++	      delfiles="$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
+-	  $rm $output
+-	  # place dlname in correct position for cygwin
+-	  tdlname=$dlname
+-	  case $host,$output,$installed,$module,$dlname in
+-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+-	  esac
+-	  $echo > $output "\
+-# $outputname - a libtool library file
+-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+-#
+-# Please DO NOT delete this file!
+-# It is necessary for linking the library.
++	fi
+ 
+-# The name that we can dlopen(3).
+-dlname='$tdlname'
++	if test -n "$delfiles"; then
++	  # Append the command to remove temporary files to $cmds.
++	  eval cmds=\"\$cmds~\$RM $delfiles\"
++	fi
+ 
+-# Names of this library.
+-library_names='$library_names'
++	# Add any objects from preloaded convenience libraries
++	if test -n "$dlprefiles"; then
++	  gentop="$output_objdir/${outputname}x"
++	  generated="$generated $gentop"
+ 
+-# The name of the static archive.
+-old_library='$old_library'
++	  func_extract_archives $gentop $dlprefiles
++	  libobjs="$libobjs $func_extract_archives_result"
++	  test "X$libobjs" = "X " && libobjs=
++	fi
+ 
+-# Libraries that this one depends upon.
+-dependency_libs='$dependency_libs'
++	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 "$mode" = relink; then
++	      ( cd "$output_objdir" && \
++	        $RM "${realname}T" && \
++		$MV "${realname}U" "$realname" )
++	    fi
+ 
+-# Version information for $libname.
+-current=$current
+-age=$age
+-revision=$revision
++	    exit $lt_exit
++	  }
++	done
++	IFS="$save_ifs"
+ 
+-# Is this an already installed library?
+-installed=$installed
++	# Restore the uninstalled library and exit
++	if test "$mode" = relink; then
++	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+ 
+-# Should we warn about portability when linking against -modules?
+-shouldnotlink=$module
++	  if test -n "$convenience"; then
++	    if test -z "$whole_archive_flag_spec"; then
++	      func_show_eval '${RM}r "$gentop"'
++	    fi
++	  fi
+ 
+-# Files to dlopen/dlpreopen
+-dlopen='$dlfiles'
+-dlpreopen='$dlprefiles'
++	  exit $EXIT_SUCCESS
++	fi
+ 
+-# 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\""
++	# 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
+-      fi
+ 
+-      # Do a symbolic link so that the libtool archive can be found in
+-      # LD_LIBRARY_PATH before the program is installed.
+-      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
+-      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
++	# 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
+       ;;
+-    esac
+-    exit 0
+-    ;;
+ 
+-  # libtool install mode
+-  install)
+-    modename="$modename: install"
++    obj)
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	func_warning "\`-dlopen' is ignored for objects"
++      fi
+ 
+-    # 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.
+-       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
+-      # Aesthetically quote it.
+-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+-      case $arg in
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+-	arg="\"$arg\""
+-	;;
++      case " $deplibs" in
++      *\ -l* | *\ -L*)
++	func_warning "\`-l' and \`-L' are ignored for objects" ;;
+       esac
+-      install_prog="$arg "
+-      arg="$1"
+-      shift
+-    else
+-      install_prog=
+-      arg="$nonopt"
+-    fi
+ 
+-    # The real first argument should be the name of the installation program.
+-    # Aesthetically quote it.
+-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+-    case $arg in
+-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+-      arg="\"$arg\""
+-      ;;
+-    esac
+-    install_prog="$install_prog$arg"
++      test -n "$rpath" && \
++	func_warning "\`-rpath' is ignored for objects"
+ 
+-    # We need to accept at least all the BSD install flags.
+-    dest=
+-    files=
+-    opts=
+-    prev=
+-    install_type=
+-    isdir=no
+-    stripme=
+-    for arg
+-    do
+-      if test -n "$dest"; then
+-	files="$files $dest"
+-	dest="$arg"
+-	continue
+-      fi
++      test -n "$xrpath" && \
++	func_warning "\`-R' is ignored for objects"
+ 
+-      case $arg in
+-      -d) isdir=yes ;;
+-      -f) prev="-f" ;;
+-      -g) prev="-g" ;;
+-      -m) prev="-m" ;;
+-      -o) prev="-o" ;;
+-      -s)
+-	stripme=" -s"
+-	continue
+-	;;
+-      -*) ;;
++      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
++	;;
+       *)
+-	# If the previous option needed an argument, then skip it.
+-	if test -n "$prev"; then
+-	  prev=
+-	else
+-	  dest="$arg"
+-	  continue
+-	fi
++	libobj=
++	obj="$output"
+ 	;;
+       esac
+ 
+-      # Aesthetically quote the argument.
+-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+-      case $arg in
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+-	arg="\"$arg\""
+-	;;
+-      esac
+-      install_prog="$install_prog $arg"
+-    done
++      # Delete the old objects.
++      $opt_dry_run || $RM $obj $libobj
+ 
+-    if test -z "$install_prog"; then
+-      $echo "$modename: you must specify an install program" 1>&2
+-      $echo "$help" 1>&2
+-      exit 1
+-    fi
++      # 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 "$prev"; then
+-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
+-      $echo "$help" 1>&2
+-      exit 1
+-    fi
++      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 "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
++	else
++	  gentop="$output_objdir/${obj}x"
++	  generated="$generated $gentop"
+ 
+-    if test -z "$files"; then
+-      if test -z "$dest"; then
+-	$echo "$modename: no file or destination specified" 1>&2
+-      else
+-	$echo "$modename: you must specify a destination" 1>&2
++	  func_extract_archives $gentop $convenience
++	  reload_conv_objs="$reload_objs $func_extract_archives_result"
++	fi
+       fi
+-      $echo "$help" 1>&2
+-      exit 1
+-    fi
+ 
+-    # Strip any trailing slash from the destination.
+-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
++      # Create the old-style object.
++      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ 
+-    # Check to see that the destination is a directory.
+-    test -d "$dest" && isdir=yes
+-    if test "$isdir" = yes; then
+-      destdir="$dest"
+-      destname=
+-    else
+-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
+-      test "X$destdir" = "X$dest" && destdir=.
+-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
++      output="$obj"
++      func_execute_cmds "$reload_cmds" 'exit $?'
+ 
+-      # Not a directory, so check to see that there is only one file specified.
+-      set dummy $files
+-      if test "$#" -gt 2; then
+-	$echo "$modename: \`$dest' is not a directory" 1>&2
+-	$echo "$help" 1>&2
+-	exit 1
++      # 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
+-    fi
+-    case $destdir in
+-    [\\/]* | [A-Za-z]:[\\/]*) ;;
+-    *)
+-      for file in $files; do
+-	case $file in
+-	*.lo) ;;
+-	*)
+-	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+-	  $echo "$help" 1>&2
+-	  exit 1
+-	  ;;
+-	esac
+-      done
++
++      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
+       ;;
+-    esac
+ 
+-    # This variable tells wrapper scripts just to set variables rather
+-    # than running their programs.
+-    libtool_install_magic="$magic"
++    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"
+ 
+-    staticlibs=
+-    future_libdirs=
+-    current_libdirs=
+-    for file in $files; do
++      test -n "$release" && \
++	func_warning "\`-release' is ignored for programs"
+ 
+-      # Do each installation.
+-      case $file in
+-      *.$libext)
+-	# Do the static libraries later.
+-	staticlibs="$staticlibs $file"
++      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 "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+ 	;;
++      esac
+ 
+-      *.la)
+-	# Check to see that this really is a libtool archive.
+-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+-	else
+-	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+-	  $echo "$help" 1>&2
+-	  exit 1
++      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])
++	      compile_command="$compile_command ${wl}-bind_at_load"
++	      finalize_command="$finalize_command ${wl}-bind_at_load"
++	    ;;
++	  esac
+ 	fi
++	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
++	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
++	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
++	;;
++      esac
+ 
+-	library_names=
+-	old_library=
+-	relink_command=
+-	# If there is no directory component, then add one.
+-	case $file in
+-	*/* | *\\*) . $file ;;
+-	*) . ./$file ;;
+-	esac
+ 
+-	# Add the libdir to current_libdirs if it is the destination.
+-	if test "X$destdir" = "X$libdir"; then
+-	  case "$current_libdirs " in
+-	  *" $libdir "*) ;;
+-	  *) current_libdirs="$current_libdirs $libdir" ;;
++      # 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 "*)
++	    new_libs="$new_libs -L$path/$objdir" ;;
+ 	  esac
+-	else
+-	  # Note the libdir as a future libdir.
+-	  case "$future_libdirs " in
+-	  *" $libdir "*) ;;
+-	  *) future_libdirs="$future_libdirs $libdir" ;;
++	  ;;
++	esac
++      done
++      for deplib in $compile_deplibs; do
++	case $deplib in
++	-L*)
++	  case " $new_libs " in
++	  *" $deplib "*) ;;
++	  *) new_libs="$new_libs $deplib" ;;
+ 	  esac
+-	fi
++	  ;;
++	*) new_libs="$new_libs $deplib" ;;
++	esac
++      done
++      compile_deplibs="$new_libs"
+ 
+-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
+-	test "X$dir" = "X$file/" && dir=
+-	dir="$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 "s%$libdir\$%%"`
++      compile_command="$compile_command $compile_deplibs"
++      finalize_command="$finalize_command $finalize_deplibs"
+ 
+-	  # 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.
+-	  if test "$inst_prefix_dir" = "$destdir"; then
+-	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+-	    exit 1
+-	  fi
++      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 "*) ;;
++	  *) finalize_rpath="$finalize_rpath $libdir" ;;
++	  esac
++	done
++      fi
+ 
+-	  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%"`
++      # 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"*)
++		;;
++	      *)
++		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++		;;
++	      esac
++	    fi
+ 	  else
+-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
++	    eval flag=\"$hardcode_libdir_flag_spec\"
++	    rpath="$rpath $flag"
+ 	  fi
++	elif test -n "$runpath_var"; then
++	  case "$perm_rpath " in
++	  *" $libdir "*) ;;
++	  *) perm_rpath="$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;;
++	  *) dllsearchpath="$dllsearchpath:$libdir";;
++	  esac
++	  case :$dllsearchpath: in
++	  *":$testbindir:"*) ;;
++	  ::) dllsearchpath=$testbindir;;
++	  *) dllsearchpath="$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"
+ 
+-	  $echo "$modename: warning: relinking \`$file'" 1>&2
+-	  $show "$relink_command"
+-	  if $run eval "$relink_command"; then :
++      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"*)
++		;;
++	      *)
++		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++		;;
++	      esac
++	    fi
+ 	  else
+-	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+-	    exit 1
++	    eval flag=\"$hardcode_libdir_flag_spec\"
++	    rpath="$rpath $flag"
+ 	  fi
++	elif test -n "$runpath_var"; then
++	  case "$finalize_perm_rpath " in
++	  *" $libdir "*) ;;
++	  *) finalize_perm_rpath="$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"
+ 
+-	# See the names of the shared library.
+-	set dummy $library_names
+-	if test -n "$2"; then
+-	  realname="$2"
+-	  shift
+-	  shift
+-
+-	  srcname="$realname"
+-	  test -n "$relink_command" && srcname="$realname"T
+-
+-	  # Install the shared library and build the symlinks.
+-	  $show "$install_prog $dir/$srcname $destdir/$realname"
+-	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
+-	  if test -n "$stripme" && test -n "$striplib"; then
+-	    $show "$striplib $destdir/$realname"
+-	    $run eval "$striplib $destdir/$realname" || exit $?
+-	  fi
+-
+-	  if test "$#" -gt 0; then
+-	    # Delete the old symlinks, and create new ones.
+-	    for linkname
+-	    do
+-	      if test "$linkname" != "$realname"; then
+-		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+-		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+-	      fi
+-	    done
+-	  fi
++      if test -n "$libobjs" && test "$build_old_libs" = yes; then
++	# Transform all the library objects into standard objects.
++	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++      fi
+ 
+-	  # Do each command in the postinstall commands.
+-	  lib="$destdir/$realname"
+-	  eval cmds=\"$postinstall_cmds\"
+-	  save_ifs="$IFS"; IFS='~'
+-	  for cmd in $cmds; do
+-	    IFS="$save_ifs"
+-	    $show "$cmd"
+-	    $run eval "$cmd" || exit $?
+-	  done
+-	  IFS="$save_ifs"
+-	fi
++      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+ 
+-	# Install the pseudo-library for information purposes.
+-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+-	instname="$dir/$name"i
+-	$show "$install_prog $instname $destdir/$name"
+-	$run eval "$install_prog $instname $destdir/$name" || exit $?
++      # template prelinking step
++      if test -n "$prelink_cmds"; then
++	func_execute_cmds "$prelink_cmds" 'exit $?'
++      fi
+ 
+-	# Maybe install the static library, too.
+-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+-	;;
++      wrappers_required=yes
++      case $host in
++      *cygwin* | *mingw* )
++        if test "$build_libtool_libs" != yes; then
++          wrappers_required=no
++        fi
++        ;;
++      *cegcc)
++        # Disable wrappers for cegcc, we are cross compiling anyway.
++        wrappers_required=no
++        ;;
++      *)
++        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 "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
++	link_command="$compile_command$compile_rpath"
+ 
+-      *.lo)
+-	# Install (i.e. copy) a libtool object.
++	# We have no uninstalled library dependencies, so finalize right now.
++	exit_status=0
++	func_show_eval "$link_command" 'exit_status=$?'
+ 
+-	# Figure out destination file name, if it wasn't already specified.
+-	if test -n "$destname"; then
+-	  destfile="$destdir/$destname"
+-	else
+-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+-	  destfile="$destdir/$destfile"
++	# Delete the generated files.
++	if test -f "$output_objdir/${outputname}S.${objext}"; then
++	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+ 	fi
+ 
+-	# Deduce the name of the destination old-style object file.
+-	case $destfile in
+-	*.lo)
+-	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
+-	  ;;
+-	*.$objext)
+-	  staticdest="$destfile"
+-	  destfile=
+-	  ;;
+-	*)
+-	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+-	  $echo "$help" 1>&2
+-	  exit 1
+-	  ;;
+-	esac
+-
+-	# Install the libtool object if requested.
+-	if test -n "$destfile"; then
+-	  $show "$install_prog $file $destfile"
+-	  $run eval "$install_prog $file $destfile" || exit $?
+-	fi
++	exit $exit_status
++      fi
+ 
+-	# Install the old object if enabled.
+-	if test "$build_old_libs" = yes; then
+-	  # Deduce the name of the old-style object file.
+-	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
++      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
+ 
+-	  $show "$install_prog $staticobj $staticdest"
+-	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
++      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
++	    rpath="$rpath$dir:"
++	  done
++	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+ 	fi
+-	exit 0
+-	;;
+-
+-      *)
+-	# Figure out destination file name, if it wasn't already specified.
+-	if test -n "$destname"; then
+-	  destfile="$destdir/$destname"
+-	else
+-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+-	  destfile="$destdir/$destfile"
++	if test -n "$finalize_perm_rpath"; then
++	  # We should set the runpath_var.
++	  rpath=
++	  for dir in $finalize_perm_rpath; do
++	    rpath="$rpath$dir:"
++	  done
++	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+ 	fi
++      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
+-	      file=`$echo $file|${SED} 's,.exe$,,'`
+-	      stripped_ext=".exe"
+-	    fi
+-	    ;;
+-	esac
+-
+-	# Do a test to see if this is really a libtool program.
+-	case $host in
+-	*cygwin*|*mingw*)
+-	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
+-	    ;;
+-	*)
+-	    wrapper=$file
+-	    ;;
+-	esac
+-	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
+-	  notinst_deplibs=
+-	  relink_command=
++      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 "X$link_command" | $Xsed -e '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 $?'
++	exit $EXIT_SUCCESS
++      fi
+ 
+-	  # To insure that "foo" is sourced, and not "foo.exe",
+-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
+-	  # which disallows the automatic-append-.exe behavior.
+-	  case $build in
+-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+-	  *) wrapperdot=${wrapper} ;;
+-	  esac
+-	  # If there is no directory component, then add one.
+-	  case $file in
+-	  */* | *\\*) . ${wrapperdot} ;;
+-	  *) . ./${wrapperdot} ;;
+-	  esac
++      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"
+ 
+-	  # Check the variables that should have been set.
+-	  if test -z "$notinst_deplibs"; then
+-	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+-	    exit 1
++	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 "X$compile_var$compile_command$compile_rpath" | $Xsed -e '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
+ 
+-	  finalize=yes
+-	  for lib in $notinst_deplibs; do
+-	    # Check to see that each library is installed.
+-	    libdir=
+-	    if test -f "$lib"; then
+-	      # If there is no directory component, then add one.
+-	      case $lib in
+-	      */* | *\\*) . $lib ;;
+-	      *) . ./$lib ;;
+-	      esac
+-	    fi
+-	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+-	    if test -n "$libdir" && test ! -f "$libfile"; then
+-	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
+-	      finalize=no
+-	    fi
+-	  done
++      # Replace the output file specification.
++      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+ 
+-	  relink_command=
+-	  # To insure that "foo" is sourced, and not "foo.exe",
+-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
+-	  # which disallows the automatic-append-.exe behavior.
+-	  case $build in
+-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+-	  *) wrapperdot=${wrapper} ;;
+-	  esac
+-	  # If there is no directory component, then add one.
+-	  case $file in
+-	  */* | *\\*) . ${wrapperdot} ;;
+-	  *) . ./${wrapperdot} ;;
+-	  esac
++      # Delete the old output files.
++      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
+ 
+-	  outputname=
+-	  if test "$fast_install" = no && test -n "$relink_command"; then
+-	    if test "$finalize" = yes && test -z "$run"; then
+-	      tmpdir="/tmp"
+-	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
+-	      tmpdir="$tmpdir/libtool-$$"
+-	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
+-	      else
+-		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+-		continue
+-	      fi
+-	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+-	      outputname="$tmpdir/$file"
+-	      # Replace the output file specification.
+-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
++      func_show_eval "$link_command" 'exit $?'
+ 
+-	      $show "$relink_command"
+-	      if $run eval "$relink_command"; then :
+-	      else
+-		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+-		${rm}r "$tmpdir"
+-		continue
+-	      fi
+-	      file="$outputname"
+-	    else
+-	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
+-	    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
+-	    # Install the binary that we compiled earlier.
+-	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
++	    func_quote_for_eval "$var_value"
++	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+ 	  fi
+-	fi
++	done
++	relink_command="(cd `pwd`; $relink_command)"
++	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++      fi
+ 
+-	# remove .exe since cygwin /usr/bin/install will append another
+-	# one anyways
+-	case $install_prog,$host in
+-	*/usr/bin/install*,*cygwin*)
+-	  case $file:$destfile in
+-	  *.exe:*.exe)
+-	    # this is ok
+-	    ;;
+-	  *.exe:*)
+-	    destfile=$destfile.exe
+-	    ;;
+-	  *:*.exe)
+-	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
+-	    ;;
+-	  esac
+-	  ;;
++      # Quote $ECHO for shipping.
++      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
++	case $progpath in
++	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
++	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+ 	esac
+-	$show "$install_prog$stripme $file $destfile"
+-	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
+-	test -n "$outputname" && ${rm}r "$tmpdir"
+-	;;
+-      esac
+-    done
++	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
++      else
++	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
++      fi
+ 
+-    for file in $staticlibs; do
+-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++      # 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
+ 
+-      # Set up the ranlib parameters.
+-      oldlib="$destdir/$name"
++	    func_emit_wrapper no > $output
++	    chmod +x $output
++	  ;;
++	esac
++      }
++      exit $EXIT_SUCCESS
++      ;;
++    esac
+ 
+-      $show "$install_prog $file $oldlib"
+-      $run eval "$install_prog \$file \$oldlib" || exit $?
++    # See if we need to build an old-fashioned archive.
++    for oldlib in $oldlibs; do
+ 
+-      if test -n "$stripme" && test -n "$striplib"; then
+-	$show "$old_striplib $oldlib"
+-	$run eval "$old_striplib $oldlib" || exit $?
++      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
++	    oldobjs="$oldobjs $symfileobj"
++	  fi
++	fi
++	addlibs="$old_convenience"
+       fi
+ 
+-      # Do each command in the postinstall commands.
+-      eval cmds=\"$old_postinstall_cmds\"
+-      save_ifs="$IFS"; IFS='~'
+-      for cmd in $cmds; do
+-	IFS="$save_ifs"
+-	$show "$cmd"
+-	$run eval "$cmd" || exit $?
+-      done
+-      IFS="$save_ifs"
+-    done
++      if test -n "$addlibs"; then
++	gentop="$output_objdir/${outputname}x"
++	generated="$generated $gentop"
+ 
+-    if test -n "$future_libdirs"; then
+-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
+-    fi
++	func_extract_archives $gentop $addlibs
++	oldobjs="$oldobjs $func_extract_archives_result"
++      fi
+ 
+-    if test -n "$current_libdirs"; then
+-      # Maybe just do a dry run.
+-      test -n "$run" && current_libdirs=" -n$current_libdirs"
+-      exec_cmd='$SHELL $0 --finish$current_libdirs'
+-    else
+-      exit 0
+-    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
+ 
+-  # libtool finish mode
+-  finish)
+-    modename="$modename: finish"
+-    libdirs="$nonopt"
+-    admincmds=
++	# Add any objects from preloaded convenience libraries
++	if test -n "$dlprefiles"; then
++	  gentop="$output_objdir/${outputname}x"
++	  generated="$generated $gentop"
+ 
+-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+-      for dir
+-      do
+-	libdirs="$libdirs $dir"
+-      done
++	  func_extract_archives $gentop $dlprefiles
++	  oldobjs="$oldobjs $func_extract_archives_result"
++	fi
+ 
+-      for libdir in $libdirs; do
+-	if test -n "$finish_cmds"; then
+-	  # Do each command in the finish commands.
+-	  eval cmds=\"$finish_cmds\"
+-	  save_ifs="$IFS"; IFS='~'
+-	  for cmd in $cmds; do
+-	    IFS="$save_ifs"
+-	    $show "$cmd"
+-	    $run eval "$cmd" || admincmds="$admincmds
+-       $cmd"
++	# 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"
++	  generated="$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"
++	      oldobjs="$oldobjs $gentop/$newobj"
++	      ;;
++	    *) oldobjs="$oldobjs $obj" ;;
++	    esac
+ 	  done
+-	  IFS="$save_ifs"
+ 	fi
+-	if test -n "$finish_eval"; then
+-	  # Do the single finish_eval.
+-	  eval cmds=\"$finish_eval\"
+-	  $run eval "$cmds" || admincmds="$admincmds
+-       $cmds"
+-	fi
+-      done
+-    fi
+-
+-    # Exit here if they wanted silent mode.
+-    test "$show" = : && exit 0
++	eval cmds=\"$old_archive_cmds\"
+ 
+-    $echo "----------------------------------------------------------------------"
+-    $echo "Libraries have been installed in:"
+-    for libdir in $libdirs; do
+-      $echo "   $libdir"
++	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
++	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
+-    $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"
+-    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
+-    $echo "----------------------------------------------------------------------"
+-    exit 0
+-    ;;
+ 
+-  # libtool execute mode
+-  execute)
+-    modename="$modename: execute"
+-
+-    # The first argument is the command name.
+-    cmd="$nonopt"
+-    if test -z "$cmd"; then
+-      $echo "$modename: you must specify a COMMAND" 1>&2
+-      $echo "$help"
+-      exit 1
+-    fi
++    test -n "$generated" && \
++      func_show_eval "${RM}r$generated"
+ 
+-    # Handle -dlopen flags immediately.
+-    for file in $execute_dlfiles; do
+-      if test ! -f "$file"; then
+-	$echo "$modename: \`$file' is not a file" 1>&2
+-	$echo "$help" 1>&2
+-	exit 1
+-      fi
++    # Now create the libtool archive.
++    case $output in
++    *.la)
++      old_library=
++      test "$build_old_libs" = yes && old_library="$libname.$libext"
++      func_verbose "creating $output"
+ 
+-      dir=
+-      case $file in
+-      *.la)
+-	# Check to see that this really is a libtool archive.
+-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; 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
+-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-	  $echo "$help" 1>&2
+-	  exit 1
++	  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 "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++      if test "$hardcode_automatic" = yes ; then
++	relink_command=
++      fi
+ 
+-	# Read the libtool library.
+-	dlname=
+-	library_names=
++      # 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"
++		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++		test -z "$libdir" && \
++		  func_fatal_error "\`$deplib' is not a valid libtool archive"
++		newdependency_libs="$newdependency_libs $libdir/$name"
++		;;
++	      *) newdependency_libs="$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"
++		newdlfiles="$newdlfiles $libdir/$name"
++		;;
++	      *) newdlfiles="$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"
++		newdlprefiles="$newdlprefiles $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
++	      newdlfiles="$newdlfiles $abs"
++	    done
++	    dlfiles="$newdlfiles"
++	    newdlprefiles=
++	    for lib in $dlprefiles; do
++	      case $lib in
++		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++		*) abs=`pwd`"/$lib" ;;
++	      esac
++	      newdlprefiles="$newdlprefiles $abs"
++	    done
++	    dlprefiles="$newdlprefiles"
++	  fi
++	  $RM $output
++	  # place dlname in correct position for cygwin
++	  tdlname=$dlname
++	  case $host,$output,$installed,$module,$dlname in
++	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
++	  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.
+ 
+-	# If there is no directory component, then add one.
+-	case $file in
+-	*/* | *\\*) . $file ;;
+-	*) . ./$file ;;
+-	esac
++# The name that we can dlopen(3).
++dlname='$tdlname'
+ 
+-	# Skip this library if it cannot be dlopened.
+-	if test -z "$dlname"; then
+-	  # Warn if it was a shared library.
+-	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
+-	  continue
+-	fi
++# Names of this library.
++library_names='$library_names'
+ 
+-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+-	test "X$dir" = "X$file" && dir=.
++# The name of the static archive.
++old_library='$old_library'
+ 
+-	if test -f "$dir/$objdir/$dlname"; then
+-	  dir="$dir/$objdir"
+-	else
+-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+-	  exit 1
+-	fi
+-	;;
++# Linker flags that can not go in dependency_libs.
++inherited_linker_flags='$new_inherited_linker_flags'
+ 
+-      *.lo)
+-	# Just add the directory containing the .lo file.
+-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+-	test "X$dir" = "X$file" && dir=.
+-	;;
++# Libraries that this one depends upon.
++dependency_libs='$dependency_libs'
+ 
+-      *)
+-	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
+-	continue
+-	;;
+-      esac
++# Names of additional weak libraries provided by this library
++weak_library_names='$weak_libs'
+ 
+-      # Get the absolute pathname.
+-      absdir=`cd "$dir" && pwd`
+-      test -n "$absdir" && dir="$absdir"
++# Version information for $libname.
++current=$current
++age=$age
++revision=$revision
+ 
+-      # 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
++# Is this an already installed library?
++installed=$installed
+ 
+-    # This variable tells wrapper scripts just to set shlibpath_var
+-    # rather than running their programs.
+-    libtool_execute_magic="$magic"
++# Should we warn about portability when linking against -modules?
++shouldnotlink=$module
+ 
+-    # Check if any of the arguments is a wrapper script.
+-    args=
+-    for file
+-    do
+-      case $file in
+-      -*) ;;
+-      *)
+-	# Do a test to see if this is really a libtool program.
+-	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+-	  # If there is no directory component, then add one.
+-	  case $file in
+-	  */* | *\\*) . $file ;;
+-	  *) . ./$file ;;
+-	  esac
++# Files to dlopen/dlpreopen
++dlopen='$dlfiles'
++dlpreopen='$dlprefiles'
+ 
+-	  # Transform arg to wrapped name.
+-	  file="$progdir/$program"
+-	fi
+-	;;
+-      esac
+-      # Quote arguments (to preserve shell metacharacters).
+-      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
+-      args="$args \"$file\""
+-    done
++# 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
++      }
+ 
+-    if test -z "$run"; then
+-      if test -n "$shlibpath_var"; then
+-	# Export the shlibpath_var.
+-	eval "export $shlibpath_var"
+-      fi
++      # 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
++}
+ 
+-      # Restore saved environment variables
+-      if test "${save_LC_ALL+set}" = set; then
+-	LC_ALL="$save_LC_ALL"; export LC_ALL
+-      fi
+-      if test "${save_LANG+set}" = set; then
+-	LANG="$save_LANG"; export LANG
+-      fi
++{ test "$mode" = link || test "$mode" = relink; } &&
++    func_mode_link ${1+"$@"}
+ 
+-      # 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 0
+-    fi
+-    ;;
+ 
+-  # libtool clean and uninstall mode
+-  clean | uninstall)
+-    modename="$modename: $mode"
+-    rm="$nonopt"
++# func_mode_uninstall arg...
++func_mode_uninstall ()
++{
++    $opt_debug
++    RM="$nonopt"
+     files=
+     rmforce=
+     exit_status=0
+@@ -5887,30 +8253,28 @@ relink_command=\"$relink_command\""
+     for arg
+     do
+       case $arg in
+-      -f) rm="$rm $arg"; rmforce=yes ;;
+-      -*) rm="$rm $arg" ;;
++      -f) RM="$RM $arg"; rmforce=yes ;;
++      -*) RM="$RM $arg" ;;
+       *) files="$files $arg" ;;
+       esac
+     done
+ 
+-    if test -z "$rm"; then
+-      $echo "$modename: you must specify an RM program" 1>&2
+-      $echo "$help" 1>&2
+-      exit 1
+-    fi
++    test -z "$RM" && \
++      func_fatal_help "you must specify an RM program"
+ 
+     rmdirs=
+ 
+     origobjdir="$objdir"
+     for file in $files; do
+-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+-      if test "X$dir" = "X$file"; then
+-	dir=.
++      func_dirname "$file" "" "."
++      dir="$func_dirname_result"
++      if test "X$dir" = X.; then
+ 	objdir="$origobjdir"
+       else
+ 	objdir="$dir/$origobjdir"
+       fi
+-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++      func_basename "$file"
++      name="$func_basename_result"
+       test "$mode" = uninstall && objdir="$dir"
+ 
+       # Remember objdir for removal later, being careful to avoid duplicates
+@@ -5922,9 +8286,9 @@ relink_command=\"$relink_command\""
+       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
++      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
+@@ -5938,67 +8302,56 @@ relink_command=\"$relink_command\""
+       case $name in
+       *.la)
+ 	# Possibly a libtool archive, so verify it.
+-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+-	  . $dir/$name
++	if func_lalib_p "$file"; then
++	  func_source $dir/$name
+ 
+ 	  # Delete the libtool libraries and symlinks.
+ 	  for n in $library_names; do
+ 	    rmfiles="$rmfiles $objdir/$n"
+ 	  done
+ 	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+-	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+ 
+-	  if test "$mode" = uninstall; then
++	  case "$mode" in
++	  clean)
++	    case "  $library_names " in
++	    # "  " in the beginning catches empty $dlname
++	    *" $dlname "*) ;;
++	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
++	    esac
++	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
++	    ;;
++	  uninstall)
+ 	    if test -n "$library_names"; then
+ 	      # Do each command in the postuninstall commands.
+-	      eval cmds=\"$postuninstall_cmds\"
+-	      save_ifs="$IFS"; IFS='~'
+-	      for cmd in $cmds; do
+-		IFS="$save_ifs"
+-		$show "$cmd"
+-		$run eval "$cmd"
+-		if test "$?" -ne 0 && test "$rmforce" != yes; then
+-		  exit_status=1
+-		fi
+-	      done
+-	      IFS="$save_ifs"
++	      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.
+-	      eval cmds=\"$old_postuninstall_cmds\"
+-	      save_ifs="$IFS"; IFS='~'
+-	      for cmd in $cmds; do
+-		IFS="$save_ifs"
+-		$show "$cmd"
+-		$run eval "$cmd"
+-		if test "$?" -ne 0 && test "$rmforce" != yes; then
+-		  exit_status=1
+-		fi
+-	      done
+-	      IFS="$save_ifs"
++	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+ 	    fi
+ 	    # FIXME: should reinstall the best remaining shared library.
+-	  fi
++	    ;;
++	  esac
+ 	fi
+ 	;;
+ 
+       *.lo)
+ 	# Possibly a libtool object, so verify it.
+-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++	if func_lalib_p "$file"; then
+ 
+ 	  # Read the .lo file
+-	  . $dir/$name
++	  func_source $dir/$name
+ 
+ 	  # Add PIC object to the list of files to remove.
+-	  if test -n "$pic_object" \
+-	     && test "$pic_object" != none; then
++	  if test -n "$pic_object" &&
++	     test "$pic_object" != none; then
+ 	    rmfiles="$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
++	  if test -n "$non_pic_object" &&
++	     test "$non_pic_object" != none; then
+ 	    rmfiles="$rmfiles $dir/$non_pic_object"
+ 	  fi
+ 	fi
+@@ -6008,18 +8361,27 @@ relink_command=\"$relink_command\""
+ 	if test "$mode" = clean ; then
+ 	  noexename=$name
+ 	  case $file in
+-	  *.exe) 
+-	    file=`$echo $file|${SED} 's,.exe$,,'`
+-	    noexename=`$echo $name|${SED} 's,.exe$,,'`
++	  *.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
+ 	    rmfiles="$rmfiles $file"
+ 	    ;;
+ 	  esac
+ 	  # Do a test to see if this is a libtool program.
+-	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+-	    relink_command=
+-	    . $dir/$noexename
++	  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
++	      rmfiles="$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
+@@ -6034,235 +8396,38 @@ relink_command=\"$relink_command\""
+ 	fi
+ 	;;
+       esac
+-      $show "$rm $rmfiles"
+-      $run $rm $rmfiles || exit_status=1
++      func_show_eval "$RM $rmfiles" 'exit_status=1'
+     done
+     objdir="$origobjdir"
+ 
+     # Try to remove the ${objdir}s in the directories where we deleted files
+     for dir in $rmdirs; do
+       if test -d "$dir"; then
+-	$show "rmdir $dir"
+-	$run rmdir $dir >/dev/null 2>&1
++	func_show_eval "rmdir $dir >/dev/null 2>&1"
+       fi
+     done
+ 
+     exit $exit_status
+-    ;;
++}
+ 
+-  "")
+-    $echo "$modename: you must specify a MODE" 1>&2
+-    $echo "$generic_help" 1>&2
+-    exit 1
+-    ;;
+-  esac
++{ test "$mode" = uninstall || test "$mode" = clean; } &&
++    func_mode_uninstall ${1+"$@"}
+ 
+-  if test -z "$exec_cmd"; then
+-    $echo "$modename: invalid operation mode \`$mode'" 1>&2
+-    $echo "$generic_help" 1>&2
+-    exit 1
+-  fi
+-fi # test -z "$show_help"
++test -z "$mode" && {
++  help="$generic_help"
++  func_fatal_help "you must specify a MODE"
++}
++
++test -z "$exec_cmd" && \
++  func_fatal_help "invalid operation mode \`$mode'"
+ 
+ if test -n "$exec_cmd"; then
+-  eval exec $exec_cmd
+-  exit 1
++  eval exec "$exec_cmd"
++  exit $EXIT_FAILURE
+ fi
+ 
+-# We need to display help for each of the modes.
+-case $mode in
+-"") $echo \
+-"Usage: $modename [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
+-    --finish          same as \`--mode=finish'
+-    --help            display this help message and exit
+-    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
+-    --quiet           same as \`--silent'
+-    --silent          don't print informational messages
+-    --tag=TAG         use configuration variables from tag TAG
+-    --version         print version information
+-
+-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.  Try \`$modename --help --mode=MODE' for
+-a more detailed description of MODE.
+-
+-Report bugs to <bug-libtool@gnu.org>."
+-  exit 0
+-  ;;
+-
+-clean)
+-  $echo \
+-"Usage: $modename [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: $modename [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
+-  -prefer-pic       try to building PIC objects only
+-  -prefer-non-pic   try to building non-PIC objects only
+-  -static           always build a \`.o' file suitable for static linking
+-
+-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: $modename [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: $modename [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: $modename [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 rest of the components are interpreted as arguments to that command (only
+-BSD-compatible install options are recognized)."
+-  ;;
+-
+-link)
+-  $echo \
+-"Usage: $modename [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
+-  -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
+-  -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
+-  -static           do not do any dynamic linking of libtool libraries
+-  -version-info CURRENT[:REVISION[:AGE]]
+-		    specify library version info [each variable defaults to 0]
+-
+-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: $modename [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."
+-  ;;
++exit $exit_status
+ 
+-*)
+-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
+-  $echo "$help" 1>&2
+-  exit 1
+-  ;;
+-esac
+-
+-$echo
+-$echo "Try \`$modename --help' for more information about other modes."
+-
+-exit 0
+ 
+ # The TAGs below are defined such that we never get into a situation
+ # in which we disable both kinds of libraries.  Given conflicting
+@@ -6281,10 +8446,12 @@ 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`
++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/japanese/FreeWnn-lib/files/patch-makerule.mk.in b/japanese/FreeWnn-lib/files/patch-makerule.mk.in
index 38dab5046455..d8f6b85ba35f 100644
--- a/japanese/FreeWnn-lib/files/patch-makerule.mk.in
+++ b/japanese/FreeWnn-lib/files/patch-makerule.mk.in
@@ -1,6 +1,12 @@
---- makerule.mk.in.orig	2008-10-27 03:37:44.000000000 +0900
-+++ makerule.mk.in	2008-10-27 03:38:15.000000000 +0900
-@@ -42,8 +42,8 @@
+Index: makerule.mk.in
+===================================================================
+RCS file: /home/cvs/private/hrs/freewnn/makerule.mk.in,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- makerule.mk.in	20 Dec 2008 07:13:30 -0000	1.1.1.1
++++ makerule.mk.in	20 Dec 2008 07:17:14 -0000	1.2
+@@ -42,8 +42,8 @@ all::
  # for libtool (AM_PROG_LIBTOOL)
  #     top_builddir = @abs_top_srcdir@
author	Hiroki Sato <hrs@FreeBSD.org>	2010-01-02 14:47:20 +0000
committer	Hiroki Sato <hrs@FreeBSD.org>	2010-01-02 14:47:20 +0000
commit	4b38031b7f2a6cc8fcf3ef57a907f00dcc2b5335 (patch)
tree	fb4d9f6e7af5bc43687100e12721b75ba27087b9 /japanese/FreeWnn-lib
parent	321eea39e0c70d8678fb84e0cd069981165a96d5 (diff)
download	ports-4b38031b7f2a6cc8fcf3ef57a907f00dcc2b5335.tar.gz ports-4b38031b7f2a6cc8fcf3ef57a907f00dcc2b5335.zip