diff options
| author | mef <mef> | 2013-10-15 06:25:37 +0000 |
|---|---|---|
| committer | mef <mef> | 2013-10-15 06:25:37 +0000 |
| commit | 0a9fa3881a98fe230ff80c2c8a04f3e70b0cc469 (patch) | |
| tree | 0d80b83b4ed99b71975808fd5d48abdc28e6a39d /inputmethod/ja-freewnn-lib | |
| parent | 43430b80dd9faf1e835e478d2ac75abe0b99a2cf (diff) | |
| download | pkgsrc-0a9fa3881a98fe230ff80c2c8a04f3e70b0cc469.tar.gz | |
Bump PKGREVISION to 1.
New DISTFILE announced recently as follows.
| Subject: [Freewnn-users 136] Released 1.1.1-a022
| From: aono (at) cc.osaka-kyoiku.ac.jp (Tomoki AONO)
| Date: Mon, 5 Aug 2013 04:07:28 +0900
Our package had (all) diffs from 8 years old previous release.
3617618 Nov 30 2005 FreeWnn-1.1.1-a021.tar.gz
3702026 Aug 5 04:00 FreeWnn-1.1.1-a022.tar.gz
And already named following.
PKGNAME= ja-FreeWnn-lib-1.11alpha22
Thus this time, deleting patches and PKGREVISION= 1.
Diffstat (limited to 'inputmethod/ja-freewnn-lib')
72 files changed, 34 insertions, 30635 deletions
diff --git a/inputmethod/ja-freewnn-lib/Makefile b/inputmethod/ja-freewnn-lib/Makefile index d9ea2b799b7..8640c3bef7f 100644 --- a/inputmethod/ja-freewnn-lib/Makefile +++ b/inputmethod/ja-freewnn-lib/Makefile @@ -1,8 +1,11 @@ -# $NetBSD: Makefile,v 1.11 2011/09/13 07:23:16 mef Exp $ +# $NetBSD: Makefile,v 1.12 2013/10/15 06:25:37 mef Exp $ .include "Makefile.common" PKGNAME= ja-FreeWnn-lib-1.11alpha22 +# DISTFILE now includes all patches, the same PKGNAME, almost the same binary +# but build is different, and binary may not be exactly the same +PKGREVISION= 1 COMMENT+= (Japanese client library) diff --git a/inputmethod/ja-freewnn-lib/Makefile.common b/inputmethod/ja-freewnn-lib/Makefile.common index a30f8eb9b4c..17a56b2a758 100644 --- a/inputmethod/ja-freewnn-lib/Makefile.common +++ b/inputmethod/ja-freewnn-lib/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.18 2013/06/10 03:09:01 dholland Exp $ +# $NetBSD: Makefile.common,v 1.19 2013/10/15 06:25:37 mef Exp $ # used by inputmethod/ja-freewnn-server/Makefile # used by inputmethod/ja-freewnn-lib/Makefile -DISTNAME= FreeWnn-1.1.1-a021 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=freewnn/17724/} \ +DISTNAME= FreeWnn-1.1.1-a022 +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=freewnn/59257/} \ ftp://ftp.st.ryukoku.ac.jp/pub/japanese-im/FreeWnn/ CATEGORIES= inputmethod diff --git a/inputmethod/ja-freewnn-lib/distinfo b/inputmethod/ja-freewnn-lib/distinfo index 7bce7ad7cd0..e450cfd9129 100644 --- a/inputmethod/ja-freewnn-lib/distinfo +++ b/inputmethod/ja-freewnn-lib/distinfo @@ -1,74 +1,6 @@ -$NetBSD: distinfo,v 1.11 2011/09/13 07:23:16 mef Exp $ +$NetBSD: distinfo,v 1.12 2013/10/15 06:25:37 mef Exp $ -SHA1 (FreeWnn-1.1.1-a021.tar.gz) = 9fec62d6f0a584f4ccfdc879687bf2726b86df47 -RMD160 (FreeWnn-1.1.1-a021.tar.gz) = e16b39b572cc368a705bf24fbb87dedf8d8940de -Size (FreeWnn-1.1.1-a021.tar.gz) = 3617618 bytes -SHA1 (patch-CONTRIBUTORS) = d266fbd7f46b37aea0872f111ec8399590986b08 -SHA1 (patch-ChangeLog) = 465a0ffd0cbe0741470c5f13628a69c02561c705 -SHA1 (patch-ChangeLog.en) = 9a25261d0988171c8a41f5dc6819709c69479463 -SHA1 (patch-Contrib_dic_gerodic_Makefile.in) = c0e4cfd5d4a91d87b5e91ccbc6f1224229a66b67 -SHA1 (patch-INSTALL) = 1adeeea9147a3d1343df61df0a1e426c8ff7fd27 -SHA1 (patch-INSTALL.en) = f47e38aa5a46926d733b92df5e6e8d0320dd852f -SHA1 (patch-Makefile.in) = 2a7867f909e01af1c7a4d7db3c950de9f5cbc68c -SHA1 (patch-PubdicPlus_pod.c) = 1d6b66c7772299a0f15d08b5dc2a5197bc3b7f32 -SHA1 (patch-Wnn_Makefile.in) = ecadaaaba0f8ba98b2aae0d44fd2b40f90f8632c -SHA1 (patch-Wnn_conv_cvt__head.h) = 23a4e8652117708b76e875e1b53b30e4cff70916 -SHA1 (patch-Wnn_conv_cvt__read.c) = 7ab3255f6dc81787ffa6826f1f51b3f7dccce905 -SHA1 (patch-Wnn_include_commonhd.h) = 476d644af23b455a511ea86067b08751c989a910 -SHA1 (patch-Wnn_include_jllib.h) = c1a787d10d3eaca5a987d76f625c2921f6c0f304 -SHA1 (patch-Wnn_include_jslib.h) = 8bf82de6cf46fbe52b2c7fb2f6a11a3332487ed0 -SHA1 (patch-Wnn_include_wnn__os.h) = 59ade03300429d8dfc33065fb9fed413316ae033 -SHA1 (patch-Wnn_jlib.V3_Makefile.in) = 696609aec7a42a8d83eb26fbe530186e4ddfacc9 -SHA1 (patch-Wnn_jlib_Makefile.in) = 0cf9edcefd68fdf58e2daacc18843dd960e86cb2 -SHA1 (patch-Wnn_jserver_Makefile.in) = 5627dfbe6dd8a585a2561c6bbef78698b515ba27 -SHA1 (patch-Wnn_jserver_de__header.h) = 714639d77f07fe91fb5235db1e7c907c2bff3f82 -SHA1 (patch-Wnn_jserver_renbn__kai.c) = eebf524ad171d49fe7a630e7599715f0cbc2c18a -SHA1 (patch-Wnn_jutil_Makefile.in) = 2d4bb490b2b84e240e6ca3b805f4bf1296b23972 -SHA1 (patch-Wnn_jutil_ujisf.c) = 182dd1677fd261444f693ea9208d7100878f4673 -SHA1 (patch-Wnn_man_2.env_wnn_2b__romkan.man) = 5662c5e2d107a5c2392052f93d30269b6a00be76 -SHA1 (patch-Wnn_man_4.cmd_Makefile.in) = e3447e1fd6ad7a1f5f62ccfe6b0d6f1ec2083e5a -SHA1 (patch-Wnn_man_6.jutil_Makefile.in) = 44010d0db4fc3fab32779cd6068e5ea280743460 -SHA1 (patch-Wnn_manual_2.env_wnn_2b__romkana) = e02b0d905957670a83b307c507cf42c0a1461ff0 -SHA1 (patch-Wnn_pubdicplus_Makefile.in) = ecdceea5ae48700a9554769de2cfaf6615e657ee -SHA1 (patch-Wnn_romkan_Makefile.in) = 5b32541fd3c5948e93aeb12d329854cb7bbbbb3a -SHA1 (patch-Wnn_uum_Makefile.in) = f4609dae969bd4cab1cc5549a6439bc6ca5f3fea -SHA1 (patch-Wnn_uum_basic__op.c) = 4e83cd2bfb5f6256a3cb24da2faa4637358bb3d5 -SHA1 (patch-Wnn_uum_epilogue.c) = c0c8937f932ea5f88aeee4542a11ce6c2838cc18 -SHA1 (patch-Wnn_uum_header.c) = 633c1498283a0f7cde2689c7f7e00b8d578a22a6 -SHA1 (patch-Wnn_uum_hinsi.c) = fed5b127f0b9690c96554faad0ac28c60cebb532 -SHA1 (patch-Wnn_uum_jhlp.c) = 1eb0c5f7d9bbd7a43fe898c2ba19b45525b2f255 -SHA1 (patch-Wnn_uum_jikouho.c) = ace7f19c0b0b4796559a0744d7da9ab12f2c4c1b -SHA1 (patch-Wnn_uum_printf.c) = 863f6dafe7e9271a10465614dc4aa32a4295d688 -SHA1 (patch-Wnn_uum_sdefine.h) = e286bbb6eb7ec2fb3846f97d48d8462a647343de -SHA1 (patch-Wnn_uum_setutmp.c) = 7259fdec5c975435e4750c528e49f35bf115d9f3 -SHA1 (patch-Wnn_uum_sheader.h) = 75015835b05c92947cb2efa1e992282e30237c18 -SHA1 (patch-Wnn_uum_termcap.c) = a27ddf00b16de74084f86a9aafd9c1645653ee50 -SHA1 (patch-Wnn_uum_termio.c) = c57582336fd5a94d073d7795d5852c6fe56b6623 -SHA1 (patch-Wnn_uum_touroku.c) = 2b3890220fe20f79583a9e8ef14d78fda49aa06f -SHA1 (patch-aclocal.m4) = 883a7db7666ea03e61aed95900ca56150c4b135a -SHA1 (patch-cWnn_Makefile.in) = c03dbd8492c7914f7c9d1ca3c3bc7c110806a109 -SHA1 (patch-cWnn_cdic_Makefile.in) = d3a5d81b3e50f455d13815280cd8f1bf6b9f61c6 -SHA1 (patch-cWnn_jlib_Makefile.in) = fffa48c9a2891b5240a49c699cb5a20b1a297b7d -SHA1 (patch-cWnn_jserver_Makefile.in) = 443625fb83356c62d38795d4e1c0d5c1ef97e3bc -SHA1 (patch-cWnn_jutil_Makefile.in) = 3e23ba23b453dd49fa703c76ad0626015db48978 -SHA1 (patch-cWnn_man_2.env_ckey.man) = f0ccf53a8907b7fd4e1f5e835a855826e5ce0d8f -SHA1 (patch-cWnn_man_4.cmd_Makefile.in) = ce2d1bfb332a8a60ec4cd90a169a555bbea8738b -SHA1 (patch-cWnn_man_6.jutil_Makefile.in) = 521d372977d095666cef5f76590546ce638df1b8 -SHA1 (patch-cWnn_romkan_Makefile.in) = 447b60c7ece313337f8b4cf64d566218ee0400e3 -SHA1 (patch-cWnn_tdic_Makefile.in) = 29f0a39e9321906250041d9a5661272a539fd598 -SHA1 (patch-cWnn_uum_Makefile.in) = b600c3693f7d13fb5fcf3020f3aaa657fd3bd5ca -SHA1 (patch-config.guess) = 7ec197c7acd7d30b710980c6192b181988c94e04 -SHA1 (patch-config.h.in) = 86d2136d77de53551f73550edb93fd3751a213f0 -SHA1 (patch-config.sub) = 7559286d131f783873f1fdb4218f65ca813b2ed9 -SHA1 (patch-configure) = 538ae7cbe6c354eaeb967e9928ba6503cb8bc7a8 -SHA1 (patch-configure.in) = 0fc409da3fc1cb888e60a9a4140be6a7f27b9e01 -SHA1 (patch-kWnn_Makefile.in) = 10b587a04c1426f5c597bbe1348e0b89ad523c33 -SHA1 (patch-kWnn_jlib_Makefile.in) = 47a2c15fa9a2fd46fc1be5bdb82f411f5cf0fc0b -SHA1 (patch-kWnn_jserver_Makefile.in) = 0a59e11b28a1168028ec176ce226b08554ea7273 -SHA1 (patch-kWnn_jutil_Makefile.in) = f7f2ecf2d82b804b89f67e7849001e05e432a129 -SHA1 (patch-kWnn_kdic_Makefile.in) = 5920cd464833a2aa18f54e02217748c8c2cdb432 -SHA1 (patch-kWnn_romkan_Makefile.in) = 5ccccf5c0e5d0965d3203bf03c84d9817c08f9dd -SHA1 (patch-kWnn_uum_Makefile.in) = 0fade22c5cffabeff5c743c85f8c9077831a9598 -SHA1 (patch-ltmain.sh) = 291d07960a3553fe3b24ffb1e6844cf89c8e520f -SHA1 (patch-makerule.mk.in) = 2fd873224c1a4bba5ba5bea454b7f9964e750e88 -SHA1 (patch-makerule.mk.in-2) = 3c27d57081ac5937bb280c1b8cdaf12e489d2384 +SHA1 (FreeWnn-1.1.1-a022.tar.gz) = 659ab9db35e7a92189671ea6be17f138c24913d3 +RMD160 (FreeWnn-1.1.1-a022.tar.gz) = ae8373cb1522de9170bab01a185287c325368749 +Size (FreeWnn-1.1.1-a022.tar.gz) = 3702026 bytes +SHA1 (patch-makerule.mk.in) = 3c27d57081ac5937bb280c1b8cdaf12e489d2384 diff --git a/inputmethod/ja-freewnn-lib/patches/patch-CONTRIBUTORS b/inputmethod/ja-freewnn-lib/patches/patch-CONTRIBUTORS deleted file mode 100644 index 8c48436b836..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-CONTRIBUTORS +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-CONTRIBUTORS,v 1.1 2011/09/13 07:23:16 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- CONTRIBUTORS.orig 2005-04-10 15:26:36.000000000 +0000 -+++ CONTRIBUTORS -@@ -60,6 +60,8 @@ FreeWnn 1.1.1 (ͽÄê) - Keiji Wada - ÏÂÅÄ@Àîºê <keiji@hiemalis.org> - Kazuo ISHIDA - ¤¤¤·¤À@NEC <ishidakz@hml.cl.nec.co.jp> - Yukihiro Nakai -+ AIDA Shinra and Canna contributors -+ Taketo Kabe - - Pubdic+ Éôʬ - SUNAGAWA Keiki <kei_sun@ba2.so-net.ne.jp> diff --git a/inputmethod/ja-freewnn-lib/patches/patch-ChangeLog b/inputmethod/ja-freewnn-lib/patches/patch-ChangeLog deleted file mode 100644 index be9ab5300fb..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-ChangeLog +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ChangeLog,v 1.1 2011/09/13 07:23:16 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- ChangeLog.orig 2005-11-29 17:30:42.000000000 +0000 -+++ ChangeLog -@@ -82,7 +82,7 @@ Mon, 11 Apr 2005 00:26:36 Tomoki AONO < - Changed license of libwnn-related files to LGPL-2.0. - Thanks to the original Wnn authors and FreeWnn contributors. - -- And thanks to Yukihiro Nagai (and tyoshida) for coordination -+ And thanks to Yukihiro Nakai (and tyoshida) for coordination - of this relicensing. - - Mon, 31 Jan 2005 02:14:20 Tomoki AONO <aonoto at users.sourceforge.jp> diff --git a/inputmethod/ja-freewnn-lib/patches/patch-ChangeLog.en b/inputmethod/ja-freewnn-lib/patches/patch-ChangeLog.en deleted file mode 100644 index 51efb11afea..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-ChangeLog.en +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ChangeLog.en,v 1.1 2011/09/13 07:23:16 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- ChangeLog.en.orig 2005-11-29 17:30:42.000000000 +0000 -+++ ChangeLog.en -@@ -76,7 +76,7 @@ Mon, 11 Apr 2005 00:26:36 Tomoki AONO < - Changed license of libwnn-related files to LGPL-2.0. - Thanks to the original Wnn authors and FreeWnn contributors. - -- And thanks to Yukihiro Nagai (and tyoshida) for coordination -+ And thanks to Yukihiro Nakai (and tyoshida) for coordination - of this relicensing. - - Mon, 31 Jan 2005 02:14:20 Tomoki AONO <aonoto at users.sourceforge.jp> diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Contrib_dic_gerodic_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-Contrib_dic_gerodic_Makefile.in deleted file mode 100644 index 21b797e79c4..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Contrib_dic_gerodic_Makefile.in +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-Contrib_dic_gerodic_Makefile.in,v 1.1 2011/09/13 07:23:16 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Contrib/dic/gerodic/Makefile.in.orig 2001-08-14 13:43:20.000000000 +0000 -+++ Contrib/dic/gerodic/Makefile.in -@@ -31,11 +31,14 @@ - # '99/04/19 TAOKA Satoshi - ÅIJ¬ ÃÒ»Ö<taoka@infonets.hiroshima-u.ac.jp> - # ¥¤¥ó¥¹¥È¡¼¥ë¥Ç¥£¥ì¥¯¥È¥ê¤òÊѹ¹²Äǽ¤Ë¤¹¤ë - # --# Last modified date: 19,Apr.1999 -+# More changes are described in ChangeLog file or CVS commit log. - # - --include @top_srcdir@/makerule.mk --top_builddir = ../../.. -+include @top_builddir@/makerule.mk -+ top_srcdir = @top_srcdir@ -+ srcdir = @srcdir@ -+top_builddir = @top_builddir@ -+ WNNJUTILOBJ = $(top_builddir)/Wnn/jutil - - # Makefile for gerodic 1.00 - # -@@ -46,17 +49,17 @@ INSTALL = @INSTALL@ $(INSTALLFLA - LOCAL_INSTFLAGS = -o ${WNNOWNER} - - #ATOD=${JWNNBINDIR}/atod --ATOD=${WNNJUTILSRC}/atod -+ATOD=${WNNJUTILOBJ}/atod - - #WNNTOUCH=${WNNBINDIR}/wnntouch --WNNTOUCH=${WNNJUTILSRC}/wnntouch -+WNNTOUCH=${WNNJUTILOBJ}/wnntouch - - #HINSI=${JWNNWNNDIR}/hinsi.data - HINSI=${PUBDICPLUSSRC}/hinsi.data - - GERODIR=${JWNNDICDIR}/gerodic - --SRC=g-jinmei.u -+SRC=$(srcdir)/g-jinmei.u - OBJ=g-jinmei.dic - - all:: ${OBJ} diff --git a/inputmethod/ja-freewnn-lib/patches/patch-INSTALL b/inputmethod/ja-freewnn-lib/patches/patch-INSTALL deleted file mode 100644 index fc7fcb4fe9e..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-INSTALL +++ /dev/null @@ -1,121 +0,0 @@ -$NetBSD: patch-INSTALL,v 1.1 2011/09/13 07:23:16 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- INSTALL.orig 2004-05-21 16:39:31.000000000 +0000 -+++ INSTALL -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2002 -+# Copyright FreeWnn Project 1999, 2000, 2002, 2006, 2007, 2010 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -55,19 +55,33 @@ - - $ make - --5. ¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¡¼¤Ë¤Ê¤Ã¤Æ make install ¤·¤Þ¤¹ -+5. (¥µ¡¼¥Ð¤ò¹½ÃÛ¤¹¤ë¾ì¹ç¤Ï)¥æ¡¼¥¶¡¼ wnn ¤òºîÀ®¤·¤Þ¤¹ -+ -+ ´û¤Ë¥æ¡¼¥¶¡¼ wnn ¤¬Â¸ºß¤¹¤ë¾ì¹ç¤ÏÉÔÍפǤ¹¡£ -+ ¥æ¡¼¥¶¡¼ wnn¤Ç¥í¥°¥¤¥ó¤¹¤ëɬÍפϤʤ¤¤¿¤á¡¢¥Ñ¥¹¥ï¡¼¥É¤ò¥í¥Ã¥¯(¤Þ¤¿¤ÏÁêÅö¤Î -+ ¾õÂÖ¤Ë)¤·¤Æ¤ª¤¤¤Æ²¼¤µ¤¤¡£ -+ ¥æ¡¼¥¶¡¼¤ÎºîÀ®ÊýË¡¤Ï -+ ¤ª»È¤¤¤Î¥·¥¹¥Æ¥à¤Ë°Í¸¤·¤Þ¤¹¤Î¤Ç¡¢¾ÜºÙ¤Ï¤½¤Î¥·¥¹¥Æ¥à¤Î¥Þ¥Ë¥å¥¢¥ë -+ ¤Ê¤É¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ -+ -+ Ãí3: [cjkt]server ¤Ï¥·¥¹¥Æ¥à¤ä¥Õ¥¡¥¤¥ë¤Ø¤Î±Æ¶Á¤ò¾¯¤Ê¤¯¤¹¤ë¤¿¤á¡¢ -+ ¥æ¡¼¥¶¡¼ wnn ¤Î¸¢¸Â¤ÇÆ°ºî¤·¤Þ¤¹¡£¤Þ¤¿¡¢¥í¡¼¥«¥ë¥æ¡¼¥¶¤¬Ã¯¤Ç¤â -+ µ¯Æ°¤Ç¤¤ë¤è¤¦¤Ë¥æ¡¼¥¶¡¼ wnn ¤Ë setuid¤·¤¿¾õÂ֤ǥ¤¥ó¥¹¥È¡¼¥ë -+ ¤µ¤ì¤Þ¤¹¡£ -+ -+6. ¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¡¼¤Ë¤Ê¤Ã¤Æ make install ¤·¤Þ¤¹ - - $ su - # make install - -- Ãí3: ¸½ºß¤Î¤È¤³¤í¡¢¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¡¼°Ê³°¤Ç¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï¤¦¤Þ¤¯¹Ô -+ Ãí4: ¸½ºß¤Î¤È¤³¤í¡¢¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¡¼°Ê³°¤Ç¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï¤¦¤Þ¤¯¹Ô - ¤¤Þ¤»¤ó¡£ - --6. ¥Þ¥Ë¥å¥¢¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹ -+7. ¥Þ¥Ë¥å¥¢¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹ - - # make install.man - -- Ãí4: ¥Þ¥Ë¥å¥¢¥ë¤¬ÉÔÍפǤ¢¤ì¤Ð¾Êά¤·¤Æ¹½¤¤¤Þ¤»¤ó¡£ -+ Ãí5: ¥Þ¥Ë¥å¥¢¥ë¤¬ÉÔÍפǤ¢¤ì¤Ð¾Êά¤·¤Æ¹½¤¤¤Þ¤»¤ó¡£ - - - ¡Úconfigure ¤Î¥ª¥×¥·¥ç¥ó¡Û -@@ -88,16 +102,52 @@ FreeWnn Æȼ«¤Î configure option ¤Î¤¦¤Á¡¢ - --enable-Wnn Wnn (ÆüËܸì) ¤òºîÀ®µÚ¤Ó¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ - --enable-cWnn cWnn (Ãæ¹ñ¸ì) ¤òºîÀ®µÚ¤Ó¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ - --enable-kWnn kWnn (´Ú¹ñ¸ì) ¤òºîÀ®µÚ¤Ó¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ -+ --enable-traditional-layout -+ ̵¸ú¤Ë¤·¤¿¾ì¹ç¡¢¶áǯ¤Î¥½¥Õ¥È¤¬ -+ ¤è¤¯ÍøÍѤ¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¹½À®¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤·¤è¤¦¤È¤·¤Þ¤¹¡£ -+ ͸ú¤Î¤Þ¤Þ¤Î¾ì¹ç¤Ï¡¢½¾Íè¤ÎWnn4¤Î¥¤¥ó¥¹¥È¡¼¥ëÀè¤Ë -+ ½à¤¸¤¿¥Ç¥£¥ì¥¯¥È¥ê¹½À®¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£(Ãí6) - - default ¤Ç̵¸ú¤Ê¤â¤Î: - --enable-ipv6 IPv6 ¤ò͸ú¤Ë¤·¤Þ¤¹¡£ - --enable-unsafe-path jserverdir °Ê³°¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë jserver ¤¬¥Õ¥¡¥¤¥ë -- ¤òºîÀ®¤¹¤ë¤Î¤òµö²Ä¤·¤Þ¤¹¡£(Ãí5) -- --enable-client uum ¤òºîÀ®µÚ¤Ó¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£(Ãí6) -+ ¤òºîÀ®¤¹¤ë¤Î¤òµö²Ä¤·¤Þ¤¹¡£(Ãí7) -+ --enable-client uum ¤òºîÀ®µÚ¤Ó¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ -+ -+ configureÃæ¤ÇɬÍ×À¡¦¥é¥¤¥Ö¥é¥ê¤Î¸ºß¤ò³Îǧ¤¹¤ë¤â¤Î: - --with-libwrap TCP wrapper¤Îlibwrap¤ò»ÈÍѤ·¡¢jserver¤ÎÀܳ»þÅÀ¤Ç¤Î -- ¥¢¥¯¥»¥¹À©¸Â¤ò²Äǽ¤Ë¤·¤Þ¤¹¡£(Ãí7) -+ ¥¢¥¯¥»¥¹À©¸Â¤ò²Äǽ¤Ë¤·¤Þ¤¹¡£(Ãí8) -+ --enable-client-utmp (uum¤òºîÀ®¤¹¤ë¾ì¹ç)uum¤¬³ÎÊݤ·¤¿µ¼»÷üËö¾ðÊó¤ò -+ utmp¤ËÅÐÏ¿¤·¡¢who¥³¥Þ¥ó¥É¤Ê¤É¤Ç»²¾È¤Ç¤¤ë¤è¤¦¤Ë -+ ¤·¤Þ¤¹¡£(°ìÉô¤Î¥·¥¹¥Æ¥à¤ò½ü¤Í¸ú¤Ë¤Ê¤ê¤Þ¤¹) -+ --enable-client-setuid[=user] -+ (uum¤òºîÀ®¤¹¤ë¾ì¹ç)»ØÄꤷ¤¿user(̤»ØÄê¤Î¾ì¹ç¤Ï -+ root)¤Çset-uid¤·¤Æuum¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ -+ ¤³¤Î¥ª¥×¥·¥ç¥ó¼«ÂΤò»ØÄꤷ¤Ê¤¤¾ì¹ç¤Ï¡¢È½ÊÌ·ë²Ì¤Ë -+ ¤è¤êɬÍפʾì¹ç¤Ïset-uid¤·¤Þ¤¹¡£ -+ --enable-client-setgid=group -+ (uum¤òºîÀ®¤¹¤ë¾ì¹ç)»ØÄꤷ¤¿group¤Çset-gid¤·¤Æ -+ uum¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£Á°½Ò¤Î¥ª¥×¥·¥ç¥ó¤È°Û¤Ê¤ê¡¢ -+ group¤Ïɬ¤º»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ -+ ¤³¤Î¥ª¥×¥·¥ç¥ó¼«ÂΤò»ØÄꤷ¤Ê¤¤¾ì¹ç¤Ï¡¢È½ÊÌ·ë²Ì¤Ë -+ ¤è¤êɬÍפʾì¹ç¤Ïset-gid¤·¤Þ¤¹¡£ -+ --enable-sub-bindir ¥³¥Þ¥ó¥ÉÎà¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëºÝ¡¢¸À¸ìÊÌ¤Ë -+ ¡ÖWnn4¡×¤Ê¤É¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤òºîÀ®¤¹¤ë¤«¤É¤¦¤«¤ò -+ À©¸æ¤·¤Þ¤¹¡£»ØÄꤷ¤Ê¤¤¾ì¹ç¤Ï¡¢ -+ --enable-traditional-layout ¥ª¥×¥·¥ç¥ó¤¬Í¸ú¤Î»þ¤Ë¤Ï -+ ͸ú¡¢Ìµ¸ú¤Î»þ¤Ë¤Ï̵¸ú¤È¤Ê¤ê¤Þ¤¹¡£(Ãí6) -+ -+Ãí6: ¤¤¤ï¤æ¤ëFHS (File Hierarchy Standard)¤Ë¶á¤Å¤±¤ë¤³¤È¤ò°Õ¿Þ¤·¤Æ¤¤¤Þ¤¹¡£ -+ ¸½»þÅÀ¤Ç¤Ï¥Ñ¥é¥á¡¼¥¿¤Ë¤è¤ê¡¢¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Ñ¥¹¤Ë°Ê²¼¤ÎÊѲ½¤¬¤¢¤ê¤Þ¤¹¡£ -+ -+ (¥Õ¥¡¥¤¥ë) enable disable -+ jserver, wnnstat, wnnkill $(bindir)/*Wnn4 $(sbindir) -+ ¤½¤Î¾¤Î¥³¥Þ¥ó¥ÉÎà $(bindir)/*Wnn4 $(bindir) - --Ãí5: [cjkt]server ¤Ï¡¢Ç¤°Õ¤Î host ¤«¤é¤ÎÍ×µá¤ò¼õ¤±ÉÕ¤±¤Æ¤·¤Þ¤¤¤Þ¤¹¡£ -+ ¡Ö*Wnn4¡×¤Ï¸À¸ì¤Ë±þ¤¸¤Æ¡ÖWnn4¡×¡ÖcWnn4¡×¡ÖkWnn4¡×¤Î¤¤¤º¤ì¤«¤¬ÍøÍѤµ¤ì¤Þ¤¹¡£ -+ ¡Ö*Wnn4¡×¤òºîÀ®¤¹¤ë¤«¤É¤¦¤«¤Ï --enable-sub-bindir ¤ÇÀ©¸æ¤Ç¤¤Þ¤¹¡£ -+ -+Ãí7: [cjkt]server ¤Ï¡¢Ç¤°Õ¤Î host ¤«¤é¤ÎÍ×µá¤ò¼õ¤±ÉÕ¤±¤Æ¤·¤Þ¤¤¤Þ¤¹¡£ - --enable-unsafe-path ¤ò͸ú¤Ë¤¹¤ë¤È¡¢Ç¤°Õ¤Î host ¤«¤é jserver ¼Â¹Ô¥æ¡¼¥¶¡¼ - ¤Î¸¢¸Â¤Ç¡¢Ç¤°Õ¤Î path ¤Ë Wnn ¤Î¼½ñ¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤¤Æ¤·¤Þ¤¤ - ¤Þ¤¹¡£½¾Íè¡¢home directory ¤Ê¤É¡¢lib/wnn/$LANG/dic/usr °Ê³°¤Ë¼½ñ¥Õ¥¡¥¤ -@@ -107,6 +157,4 @@ FreeWnn Æȼ«¤Î configure option ¤Î¤¦¤Á¡¢ - (Ä̾ï¤Ï /usr/local/lib/wnn/$LANG/dic) °Ê²¼¤Ë¼½ñ¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ë¤³¤È¤Ï - Ëɤ²¤Þ¤»¤ó¡£ - --Ãí6: cuum ¤Ï¤Þ¤À compile ½ÐÍè¤Þ¤»¤ó¡£ -- --Ãí7: --enable-ipv6¤ÈƱ»þ¤Ë»ØÄꤹ¤ë¾ì¹ç¡¢libwrap¤âIPv6Âбþ¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ -+Ãí8: --enable-ipv6¤ÈƱ»þ¤Ë»ØÄꤹ¤ë¾ì¹ç¡¢libwrap¤âIPv6Âбþ¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ diff --git a/inputmethod/ja-freewnn-lib/patches/patch-INSTALL.en b/inputmethod/ja-freewnn-lib/patches/patch-INSTALL.en deleted file mode 100644 index f1558065ea5..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-INSTALL.en +++ /dev/null @@ -1,117 +0,0 @@ -$NetBSD: patch-INSTALL.en,v 1.1 2011/09/13 07:23:16 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- INSTALL.en.orig 2004-05-21 16:39:31.000000000 +0000 -+++ INSTALL.en -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2002 -+# Copyright FreeWnn Project 1999, 2000, 2002, 2006, 2007, 2010 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -54,19 +54,29 @@ - - $ make - --5. To install commands, libraries, dictionaries and so on, -- run make install as a superuser(*3). -+5. (If you build server,) add user named `wnn'. -+ -+ You don't need to add `wnn' if it exists. We don't login as `wnn', -+ so please lock password (or equivalent state). Please refer -+ to administration manual of your system to add user `wnn'. -+ -+ *3: jserver (and [ckt]server) runs as user `wnn' to reduce affect -+ system and files. We install them as setuid `wnn', -+ so any local user can run jserver. -+ -+6. To install commands, libraries, dictionaries and so on, -+ run make install as a superuser(*4). - - $ su - # make install - -- *3: Currently, install target does not work well for other user. -+ *4: Currently, install target does not work well for other user. - --6. To install manuals, you should do the following as a superuser -+7. To install manuals, you should do the following as a superuser - - # make install.man - -- *4: You can ommit this if you do not want manuals installed. -+ *5: You can ommit this if you do not want manuals installed. - - [Configure options] - -@@ -88,21 +98,56 @@ Below are the main configure option of F - --enable-Wnn compile and install Wnn (Japanese). - --enable-cWnn compile and install cWnn (Chinese). - --enable-kWnn compile and install kWnn (Korean). -+ --enable-traditional-layout -+ If disabled, install files in modern layout. -+ If leave enabled, install files in Wnn4 compatible -+ directories. (*6) - - disabled by default: - --enable-ipv6 enable IPv6 feature. -- --enable-unsafe-path allow creating files in jserver_dir (*5). -- --enable-client compile and install uum (*6). -+ --enable-unsafe-path allow creating files in jserver_dir (*7). -+ --enable-client compile and install uum. -+ -+ auto determine by default: - --with-libwrap use libwrap (in TCP wrapper) for jserver -- to enable connection-based access control (*7). -+ to enable connection-based access control (*8). -+ --enable-client-utmp (if --enable-client specified,) uum register -+ pseudo tty information to utmp. (Except some systems, -+ it is enabled by default.) -+ --enable-client-setuid[=user] -+ (if --enable-client specified,) install uum as set-uid -+ program with specified user (root by default). -+ If this option (itself) is not specified, -+ configure determine if set-uid install is needed. -+ --enable-client-setgid=group -+ (if --enable-client specified,) install uum as set-gid -+ program with specified group (you must specify group). -+ If this option (itself) is not specified, -+ configure determine if set-gid install is needed. -+ --enable-sub-bindir Control if we install commands to separate sub directory -+ by language (ex. Japanese commands to $(bindir)/Wnn4). -+ If this option is not specified, it relies on -+ --enable-traditional-layout option. (Enable if -+ --enable-traditional-layout specified, disable -+ otherwise.) (*6) -+ -+*6: We intend to follow installation path like FHS (File Hierarchy -+ Standard). Currently difference between specifying parameter -+ --enable-traditional-layout or not is following: -+ -+ Files If enabled If disabled -+ jserver, wnnstat, wnnkill $(bindir)/*Wnn4 $(sbindir) -+ Other commands $(bindir)/*Wnn4 $(bindir) -+ -+ Note the name of sub directory "*Wnn4" depends on language (Wnn4, -+ cWnn4, kWnn4). You can control whether you use "*Wnn4" by specifing -+ --enable-sub-bindir option. - --*5: If the option --enable-unsafe-path is enabled, the [cjkt]server -+*7: If the option --enable-unsafe-path is enabled, the [cjkt]server - daemons accept creation of an FreeWnn dictionary file in an arbitrary - path, and they accept request from client of any hosts. - This feature may be a security hole. - Unless you used to place FreeWnn dictionary files in a path other than - jserver_dir (lib/wnn/$LANG/dic/usr), you should not enable this feature. - --*6: cuum cannot be compiled yet. -- --*7: If you specify --enable-ipv6, libwrap need to support IPv6 also. -+*8: If you specify --enable-ipv6, libwrap need to support IPv6 also. diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-Makefile.in deleted file mode 100644 index 5203e38f7a3..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Makefile.in +++ /dev/null @@ -1,79 +0,0 @@ -$NetBSD: patch-Makefile.in,v 1.1 2011/09/13 07:23:16 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Makefile.in.orig 2003-05-11 18:22:54.000000000 +0000 -+++ Makefile.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2003 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2003, 2010 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -114,26 +114,6 @@ man_keywords:: - # ---------------------------------------------------------------------- - # rules for building in SUBDIRS - do not edit - --install:: -- @for flag in ${MAKEFLAGS} ''; do \ -- case "$$flag" in *=*) ;; *[ik]*) set +e;; esac; done; \ -- for i in $(SUBDIRS) ;\ -- do \ -- echo "installing" "in $(CURRENT_DIR)/$$i..."; \ -- (cd $$i && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ -- DESTDIR=$(DESTDIR) install); \ -- done -- --install.man:: -- @for flag in ${MAKEFLAGS} ''; do \ -- case "$$flag" in *=*) ;; *[ik]*) set +e;; esac; done; \ -- for i in $(SUBDIRS) ;\ -- do \ -- echo "installing man pages" "in $(CURRENT_DIR)/$$i..."; \ -- (cd $$i && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ -- DESTDIR=$(DESTDIR) install.man); \ -- done -- - install.linkkit:: - @for flag in ${MAKEFLAGS} ''; do \ - case "$$flag" in *=*) ;; *[ik]*) set +e;; esac; done; \ -@@ -144,16 +124,6 @@ install.linkkit:: - DESTDIR='$(DESTDIR)' install.linkkit); \ - done - --clean:: -- @for flag in ${MAKEFLAGS} ''; do \ -- case "$$flag" in *=*) ;; *[ik]*) set +e;; esac; done; \ -- for i in $(SUBDIRS) ;\ -- do \ -- echo "cleaning" "in $(CURRENT_DIR)/$$i..."; \ -- (cd $$i && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ -- clean); \ -- done -- - tags:: - @for flag in ${MAKEFLAGS} ''; do \ - case "$$flag" in *=*) ;; *[ik]*) set +e;; esac; done; \ -@@ -164,16 +134,6 @@ tags:: - TAGS='$(TAGS)' tags); \ - done - --includes:: -- @for flag in ${MAKEFLAGS} ''; do \ -- case "$$flag" in *=*) ;; *[ik]*) set +e;; esac; done; \ -- for i in $(SUBDIRS) ;\ -- do \ -- echo including "in $(CURRENT_DIR)/$$i..."; \ -- (cd $$i && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ -- includes); \ -- done -- - # ---------------------------------------------------------------------- - # dependencies generated by makedepend - diff --git a/inputmethod/ja-freewnn-lib/patches/patch-PubdicPlus_pod.c b/inputmethod/ja-freewnn-lib/patches/patch-PubdicPlus_pod.c deleted file mode 100644 index ba4b2e2314e..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-PubdicPlus_pod.c +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-PubdicPlus_pod.c,v 1.1 2011/09/13 07:23:16 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- PubdicPlus/pod.c.orig 2005-11-29 17:00:02.000000000 +0000 -+++ PubdicPlus/pod.c -@@ -130,7 +130,7 @@ struct dicpack - - #if defined (__STDC__) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(_WIN32) - /* Prototype for C89 (or later) */ --#ifndef POD_WCHAR -+#ifdef POD_WCHAR - size_t Mbstowcs (Wchar *d, char *ss, int n); - size_t Wcstombs (char *d, Wchar *s, int n); - int Wscmp (register Wchar *s1, register Wchar *s2); -@@ -139,7 +139,7 @@ int Wslen (Wchar *s); - int Watoi (Wchar *s); - static void Fputws (Wchar *s, FILE *f); - Wchar *Fgetws (Wchar *buf, int siz, FILE *f); --#endif /* !POD_WCHAR */ -+#endif /* POD_WCHAR */ - - static int all_kana (Wchar *s); - static Wchar *findslash (Wchar *s); diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_Makefile.in deleted file mode 100644 index 4105b1b064b..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_Makefile.in +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-Wnn_Makefile.in,v 1.1 2011/09/13 07:23:16 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/Makefile.in.orig 2001-09-16 11:42:58.000000000 +0000 -+++ Wnn/Makefile.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2006 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -29,8 +29,8 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - # - --include @top_srcdir@/makerule.mk --top_builddir = .. -+include @top_builddir@/makerule.mk -+top_builddir = @top_builddir@ - - WNNOWNER= wnn - -@@ -56,11 +56,11 @@ JLIBV3DIR = jlib.V3 - - UUMDIR = uum - --LIB_SUBDIRS = $(JDDIR) $(JLIBDIR) $(WNNCLIENTSDIR) $(WNNMANDIR) $(WNNENVDIR) $(JLIBV3DIR) -+LIB_SUBDIRS = $(JDDIR) $(JLIBDIR) $(WNNMANDIR) $(WNNENVDIR) $(JLIBV3DIR) - - SERVER_SUBDIRS = $(JSERVERDIR) $(WNNJUTILDIR) $(PUBDICPLUSDIR) $(WNNCONSDIR) $(WNNMANDIR) - --CLIENT_SUBDIRS = $(UUMDIR) -+CLIENT_SUBDIRS = $(WNNCLIENTSDIR) $(UUMDIR) - - SUBDIRS = @SUBDIRS@ - diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_conv_cvt__head.h b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_conv_cvt__head.h deleted file mode 100644 index 87625110838..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_conv_cvt__head.h +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-Wnn_conv_cvt__head.h,v 1.1 2011/09/13 07:23:16 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/conv/cvt_head.h.orig 2002-03-21 03:32:45.000000000 +0000 -+++ Wnn/conv/cvt_head.h -@@ -10,9 +10,9 @@ - * 1987, 1988, 1989, 1990, 1991, 1992 - * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 -- * Copyright FreeWnn Project 1999, 2000, 2002 -+ * Copyright FreeWnn Project 1999, 2000, 2002, 2006 - * -- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+ * Maintainer: FreeWnn Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -40,11 +40,11 @@ - - #include "commonhd.h" - --#if defined(luna) || defined(DGUX) -+#if defined(luna) || defined(DGUX) || defined(hpux) || defined(sun) - #ifndef SUPPORT_TWODIGIT_FUNCTIONS - #define SUPPORT_TWODIGIT_FUNCTIONS - #endif /* SUPPORT_TWODIGIT_FUNCTIONS */ --#endif /* defined(luna) || defined(DGUX) */ -+#endif /* defined(luna) || defined(DGUX) || defined(hpux) || defined(sun) */ - - #define BITSIZ (sizeof(int) * 8) - #define CHANGE_MAX 4 /* ÊÑ´¹¥Æ¡¼¥Ö¥ë¤ÎºÇÂç¸Ä¿ô¡àBITSIZ¤ò²¼²ó¤é¤Ê¤¤À°¿ô */ diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_conv_cvt__read.c b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_conv_cvt__read.c deleted file mode 100644 index 7ed3b7cce95..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_conv_cvt__read.c +++ /dev/null @@ -1,158 +0,0 @@ -$NetBSD: patch-Wnn_conv_cvt__read.c,v 1.1 2011/09/13 07:23:16 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/conv/cvt_read.c.orig 2002-04-03 04:16:19.000000000 +0000 -+++ Wnn/conv/cvt_read.c -@@ -10,9 +10,10 @@ - * 1987, 1988, 1989, 1990, 1991, 1992 - * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 -- * Copyright FreeWnn Project 1999, 2000, 2002 -+ * Copyright FreeWnn Project 1999, 2000, 2002, 2003, 2006 -+ * Copyright Taketo Kabe 2003 - * -- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+ * Maintainer: FreeWnn Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -52,16 +53,91 @@ - #if HAVE_FCNTL_H - # include <fcntl.h> - #endif -+#ifdef HAVE_UNISTD_H -+# include <unistd.h> -+#endif - --#include "cvt_head.h" -+/* Solaris 2.x needs termio.h , so include both. */ -+#if HAVE_TERMIOS_H -+# include <termios.h> -+#endif -+#if HAVE_TERMIO_H -+# include <termio.h> -+#endif -+ -+#if defined(HAVE_TERMIOS_H) -+/* # include <termios.h> */ -+# define USE_TERMIOS 1 -+#elif defined(HAVE_TERMIO_H) -+/* # include <termio.h> */ -+# define USE_TERMIO 1 -+#elif defined(HAVE_SYS_TERMIO_H) -+# include <sys/termio.h> -+# define USE_TERMIO 1 -+#elif defined(HAVE_SGTTY_H) -+# include <sgtty.h> -+# define USE_SGTTY -+#else -+# error "No termio header." -+#endif /* HAVE_TERMIOS_H */ - --#ifdef SYSVR2 --#ifdef TERMINFO --#include <curses.h> --#endif /* TERMINFO */ --#include <term.h> -+#ifdef HAVE_TERMINFO -+# define TERMINFO 1 -+#else -+# define TERMCAP 1 -+#endif /* HAVE_TERMINFO */ -+ -+/* ncurses' term.h defines them to either 0 or 1! */ -+#ifndef HAVE_TERMIOS_H -+# define DONT_HAVE_TERMIOS_H -+#endif -+#ifndef HAVE_TERMIO_H -+# define DONT_HAVE_TERMIO_H -+#endif -+#ifndef HAVE_SYS_TERMIO_H -+# define DONT_HAVE_SYS_TERMIO_H -+#endif -+#ifndef HAVE_SGTTY_H -+# define DONT_HAVE_SGTTY_H -+#endif -+ -+#if defined(HAVE_TERMINFO) -+# if defined(HAVE_CURSES_H) -+# include <curses.h> -+# elif defined(HAVE_NCURSES_H) -+# include <ncurses.h> -+# else -+# error "no terminfo header" -+# endif /* HAVE_CURSES_H */ -+# ifdef HAVE_TERM_H -+# include <term.h> -+# endif -+#else /* HAVE_TERMINFO */ -+# if defined(HAVE_TERMCAP_H) -+# include <termcap.h> -+# endif /* HAVE_TERMCAP_H */ -+#endif /* HAVE_TERMINFO */ -+ -+#ifdef DONT_HAVE_TERMIOS_H -+# undef HAVE_TERMIOS_H -+# undef DONT_HAVE_TERMIOS_H -+#endif -+#ifdef DONT_HAVE_TERMIO_H -+# undef HAVE_TERMIO_H -+# undef DONT_HAVE_TERMIO_H -+#endif -+#ifdef DONT_HAVE_SYS_TERMIO_H -+# undef HAVE_SYS_TERMIO_H -+# undef DONT_HAVE_SYS_TERMIO_H -+#endif -+#ifdef DONT_HAVE_SGTTY_H -+# undef HAVE_SGTTY_H -+# undef DONT_HAVE_SGTTY_H - #endif - -+#include "wnn_os.h" -+#include "cvt_head.h" -+ - #define ENTRY_LEN 10 /* ¥³¥ó¥Ð¡¼¥Èɽ¤Î¥¨¥ó¥È¥ê̾¤ÎºÇÂçĹ */ - - /* -@@ -455,6 +531,40 @@ convert_getstrs (flg) - keydef_key[i++] = stradd (&tdataptr, key_f29); - keydef_key[i++] = stradd (&tdataptr, key_f30); - keydef_key[i++] = stradd (&tdataptr, key_f31); -+# ifndef uniosu -+ keydef_key[i++] = stradd (&tdataptr, key_f32); -+ keydef_key[i++] = stradd (&tdataptr, key_f33); -+ keydef_key[i++] = stradd (&tdataptr, key_f34); -+ keydef_key[i++] = stradd (&tdataptr, key_f35); -+ keydef_key[i++] = stradd (&tdataptr, key_f36); -+ keydef_key[i++] = stradd (&tdataptr, key_f37); -+ keydef_key[i++] = stradd (&tdataptr, key_f38); -+ keydef_key[i++] = stradd (&tdataptr, key_f39); -+ keydef_key[i++] = stradd (&tdataptr, key_f40); -+ keydef_key[i++] = stradd (&tdataptr, key_f41); -+ keydef_key[i++] = stradd (&tdataptr, key_f42); -+ keydef_key[i++] = stradd (&tdataptr, key_f43); -+ keydef_key[i++] = stradd (&tdataptr, key_f44); -+ keydef_key[i++] = stradd (&tdataptr, key_f45); -+ keydef_key[i++] = stradd (&tdataptr, key_f46); -+ keydef_key[i++] = stradd (&tdataptr, key_f47); -+ keydef_key[i++] = stradd (&tdataptr, key_f48); -+ keydef_key[i++] = stradd (&tdataptr, key_f49); -+ keydef_key[i++] = stradd (&tdataptr, key_f50); -+ keydef_key[i++] = stradd (&tdataptr, key_f51); -+ keydef_key[i++] = stradd (&tdataptr, key_f52); -+ keydef_key[i++] = stradd (&tdataptr, key_f53); -+ keydef_key[i++] = stradd (&tdataptr, key_f54); -+ keydef_key[i++] = stradd (&tdataptr, key_f55); -+ keydef_key[i++] = stradd (&tdataptr, key_f56); -+ keydef_key[i++] = stradd (&tdataptr, key_f57); -+ keydef_key[i++] = stradd (&tdataptr, key_f58); -+ keydef_key[i++] = stradd (&tdataptr, key_f59); -+ keydef_key[i++] = stradd (&tdataptr, key_f60); -+ keydef_key[i++] = stradd (&tdataptr, key_f61); -+ keydef_key[i++] = stradd (&tdataptr, key_f62); -+ keydef_key[i++] = stradd (&tdataptr, key_f63); -+# endif /* !uniosu */ - #endif /* SUPPORT_TWODIGIT_FUNCTIONS */ - /* °Ê²¼½ç¤Ë - "kcuu1", "kcuf1", "kcub1", "kcud1", "khome", diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_include_commonhd.h b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_include_commonhd.h deleted file mode 100644 index 5723b6e0e49..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_include_commonhd.h +++ /dev/null @@ -1,99 +0,0 @@ -$NetBSD: patch-Wnn_include_commonhd.h,v 1.1 2011/09/13 07:23:17 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/include/commonhd.h.orig 2005-04-10 15:26:37.000000000 +0000 -+++ Wnn/include/commonhd.h -@@ -10,9 +10,9 @@ - * 1987, 1988, 1989, 1990, 1991, 1992 - * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 -- * Copyright FreeWnn Project 1999, 2000, 2001, 2002 -+ * Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2005, 2006 - * -- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+ * Maintainer: FreeWnn Project - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -39,7 +39,7 @@ - #include <stdio.h> - - #define JSERVER_VERSION 0x4200 /* minor version */ --#define _SERVER_VERSION "FreeWnn 1.1.0 pl21" -+#define _SERVER_VERSION "FreeWnn 1.1.0 pl22" - - #include "wnnerror.h" - -@@ -75,9 +75,6 @@ typedef unsigned char UCHAR; - # ifndef SYSVR2 - # define SYSVR2 - # endif --# ifndef TERMINFO --# define TERMINFO --# endif - #else /* if defined(MACH) || defined(uniosb) */ - # ifndef BSD42 - # define BSD42 -@@ -90,34 +87,22 @@ typedef unsigned char UCHAR; - # define BSD44 - # endif - # endif /* defined(luna68k) */ --# ifndef TERMCAP --# define TERMCAP --# endif - #endif - #else /* defined(luna) */ - #if defined(sun) && !defined(SVR4) - # ifndef BSD42 - # define BSD42 - # endif --# ifndef TERMCAP --# define TERMCAP --# endif - #else /* sun else */ - #if defined(DGUX) || defined(linux) - # ifndef SYSVR2 - # define SYSVR2 - # endif --# ifndef TERMCAP --# define TERMCAP --# endif - #else --#if defined(SVR4) || defined(hpux) -+#if defined(SVR4) || defined(hpux) || defined(SYSV) || defined(USG) - # ifndef SYSVR2 - # define SYSVR2 - # endif --# ifndef TERMINFO --# define TERMINFO --# endif - # ifdef sun - # define SOLARIS - # endif -@@ -128,22 +113,19 @@ typedef unsigned char UCHAR; - # ifndef BSD42 - # define BSD42 - # endif --# ifndef TERMCAP --# define TERMCAP --# endif --#endif /* defined(SVR4) || defined(hpux) */ -+#endif /* defined(SVR4) || defined(hpux) || defined(SYSV) || defined(USG) */ - #endif /* DGUX */ - #endif /* sun */ - #endif /* luna */ - --#if defined(SVR4) || defined(hpux) -+#if defined(SVR4) || defined(hpux) || defined(SYSV) || defined(USG) - #ifndef F_OK - #define F_OK 0 - #endif - #ifndef R_OK - #define R_OK 4 - #endif --#endif -+#endif /* defined(SVR4) || defined(hpux) || defined(SYSV) || defined(USG) */ - - #define MAXBUNSETSU 80 - #define LIMITBUNSETSU 400 diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_include_jllib.h b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_include_jllib.h deleted file mode 100644 index 14e3b677d50..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_include_jllib.h +++ /dev/null @@ -1,144 +0,0 @@ -$NetBSD: patch-Wnn_include_jllib.h,v 1.1 2011/09/13 07:23:17 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/include/jllib.h.orig 2005-04-10 15:26:37.000000000 +0000 -+++ Wnn/include/jllib.h -@@ -10,9 +10,9 @@ - * 1987, 1988, 1989, 1990, 1991, 1992 - * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 -- * Copyright FreeWnn Project 1999, 2000 -+ * Copyright FreeWnn Project 1999, 2000, 2008 - * -- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+ * Maintainer: FreeWnn Project - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -39,6 +39,9 @@ - - #include "jslib.h" - -+#ifdef __cplusplus -+extern "C" { -+#endif - - /* - ¥æ¡¼¥¶¡¼¥×¥í¥°¥é¥à¤Ï¡¢Ä¾Àܤ³¤Î¹½Â¤ÂΤÎÆâÍƤò¥¢¥¯¥»¥¹¤¹¤ëɬÍפÏ̵¤¤¤Ï¤º¡£ -@@ -248,59 +251,65 @@ struct wnn_buf - #define jl_set_lang(buf, lang) js_set_lang((buf)->env, lang) - - /* extern function defines */ --extern struct wnn_buf *jl_open_lang (); --extern struct wnn_env *jl_connect_lang (); --extern struct wnn_env *jl_env_get (); --extern struct wnn_jdata *jl_word_info_e (); --extern w_char *jl_hinsi_name_e (); -- --extern void jl_close (); --extern int jl_dic_add_e (); --extern int jl_dic_comment_set_e (); --extern int jl_dic_delete_e (); --extern int jl_dic_list_e (); --extern int jl_dic_save_all_e (); --extern int jl_dic_save_e (); --extern int jl_dic_use_e (); --extern void jl_disconnect (); --extern void jl_disconnect_if_server_dead (); --extern void jl_env_set (); --extern int jl_fuzokugo_get_e (); --extern int jl_fuzokugo_set_e (); --extern void jl_get_zenkouho_kanji (); --extern int jl_hinsi_dicts_e (); --extern int jl_hinsi_list_e (); --extern int jl_hinsi_number_e (); --extern int jl_isconnect_e (); --extern int jl_kanji_len (); --extern int jl_kill (); --extern int jl_nobi_conv (); --extern int jl_nobi_conv_e2 (); --extern int jl_param_get_e (); --extern int jl_param_set_e (); --extern int jl_ren_conv (); --extern int jl_set_env_wnnrc (); --extern int jl_set_env_wnnrc1 (); --extern int jl_set_jikouho (); --extern int jl_set_jikouho_dai (); --extern int jl_tan_conv (); --extern int jl_update_hindo (); --extern int jl_word_add_e (); --extern int jl_word_comment_set_e (); --extern int jl_word_delete_e (); --extern int jl_word_search_by_env_e (); --extern int jl_word_search_e (); --extern int jl_word_use_e (); --extern int jl_yomi_len (); --extern int jl_zenkouho (); --extern int jl_zenkouho_dai (); --extern int wnn_get_area (); -+/* Note: FRWNN_PARAMS is defined in jslib.h . */ -+ -+extern struct wnn_buf *jl_open_lang FRWNN_PARAMS((char *env_n, char *server_n, char *lang, char *wnnrc_n, int (*error_handler) (), int (*message_handler) (), int timeout)); -+extern struct wnn_env *jl_connect_lang FRWNN_PARAMS((register char *env_n, register char *server_n, register char *lang, register char *wnnrc_n, int (*error_handler) (), int (*message_handler) (), int timeout)); -+extern struct wnn_env *jl_env_get FRWNN_PARAMS((register struct wnn_buf *buf)); -+extern struct wnn_jdata *jl_word_info_e FRWNN_PARAMS((register struct wnn_env *env, int dic_no, int entry)); -+extern w_char *jl_hinsi_name_e FRWNN_PARAMS((register struct wnn_env *env, register int no)); -+ -+extern void jl_close FRWNN_PARAMS((register struct wnn_buf *buf)); -+extern int jl_dic_add_e FRWNN_PARAMS((register struct wnn_env *env, char *dic_name, char *hindo_name, int rev, int prio, int rw, int hrw, char *pwd_dic, char *pwd_hindo, int (*error_handler) (), int (*message_handler) () )); -+extern int jl_dic_comment_set_e FRWNN_PARAMS((register struct wnn_env *env, int dic_no, w_char *comment)); -+extern int jl_dic_delete_e FRWNN_PARAMS((register struct wnn_env *env, register int dic_no)); -+extern int jl_dic_list_e FRWNN_PARAMS((struct wnn_env *env, WNN_DIC_INFO **dicinfo)); -+extern int jl_dic_save_all_e FRWNN_PARAMS((struct wnn_env *env)); -+extern int jl_dic_save_e FRWNN_PARAMS((register struct wnn_env *env, int dic_no)); -+extern int jl_dic_use_e FRWNN_PARAMS((struct wnn_env *env, int dic_no, int flag)); -+extern void jl_disconnect FRWNN_PARAMS((register struct wnn_env *env)); -+extern void jl_disconnect_if_server_dead FRWNN_PARAMS((register struct wnn_env *env)); -+extern void jl_env_set FRWNN_PARAMS((register struct wnn_buf *buf, register struct wnn_env *env)); -+extern int jl_fuzokugo_get_e FRWNN_PARAMS((register struct wnn_env *env, char *fname)); -+extern int jl_fuzokugo_set_e FRWNN_PARAMS((struct wnn_env *env, char *fname)); -+extern void jl_get_zenkouho_kanji FRWNN_PARAMS((register struct wnn_buf *buf, int zen_num, w_char *area)); -+extern int jl_hinsi_dicts_e FRWNN_PARAMS((register struct wnn_env *env, int no, int **area)); -+extern int jl_hinsi_list_e FRWNN_PARAMS((register struct wnn_env *env, int dic_no, w_char *name, w_char ***area)); -+extern int jl_hinsi_number_e FRWNN_PARAMS((register struct wnn_env *env, w_char *name)); -+extern int jl_isconnect_e FRWNN_PARAMS((register struct wnn_env *env)); -+extern int jl_kanji_len FRWNN_PARAMS((struct wnn_buf *buf, register int bun_no, register int bun_no2)); -+extern int jl_kill FRWNN_PARAMS((struct wnn_buf *buf, register int bun_no, register int bun_no2)); -+extern int jl_nobi_conv FRWNN_PARAMS((register struct wnn_buf *buf, register int bun_no, int ichbn_len, register int bun_no2, int use_maep, int ich_shop)); -+extern int jl_nobi_conv_e2 FRWNN_PARAMS((register struct wnn_buf *buf, struct wnn_env *env, register int bun_no, int ichbn_len, register int bun_no2, int use_maep, int ich_shop)); -+extern int jl_param_get_e FRWNN_PARAMS((struct wnn_env *env, struct wnn_param *para)); -+extern int jl_param_set_e FRWNN_PARAMS((register struct wnn_env *env, struct wnn_param *para)); -+extern int jl_ren_conv FRWNN_PARAMS((register struct wnn_buf *buf, register w_char *yomi, int bun_no, int bun_no2, int use_maep)); -+extern int jl_set_env_wnnrc FRWNN_PARAMS((register struct wnn_env *env, char *wnnrc_n, int (*error_handler) (), int (*message_handler) () )); -+extern int jl_set_env_wnnrc1 FRWNN_PARAMS((register struct wnn_env *env, char *wnnrc_n, int (*error_handler) (), int (*message_handler) (), int level)); -+extern int jl_set_jikouho FRWNN_PARAMS((register struct wnn_buf *buf, register int offset)); -+extern int jl_set_jikouho_dai FRWNN_PARAMS((register struct wnn_buf *buf, int offset)); -+extern int jl_tan_conv FRWNN_PARAMS((register struct wnn_buf *buf, w_char *yomi, register int bun_no, register int bun_no2, int use_maep, int ich_shop)); -+extern int jl_update_hindo FRWNN_PARAMS((register struct wnn_buf *buf, int bun_no, int bun_no2)); -+extern int jl_word_add_e FRWNN_PARAMS((struct wnn_env *env, int dic_no, w_char *yomi, w_char *kanji, w_char *comment, int hinsi, int init_hindo)); -+extern int jl_word_comment_set_e FRWNN_PARAMS((register struct wnn_env *env, int dic_no, int entry, w_char *comment)); -+extern int jl_word_delete_e FRWNN_PARAMS((struct wnn_env *env, int dic_no, int entry)); -+extern int jl_word_search_by_env_e FRWNN_PARAMS((register struct wnn_env *env, w_char *yomi, struct wnn_jdata **jdp)); -+extern int jl_word_search_e FRWNN_PARAMS((register struct wnn_env *env, int dic_no, w_char *yomi, struct wnn_jdata **jdp)); -+extern int jl_word_use_e FRWNN_PARAMS((register struct wnn_env *env, int dic_no, int entry)); -+extern int jl_yomi_len FRWNN_PARAMS((struct wnn_buf *buf, register int bun_no, register int bun_no2)); -+extern int jl_zenkouho FRWNN_PARAMS((register struct wnn_buf *buf, int bun_no, int use_maep, int uniq_level)); -+extern int jl_zenkouho_dai FRWNN_PARAMS((register struct wnn_buf *buf, int bun_no, int bun_no2, int use_maep, int uniq_level)); -+extern int wnn_get_area FRWNN_PARAMS((struct wnn_buf *buf, register int bun_no, register int bun_no2, w_char *area, int kanjip)); - --extern char *wnn_perror (); --extern char *wnn_perror_lang (); -+extern char *wnn_perror FRWNN_PARAMS((void)); -+extern char *wnn_perror_lang FRWNN_PARAMS((char *lang)); - - #ifdef CONVERT_by_STROKE --extern void jl_get_zenkouho_yomi (); -+extern void jl_get_zenkouho_yomi FRWNN_PARAMS((register struct wnn_buf *buf, int zen_num, w_char *area)); -+#endif -+ -+#ifdef __cplusplus -+} - #endif - - #endif /* WNN_JLLIB_H */ diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_include_jslib.h b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_include_jslib.h deleted file mode 100644 index 3a3e3c91e93..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_include_jslib.h +++ /dev/null @@ -1,180 +0,0 @@ -$NetBSD: patch-Wnn_include_jslib.h,v 1.1 2011/09/13 07:23:17 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/include/jslib.h.orig 2005-04-10 15:26:37.000000000 +0000 -+++ Wnn/include/jslib.h -@@ -10,9 +10,9 @@ - * 1987, 1988, 1989, 1990, 1991, 1992 - * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 -- * Copyright FreeWnn Project 1999, 2000 -+ * Copyright FreeWnn Project 1999, 2000, 2008 - * -- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+ * Maintainer: FreeWnn Project - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -42,6 +42,10 @@ - #include <setjmp.h> - #endif - -+#ifdef __cplusplus -+extern "C" { -+#endif -+ - #define JLIB_VERSION 0x4003 - - #ifndef w_char -@@ -399,70 +403,87 @@ struct wnn_file_head - #define js_open(server, timeout) js_open_lang(server, "ja_JP", timeout) - #define js_connect(server,env_name) js_connect_lang(server, env_name, "ja_JP") - --extern WNN_JSERVER_ID *js_open_lang (); --extern int js_close (); --extern WNN_JSERVER_ID *js_change_current_jserver (); --extern struct wnn_env *js_connect_lang (); --extern int js_disconnect (); --extern int js_env_list (); --extern int js_param_set (); --extern int js_param_get (); --extern char *js_get_lang (); -+#ifndef FRWNN_PARAMS -+/* -+ * I currently think ANSI-C is not sufficiant on building your clients -+ * linked with libwnn. (aonoto) -+ */ -+#if __STDC__ /* Sufficient? */ -+#define FRWNN_PARAMS(paramlist) paramlist -+#else -+#define FRWNN_PARAMS(paramlist) () -+#endif -+#endif -+ -+extern WNN_JSERVER_ID *js_open_lang FRWNN_PARAMS((register char *server, register char *lang, register int timeout)); -+extern int js_close FRWNN_PARAMS((WNN_JSERVER_ID *server)); -+/* extern WNN_JSERVER_ID *js_change_current_jserver (); */ /* Not exist? */ -+extern struct wnn_env *js_connect_lang FRWNN_PARAMS((WNN_JSERVER_ID *server, register char *env_name, char *lang)); -+extern int js_disconnect FRWNN_PARAMS((register struct wnn_env *env)); -+extern int js_env_list FRWNN_PARAMS((WNN_JSERVER_ID *server, struct wnn_ret_buf *ret)); -+extern int js_param_set FRWNN_PARAMS((struct wnn_env *env, register struct wnn_param *para)); -+extern int js_param_get FRWNN_PARAMS((struct wnn_env *env, register struct wnn_param *para)); -+extern char *js_get_lang FRWNN_PARAMS((struct wnn_env *env)); - /**************************************/ --extern int js_access (); --extern int js_dic_add (); --extern int js_dic_delete (); --extern int js_dic_file_create (); --extern int js_dic_file_create_client (); --extern int js_dic_info (); --extern int js_dic_list (); --extern int js_dic_list_all (); --extern int js_dic_use (); --extern int js_env_exist (); --extern int js_env_sticky (); --extern int js_env_un_sticky (); --extern int js_file_comment_set (); --extern int js_file_discard (); --extern int js_file_info (); --extern int js_file_list (); --extern int js_file_list_all (); --extern int js_file_loaded (); --extern int js_file_loaded_local (); --extern int js_file_password_set (); --extern int js_file_read (); --extern int js_file_receive (); --extern int js_file_remove (); --extern int js_file_remove_client (); --extern int js_file_send (); --extern int js_file_stat (); --extern int js_file_write (); --extern void js_flush (); --extern int js_fuzokugo_get (); --extern int js_fuzokugo_set (); --extern int js_hindo_file_create (); --extern int js_hindo_file_create_client (); --extern int js_hindo_set (); --extern int js_hinsi_dicts (); --extern int js_hinsi_list (); --extern int js_hinsi_name (); --extern int js_hinsi_number (); --extern int js_hinsi_table_set (); --extern int js_isconnect (); --extern int js_kanren (); --extern int js_kantan_dai (); --extern int js_kantan_sho (); --extern int js_kanzen_dai (); --extern int js_kanzen_sho (); --extern int js_kill (); --extern int js_mkdir (); --extern int js_version (); --extern int js_who (); --extern int js_word_add (); --extern int js_word_comment_set (); --extern int js_word_delete (); --extern int js_word_info (); --extern int js_word_search (); --extern int js_word_search_by_env (); -+extern int js_access FRWNN_PARAMS((struct wnn_env *env, char *path, int amode)); -+extern int js_dic_add FRWNN_PARAMS((struct wnn_env *env, int fid, int hfid, int rev,int jnice, int rw, int hrw, char *pw1, char *pw2)); -+extern int js_dic_delete FRWNN_PARAMS((struct wnn_env *env, int dicno)); -+extern int js_dic_file_create FRWNN_PARAMS((struct wnn_env *env, char *fn, int type, w_char *comment, char *passwd, char *hpasswd)); -+extern int js_dic_file_create_client FRWNN_PARAMS((struct wnn_env *env, char *fn, int type, w_char *comment, char *passwd, char *hpasswd)); -+extern int js_dic_info FRWNN_PARAMS((struct wnn_env *env, int dic_no, register WNN_DIC_INFO *ret)); -+extern int js_dic_list FRWNN_PARAMS((struct wnn_env *env, struct wnn_ret_buf *ret)); -+extern int js_dic_list_all FRWNN_PARAMS((WNN_JSERVER_ID *server, struct wnn_ret_buf *ret)); -+extern int js_dic_use FRWNN_PARAMS((struct wnn_env *env, int dic_no, int flag)); -+extern int js_env_exist FRWNN_PARAMS((register WNN_JSERVER_ID *server, register char *env_name)); -+extern int js_env_sticky FRWNN_PARAMS((register struct wnn_env *env)); -+extern int js_env_un_sticky FRWNN_PARAMS((register struct wnn_env *env)); -+extern int js_file_comment_set FRWNN_PARAMS((struct wnn_env *env, int fid, w_char *comment)); -+extern int js_file_discard FRWNN_PARAMS((struct wnn_env *env, int fid)); -+extern int js_file_info FRWNN_PARAMS((struct wnn_env *env, int fid, register WNN_FILE_INFO_STRUCT *file)); -+extern int js_file_list FRWNN_PARAMS((struct wnn_env *env, struct wnn_ret_buf *ret)); -+extern int js_file_list_all FRWNN_PARAMS((WNN_JSERVER_ID *server, struct wnn_ret_buf *ret)); -+extern int js_file_loaded FRWNN_PARAMS((WNN_JSERVER_ID *server, char *path)); -+extern int js_file_loaded_local FRWNN_PARAMS((WNN_JSERVER_ID *server, char *path)); -+extern int js_file_password_set FRWNN_PARAMS((struct wnn_env *env, int fid, int which, char *old_passwd, char *new_passwd)); -+extern int js_file_read FRWNN_PARAMS((struct wnn_env *env, char *fn)); -+extern int js_file_receive FRWNN_PARAMS((struct wnn_env *env, int fid, char *fn)); -+extern int js_file_remove FRWNN_PARAMS((WNN_JSERVER_ID *server, char *n, char *pwd)); -+extern int js_file_remove_client FRWNN_PARAMS((WNN_JSERVER_ID *server, char *n, char *pwd)); -+extern int js_file_send FRWNN_PARAMS((struct wnn_env *env, char *fn)); -+extern int js_file_stat FRWNN_PARAMS((struct wnn_env *env, char *path, WNN_FILE_STAT *s)); -+extern int js_file_write FRWNN_PARAMS((struct wnn_env *env, int fid, char *fn)); -+extern void js_flush FRWNN_PARAMS((struct wnn_env *env)); -+extern int js_fuzokugo_get FRWNN_PARAMS((struct wnn_env *env)); -+extern int js_fuzokugo_set FRWNN_PARAMS((struct wnn_env *env, int fid)); -+extern int js_hindo_file_create FRWNN_PARAMS((struct wnn_env *env, int fid, char *fn, w_char *comment, char *hpasswd)); -+extern int js_hindo_file_create_client FRWNN_PARAMS((struct wnn_env *env, int fid, char *fn, w_char *com, char *hpasswd)); -+extern int js_hindo_set FRWNN_PARAMS((struct wnn_env *env, int dic, int entry, int ima, int hindo)); -+extern int js_hinsi_dicts FRWNN_PARAMS((struct wnn_env *env, int no, struct wnn_ret_buf *rb)); -+extern int js_hinsi_list FRWNN_PARAMS((struct wnn_env *env, int dic_no, w_char *name, struct wnn_ret_buf *rb)); -+extern int js_hinsi_name FRWNN_PARAMS((WNN_JSERVER_ID *server, int no, struct wnn_ret_buf *rb)); -+extern int js_hinsi_number FRWNN_PARAMS((WNN_JSERVER_ID *server, w_char *name)); -+extern int js_hinsi_table_set FRWNN_PARAMS((struct wnn_env *env, int dic_no, w_char *hinsi_table)); -+extern int js_isconnect FRWNN_PARAMS((register struct wnn_env *env)); -+extern int js_kanren FRWNN_PARAMS((struct wnn_env *env, w_char *yomi, int hinsi, w_char *fzk, int vec, int vec1, int vec2, struct wnn_ret_buf *rb)); -+extern int js_kantan_dai FRWNN_PARAMS((struct wnn_env *env, w_char *yomi, int hinsi, w_char *fzk, int vec, int vec1, struct wnn_ret_buf *rb)); -+extern int js_kantan_sho FRWNN_PARAMS((struct wnn_env *env, w_char *yomi, int hinsi, w_char *fzk, int vec, int vec1, struct wnn_ret_buf *rb)); -+extern int js_kanzen_dai FRWNN_PARAMS((struct wnn_env *env, w_char *yomi, int hinsi, w_char *fzk, int vec, int vec1, struct wnn_ret_buf *rb)); -+extern int js_kanzen_sho FRWNN_PARAMS((struct wnn_env *env, w_char *yomi, int hinsi, w_char *fzk, int vec, int vec1, struct wnn_ret_buf *rb)); -+extern int js_kill FRWNN_PARAMS((WNN_JSERVER_ID *server)); -+extern int js_mkdir FRWNN_PARAMS((struct wnn_env *env, char *path)); -+extern int js_version FRWNN_PARAMS((WNN_JSERVER_ID *server, int *serv, int *libv)); -+extern int js_who FRWNN_PARAMS((WNN_JSERVER_ID *server, struct wnn_ret_buf *ret)); -+extern int js_word_add FRWNN_PARAMS((struct wnn_env *env, int dic_no, w_char *yomi, w_char *kanji, w_char *comment, int hinshi, int init_hindo)); -+extern int js_word_comment_set FRWNN_PARAMS((struct wnn_env *env, int dic_no, int entry, w_char *comment)); -+extern int js_word_delete FRWNN_PARAMS((struct wnn_env *env, int dic_no, int entry)); -+extern int js_word_info FRWNN_PARAMS((struct wnn_env *env, int dic_no, int entry, struct wnn_ret_buf *ret)); -+extern int js_word_search FRWNN_PARAMS((struct wnn_env *env, int dic_no, w_char *yomi, struct wnn_ret_buf *ret)); -+extern int js_word_search_by_env FRWNN_PARAMS((struct wnn_env *env, w_char *yomi, struct wnn_ret_buf *ret)); - -+#endif /* !JSERVER */ -+ -+#ifdef __cplusplus -+} - #endif -+ - #endif /* WNN_JSLIB_H */ diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_include_wnn__os.h b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_include_wnn__os.h deleted file mode 100644 index 0373a474da4..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_include_wnn__os.h +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-Wnn_include_wnn__os.h,v 1.1 2011/09/13 07:23:17 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/include/wnn_os.h.orig 2005-06-12 17:14:23.000000000 +0000 -+++ Wnn/include/wnn_os.h -@@ -10,9 +10,9 @@ - * 1987, 1988, 1989, 1990, 1991, 1992 - * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 -- * Copyright FreeWnn Project 1999, 2000, 2002, 2005 -+ * Copyright FreeWnn Project 1999, 2000, 2002, 2005, 2006 - * -- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+ * Maintainer: FreeWnn Project - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -50,11 +50,6 @@ - # include <sys/param.h> - #endif - --#ifdef TERMINFO --#include <curses.h> --#include <term.h> --#endif -- - /* strchr vs. index, etc. */ - #if (HAVE_MEMSET) && !(HAVE_BZERO) - # define bzero(adr,n) memset((adr),0,(n)) diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_jlib.V3_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_jlib.V3_Makefile.in deleted file mode 100644 index f5b902f33be..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_jlib.V3_Makefile.in +++ /dev/null @@ -1,105 +0,0 @@ -$NetBSD: patch-Wnn_jlib.V3_Makefile.in,v 1.1 2011/09/13 07:23:17 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/jlib.V3/Makefile.in.orig 2003-05-11 18:31:44.000000000 +0000 -+++ Wnn/jlib.V3/Makefile.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001, 2003 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2003, 2009 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -29,12 +29,17 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - # - --include @top_srcdir@/makerule.mk --top_builddir = ../.. -+include @top_builddir@/makerule.mk -+ top_srcdir = @top_srcdir@ -+top_builddir = @top_builddir@ -+ srcdir = @srcdir@ -+ VPATH = @srcdir@ -+ WNNJLIBOBJ = $(top_builddir)/Wnn/jlib -+WNNROMKANOBJ = $(top_builddir)/Wnn/romkan - - INSTALL = @INSTALL@ $(INSTALLFLAGS) - -- INCLUDES = -I$(WNNINCLUDESRC) -I$(TOP) -+ INCLUDES = -I$(WNNINCLUDESRC) -I$(top_builddir) - DEFINES = $(WNNDEFINES) $(WNNLANGDEF) - LINTLIBS = - -@@ -48,15 +53,15 @@ SRC4= $(WNNETCSRC)/xutoj.c - OBJ4= xutoj.o - LOCAL_RKSRCS= $(WNNROMKANSRC)/rk_bltinfn.c $(WNNROMKANSRC)/rk_main.c $(WNNROMKANSRC)/rk_modread.c $(WNNROMKANSRC)/rk_read.c $(WNNROMKANSRC)/rk_vars.c - --LOCAL_RKOBJS= $(WNNROMKANSRC)/rk_bltinfn.o $(WNNROMKANSRC)/rk_main.o $(WNNROMKANSRC)/rk_modread.o $(WNNROMKANSRC)/rk_read.o $(WNNROMKANSRC)/rk_vars.o -+LOCAL_RKOBJS= $(WNNROMKANOBJ)/rk_bltinfn.o $(WNNROMKANOBJ)/rk_main.o $(WNNROMKANOBJ)/rk_modread.o $(WNNROMKANOBJ)/rk_read.o $(WNNROMKANOBJ)/rk_vars.o - - LOCAL_ETCSRCS= $(WNNETCSRC)/msg.c $(WNNETCSRC)/yincoding.c $(WNNETCSRC)/py_table.c $(WNNETCSRC)/zy_table.c $(WNNETCSRC)/strings.c $(WNNETCSRC)/bcopy.c $(WNNETCSRC)/mkdir.c - --LOCAL_ETCOBJS= $(WNNJLIBSRC)/msg.o $(WNNJLIBSRC)/yincoding.o $(WNNJLIBSRC)/py_table.o $(WNNJLIBSRC)/zy_table.o $(WNNJLIBSRC)/strings.o $(WNNJLIBSRC)/bcopy.o $(WNNJLIBSRC)/mkdir.o -+LOCAL_ETCOBJS= $(WNNJLIBOBJ)/msg.o $(WNNJLIBOBJ)/yincoding.o $(WNNJLIBOBJ)/py_table.o $(WNNJLIBOBJ)/zy_table.o $(WNNJLIBOBJ)/strings.o $(WNNJLIBOBJ)/bcopy.o $(WNNJLIBOBJ)/mkdir.o - - LOCAL_JLIBSRCS= $(WNNJLIBSRC)/js.c $(WNNJLIBSRC)/wnnerrmsg.c $(WNNJLIBSRC)/jl.c - --LOCAL_JLIBOBJS= $(WNNJLIBSRC)/js.o $(WNNJLIBSRC)/wnnerrmsg.o $(WNNJLIBSRC)/jl.o -+LOCAL_JLIBOBJS= $(WNNJLIBOBJ)/js.o $(WNNJLIBOBJ)/wnnerrmsg.o $(WNNJLIBOBJ)/jl.o - - SRCS= $(SRC1) $(SRC2) $(SRC3) $(SRC4) - OBJS= $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) $(LOCAL_ETCOBJS) $(LOCAL_RKOBJS) $(LOCAL_JLIBOBJS) -@@ -71,12 +76,12 @@ includes:: - - .c.o: - $(RM) $@ -- $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c -+ $(LT_CC) -c $(CFLAGS) $(_NOOP_) $< - - all:: libjd.la - - libjd.la: $(OBJS) $(EXTRALIBRARYDEPS) -- $(LIBTOOL) $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION) -+ $(LT_LD) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION) @LIBS@ - - lintlib:: llib-ljd.ln - -@@ -87,12 +92,12 @@ llib-ljd.ln: $(SRCS) $(EXTRALIBRARYDEPS) - install:: libjd.la - @if [ -d $(DESTDIR)$(WNNLIBDIR) ]; then set +x; \ - else (set -x; $(MKDIRHIER) $(DESTDIR)$(WNNLIBDIR)); fi -- $(LIBTOOL) $(INSTALL) $(INSTLIBFLAGS) libjd.la $(DESTDIR)$(WNNLIBDIR) -+ $(LT_INSTALL) $(INSTLIBFLAGS) libjd.la $(DESTDIR)$(WNNLIBDIR) - - install:: jlib.h - @if [ -d $(DESTDIR)$(JWNNINCDIR) ]; then set +x; \ - else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNINCDIR)); fi -- $(INSTALL) $(INSTDATFLAGS) jlib.h $(DESTDIR)$(JWNNINCDIR)/jlib.h -+ $(INSTALL) $(INSTDATFLAGS) $(srcdir)/jlib.h $(DESTDIR)$(JWNNINCDIR)/jlib.h - - lint: - $(LINT) $(LINTFLAGS) $(SRCS) $(LINTLIBS) -@@ -109,13 +114,13 @@ $(WNNJLIB):: - done - - $(OBJ2) : $(SRC2) -- $(LIBTOOL) $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c -+ $(LT_CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c - - $(OBJ3) : $(SRC3) -- $(LIBTOOL) $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c -+ $(LT_CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c - - $(OBJ4) : $(SRC4) -- $(LIBTOOL) $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c -+ $(LT_CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c - - depend:: .depend - diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_jlib_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_jlib_Makefile.in deleted file mode 100644 index 48bab9267bf..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_jlib_Makefile.in +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-Wnn_jlib_Makefile.in,v 1.1 2011/09/13 07:23:17 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/jlib/Makefile.in.orig 2004-09-12 16:56:55.000000000 +0000 -+++ Wnn/jlib/Makefile.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001, 2003 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2003, 2009 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -42,8 +42,6 @@ WNNROMKANOBJ = $(top_builddir)/Wnn/romka - LINTLIBS = - - INSTALL = @INSTALL@ $(INSTALLFLAGS) --LT_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) --LT_CC = $(LIBTOOL) --mode=compile $(CC) - - SRC1= jl.c js.c wnnerrmsg.c - OBJ1= jl.o js.o wnnerrmsg.o -@@ -93,7 +91,7 @@ lint: - - kankana: kankana.o - $(RM) $@ -- $(LIBTOOL) --mode=link $(CCLINK) -o $@ $(LDOPTIONS) kankana.o $(WNNJLIB) @LIBS@ -+ $(LT_LD) -o $@ $(LDOPTIONS) kankana.o $(WNNJLIB) - - clean:: - $(RM) kankana -@@ -101,7 +99,7 @@ clean:: - all:: libwnn.la - - libwnn.la: $(OBJS) $(EXTRALIBRARYDEPS) -- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION) -+ $(LT_LD) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION) @LIBS@ - - lintlib:: llib-lwnn.ln - diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_jserver_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_jserver_Makefile.in deleted file mode 100644 index 86e2ad22bc0..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_jserver_Makefile.in +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-Wnn_jserver_Makefile.in,v 1.1 2011/09/13 07:23:17 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/jserver/Makefile.in.orig 2004-05-21 16:39:32.000000000 +0000 -+++ Wnn/jserver/Makefile.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2003, 2004 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2003, 2004, 2010 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -102,9 +102,9 @@ clean:: - instserver:: install - - install:: jserver -- @if [ -d $(DESTDIR)$(JWNNBINDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNBINDIR)); fi -- $(LIBTOOL) --mode=install $(INSTALL) $(INSTPGMFLAGS) $(INSTUIDFLAGS) $(LOCAL_INSTFLAGS) jserver $(DESTDIR)$(JWNNBINDIR)/jserver -+ @if [ -d $(DESTDIR)$(JWNNSBINDIR) ]; then set +x; \ -+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNSBINDIR)); fi -+ $(LT_INSTALL) $(INSTPGMFLAGS) $(INSTUIDFLAGS) $(LOCAL_INSTFLAGS) jserver $(DESTDIR)$(JWNNSBINDIR)/`echo jserver | sed '$(transform)'` - - $(OBJ0) : $(SRC0) - $(CC) -c $(CFLAGS) $(SERVERINITDEF) $(SOLINGERDEFS) $(srcdir)/`basename $@ .o`.c diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_jserver_de__header.h b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_jserver_de__header.h deleted file mode 100644 index 6dc6542f1fc..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_jserver_de__header.h +++ /dev/null @@ -1,109 +0,0 @@ -$NetBSD: patch-Wnn_jserver_de__header.h,v 1.1 2011/09/13 07:23:17 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/jserver/de_header.h.orig 2004-12-29 17:45:32.000000000 +0000 -+++ Wnn/jserver/de_header.h -@@ -10,9 +10,10 @@ - * 1987, 1988, 1989, 1990, 1991, 1992 - * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 -- * Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2003, 2004 -+ * Copyright FreeWnn Project -+ * 1999, 2000, 2001, 2002, 2003, 2004, 2010, 2011 - * -- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+ * Maintainer: FreeWnn Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -218,13 +219,13 @@ extern int b_index_add (struct JT *jt, w - extern void b_index_delete (struct JT *jt, int serial); - #endif - /* bnsetu_kai.c */ --extern int sbn_kai (); --extern int j_max (); --extern int getgiji (); --extern int is_g_eisuu (); --extern int getgiji_f (); --extern int check_bar_katakana (); --extern int kan_ckvt (); -+extern int sbn_kai (int, int, int, int, struct SYO_BNSETSU **, int, struct SYO_BNSETSU *); -+extern int j_max (struct ICHBNP *, int); -+extern int getgiji (int, int, struct SYO_BNSETSU *, struct ICHBNP *, int, int); -+extern int is_g_eisuu (w_char); -+extern int getgiji_f (int, struct SYO_BNSETSU *); -+extern int check_bar_katakana (int, int); -+extern int kan_ckvt (unsigned short, int); - /* daibn_kai.c */ - extern int dbn_kai (); - extern int get_status (); -@@ -512,7 +513,7 @@ extern int fread_cur (); - extern int xgetc_cur (); - extern void xungetc_cur (); - extern void fwrite_cur (); --extern void xputc_cur (); -+extern void xputc_cur (unsigned char); - extern void fclose_cur (); - /* w_string.c */ - extern void Sreverse (); -@@ -534,27 +535,27 @@ extern char *wnn_get_hinsi_name (); - extern int wnn_get_fukugou_component_body (); - extern int wnn_get_fukugou_component (); - /* bdic.c */ --extern void check_backup (); --extern void delete_tmp_file (); --extern char *make_backup_file (); --extern char *make_tmp_file (); --extern void move_tmp_to_org (); --extern int output_file_header (); --extern int input_file_header (); --extern int output_file_uniq (struct wnn_file_uniq* funiq, FILE* ofpter); --extern int check_inode (); --extern int change_file_uniq (); --extern int f_uniq_cmp (); --extern void Get_knj2 (); --extern void get_kanji_str (); --extern void Get_kanji_str_r (); --extern unsigned char *kanjiaddr (); --extern int create_null_dic (); --extern int create_hindo_file (); --extern int input_header_jt (); --extern int output_header_jt (); --extern int input_header_hjt (); --extern int output_header_hjt (); -+extern void check_backup (char*); -+extern void delete_tmp_file (char*); -+extern char *make_backup_file (char*); -+extern char *make_tmp_file (char*, int, FILE**); -+extern void move_tmp_to_org (char*, char*, int); -+extern int output_file_header (FILE*, struct wnn_file_head*); -+extern int input_file_header (FILE*, struct wnn_file_head*); -+extern int output_file_uniq (struct wnn_file_uniq*, FILE*); -+extern int check_inode (FILE*, struct wnn_file_head*); -+extern int change_file_uniq (struct wnn_file_head*, char*); -+extern int f_uniq_cmp (struct wnn_file_uniq*, struct wnn_file_uniq*); -+extern void Get_knj2 (unsigned char*, int, w_char*, w_char*, w_char*); -+extern void get_kanji_str (unsigned char*, w_char*, w_char*, w_char*); -+extern void Get_kanji_str_r (unsigned char*, w_char**, w_char**, w_char**); -+extern unsigned char kanjiaddr (unsigned char*, w_char*, w_char*, w_char*); -+extern int create_null_dic (char*, w_char*, char*, char*, int); -+extern int create_hindo_file (struct wnn_file_uniq*, char*, w_char*, char*, int); -+extern int input_header_jt (FILE*, struct JT*); -+extern int output_header_jt (FILE*, struct JT*); -+extern int input_header_hjt (FILE*, struct HJT*); -+extern int output_header_hjt (FILE*, struct HJT*); - /* dic_atojis.c */ - extern void Get_kanji (); - extern void Get_knj1 (); -@@ -565,8 +566,8 @@ extern int revdic (); - extern int asshuku (); - extern int motoni2 (); - /* pwd.c */ --extern int new_pwd (); --extern int check_pwd (); -+extern void new_pwd (char*, char*); -+extern int check_pwd (char*, char*); - - #endif /* JSERVER_DE_HEADER_H */ - diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_jserver_renbn__kai.c b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_jserver_renbn__kai.c deleted file mode 100644 index 43df9ca876e..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_jserver_renbn__kai.c +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-Wnn_jserver_renbn__kai.c,v 1.1 2011/09/13 07:23:17 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/jserver/renbn_kai.c.orig 2002-09-01 17:13:11.000000000 +0000 -+++ Wnn/jserver/renbn_kai.c -@@ -6,9 +6,9 @@ - * 1987, 1988, 1989, 1990, 1991, 1992 - * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 -- * Copyright FreeWnn Project 1999, 2000, 2002 -+ * Copyright FreeWnn Project 1999, 2000, 2002, 2011 - * -- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+ * Maintainer: FreeWnn Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -321,7 +321,7 @@ tan_syo (int yomi_sno, /* ²òÀÏʸ»úÎó st - _status = 0; - if (chk_yomi_endvect (yomi_sno, yomi_eno, endvect, endvect1) < 0) - return (-1); -- if (sbn_kai (yomi_sno, yomi_eno, endvect, endvect1, &rsbnptr, 1, 0) < 0) -+ if (sbn_kai (yomi_sno, yomi_eno, endvect, endvect1, &rsbnptr, 1, (struct SYO_BNSETSU *) 0) < 0) - { - init_work_areas (); - return (-1); /* ERROR */ diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_jutil_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_jutil_Makefile.in deleted file mode 100644 index fcb7c70fdb1..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_jutil_Makefile.in +++ /dev/null @@ -1,60 +0,0 @@ -$NetBSD: patch-Wnn_jutil_Makefile.in,v 1.1 2011/09/13 07:23:17 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/jutil/Makefile.in.orig 2004-08-15 09:38:22.000000000 +0000 -+++ Wnn/jutil/Makefile.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001, 2004 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2004, 2010, 2011 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -39,17 +39,20 @@ LT_INSTALL = $(LIBTOOL) --mode=inst - LT_LD = $(LIBTOOL) --mode=link $(CCLINK) - LOCAL_INSTFLAGS = -o $(WNNOWNER) - -- INCLUDES = -I$(WNNINCLUDESRC) -I$(top_builddir) -+ INCLUDES = -I$(top_builddir) @EXTWNNJINC@ -I$(WNNINCLUDESRC) - DEFINES = $(WNNDEFINES) $(WNNLANGDEF) - HINSIDEFINE = -DHINSIDATA_FILE=\"/$(JWNNLANG)/hinsi.data\" - --CLIENTPROGRAMS = wnnstat wnnkill wddel wdreg -+CLIENTPROGRAMS = wddel wdreg -+ -+# Server status / kill programs -+CLIENT_SV_PROGRAMS = wnnstat wnnkill - - DICUTIL2PROGRAMS = atod atof wnntouch - - DICUTILPROGRAMS = oldatonewa dtoa - --PROGRAMS = $(CLIENTPROGRAMS) $(DICUTILPROGRAMS) $(DICUTIL2PROGRAMS) -+PROGRAMS = $(CLIENTPROGRAMS) $(CLIENT_SV_PROGRAMS) $(DICUTILPROGRAMS) $(DICUTIL2PROGRAMS) - - SRC1= $(WNNETCSRC)/bdic.c - OBJ1= bdic.o -@@ -190,10 +193,15 @@ clean:: - install:: $(PROGRAMS) - @if [ -d $(DESTDIR)$(JWNNBINDIR) ]; then set +x; \ - else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNBINDIR)); fi -+ @if [ -d $(DESTDIR)$(JWNNSBINDIR) ]; then set +x; \ -+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNSBINDIR)); fi - @for flag in ${MAKEFLAGS} ''; do \ - case "$$flag" in *=*) ;; *[i]*) set +e;; esac; done; \ -- for i in $(PROGRAMS); do \ -- (set -x; $(LT_INSTALL) $(INSTBINFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) $$i $(DESTDIR)$(JWNNBINDIR)); \ -+ for i in $(CLIENTPROGRAMS) $(DICUTILPROGRAMS) $(DICUTIL2PROGRAMS); do \ -+ (set -x; $(LT_INSTALL) $(INSTBINFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) $$i $(DESTDIR)$(JWNNBINDIR)/`echo $$i | sed '$(transform)'`); \ -+ done; \ -+ for i in $(CLIENT_SV_PROGRAMS); do \ -+ (set -x; $(LT_INSTALL) $(INSTBINFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) $$i $(DESTDIR)$(JWNNSBINDIR)/`echo $$i | sed '$(transform)'`); \ - done - - $(OBJ1) : $(SRC1) diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_jutil_ujisf.c b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_jutil_ujisf.c deleted file mode 100644 index 9420b920994..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_jutil_ujisf.c +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-Wnn_jutil_ujisf.c,v 1.1 2011/09/13 07:23:17 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/jutil/ujisf.c.orig 2002-07-14 04:26:57.000000000 +0000 -+++ Wnn/jutil/ujisf.c -@@ -10,9 +10,9 @@ - * 1987, 1988, 1989, 1990, 1991, 1992 - * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 -- * Copyright FreeWnn Project 1999, 2000, 2002 -+ * Copyright FreeWnn Project 1999, 2000, 2002, 2010 - * -- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+ * Maintainer: FreeWnn Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -68,8 +68,10 @@ static void sisheng_num (), read_kanji_s - #define max(a, b) ((a < b)? b:a) - #endif - --extern unsigned char kanjiaddr (); --extern void Print_entry (); -+extern unsigned char kanjiaddr (unsigned char *d0, w_char* kanji, w_char* yomi, w_char* comment); -+extern void Print_entry (w_char* yomi, w_char* kstr, w_char* cstr, -+ int hindo, int ima, int hinsi, int serial, -+ FILE* ofpter, int esc_exp); - extern int wnn_find_hinsi_by_name (); - #ifdef CHINESE - extern void cwnn_zy_str_analysis (), cwnn_py_str_analysis (); diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_man_2.env_wnn_2b__romkan.man b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_man_2.env_wnn_2b__romkan.man deleted file mode 100644 index 7fafc358ed4..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_man_2.env_wnn_2b__romkan.man +++ /dev/null @@ -1,69 +0,0 @@ -$NetBSD: patch-Wnn_man_2.env_wnn_2b__romkan.man,v 1.1 2011/09/13 07:23:17 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/man/2.env/wnn/2b_romkan.man.orig 2001-06-14 18:08:31.000000000 +0000 -+++ Wnn/man/2.env/wnn/2b_romkan.man -@@ -9,9 +9,9 @@ - .\" 1987, 1988, 1989, 1990, 1991, 1992 - .\" Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - .\" Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --.\" Copyright FreeWnn Project 1999, 2000 -+.\" Copyright FreeWnn Project 1999, 2000, 2010 - .\" --.\" Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+.\" Maintainer: FreeWnn Project - .\" - .\" This program is free software; you can redistribute it and/or modify - .\" it under the terms of the GNU General Public License as published by -@@ -82,6 +82,7 @@ uum(1) µ¯Æ°»þ¤Ë²ò¼á¤µ¤ì¡¢¥í¡¼¥Þ»úÊÑ´¹ÍѤ - ¥í¡¼¥Þ»úÊÑ´¹¥Ç¥Õ¥©¥ë¥ÈÀßÄê - (³ç¸ÌÆâ¤Î¤â¤Î¤Ï¡¢¥«¥¿¥«¥Ê¥â¡¼¥É¤Î»þ¤Ë¸Â¤êŬÍѤµ¤ì¤ëÊÑ´¹¤ò¼¨¤¹¡£) - -+.nf - A ¤¢ KA ¤« SA ¤µ TA ¤¿ - I ¤¤ KI ¤ SI ¤· TI ¤Á - U ¤¦ KU ¤¯ SU ¤¹ TU ¤Ä -@@ -145,28 +146,31 @@ uum(1) µ¯Æ°»þ¤Ë²ò¼á¤µ¤ì¡¢¥í¡¼¥Þ»úÊÑ´¹ÍѤ - N ¤ó - N' ¤ó - -- XA ¤¡ \A ¤¡ XYA ¤ã \YA ¤ã -- XI ¤£ \I ¤£ -- XU ¤¥ \U ¤¥ XYU ¤å \YU ¤å -- XE ¤§ \E ¤§ -- XO ¤© \O ¤© XYO ¤ç \YO ¤ç -- -- XTU ¤Ã \TU ¤Ã XTI ¤Æ¤£ XWI ¤¦¤£ -- XTSU ¤Ã \TSU ¤Ã XDI ¤Ç¤£ XWE ¤¦¤§ -- XWA ¤î \WA ¤î XDU ¤É¤¥ XWO ¤¦¤© -- XKA ( ¥õ ) \KA ( ¥õ ) XDE ¤Ç¤§ -- XKE ( ¥ö ) \KE ( ¥ö ) XDO ¤É¤© -+ XA ¤¡ \eA ¤¡ XYA ¤ã \eYA ¤ã -+ XI ¤£ \eI ¤£ -+ XU ¤¥ \eU ¤¥ XYU ¤å \eYU ¤å -+ XE ¤§ \eE ¤§ -+ XO ¤© \eO ¤© XYO ¤ç \eYO ¤ç -+ -+ XTU ¤Ã \eTU ¤Ã XTI ¤Æ¤£ XWI ¤¦¤£ -+ XTSU ¤Ã \eTSU ¤Ã XDI ¤Ç¤£ XWE ¤¦¤§ -+ XWA ¤î \eWA ¤î XDU ¤É¤¥ XWO ¤¦¤© -+ XKA ( ¥õ ) \eKA ( ¥õ ) XDE ¤Ç¤§ -+ XKE ( ¥ö ) \eKE ( ¥ö ) XDO ¤É¤© - - - ¡¼ / ¡¦ Z. ¡Ä - , ¡¢ [ ¡Ö Z- ¡Á - . ¡£ ] ¡× -+.fi - - Êì²»¤Î¼¡¤ËĹ²»¤¬¤¤¿¾ì¹ç¡¢¼¡¤Î¤è¤¦¤Ë³ÎÄꤹ¤ë¡£ -+.nf - A^ ¤¢¤¢ A~ ¤¢¤¢ - I^ ¤¤¤¤ I~ ¤¤¤¤ - U^ ¤¦¤¦ U~ ¤¦¤¦ - E^ ¤¨¤¤ E~ ¤¨¤¤ - O^ ¤ª¤¦ O~ ¤ª¤¦ -+.fi - - M ¤Î¼¡¤Ë B M P ¤Î¤¤¤º¤ì¤«¤¬¤¤¿¾ì¹ç¡¢M ¤ò"¤ó"¤Ë³ÎÄꤹ¤ë¡£ - diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_man_4.cmd_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_man_4.cmd_Makefile.in deleted file mode 100644 index 5dd3b00863a..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_man_4.cmd_Makefile.in +++ /dev/null @@ -1,79 +0,0 @@ -$NetBSD: patch-Wnn_man_4.cmd_Makefile.in,v 1.1 2011/09/13 07:23:17 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/man/4.cmd/Makefile.in.orig 2001-08-14 13:43:21.000000000 +0000 -+++ Wnn/man/4.cmd/Makefile.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2010 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -29,41 +29,30 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - # - --include @top_srcdir@/makerule.mk --top_builddir = ../../.. -+include @top_builddir@/makerule.mk -+top_builddir = @top_builddir@ -+ srcdir = @srcdir@ - - INSTALL = @INSTALL@ $(INSTALLFLAGS) - - MANSUFFIX = 1 - --install.man:: jserver.man -- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -- $(RM) $(DESTDIR)$(MANDIR)/jserver.$(MANSUFFIX)* -- $(INSTALL) $(INSTMANFLAGS) jserver.man \ -- $(DESTDIR)$(MANDIR)/jserver.$(MANSUFFIX) -- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/jserver.$(MANSUFFIX) -- --install.man:: uum.man -- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -- $(RM) $(DESTDIR)$(MANDIR)/uum.$(MANSUFFIX)* -- $(INSTALL) $(INSTMANFLAGS) uum.man \ -- $(DESTDIR)$(MANDIR)/uum.$(MANSUFFIX) -- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/uum.$(MANSUFFIX) -- --install.man:: wnnkill.man -- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -- $(RM) $(DESTDIR)$(MANDIR)/wnnkill.$(MANSUFFIX)* -- $(INSTALL) $(INSTMANFLAGS) wnnkill.man \ -- $(DESTDIR)$(MANDIR)/wnnkill.$(MANSUFFIX) -- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/wnnkill.$(MANSUFFIX) -+SERVER_MAN = jserver.man -+CLIENT_MAN = uum.man -+SVTOOL_MAN = wnnkill.man wnnstat.man -+ MANUALS = $(SERVER_MAN) $(CLIENT_MAN) $(SVTOOL_MAN) - --install.man:: wnnstat.man -+# Probably we don't need $(MANUALS) as dependency ... -+install.man:: - @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ - else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -- $(RM) $(DESTDIR)$(MANDIR)/wnnstat.$(MANSUFFIX)* -- $(INSTALL) $(INSTMANFLAGS) wnnstat.man \ -- $(DESTDIR)$(MANDIR)/wnnstat.$(MANSUFFIX) -- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/wnnstat.$(MANSUFFIX) -+ for m in $(MANUALS); do \ -+ manname=`basename $$m .man | sed '$(transform)'`; \ -+ $(RM) $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX)*; \ -+ $(INSTALL) $(INSTMANFLAGS) $(srcdir)/$$m \ -+ $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX); \ -+ done -+ -for m in $(MANUALS); do \ -+ manname=`basename $$m .man | sed '$(transform)'`; \ -+ $(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX); \ -+ done diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_man_6.jutil_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_man_6.jutil_Makefile.in deleted file mode 100644 index f4726c7ebbe..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_man_6.jutil_Makefile.in +++ /dev/null @@ -1,112 +0,0 @@ -$NetBSD: patch-Wnn_man_6.jutil_Makefile.in,v 1.1 2011/09/13 07:23:17 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/man/6.jutil/Makefile.in.orig 2001-08-14 13:43:21.000000000 +0000 -+++ Wnn/man/6.jutil/Makefile.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2010 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -29,65 +29,39 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - # - --include @top_srcdir@/makerule.mk --top_builddir = ../../.. -+include @top_builddir@/makerule.mk -+top_builddir = @top_builddir@ -+ srcdir = @srcdir@ - - INSTALL = @INSTALL@ $(INSTALLFLAGS) - - MANSUFFIX = 1 - --install.man:: atod.man -- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -- $(RM) $(DESTDIR)$(MANDIR)/atod.$(MANSUFFIX)* -- $(INSTALL) $(INSTMANFLAGS) atod.man \ -- $(DESTDIR)$(MANDIR)/atod.$(MANSUFFIX) -- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/atod.$(MANSUFFIX) -- --install.man:: atof.man -- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -- $(RM) $(DESTDIR)$(MANDIR)/atof.$(MANSUFFIX)* -- $(INSTALL) $(INSTMANFLAGS) atof.man \ -- $(DESTDIR)$(MANDIR)/atof.$(MANSUFFIX) -- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/atof.$(MANSUFFIX) -- --install.man:: dtoa.man -- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -- $(RM) $(DESTDIR)$(MANDIR)/dtoa.$(MANSUFFIX)* -- $(INSTALL) $(INSTMANFLAGS) dtoa.man \ -- $(DESTDIR)$(MANDIR)/dtoa.$(MANSUFFIX) -- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/dtoa.$(MANSUFFIX) -- --install.man:: wddel.man -- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -- $(RM) $(DESTDIR)$(MANDIR)/wddel.$(MANSUFFIX)* -- $(INSTALL) $(INSTMANFLAGS) wddel.man \ -- $(DESTDIR)$(MANDIR)/wddel.$(MANSUFFIX) -- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/wddel.$(MANSUFFIX) -- --install.man:: wdreg.man -- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -- $(RM) $(DESTDIR)$(MANDIR)/wdreg.$(MANSUFFIX)* -- $(INSTALL) $(INSTMANFLAGS) wdreg.man \ -- $(DESTDIR)$(MANDIR)/wdreg.$(MANSUFFIX) -- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/wdreg.$(MANSUFFIX) -- --install.man:: wnntouch.man -- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -- $(RM) $(DESTDIR)$(MANDIR)/wnntouch.$(MANSUFFIX)* -- $(INSTALL) $(INSTMANFLAGS) wnntouch.man \ -- $(DESTDIR)$(MANDIR)/wnntouch.$(MANSUFFIX) -- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/wnntouch.$(MANSUFFIX) -+MANUALS = atod.man dtoa.man atof.man wddel.man wdreg.man wnntouch.man -+# Omit oldtonew.man (See below.) - --install.man:: oldtonew.man -+# Probably we don't need $(MANUALS) as dependency ... -+install.man:: - @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ - else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -- $(RM) $(DESTDIR)$(MANDIR)/oldatonewa.$(MANSUFFIX)* -- $(INSTALL) $(INSTMANFLAGS) oldtonew.man \ -- $(DESTDIR)$(MANDIR)/oldatonewa.$(MANSUFFIX) -- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/oldatonewa.$(MANSUFFIX) -+ for m in $(MANUALS); do \ -+ manname=`basename $$m .man | sed '$(transform)'`; \ -+ $(RM) $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX)*; \ -+ $(INSTALL) $(INSTMANFLAGS) $(srcdir)/$$m \ -+ $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX); \ -+ done -+ -for m in $(MANUALS); do \ -+ manname=`basename $$m .man | sed '$(transform)'`; \ -+ $(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX); \ -+ done -+ -+# Leave oldtonew.man (-> oldatonewa.1): need extra transformation -+install.man:: -+ @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ -+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -+ manname=`echo oldatonewa | sed '$(transform)'`; \ -+ $(RM) $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX)*; \ -+ $(INSTALL) $(INSTMANFLAGS) $(srcdir)/oldtonew.man \ -+ $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX) -+ -manname=`echo oldatonewa | sed '$(transform)'`; \ -+ $(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX) diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_manual_2.env_wnn_2b__romkana b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_manual_2.env_wnn_2b__romkana deleted file mode 100644 index 754de25dfd8..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_manual_2.env_wnn_2b__romkana +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-Wnn_manual_2.env_wnn_2b__romkana,v 1.1 2011/09/13 07:23:17 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/manual/2.env/wnn/2b_romkana.orig 2000-01-16 05:07:46.000000000 +0000 -+++ Wnn/manual/2.env/wnn/2b_romkana -@@ -118,17 +118,17 @@ - N ¤ó - N' ¤ó - -- XA ¤¡ A ¤¡ XYA ¤ã YA ¤ã -- XI ¤£ I ¤£ -- XU ¤¥ U ¤¥ XYU ¤å YU ¤å -- XE ¤§ E ¤§ -- XO ¤© O ¤© XYO ¤ç YO ¤ç -- -- XTU ¤Ã TU ¤Ã XTI ¤Æ¤£ XWI ¤¦¤£ -- XTSU ¤Ã TSU ¤Ã XDI ¤Ç¤£ XWE ¤¦¤§ -- XWA ¤î WA ¤î XDU ¤É¤¥ XWO ¤¦¤© -- XKA ( ¥õ ) KA ( ¥õ ) XDE ¤Ç¤§ -- XKE ( ¥ö ) KE ( ¥ö ) XDO ¤É¤© -+ XA ¤¡ \A ¤¡ XYA ¤ã YA ¤ã -+ XI ¤£ \I ¤£ -+ XU ¤¥ \U ¤¥ XYU ¤å YU ¤å -+ XE ¤§ \E ¤§ -+ XO ¤© \O ¤© XYO ¤ç YO ¤ç -+ -+ XTU ¤Ã \TU ¤Ã XTI ¤Æ¤£ XWI ¤¦¤£ -+ XTSU ¤Ã \TSU ¤Ã XDI ¤Ç¤£ XWE ¤¦¤§ -+ XWA ¤î \WA ¤î XDU ¤É¤¥ XWO ¤¦¤© -+ XKA ( ¥õ ) \KA ( ¥õ ) XDE ¤Ç¤§ -+ XKE ( ¥ö ) \KE ( ¥ö ) XDO ¤É¤© - - - ¡¼ / ¡¦ Z. ¡Ä - , ¡¢ [ ¡Ö Z- ¡Á diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_pubdicplus_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_pubdicplus_Makefile.in deleted file mode 100644 index eb59e0d64cf..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_pubdicplus_Makefile.in +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-Wnn_pubdicplus_Makefile.in,v 1.1 2011/09/13 07:23:17 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/pubdicplus/Makefile.in.orig 2004-04-24 18:56:40.000000000 +0000 -+++ Wnn/pubdicplus/Makefile.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2004 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2004, 2010 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -422,7 +422,7 @@ fzk.master-.c: fzk.master - $(LN) $? $@ - - std.fzk: fzk.master-.c $(FZK_SRC) -- $(CPP) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ -+ $(FZK_PP) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ - - full.fzk: $(FZK_SRC) - $(MAKE) FZK_FLAG=-DKANSAI std.fzk diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_romkan_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_romkan_Makefile.in deleted file mode 100644 index 7523a081c58..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_romkan_Makefile.in +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-Wnn_romkan_Makefile.in,v 1.1 2011/09/13 07:23:18 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/romkan/Makefile.in.orig 2002-03-30 09:34:45.000000000 +0000 -+++ Wnn/romkan/Makefile.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2006 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -29,10 +29,12 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - # - --include ../../makerule.mk --top_builddir = ../.. -+include @top_builddir@/makerule.mk -+ top_srcdir = @top_srcdir@ -+ VPATH = @srcdir@ -+top_builddir = @top_builddir@ - -- INCLUDES = -I$(WNNINCLUDESRC) -I$(TOP) -+ INCLUDES = -I$(WNNINCLUDESRC) -I$(top_builddir) - DEFINES = $(WNNDEFINES) -DWNNDEFAULT $(WNNLANGDEF) - LINTLIBS = - -@@ -46,7 +48,7 @@ includes:: - - .c.o: - $(RM) $@ -- $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $< -+ $(LT_CC) -c $(CFLAGS) $(_NOOP_) $< - - clean:: - $(RM) -r .libs diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_Makefile.in deleted file mode 100644 index ffd0718dbb0..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_Makefile.in +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-Wnn_uum_Makefile.in,v 1.1 2011/09/13 07:23:18 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/uum/Makefile.in.orig 2005-11-20 16:10:28.000000000 +0000 -+++ Wnn/uum/Makefile.in -@@ -10,7 +10,8 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2005 -+# Copyright FreeWnn Project -+# 1999, 2000, 2001, 2002, 2005, 2006, 2007, 2010, 2011 - # - # Maintainer: FreeWnn Project - # -@@ -34,13 +35,17 @@ include @top_builddir@/makerule.mk - top_builddir = @top_builddir@ - VPATH = @srcdir@ - --INSTALL = @INSTALL@ $(INSTALLFLAGS) --LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(UUMOWNER) -+INSTALL = @INSTALL@ -+LOCAL_INSTFLAGS = $(INSTUUMFLAGS) - -- UUMOWNER = root -- INCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANSRC) -I$(top_builddir) -+ INCLUDES = -I$(top_builddir) @EXTWNNJINC@ -I$(WNNINCLUDESRC) -I$(WNNROMKANSRC) - DEFINES = $(WNNDEFINES) $(WNNLANGDEF) -+# todo: should update configure to switch both WNNJLIB and WNNCONVLIB -+# according to --with-wnn-libraries - LOCAL_LIBRARIES = $(WNNJLIB) $(WNNCONVLIB) @LIBS@ -+# FIXME: libspt: need configure support ... -+# LIBSPT_CFLAGS = @LIBSPT_CFLAGS@ -+# LIBSPT_LIBS = @LIBSPT_LIBS@ - - SRC1= epilogue.c header.c kensaku.c kuten.c jis_in.c prologue.c touroku.c jikouho.c jutil.c w_string.c printf.c termio.c hinsi.c termcap.c ttyfdslot.c setutmp.c redraw.c history.c key_bind.c screen.c basic_op.c uif.c cursor.c jhlp.c select_ele.c inspect.c wnnrc_op.c functions.c - -@@ -63,7 +68,7 @@ all:: uum - - uum: $(OBJS) @DEPWNNJLIB@ $(WNNCONVLIB) - $(RM) $@ -- $(LIBTOOL) --mode=link $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LOCAL_LIBRARIES) $(WNNTERM_LIB) -+ $(LT_LD) -o $@ $(LDOPTIONS) $(OBJS) $(LOCAL_LIBRARIES) $(LIBSPT_LIBS) @TERMLIB@ - - clean:: - $(RM) -r .libs -@@ -74,7 +79,7 @@ instclient:: install - install:: uum - @if [ -d $(DESTDIR)$(JWNNBINDIR) ]; then set +x; \ - else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNBINDIR)); fi -- $(LIBTOOL) --mode=install $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) uum $(DESTDIR)$(JWNNBINDIR)/uum -+ $(LT_INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) uum $(DESTDIR)$(JWNNBINDIR)/`echo uum | sed '$(transform)'` - - $(OBJ2) : $(SRC2) - $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_basic__op.c b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_basic__op.c deleted file mode 100644 index 5cf85c2571c..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_basic__op.c +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-Wnn_uum_basic__op.c,v 1.1 2011/09/13 07:23:18 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/uum/basic_op.c.orig 2002-05-12 22:51:17.000000000 +0000 -+++ Wnn/uum/basic_op.c -@@ -10,9 +10,9 @@ - * 1987, 1988, 1989, 1990, 1991, 1992 - * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 -- * Copyright FreeWnn Project 1999, 2000, 2002 -+ * Copyright FreeWnn Project 1999, 2000, 2002, 2006 - * -- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+ * Maintainer: FreeWnn Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -43,10 +43,14 @@ buffer¤Î»È¤¤Êý¤È¤«buffer¤ÎÆâÍƤ¬¤É¤Î¤è¤¦ - #include <stdio.h> - #if STDC_HEADERS - # include <stdlib.h> -+# include <string.h> - #else - # if HAVE_MALLOC_H - # include <malloc.h> - # endif -+# if HAVE_STRINGS_H -+# include <strings.h> -+# endif - #endif /* STDC_HEADERS */ - #include "jllib.h" - #include "commonhd.h" diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_epilogue.c b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_epilogue.c deleted file mode 100644 index 0fff869bbfc..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_epilogue.c +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-Wnn_uum_epilogue.c,v 1.1 2011/09/13 07:23:18 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/uum/epilogue.c.orig 2001-06-14 18:16:06.000000000 +0000 -+++ Wnn/uum/epilogue.c -@@ -10,9 +10,9 @@ - * 1987, 1988, 1989, 1990, 1991, 1992 - * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 -- * Copyright FreeWnn Project 1999, 2000 -+ * Copyright FreeWnn Project 1999, 2000, 2006 - * -- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+ * Maintainer: FreeWnn Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -49,7 +49,7 @@ epilogue_no_close () - set_scroll_region (0, crow + conv_lines - 1); - kk_restore_cursor (); - flush (); --#ifdef TERMINFO -+#ifdef HAVE_TERMINFO - closeTermData (); - #endif - } diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_header.c b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_header.c deleted file mode 100644 index 9b7210910d3..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_header.c +++ /dev/null @@ -1,55 +0,0 @@ -$NetBSD: patch-Wnn_uum_header.c,v 1.1 2011/09/13 07:23:18 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/uum/header.c.orig 2001-09-16 11:42:58.000000000 +0000 -+++ Wnn/uum/header.c -@@ -10,9 +10,10 @@ - * 1987, 1988, 1989, 1990, 1991, 1992 - * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 -- * Copyright FreeWnn Project 1999, 2000 -+ * Copyright FreeWnn Project 1999, 2000, 2006 -+ * Copyright Canna Project 2002 - * -- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+ * Maintainer: FreeWnn Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -131,7 +132,7 @@ FunctionTable *f_table = NULL; - - FuncDataBase function_db[] = { - #ifdef JAPANESE -- {"ja_JP", -+ {WNN_J_LANG, - {NULL, NULL, call_t_redraw_move_normal, - call_t_redraw_move_1_normal, call_t_redraw_move_2_normal, - call_t_print_l_normal, NULL, char_len_normal, char_q_len_normal, -@@ -151,7 +152,7 @@ FuncDataBase function_db[] = { - }, - #endif /* JAPANESE */ - #ifdef CHINESE -- {"zh_CN", /* Simplified Chinese */ -+ {WNN_C_LANG, /* Simplified Chinese */ - {print_out_yincod, input_yincod, call_t_redraw_move_yincod, - call_t_redraw_move_1_yincod, call_t_redraw_move_2_yincod, - call_t_print_l_yincod, redraw_when_chmsig_yincod, char_len_yincod, -@@ -170,7 +171,7 @@ FuncDataBase function_db[] = { - { - NULL, NULL, NULL, NULL, NULL, NULL} - }, -- {"zh_TW", /* Traditional Chinese */ -+ {WNN_T_LANG, /* Traditional Chinese */ - {print_out_yincod, input_yincod, call_t_redraw_move_yincod, - call_t_redraw_move_1_yincod, call_t_redraw_move_2_yincod, - call_t_print_l_yincod, redraw_when_chmsig_yincod, char_len_yincod, -@@ -191,7 +192,7 @@ FuncDataBase function_db[] = { - }, - #endif /* CHINESE */ - #ifdef KOREAN -- {"ko_KR", -+ {WNN_K_LANG, - {NULL, NULL, call_t_redraw_move_normal, - call_t_redraw_move_1_normal, call_t_redraw_move_2_normal, - call_t_print_l_normal, NULL, char_len_normal, char_q_len_normal, diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_hinsi.c b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_hinsi.c deleted file mode 100644 index 838098e1f63..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_hinsi.c +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-Wnn_uum_hinsi.c,v 1.1 2011/09/13 07:23:18 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/uum/hinsi.c.orig 2001-06-14 18:16:07.000000000 +0000 -+++ Wnn/uum/hinsi.c -@@ -10,9 +10,9 @@ - * 1987, 1988, 1989, 1990, 1991, 1992 - * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 -- * Copyright FreeWnn Project 1999, 2000 -+ * Copyright FreeWnn Project 1999, 2000, 2006 - * -- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+ * Maintainer: FreeWnn Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -29,7 +29,19 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#if HAVE_CONFIG_H -+# include <config.h> -+#endif -+ - #include <stdio.h> -+#if STDC_HEADERS -+# include <string.h> -+#else -+# if HAVE_STRINGS_H -+# include <strings.h> -+# endif -+#endif /* STDC_HEADERS */ -+ - #include "commonhd.h" - #include "sdefine.h" - #include "sheader.h" diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_jhlp.c b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_jhlp.c deleted file mode 100644 index 2b62a1ef0e3..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_jhlp.c +++ /dev/null @@ -1,2219 +0,0 @@ -$NetBSD: patch-Wnn_uum_jhlp.c,v 1.1 2011/09/13 07:23:18 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/uum/jhlp.c.orig 2005-08-28 16:44:21.000000000 +0000 -+++ Wnn/uum/jhlp.c -@@ -10,7 +10,9 @@ - * 1987, 1988, 1989, 1990, 1991, 1992 - * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 -- * Copyright FreeWnn Project 1999, 2000, 2002-2003 -+ * Copyright FreeWnn Project 1999, 2000, 2002, 2003, 2006, 2009 -+ * Copyright Canna Project 2002 -+ * Copyright Taketo Kabe 2003 - * - * Maintainer: FreeWnn Project - * -@@ -38,6 +40,7 @@ static char *rcs_id = "$Id: jhlp.c,v 1.1 - #endif - - #include <stdio.h> -+#include <sys/types.h> - #include <setjmp.h> - #include <signal.h> - #if STDC_HEADERS -@@ -53,12 +56,20 @@ static char *rcs_id = "$Id: jhlp.c,v 1.1 - #endif /* STDC_HEADERS */ - #include <errno.h> - #include <sys/ioctl.h> -+#include <sys/stat.h> - #ifdef HAVE_SYS_PARAM_H - # include <sys/param.h> - #endif --#include <sys/stat.h> --#include <sys/time.h> --#include <sys/types.h> -+#if TIME_WITH_SYS_TIME -+# include <sys/time.h> -+# include <time.h> -+#else -+# if HAVE_SYS_TIME_H -+# include <sys/time.h> -+# else -+# include <time.h> -+# endif /* HAVE_SYS_TIME_H */ -+#endif /* TIME_WITH_SYS_TIME */ - #if HAVE_FCNTL_H - # include <fcntl.h> - #endif -@@ -66,45 +77,64 @@ static char *rcs_id = "$Id: jhlp.c,v 1.1 - #ifdef HAVE_UNISTD_H - # include <unistd.h> - #endif -+#if HAVE_SYS_WAIT_H -+# include <sys/wait.h> -+#endif -+#ifdef HAVE_LIBUTIL_H -+# include <libutil.h> -+#endif -+ -+/* Solaris 2.x needs termio.h , so include both. */ -+#if HAVE_TERMIOS_H -+# include <termios.h> -+#endif -+#if HAVE_TERMIO_H -+# include <termio.h> -+#endif -+ -+#if defined(HAVE_TERMIOS_H) -+/* # include <termios.h> */ -+# define USE_TERMIOS 1 -+#elif defined(HAVE_TERMIO_H) -+/* # include <termio.h> */ -+# define USE_TERMIO 1 -+#elif defined(HAVE_SYS_TERMIO_H) -+# include <sys/termio.h> -+# define USE_TERMIO 1 -+#elif defined(HAVE_SGTTY_H) -+# include <sgtty.h> -+# define USE_SGTTY -+#else -+# error "No termio header." -+#endif /* HAVE_TERMIOS_H */ -+ -+#ifdef HAVE_LIBSPT -+# include <libspt.h> /* lib from Canna. not used w/FreeWnn */ -+#endif -+ -+/* -+ * Enable old Linux specific code. -+ * We hope you don't have to use this #define ... -+ * (We will remove this #define and related code in near future.) -+ */ -+/* #define USE_LINUX_TERM */ -+ -+ -+#include "sdefine.h" - - #include "jllib.h" - #include "commonhd.h" --#include "sdefine.h" - #include "sheader.h" - #include "wnn_config.h" - #include "wnn_os.h" - --jmp_buf kk_env; -- --#ifdef HAVE_WAIT3 --# include <sys/wait.h> --#endif /* HAVE_WAIT3 */ -- --#ifdef BSD42 --# include <sgtty.h> --#endif /* BSD42 */ -- --#ifdef SYSVR2 --#ifdef TERMINFO --# include <curses.h> --#endif /* TERMINFO */ --# include <term.h> --#endif /* SYSVR2 */ --#if defined(SVR4) || defined(hpux) || defined(sgi) --#include <sys/termio.h> --#endif --#ifdef linux --#include <termios.h> --#endif -- -+/* old system check (don't know if it works) */ - #ifdef nec_ews_svr2 --#include <sys/jtermio.h> -+# include <sys/jtermio.h> - #endif /* nec_ews_svr2 */ -- - #if defined(uniosu) - # include <sys/pty.h> - #endif /* defined(uniosu) */ -- - #ifdef SVR4 - #include <sys/stropts.h> - #include <sys/euc.h> -@@ -113,36 +143,44 @@ jmp_buf kk_env; - - #define ERROR -1 - -+jmp_buf kk_env; - #ifdef TIOCSSIZE - struct ttysize pty_rowcol; - #endif /* TIOCSSIZE */ - --int ttyfd; -+int ttyfd; /* master tty */ - - char *tname; /* terminal name */ - char *cmdnm = "csh"; /* char *cmdnm = "csh"; */ - - int child_id; - char *prog; -+#ifdef HAVE_LIBSPT -+spt_handle *spth = NULL; -+#endif -+int need_utmp_clear = 0; - --extern char *optarg; --extern int optind; -- --extern char *ttyname (); -- --static void save_signals (); --static void restore_signals (); -- --static RETSIGTYPE terminate_handler (); --static void do_end (), open_pty (), open_ttyp (), do_main (), exec_cmd (), parse_options (), setsize (), get_rubout (), usage (), change_size (), default_usage (); -+static void save_signals (void); -+static void restore_signals (void); -+static RETSIGTYPE terminate_handler (void); -+static void do_end (void); -+static void open_pty (void); -+static void open_pty_traditional (void); -+static void open_ttyp (void); -+static void do_main (void); -+static void exec_cmd (char **); -+static void parse_options (int, char **); -+static void setsize (void); -+static void get_rubout (void); -+static void usage (char *); -+static void change_size (void); -+static void default_usage (void); -+static void j_term_save (void); -+static unsigned char keyin0 (void); - --/** ¥á¥¤¥ó */ - int --main (argc, argv) -- int argc; -- char **argv; -+main (int argc, char **argv) - { -- - char *name; - char *p; - char nlspath[64]; -@@ -150,7 +188,6 @@ main (argc, argv) - char *server_env; - char errprefix[1024] = "error"; - int i; -- extern char *get_server_env (); - - prog = argv[0]; - flow_control = FLOW_CONTROL; -@@ -182,6 +219,7 @@ main (argc, argv) - - if (*lang_dir == '\0') - { -+#ifndef CANNA - if ((p = getenv ("LANG")) != NULL) - { - if (strlen (p) >= 4) -@@ -194,6 +232,9 @@ main (argc, argv) - strcpy (lang_dir, p); - } - } -+#else /* CANNA */ -+ strcpy (lang_dir, WNN_DEFAULT_LANG); -+#endif /* CANNA */ - } - for (f = function_db; *lang_dir && f && f->lang; f++) - { -@@ -295,15 +336,14 @@ main (argc, argv) - exit (1); - } - -- --#if defined(BSD42) && !defined(DGUX) --#if !(defined(BSD) && (BSD >= 199306)) -+/* 2003.06 should delete this? */ -+#ifndef HAVE_LIBSPT -+ /* saveutmp() does utmp handling if USE_UTMP is set to 1 */ - if (saveutmp () < 0) - { - puts ("Can't save utmp\n"); - } --#endif --#endif /* BSD42 */ -+#endif /* !HAVE_LIBSPT */ - - - if (optind) -@@ -326,16 +366,11 @@ main (argc, argv) - argv[1] = NULL; - } - -+ j_term_save (); -+ /* do_end () is allowed from here */ - save_signals (); - --#ifdef TERMCAP -- if (getTermData () == -1) -- { -- fprintf (stderr, "Sorry. Something is wrong with termcap, maybe.\r\n"); -- exit (21); -- } --#endif /* TERMCAP */ --#ifdef TERMINFO -+#if HAVE_TERMINFO /* TERMINFO */ - if (openTermData () == -1) - { - fprintf (stderr, "Sorry. Something is wrong with terminfo, maybe.\r\n"); -@@ -343,37 +378,35 @@ main (argc, argv) - } - maxlength = columns; - crow = lines - conv_lines; --#endif /* TERMINFO */ -+#else /* Assume TERMCAP */ -+ if (getTermData () == -1) -+ { -+ fprintf (stderr, "Sorry. Something is wrong with termcap, maybe.\r\n"); -+ exit (21); -+ } -+#endif /* HAVE_TERMINFO */ - #if defined(BSD43) || defined(DGUX) - setsize (); - #endif /* BSD43 */ - --#ifdef TERMCAP -+#if !HAVE_TERMINFO /* Assume TERMCAP */ - if (set_TERMCAP () == -1) - { - fprintf (stderr, "Sorry. Something is wrong with termcap, maybe.\r\n"); - exit (21); - } --#endif /* TERMCAP */ -+#endif /* !HAVE_TERMINFO */ - -+ ttyfd = 0; - open_pty (); --#ifndef linux -+/* It is normal to open tty here, before fork(). -+ Don't know why linux is different. -+ So temporally comment it out to make it as other OSes. */ -+#ifndef USE_LINUX_TERM - open_ttyp (); - #endif - exec_cmd (argv); - -- /* -- close(0); -- close(1); -- close(2); -- if((ttyfd = open("/dev/tty", O_RDWR | O_NDELAY, 0)) != 0) { -- err("Can't open /dev/tty."); -- } -- dup(0); -- dup(0); -- */ -- -- ttyfd = 0; - get_rubout (); - - switch (init_uum ()) -@@ -394,6 +427,7 @@ main (argc, argv) - uum_err ("term initialize fault."); - } - -+#ifndef CANNA - if (!jl_isconnect (bun_data_)) - { - if (!servername || *servername == 0) -@@ -406,6 +440,7 @@ main (argc, argv) - } - flush (); - } -+#endif /* CANNA */ - - puteustring (MSG_GET (1), - /* -@@ -424,6 +459,7 @@ main (argc, argv) - #endif /* defined(uniosu) */ - - do_main (); -+ return 0; - } - - /* -@@ -431,7 +467,7 @@ main (argc, argv) - */ - - static int --do_h_opt () -+do_h_opt (void) - { - henkan_off_flag = 1; - defined_by_option |= OPT_WAKING_UP_MODE; -@@ -439,7 +475,7 @@ do_h_opt () - } - - static int --do_H_opt () -+do_H_opt (void) - { - henkan_off_flag = 0; - defined_by_option |= OPT_WAKING_UP_MODE; -@@ -448,42 +484,42 @@ do_H_opt () - - #ifdef JAPANESE - int --do_u_opt () -+do_u_opt (void) - { - pty_c_flag = J_EUJIS; - return 0; - } - - int --do_j_opt () -+do_j_opt (void) - { - pty_c_flag = J_JIS; - return 0; - } - - int --do_s_opt () -+do_s_opt (void) - { - pty_c_flag = J_SJIS; - return 0; - } - - int --do_U_opt () -+do_U_opt (void) - { - tty_c_flag = J_EUJIS; - return 0; - } - - int --do_J_opt () -+do_J_opt (void) - { - tty_c_flag = J_JIS; - return 0; - } - - int --do_S_opt () -+do_S_opt (void) - { - tty_c_flag = J_SJIS; - return 0; -@@ -492,28 +528,28 @@ do_S_opt () - - #ifdef CHINESE - int --do_b_opt () -+do_b_opt (void) - { - pty_c_flag = C_BIG5; - return 0; - } - - int --do_t_opt () -+do_t_opt (void) - { - pty_c_flag = C_ECNS11643; - return 0; - } - - int --do_B_opt () -+do_B_opt (void) - { - tty_c_flag = C_BIG5; - return 0; - } - - int --do_T_opt () -+do_T_opt (void) - { - tty_c_flag = C_ECNS11643; - return 0; -@@ -522,14 +558,14 @@ do_T_opt () - - #ifdef KOREAN - int --do_u_opt () -+do_u_opt (void) - { - pty_c_flag = K_EUKSC; - return 0; - } - - int --do_U_opt () -+do_U_opt (void) - { - tty_c_flag = K_EUKSC; - return 0; -@@ -537,14 +573,14 @@ do_U_opt () - #endif /* KOREAN */ - - static int --do_P_opt () -+do_P_opt (void) - { - sleep (20); - return 0; - } - - static int --do_x_opt () -+do_x_opt (void) - { - flow_control = 0; - defined_by_option |= OPT_FLOW_CTRL; -@@ -552,7 +588,7 @@ do_x_opt () - } - - static int --do_X_opt () -+do_X_opt (void) - { - flow_control = 1; - defined_by_option |= OPT_FLOW_CTRL; -@@ -560,7 +596,7 @@ do_X_opt () - } - - static int --do_k_opt () -+do_k_opt (void) - { - strncpy(uumkey_name_in_uumrc, optarg, PATHNAMELEN-1); - uumkey_name_in_uumrc[PATHNAMELEN-1] = '\0'; -@@ -573,7 +609,7 @@ do_k_opt () - } - - static int --do_c_opt () -+do_c_opt (void) - { - strncpy(convkey_name_in_uumrc, optarg, PATHNAMELEN-1); - convkey_name_in_uumrc[PATHNAMELEN-1] = '\0'; -@@ -586,7 +622,7 @@ do_c_opt () - } - - static int --do_r_opt () -+do_r_opt (void) - { - strncpy(rkfile_name_in_uumrc, optarg, PATHNAMELEN-1); - rkfile_name_in_uumrc[PATHNAMELEN-1] = '\0'; -@@ -599,14 +635,14 @@ do_r_opt () - } - - static int --do_l_opt () -+do_l_opt (void) - { - conv_lines = atoi (optarg); - return 0; - } - - static int --do_D_opt () -+do_D_opt (void) - { - strncpy(def_servername, optarg, PATHNAMELEN-1); - def_servername[PATHNAMELEN-1] = '\0'; -@@ -619,7 +655,7 @@ do_D_opt () - } - - static int --do_n_opt () -+do_n_opt (void) - { - strncpy(username, optarg, PATHNAMELEN-1); - username[PATHNAMELEN-1] = '\0'; -@@ -631,13 +667,13 @@ do_n_opt () - } - - static int --do_v_opt () -+do_v_opt (void) - { - defined_by_option |= OPT_VERBOSE; - return 0; - } - --static int (*do_opt[]) () = -+static int (*do_opt[]) (void) = - { - do_h_opt, /* 'h' : waking_up_in_henkan_mode */ - do_H_opt, /* 'H' : waking_up_no_henkan_mode */ -@@ -682,39 +718,32 @@ parse_options (argc, argv) - - /** tty ¤ËÂФ¹¤ë ioctl ¤Î¥»¥Ã¥È */ - --#ifdef BSD42 --struct sgttyb savetmio; --/* -- struct sgttyb ttyb = -- { B9600, B9600, 0x7f, 0x15, EVENP | ODDP | ECHO | CRMOD }; -- int local_mode = LCRTBS | LCRTERA | LCRTKIL | LCTLECH | LPENDIN | LDECCTQ; --*/ -+#ifdef USE_SGTTY -+# if defined(BSD43) || defined(DGUX) /* should be "defined(LPASS8)"? */ -+# define SET_PASS8 1 -+# endif - -+struct sgttyb savetmio; -+struct sgttyb ttyb_def = { B9600, B9600, 0x7f, 0x15, -+ EVENP | ODDP | ECHO | CRMOD }; -+int local_mode_def = LCRTBS | LCRTERA | LCRTKIL | LCTLECH | LPENDIN | LDECCTQ; - /* added later */ - struct tchars tcharsv; - struct ltchars ltcharsv; - struct sgttyb ttyb; - int local_mode; -+# ifdef SET_PASS8 -+static int local_mode_sv; -+# endif - - static void --get_rubout () -+get_rubout (void) - { --#ifdef nodef -- if (savetmio.sg_erase == UNDEF_STTY) -- { -- rubout_code = RUBOUT; -- } -- else -- { --#endif -- rubout_code = savetmio.sg_erase; --#ifdef nodef -- } --#endif -+ rubout_code = savetmio.sg_erase; - } - - int --j_term_init () -+j_term_init (void) - { - struct sgttyb buf; - -@@ -722,28 +751,125 @@ j_term_init () - buf.sg_flags |= RAW; - buf.sg_flags &= ~ECHO; - ioctl (ttyfd, TIOCSETP, &buf); -+# ifdef SET_PASS8 -+ ioctl (ttyfd, TIOCLSET, &local_mode); -+# endif - - return 0; - } --#endif /* BSD42 */ - --#ifdef SYSVR2 --#define UNDEF_STTY 0xff -+static_void -+j_term_save (void) -+{ -+ ioctl (ttyfd, TIOCGETC, &tcharsv); -+ ioctl (ttyfd, TIOCGLTC, <charsv); -+ if (ioctl (ttyfd, TIOCGETP, &ttyb)) -+ ttyb = ttyb_def; -+ savetmio = ttyb; -+# ifdef SET_PASS8 -+ if (ioctl (ttyfd, TIOCLGET, &local_mode_sv)) -+ local_mode_sv = local_mode_def; -+ local_mode = local_mode_sv | LPASS8; /* set PASS8 */ -+# else /* !SET_PASS8 */ -+ if (ioctl (ttyfd, TIOCLGET, &local_mode)) -+ local_mode = local_mode_def; -+# endif /* !SET_PASS8 */ -+} -+ -+static void -+j_term_restore (void) -+{ -+ ioctl (ttyfd, TIOCSETP, &savetmio); -+# ifdef SET_PASS8 -+ ioctl (ttyfd, TIOCLSET, &local_mode_sv); -+# endif /* SET_PASS8 */ -+} - --struct termio savetmio; --struct termio terms = { -- IGNBRK | ICRNL | IXON, /* c_iflag */ -- ONLCR | OPOST, /* c_oflag */ -- B9600 | CS8 | CSTOPB | CREAD | CLOCAL, /* c_cflag */ -- ISIG | ICANON | ECHO | ECHOE | ECHOK, /* c_lflag */ -- 0, /* c_line */ -- {0x3, 0x1c, 0x8, 0x15, 0x4, 0, 0, 0} /* c_cc */ --}; -+static void -+j_term_p_init (int ttypfd) -+{ -+ int word; -+ ioctl (ttypfd, TIOCSETC, &tcharsv); -+ ioctl (ttypfd, TIOCSLTC, <charsv); -+ ioctl (ttypfd, TIOCSETP, &ttyb); -+ ioctl (ttypfd, TIOCLSET, &local_mode); -+ if (pty_c_flag == J_JIS) -+ { -+ word = LCTLECH; -+ ioctl (ttypfd, TIOCLBIC, &word); -+ } -+} -+#endif /* USE_SGTTY */ -+ -+#if defined(USE_TERMIO) || defined(USE_TERMIOS) -+ -+#ifdef USE_TERMIOS -+# define TERMIO termios -+# define GET_TERMATTR(fd, tio) tcgetattr(fd, tio) -+# define SET_TERMATTR(fd, tio) tcsetattr(fd, TCSADRAIN, tio) -+# define UNDEF_STTY _POSIX_VDISABLE -+# define SET_ATTR_ERROR "error in tcsetattr.\n" -+#else /* !USE_TERMIOS */ -+# define TERMIO termio -+# define GET_TERMATTR(fd, tio) ioctl(fd, TCGETA, tio) -+# ifdef TCSETAW -+# define SET_TERMATTR(fd, tio) ioctl(fd, TCSETAW, tio) -+# define SET_ATTR_ERROR "error in ioctl TCSETAW.\n" -+# else -+# define SET_TERMATTR(fd, tio) ioctl(fd, TCSETA, tio) -+# define SET_ATTR_ERROR "error in ioctl TCSETA.\n" -+# endif -+# define UNDEF_STTY 0xff -+#endif /* !USE_TERMIOS */ -+#ifdef CERASE -+# define WNN_CERASE CERASE -+#else -+# define WNN_CERASE 0x7f -+#endif -+ -+struct TERMIO savetmio; -+ -+static void -+set_default_termio (struct TERMIO *terms) -+{ -+ bzero (terms, sizeof *terms); -+ terms->c_iflag = IGNBRK | ICRNL | IXON; -+ terms->c_oflag = OPOST; -+#ifdef ONLCR -+ terms->c_oflag |= ONLCR; -+#endif -+ terms->c_cflag = CS8 | CSTOPB | CREAD | CLOCAL; -+#ifndef USE_TERMIOS -+ terms->c_cflag |= B9600; -+#endif -+ terms->c_lflag = ISIG | ICANON | ECHO | ECHOE | ECHOK; -+#ifdef USE_TERMIOS -+ terms->c_cc[VINTR] = 0x3; -+ terms->c_cc[VQUIT] = 0x1c; -+ terms->c_cc[VERASE] = 0x8; -+ terms->c_cc[VKILL] = 0x15; -+ terms->c_cc[VEOF] = 0x4; -+ terms->c_cc[VEOL] = _POSIX_VDISABLE; -+# ifdef VEOL2 -+ terms->c_cc[VEOL2] = _POSIX_VDISABLE; -+# endif -+ cfsetospeed (terms, B9600); -+ cfsetispeed (terms, B9600); -+#else /* !USE_TERMIOS */ -+ terms->c_line = 0; -+ terms->c_cc[0] = 0x3; -+ terms->c_cc[1] = 0x1c; -+ terms->c_cc[2] = 0x8; -+ terms->c_cc[3] = 0x15; -+ terms->c_cc[4] = 0x4; -+ terms->c_cc[5] = 0; -+ terms->c_cc[6] = 0; -+ terms->c_cc[7] = 0; -+#endif /* !USE_TERMIOS */ -+} - - #if defined(uniosu) - struct jtermio savejtmio; --struct jtermio savejtmiottyp; --struct auxtermio saveauxterm; - struct auxtermio auxterm = { - 0, /* -tostop */ - {0x1a, 0, 0, 0, 0, 0, 0, 0} /* c_cc2 */ -@@ -751,7 +877,7 @@ struct auxtermio auxterm = { - #endif /* defined(uniosu) */ - - static void --get_rubout () -+get_rubout (void) - { - if (savetmio.c_cc[VERASE] == UNDEF_STTY) - { -@@ -764,9 +890,9 @@ get_rubout () - } - - int --j_term_init () -+j_term_init (void) - { -- struct termio buf1; -+ struct TERMIO buf1; - #if defined(uniosu) - struct jtermio buf2; - #endif /* defined(uniosu) */ -@@ -779,35 +905,47 @@ j_term_init () - buf1.c_cflag |= CS8; - buf1.c_cc[VMIN] = 1; /* cf. ICANON */ - buf1.c_cc[VTIME] = 0; --#else /* linux */ - buf1.c_iflag &= ~(ISTRIP | INLCR | IGNCR | ICRNL | IUCLC | IXON); -+#else /* !linux */ -+ buf1.c_iflag &= ~(ISTRIP | INLCR | IGNCR | ICRNL | IXON); -+# ifdef IUCLC -+ buf1.c_iflag &= ~(IUCLC); -+# endif - if (flow_control) - { - buf1.c_iflag |= IXON; - } -- buf1.c_lflag &= ~(ECHONL | ECHOK | ECHOE | ECHO | XCASE | ICANON | ISIG); -+ buf1.c_lflag &= ~(ECHONL | ECHOK | ECHOE | ECHO | ICANON | ISIG); -+# ifdef XCASE -+ buf1.c_lflag &= ~(XCASE); -+# endif -+# ifdef IEXTEN -+ buf1.c_lflag &= ~(IEXTEN); -+# endif - buf1.c_oflag = OPOST; -- buf1.c_cc[VINTR] = CDEL; -- buf1.c_cc[VQUIT] = CDEL; -- buf1.c_cc[VERASE] = CDEL; -- buf1.c_cc[VKILL] = CDEL; -+# ifdef USE_TERMIOS -+ buf1.c_cc[VMIN] = 1; -+ buf1.c_cc[VTIME] = 0; -+ cfsetispeed(&buf1, cfgetispeed(&savetmio)); -+ cfsetospeed(&buf1, cfgetospeed(&savetmio)); -+# else /* !USE_TERMIOS */ - buf1.c_cc[VEOF] = 1; /* cf. ICANON */ - buf1.c_cc[VEOL] = 0; --#endif /* linux */ -- if (ioctl (ttyfd, TCSETA, &buf1) == -1) -+ /* not needed? cf.ISIG*/ -+ buf1.c_cc[VINTR] = WNN_CERASE; -+ buf1.c_cc[VQUIT] = WNN_CERASE; -+ buf1.c_cc[VERASE] = WNN_CERASE; -+ buf1.c_cc[VKILL] = WNN_CERASE; -+# endif /* !USE_TERMIOS */ -+#endif /* !linux */ -+ if (SET_TERMATTR (ttyfd, &buf1) < 0) - { -- fprintf (stderr, "error in ioctl TCSETA.\n"); -+ fprintf (stderr, SET_ATTR_ERROR); - exit (1); - } - - #if defined(uniosu) -- if (ioctl (ttyfd, JTERMGET, &buf2) < 0) -- { -- fprintf (stderr, "error in ioctl JTERMGET in j_term_init.\n"); -- exit (1); -- } -- savejtmio = buf2; -- -+ buf2 = savejtmio; - buf2.j_flg = CONVTOEXT | WNN_EXIST; - buf2.j_level = jterm; - switch (jcode_set) -@@ -854,42 +992,141 @@ j_term_init () - - return 0; - } --#endif /* SYSVR2 */ -+ -+static void -+j_term_save (void) -+{ -+ if (GET_TERMATTR (ttyfd, &savetmio) < 0) -+ { -+ set_default_termio (&savetmio); -+ } -+#if defined(uniosu) -+ if (ioctl (ttyfd, JTERMGET, &savejtmio) < 0) -+ { -+ fprintf (stderr, "uum: error in ioctl JTERMGET in open_ttyp.\n"); -+ exit (1); -+ } -+#endif /* defined(uniosu) */ -+} -+ -+static void -+j_term_restore (void) -+{ -+ if (SET_TERMATTR (ttyfd, &savetmio) < 0) -+ { -+ fprintf (stderr, SET_ATTR_ERROR); -+ exit (1); -+ } -+ -+#if defined(uniosu) -+ if (ioctl (ttyfd, JTERMSET, &savejtmio) < 0) -+ { -+ fprintf (stderr, "error in ioctl JTERMSET.\n"); -+ exit (1); -+ } -+#endif /* defined(uniosu) */ -+} -+ -+static void -+j_term_p_init (int ttypfd) -+{ -+ struct TERMIO buf1; -+#if defined(uniosu) -+ struct TERMIO buf2; -+#endif -+ buf1 = savetmio; -+#ifdef DGUX /* copied from JLS5.4.2 */ -+ /* should clear on all platforms? */ -+ buf1.c_iflag &= ~ISTRIP; -+#endif /* DGUX */ -+#ifdef nec_ews_svr2 -+ buf1.c_line = JAPANLD; -+#endif -+#ifdef USE_TERMIOS -+ cfsetispeed(&buf1, cfgetispeed(&savetmio)); -+ cfsetospeed(&buf1, cfgetospeed(&savetmio)); -+#endif -+ if (SET_TERMATTR (ttypfd, &buf1) < 0) -+ { -+ fprintf (stderr, SET_ATTR_ERROR); -+ exit (1); -+ } -+#if defined(uniosu) -+ buf2 = savejtmio; -+ buf2.j_flg = CONVTOEXT | KANJIINPUT; /* kanji input & output ok */ -+ buf2.j_level = jterm; -+ switch (jcode_set) -+ { -+ case 0: -+ buf2.j_ecode = JIS; -+ break; -+ case 1: -+ buf2.j_ecode = SJIS; -+ break; -+ case 2: -+ buf2.j_ecode = UJIS; -+ break; -+ default: -+ fprintf (stderr, "uum: kanji code set not supported in terminfo.\n"); -+ exit (1); -+ } -+ -+ if (jis_kanji_in) -+ { -+ strcpy (buf2.j_jst, jis_kanji_in); -+ buf2.j_jstl = strlen (jis_kanji_in); -+ } -+ if (jis_kanji_out) -+ { -+ strcpy (buf2.j_jend, jis_kanji_out); -+ buf2.j_jendl = strlen (jis_kanji_out); -+ } -+ if (jgaiji_start_address) -+ { -+ *(short *) buf2.j_gcsa = jgaiji_start_address; -+ } -+ if (jgaiji_disp) -+ { -+ strcpy (buf2.j_gdsp, jgaiji_disp); -+ buf2.j_gdspl = strlen (jgaiji_disp); -+ } -+ -+ if (ioctl (ttypfd, JTERMSET, &buf2) < 0) -+ { -+ fprintf (stderr, "error in ioctl JTERMSET.\n"); -+ exit (1); -+ } -+ -+ if (ioctl (ttypfd, TIOCSETAUX, &auxterm) < 0) -+ { -+ fprintf (stderr, "error in ioctl TIOCSETAUX.\n"); -+ exit (1); -+ } -+ -+#endif /* defined(uniosu) */ -+} -+#endif /* USE_TERMIO || USE_TERMIOS */ - - /** signal SIGCHLD ¤ò¼õ¤±¤¿¸å¤Î½èÍý¤ò¤¹¤ë¡£*/ --/* *INDENT-OFF* */ - RETSIGTYPE --chld_handler () --/* *INDENT-ON* */ -+chld_handler (void) - { - #ifdef HAVE_WAIT3 --#ifdef linux -- int status; --#else -+#ifdef HAVE_UNION_WAIT - union wait status; -+#else /* POSIX */ -+ int status; - #endif - int pid; - --/* -- * Remove warning. -- * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/20 -- */ --/* if ((pid = wait3(&status, WNOHANG | WUNTRACED, NULL)) == child_id) { */ -- if ((pid = wait3 ((int *) &status, WNOHANG | WUNTRACED, NULL)) == child_id) -+ if ((pid = wait3 (&status, WNOHANG | WUNTRACED, NULL)) == child_id) - { - if (WIFSTOPPED (status)) - { - #ifdef SIGCONT - kill (pid, SIGCONT); --#ifndef SYSVR2 -- /* pid = getpgrp (pid); */ -- pid = getpgrp (); -- killpg (pid, SIGCONT); --#else --#if defined(uniosu) -- pid = ngetpgrp (pid); -- kill (pid, SIGCONT); --#endif -+#ifdef GETPGID -+ KILLPG (GETPGID (pid), SIGCONT); - #endif - #endif - } -@@ -900,6 +1137,10 @@ chld_handler () - /* - printf("\r\n£õ£õ£í¤ò½ª¤ï¤ê¤Þ¤¹¡£\r\n"); - */ -+#ifdef HAVE_LIBSPT -+ if (spth) -+ spt_utmp_set_exit (spth, *(int *)&status); -+#endif - epilogue (); - do_end (); - } -@@ -927,7 +1168,7 @@ chld_handler () - - /** signal SIGTERM ¤ò¼õ¤±¤¿»þ¤Î½èÍý¤ò¤¹¤ë¡£*/ - static RETSIGTYPE --terminate_handler () -+terminate_handler (void) - { - signal (SIGCHLD, SIG_IGN); - epilogue_no_close (); -@@ -940,10 +1181,8 @@ terminate_handler () - } - - #ifdef SIGWINCH --/* *INDENT-OFF* */ - RETSIGTYPE --resize_handler () --/* *INDENT-ON* */ -+resize_handler (void) - { - re_signal (SIGWINCH, resize_handler); - change_size (); -@@ -957,14 +1196,15 @@ resize_handler () - - /** ¥á¥¤¥ó¥ë¡¼¥× */ - --int sel_ptn; --int pty_bit; --int tty_bit; -+/* Assume fd_set, FD_ZERO() family. -+ though we may use glue in jserver/de.c */ -+fd_set sel_ptn; - int ptyfd; - - static void --do_main () -+do_main (void) - { -+#ifndef CANNA - unsigned char *buf; - int ml; - -@@ -978,38 +1218,35 @@ do_main () - epilogue (); - do_end (); - } -- -- pty_bit = 1 << ptyfd; -- tty_bit = 1 << ttyfd; -- sel_ptn = pty_bit | tty_bit; -+#else /* CANNA */ -+ extern void canna_mainloop(); -+#endif /* CANNA */ -+ -+ FD_ZERO (&sel_ptn); -+ FD_SET (ptyfd, &sel_ptn); -+ FD_SET (ttyfd, &sel_ptn); - - if (henkan_off_flag == 0) - { - disp_mode (); - } - -+#ifndef CANNA - for (;;) - { -- - ml = kk (); -- --/* -- if (!((ml < 2) && ((return_buf[0] <= ' ') || (return_buf[0] == 0x7f)))) { --*/ - make_history (return_buf, ml); --/* -- } --*/ - ml = (*code_trans[(internal_code << 2) | pty_c_flag]) (buf, return_buf, sizeof (w_char) * ml); - if (ml > 0) - write (ptyfd, buf, ml); - } -+#else /* CANNA */ -+ canna_mainloop(); -+#endif /* CANNA */ - } - --unsigned char keyin0 (); -- - int --keyin2 () -+keyin2 (void) - { - int total, ret; - unsigned char in; -@@ -1031,31 +1268,30 @@ keyin2 () - - /** convert_key nomi okonau key-in function */ - int --conv_keyin (inkey) -- char *inkey; -+conv_keyin (char *inkey) - { - return keyin1 (keyin2, inkey); - } - - /** ¥¡¼ÆþÎÏ´Ø¿ô 1 */ - int --keyin () -+keyin (void) - { - char inkey[16]; - return (conv_keyin (inkey)); - } - - /** ¥¡¼ÆþÎÏ´Ø¿ô 2 */ --unsigned char --keyin0 () -+static unsigned char -+keyin0 (void) - { - static unsigned char buf[BUFSIZ]; - static unsigned char outbuf[BUFSIZ]; - static unsigned char *bufend = outbuf; - static unsigned char *bufstart = outbuf; - int n; -- int rfds; -- int i, j, mask; -+ fd_set rfds, mask; -+ int i, j; - unsigned char *p; - extern int henkan_off_flag; - struct timeval time_out; /* If your OS's select was implemented as -@@ -1097,9 +1333,10 @@ keyin0 () - time_out.tv_usec = 200 * 1000; /* 200 msec ´ÖÂԤĤΤÀ¥¾! */ - for (rfds = sel_ptn; - #ifdef linux -- (sel_ret = select (20, &rfds, 0, 0, NULL)) < 0 && errno == EINTR; -+ (sel_ret = select (FD_SETSIZE, &rfds, 0, 0, NULL)) < 0 && errno == EINTR; - #else -- (sel_ret = select (20, &rfds, 0, 0, &time_out)) < 0 && errno == EINTR; -+ /* FD_SETSIZE should be 20 in classical env. */ -+ (sel_ret = select (FD_SETSIZE, &rfds, 0, 0, &time_out)) < 0 && errno == EINTR; - #endif - rfds = sel_ptn) - ; -@@ -1113,12 +1350,9 @@ keyin0 () - return (*bufstart++); - } - return (0xff); --/* -- continue; --*/ - } - -- if (rfds & pty_bit) -+ if (FD_ISSET(ptyfd, &rfds)) - { - if ((n = read (ptyfd, buf, BUFSIZ)) <= 0) - { -@@ -1150,13 +1384,14 @@ keyin0 () - p += j; - i -= j; - } -- mask = 1 << ttyfd; -+ FD_ZERO (&mask); -+ FD_SET (ttyfd, &mask); - select (32, 0, &mask, 0, 0); - } - pop_cursor (); - } - } -- if (rfds & tty_bit) -+ if (FD_ISSET(ttyfd, &rfds)) - { - if ((n = read (ttyfd, buf, BUFSIZ)) > 0) - { -@@ -1197,16 +1432,16 @@ keyin0 () - #if defined(uniosu) - /** pty ¤«¤é ioctl ¤¬¤«¤«¤Ã¤¿»þ¤Î½èÍý */ - int --arrange_ioctl (jflg) -- int jflg; /* jtermio ¤Î j_flg ¤ÎÊÑ´¹¥Õ¥é¥°¤¬¥ª¥Õ¤Î»þ 0 ¥ª¥ó¤Î»þ 1 */ -+arrange_ioctl (int jflg) -+/* jflg: jtermio ¤Î j_flg ¤ÎÊÑ´¹¥Õ¥é¥°¤¬¥ª¥Õ¤Î»þ 0 ¥ª¥ó¤Î»þ 1 */ - { - struct jtermio jbuf1; -- struct termio frombuf; -- struct termio tobuf; -+ struct TERMIO frombuf; -+ struct TERMIO tobuf; - int i; - -- ioctl (ptyfd, TCGETA, &frombuf); -- ioctl (ttyfd, TCGETA, &tobuf); -+ GET_TERMATTR (ptyfd, &frombuf); -+ GET_TERMATTR (ttyfd, &frombuf); - - if ((i = (frombuf.c_iflag & IXON)) != (tobuf.c_iflag & IXON)) - { -@@ -1243,7 +1478,7 @@ arrange_ioctl (jflg) - } - tobuf.c_cflag = (tobuf.c_cflag & ~CBAUD) | (frombuf.c_cflag & CBAUD); - -- ioctl (ttyfd, TCSETA, &tobuf); /* set again */ -+ SET_TERMATTR (ttyfd, &tobuf); /* set again */ - - ioctl (ptyfd, JTERMGET, &jbuf1); /* about Japanease */ - -@@ -1269,28 +1504,66 @@ arrange_ioctl (jflg) - - /** »Ò¥×¥í¥»¥¹¤òµ¯¤³¤¹¡£*/ - --int ttypfd; -+int ttypfd = -1; /* slave tty */ - - static void --exec_cmd (argv) -- char **argv; -+exec_cmd (char **argv) - { - int i; -+#if defined(HAVE_LIBSPT) && !defined(USE_LINUX_TERM) -+ int r; -+ const char *ttynm; -+#elif !defined(HAVE_SETSID) || defined(USE_LINUX_TERM) - #ifdef BSD42 - int pid; - #endif --#ifdef linux -+#endif /* (!HAVE_LIBSPT && !HAVE_SETSID) || USE_LINUX_TERM */ -+#if defined(SIGWINCH) && defined(TIOCSWINSZ) /* || defined(linux) */ - struct winsize win; -- extern Term_RowWidth, crow; -+ extern int Term_RowWidth; - #endif --#if defined(SYSVR2) && !defined(linux) -- setpgrp (); -- close (open (ttyname (ttypfd), O_WRONLY, 0)); --#endif /* SYSVR2 */ - -- if (!(child_id = fork ())) -- { --#ifdef BSD42 -+ child_id = fork (); -+ if (child_id < 0) -+ uum_err ("cannot fork."); -+ if (!child_id) -+ { -+ /* --- start changing controlling tty --- */ -+#if defined(HAVE_LIBSPT) && !defined(USE_LINUX_TERM) -+#if defined(SIGWINCH) && defined(TIOCSWINSZ) -+ if (ioctl (ttyfd, TIOCGWINSZ, &win) == 0) -+ ioctl (ttypfd, TIOCSWINSZ, &win); -+#endif /* SIGWINCH && TIOCSWINSZ */ -+ spt_detach_handle (spth); -+ spth = NULL; -+ if (spt_detach_ctty () || spt_set_ctty2 (ttypfd)) -+ { -+ uum_err ("cannot change controlling tty."); -+ } -+ -+#elif defined(HAVE_SETSID) && !defined(USE_LINUX_TERM) /* !HAVE_LIBSPT */ -+ -+ int fd; -+# if defined(SIGWINCH) && defined(TIOCSWINSZ) -+ if (ioctl (ttyfd, TIOCGWINSZ, &win) == 0) -+ ioctl (ttypfd, TIOCSWINSZ, &win); -+# endif /* SIGWINCH && TIOCSWINSZ */ -+ setsid (); -+# ifdef TIOCSCTTY -+ ioctl (ttypfd, TIOCSCTTY, 0); -+# else -+ close (open (ttyname (ttypfd), O_WRONLY, 0)); -+# endif -+ if ((fd = open("/dev/tty", O_WRONLY)) < 0) -+ { -+ uum_err ("cannot change controlling tty."); -+ } -+ close (fd); -+ /* disable utmp logging for now */ -+ -+#else /* (!HAVE_LIBSPT && !HAVE_SETSID) || USE_LINUX_TERM */ -+ -+#ifdef BSD42 - #ifdef TIOCNOTTY - /* set notty */ - { -@@ -1313,26 +1586,49 @@ exec_cmd (argv) - close (open (ttyname (ttypfd), O_WRONLY, 0)); - setpgrp (0, pid); - #endif /* BSD42 */ -- --#if !(defined(BSD) && (BSD >= 199306)) -+#if defined(SYSVR2) && !defined(linux) -+ setpgrp (); /* should setpgrp() AFTER fork() */ -+ close (open (ttyname (ttypfd), O_WRONLY, 0)); -+#endif /* SYSVR2 */ -+ -+#if 0 -+/* unneccessary? */ -+ /* setutmp() does utmp handling if USE_UTMP is set to 1 */ - if (setutmp (ttypfd) == ERROR) - { - puts ("Can't set utmp."); - } -+ else -+ { -+ need_utmp_clear = 1; -+ } - #endif - --#ifdef linux -+/* It is bizarre to open tty after fork(). -+ So, try to do same as other os. -+ If it does work, we can remove this. */ -+# ifdef linux - setsid (); - open_ttyp (); - close (ptyfd); -- ioctl (ttyfd, TIOCGWINSZ, &win); - ioctl (ttypfd, TCSETA, &savetmio); -+# endif -+# if defined(SIGWINCH) && defined(TIOCSWINSZ) /* || defined(linux) */ -+ ioctl (ttyfd, TIOCGWINSZ, &win); -+# endif -+ -+#endif /* (!HAVE_LIBSPT && !HAVE_SETSID) || USE_LINUX_TERM */ -+ /* --- finish changing controlling tty --- */ -+ -+#ifndef linux -+ setgid (getgid ()); -+ setuid (getuid ()); -+#endif -+#ifdef HAVE_DUP2 - dup2 (ttypfd, 0); - dup2 (ttypfd, 1); - dup2 (ttypfd, 2); --#else /* linux */ -- setgid (getgid ()); -- setuid (getuid ()); -+#else /* !HAVE_DUP2 */ - close (0); - close (1); - close (2); -@@ -1340,7 +1636,7 @@ exec_cmd (argv) - { - uum_err ("redirection fault."); - } --#endif /* linux */ -+#endif /* !HAVE_DUP2 */ - for (i = WNN_NFD - 1; i > 2; i--) - { - close (i); -@@ -1358,19 +1654,50 @@ exec_cmd (argv) - signal (SIGTTOU, SIG_IGN); - #endif - --/* if (setutmp(0) == ERROR) { -- err("Can't set utmp."); -- } --*/ --#ifdef linux -+#if defined(SIGWINCH) && defined(TIOCSWINSZ) /* || defined(linux) */ - crow = win.ws_row = Term_RowWidth = win.ws_row - conv_lines; - ioctl (ttyfd, TIOCSWINSZ, &win); -+#endif -+#ifdef linux - setgid (getgid ()); - setuid (getuid ()); - #endif - execvp (cmdnm, argv); - uum_err ("exec fault."); - } -+ -+ /* parent */ -+#ifdef HAVE_LIBSPT -+ ttynm = ttyname (0); -+ if (ttynm) -+ { -+ ttynm = strchr (ttynm + 1, '/'); -+ if (ttynm && ttynm[1]) -+ { -+ spt_utmp_set_host (spth, ttynm + 1); -+ } -+ } -+ spt_utmp_set_pid (spth, child_id); -+ r = spt_login_utmp (spth); -+ if (!r) -+ { -+ need_utmp_clear = 1; -+ } -+ else -+ { -+ spt_perror ("exec_cmd (login_utmp)", r); -+ } -+#else /* !HAVE_LIBSPT */ -+ /* setutmp() does utmp handling if USE_UTMP is set to 1 */ -+ if (setutmp (ttypfd) == ERROR) -+ { -+ puts ("Can't set utmp."); -+ } -+ else -+ { -+ need_utmp_clear = 1; -+ } -+#endif /* HAVE_LIBSPT */ - } - - #if !(HAVE_SETENV) -@@ -1381,10 +1708,7 @@ exec_cmd (argv) - * The 3rd parameter is ignored. It is added for compatibility only. - */ - int --setenv (var, value, overwrite) -- char *var; -- char *value; -- int overwrite; -+setenv (char *var, char *value, int overwrite) - { - extern char **environ; - char **newenv; -@@ -1424,9 +1748,7 @@ setenv (var, value, overwrite) - - #ifdef SVR4 - static int --euc_set (eucioc, ttyfd) -- eucioc_t *eucioc; -- int ttyfd; -+euc_set (eucioc_t *eucioc, int ttyfd) - { - struct strioctl sb; - -@@ -1442,8 +1764,7 @@ euc_set (eucioc, ttyfd) - } - - static int --set_euc_term (ttyfd) -- int ttyfd; -+set_euc_term (int ttyfd) - { - eucioc_t eucioc; - -@@ -1468,8 +1789,7 @@ set_euc_term (ttyfd) - - #ifdef nec_ews_svr2 - static void --set_jterm (ttyfd, ttypfd) -- int ttyfd, ttypfd; -+set_jterm (int ttyfd, int ttypfd) - { - struct jtermio buf; - -@@ -1488,228 +1808,285 @@ set_jterm (ttyfd, ttypfd) - } - #endif /* nec_ews_svr2 */ - --/** ttyp ¤Î¥ª¡¼¥×¥ó */ -- --int ptyno; --char *ptynm = "/dev/pty"; --#ifdef sgi --extern char *_getpty (int *, int, mode_t, int); --char *ttypnm = "/dev/ttyqxxx"; --#else --char *ttypnm = "/dev/tty"; --#endif /* sgi */ -- --#if defined(BSD43) || defined(DGUX) /* FOR PASS8 */ --static int local_mode_sv; --#endif -- --#ifndef sgi --static void ptyname (); --#endif -- -+#ifdef sony - static void --open_ttyp () -+set_sony_jterm (int ttyfd, int ttypfd) - { -- char nmbuf[20]; --#ifdef BSD42 -- int word; --#endif --#if defined(SYSVR2) && !defined(linux) -- struct termio buf1; --#endif --#if defined(uniosu) -- struct jtermio buf2; --#endif -- --#ifdef sgi -- if ((ttypfd = open (ttypnm, O_RDWR)) == ERROR) -- { --#else -- ptyname (nmbuf, ttypnm, ptyno); -- if ((ttypfd = open (nmbuf, O_RDWR, 0)) == ERROR) -- { --#endif -- uum_err ("Can't open ttyp."); -- } --#ifndef linux -- chown (nmbuf, getuid (), getgid ()); -- chmod (nmbuf, 0622); --#endif /* !linux */ --#ifdef BSD42 -- ioctl (ttyfd, TIOCGETC, &tcharsv); -- ioctl (ttyfd, TIOCGLTC, <charsv); -- ioctl (ttyfd, TIOCGETP, &ttyb); -- savetmio = ttyb; --#if defined(BSD43) || defined(DGUX) -- ioctl (ttyfd, TIOCLGET, &local_mode_sv); -- local_mode = local_mode_sv | LPASS8; /* set PASS8 */ -- ioctl (ttyfd, TIOCLSET, &local_mode); --#else /* defined(BSD43) || defined(DGUX) */ -- ioctl (ttyfd, TIOCLGET, &local_mode); --#endif /* defined(BSD43) || defined(DGUX) */ -+#ifdef TIOCKGET -+ int tmode, jmode = 0; -+ struct jtchars jtc; - -- ioctl (ttypfd, TIOCSETC, &tcharsv); -- ioctl (ttypfd, TIOCSLTC, <charsv); -- ioctl (ttypfd, TIOCSETP, &ttyb); -- ioctl (ttypfd, TIOCLSET, &local_mode); --#ifdef notdef -- pid = getpid (); -- ioctl (ttypfd, TIOCSPGRP, &pid); --#endif -- if (pty_c_flag == J_JIS) -+ if (ioctl(ttyfd, TIOCKGET, &tmode) < 0) - { -- word = LCTLECH; -- ioctl (ttypfd, TIOCLBIC, &word); -- } --#endif /* BSD42 */ --#if defined(SYSVR2) && !defined(linux) -- if (ioctl (ttyfd, TCGETA, &buf1) == -1) -- { -- buf1 = terms; -- } -- savetmio = buf1; --#ifdef DGUX /* copied from JLS5.4.2 */ -- buf1.c_iflag &= ~ISTRIP; --#endif /* DGUX */ --#ifdef nec_ews_svr2 -- buf1.c_line = JAPANLD; --#endif -- if (ioctl (ttypfd, TCSETA, &buf1) < 0) -- { -- fprintf (stderr, "error in ioctl TCSETA.\n"); -+ fprintf(stderr, "error in ioctl TIOCKGET.\n"); - exit (1); - } --#if defined(uniosu) -- if (ioctl (ttyfd, JTERMGET, &buf2) < 0) -+ jmode = tmode; -+ tmode &= ~(KM_SYSCODE | KM_TTYPE); -+ switch (pty_c_flag) - { -- fprintf (stderr, "uum: error in ioctl JTERMGET in open_ttyp.\n"); -- exit (1); -- } -- savejtmiottyp = buf2; -- buf2.j_flg = CONVTOEXT | KANJIINPUT; /* kanji input & output ok */ -- buf2.j_level = jterm; -- switch (jcode_set) -- { -- case 0: -- buf2.j_ecode = JIS; -+ case J_EUJIS: -+ tmode |= KM_EUC | KM_SYSEUC; - break; -- case 1: -- buf2.j_ecode = SJIS; -+ case J_JIS: -+ tmode |= KM_ASCII; - break; -- case 2: -- buf2.j_ecode = UJIS; -+ case J_SJIS: -+ tmode |= KM_SJIS | KM_SYSSJIS; - break; -- default: -- fprintf (stderr, "uum: kanji code set not supported in terminfo.\n"); -- exit (1); -- } -- -- if (jis_kanji_in) -- { -- strcpy (buf2.j_jst, jis_kanji_in); -- buf2.j_jstl = strlen (jis_kanji_in); -- } -- if (jis_kanji_out) -- { -- strcpy (buf2.j_jend, jis_kanji_out); -- buf2.j_jendl = strlen (jis_kanji_out); -- } -- if (jgaiji_start_address) -- { -- *(short *) buf2.j_gcsa = jgaiji_start_address; -- } -- if (jgaiji_disp) -- { -- strcpy (buf2.j_gdsp, jgaiji_disp); -- buf2.j_gdspl = strlen (jgaiji_disp); - } -- -- if (ioctl (ttypfd, JTERMSET, &buf2) < 0) -+ if (ioctl(ttypfd, TIOCKSET, &tmode) < 0) - { -- fprintf (stderr, "error in ioctl JTERMSET.\n"); -+ fprintf(stderr, "error in ioctl TIOCKSET.\n"); - exit (1); - } -+#endif /* TIOCKGET */ - -- if (ioctl (ttypfd, TIOCSETAUX, &auxterm) < 0) -+#ifdef TIOCKGETC -+ if ((jmode & KM_TTYPE) == KM_JIS) - { -- fprintf (stderr, "error in ioctl TIOCSETAUX.\n"); -- exit (1); -+ ioctl(ttyfd, TIOCKGETC, &jtc); -+ jtc.t_ascii = 'B'; -+ jtc.t_kanji = 'B'; -+ if (ioctl(ttypfd, TIOCKSETC, &jtc) < 0) -+ { -+ fprintf(stderr, "error in ioctl TIOCKSETC.\n"); -+ exit(1); -+ } - } -+#endif -+} -+#endif /* sony */ - --/* -- pid = getpid(); -+/** ttyp ¤Î¥ª¡¼¥×¥ó */ -+ -+#ifndef HAVE_LIBSPT -+/* ways to get a pty' -+ == Traditional -+ Try opening each /dev/ptyXX and use the succeeded one -+ == SGI IRIX -+ use _getpty() -+ == BSD? (HAVE_OPENPTY) -+ use openpty() -+ == STREAMS (Solaris) (HAVE_PTSNAME) -+ use posix_openpt() (or open /dev/ptmx directly) and ptsname() -+ (see pts(7D) for EXAMPLE) - */ --#endif /* defined(uniosu) */ - --#if defined(nec_ews_svr2) -- set_jterm (ttyfd, ttypfd); -+#if !defined(sgi) && !defined(HAVE_PTSNAME) -+char tty_master[32]; /*VVVV overflow?*/ -+#endif -+char tty_slave [32]; /*VVVV overflow?*/ -+ -+#if defined(BSD43) || defined(DGUX) /* FOR PASS8 */ -+static int local_mode_sv; -+#endif -+#endif /* !HAVE_LIBSPT */ -+ -+/* open slave side of pty to ttypfd */ -+static void -+open_ttyp (void) -+{ -+#ifndef HAVE_LIBSPT /* && !defined(linux) ? */ -+ struct stat tstat; -+ char chown_failed = 0; -+ const char *msg_insecure = "Your ttyp (%s) may be insecure from other users, but continue anyway ...\r\n"; -+#endif /* !HAVE_LIBSPT */ -+ -+#ifdef HAVE_LIBSPT -+ if ((ttypfd = spt_open_slave(spth)) == ERROR) -+#else /* HAVE_LIBSPT */ -+# if defined(sgi) -+ if ((ttypfd = open (tty_slave, O_RDWR)) == ERROR) -+# elif defined(HAVE_PTSNAME) -+ if ((ttypfd = open(tty_slave, O_RDWR)) == ERROR /* open slave */ -+# if defined(I_PUSH) -+ /* for systems that have STREAMS */ -+ || ioctl (ttypfd, I_PUSH, "ptem") == ERROR /* push ptem */ -+ || ioctl (ttypfd, I_PUSH, "ldterm") == ERROR /* push ldterm */ -+# endif -+ ) -+# elif defined (HAVE_OPENPTY) -+ if (ttypfd < 0) /* already open */ -+# else -+ if ((ttypfd = open (tty_slave, O_RDWR, 0)) == ERROR) /* old method */ -+# endif /* sgi */ -+#endif /* HAVE_LIBSPT */ -+ { -+ perror(tty_slave); /* debug */ -+ uum_err ("Can't open ttyp."); -+ } -+#if defined(HAVE_LIBSPT) -+ spt_init_slavefd(spth, ttypfd); -+#else /* HAVE_LIBSPT */ -+/* #if !defined(linux) */ -+ if(fstat(ttypfd, &tstat)==0) { -+ if(tstat.st_uid != getuid()) { -+ if(chown (tty_slave, getuid (), getgid ())!=0) { -+ perror("Can't change owner of ttyp."); -+ fprintf(stderr, msg_insecure, tty_slave); -+ chown_failed = 1; -+ } -+ } -+ if((tstat.st_mode & (S_IWGRP | S_IWOTH)) != 0) { -+ /* Ignore message if chown failed (chmod will fail also ...) */ -+ if(chmod (tty_slave, 0622)!=0 && chown_failed == 0) { -+ perror("Can't change permission of ttyp."); -+ fprintf(stderr, msg_insecure, tty_slave); -+ } -+ } -+ } else { -+ perror("Can't stat ttyp."); -+ fprintf(stderr, msg_insecure, tty_slave); -+ } -+/* #endif */ /* linux */ -+#endif /* HAVE_LIBSPT */ -+ -+ /* -+ * We save terminal settings in main() instead of here. -+ * When defined(linux) open_ttyp() is invoked from child! -+ */ -+#ifndef USE_LINUX_TERM -+ j_term_p_init (ttypfd); - #endif - --/* -- setpgrp(); -- close(open(ttyname(ttypfd), O_WRONLY, 0)); --*/ --#endif /* defined(SYSVR2) && !defined(linux) */ - #ifdef TIOCSSIZE - pty_rowcol.ts_lines = crow; /* instead of lines */ - pty_rowcol.ts_cols = maxlength; /* instead of columns */ - ioctl (ttypfd, TIOCSSIZE, &pty_rowcol); - #endif /* TIOCSSIZE */ -+ -+#ifdef SVR4 -+ set_euc_term(ttypfd); -+#endif -+#if defined(nec_ews_svr2) -+ set_jterm (ttyfd, ttypfd); -+#endif -+#ifdef sony -+ set_sony_jterm(ttyfd, ttypfd); -+#endif -+} -+ -+#if defined(HAVE_PTSNAME) && ! defined(HAVE_POSIX_OPENPT) -+/* Maybe harmless on defined(HAVE_LIBSPT) */ -+#if !defined(HAVE__DEV_PTMX) -+#warning "If not cross compile, you must check pts master device (other than /dev/ptmx)." -+/* but continue anyway. */ -+#endif -+ -+/* fallback function to posix_openpt */ -+static int -+posix_openpt (int flags) -+{ -+ return open("/dev/ptmx", flags); - } -+#endif /* HAVE_PTSNAME && !HAVE_POSIX_OPENPT */ - - /** pty ¤Î¥ª¡¼¥×¥ó */ --#ifdef sgi -+/* allocate a new pty master into int ptyfd */ - static void --open_pty () -+open_pty (void) - { -- char nmbuf[20]; -+#if defined(HAVE_LIBSPT) -+ int r; -+ r = spt_open_pty(&spth, &ptyfd, NULL, NULL); -+ if (r != SPT_E_NONE && r != SPT_E_CHOWN_FAIL) -+ uum_err ("Can't get pty."); -+ -+#elif defined(sgi) - char *tty_name_buff; -+ extern char *_getpty (int *, int, mode_t, int); - tty_name_buff = _getpty (&ptyfd, O_RDWR | O_NDELAY, 0600, 0); - if (tty_name_buff == 0) - uum_err ("Can't get pty."); -- strcpy (ttypnm, tty_name_buff); -- return; -+ strcpy (tty_slave, tty_name_buff); -+ -+#elif defined(HAVE_PTSNAME) -+ char *p; -+ ptyfd = posix_openpt(O_RDWR); /* open master */ -+ if (ptyfd < 0) -+ uum_err ("Could not get a pty."); -+ grantpt (ptyfd); /* change permission of slave */ -+ unlockpt (ptyfd); /* unlock slave */ -+ -+ p = ptsname (ptyfd); /* get name of slave */ -+ strcpy(tty_slave, p); -+ /* you can't get path of the "master" by ttyname; -+ * only the open filedes ptyfd is available. -+ */ -+ /* strcpy (tty_master, "/dev/ptm/x"); */ -+ -+#elif HAVE_OPENPTY -+ if (openpty(&ptyfd, &ttypfd, tty_slave, NULL, NULL) == ERROR) -+ uum_err ("Could not get a pty."); -+ /* Note: slave tty is ALREADY OPEN as ttypfd */ -+ strcpy(tty_master, ttyname(ptyfd)); - --} - #else -+ /* Traditional method that search in /dev/ttyXX */ -+ open_pty_traditional (); -+#endif /* HAVE_LIBSPT */ -+ -+ return; -+} -+ -+#if !(HAVE_LIBSPT) && !(sgi) && !(HAVE_PTSNAME) && !(HAVE_OPENPTY) - static void --open_pty () -+open_pty_traditional (void) - { -- char nmbuf[20]; --#ifdef linux -- struct termio buf1; -+ int ptyno; -+ -+#ifdef hpux -+# define MAXPTYS (11*16) -+# define PTYDEV ";/dev/ptym/pty" -+# define TTYDEV "/dev/pty/tty" -+#else -+# define MAXPTYS 32 -+# define PTYDEV "/dev/pty" -+# define TTYDEV "/dev/tty" - #endif - -- for (ptyno = 0; ptyno < 32; ptyno++) -+ for (ptyno = 0; ptyno < MAXPTYS; ptyno++) /* sysconf? */ - { -- ptyname (nmbuf, ptynm, ptyno); -- if ((ptyfd = open (nmbuf, O_RDWR, 0)) != ERROR) -+/* -+ * Change pseudo-devices. -+ * Because FreeBSD's master pseudo-devices are pty[p-sP-S][0-9a-v]. -+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/20 -+ */ -+#if (defined(BSD) && (BSD >= 199306)) /* 4.4BSD-Lite by Taoka */ -+# define PTXNAME(b, PFX, no) \ -+ sprintf ((b), PFX "%1c%1c", "pqrsPQRS"[((no) >> 5)], "0123456789abcdefghijklmnopqrstuv"[(no) & 0x1f]) -+#elif defined(hpux) -+# define PTXNAME(b, PFX, no) \ -+ sprintf ((b), PFX "%1c%1c", "zyxwvutsrqp"[(no)>>4], "fedcba9876543210"[(no)&0x0f]) -+#else /* !4.4BSD-Lite, !hpux */ -+# define PTXNAME(b, PFX, no) \ -+ sprintf ((b), PFX "%1c%1c", 'p' + ((no) >> 4), "0123456789abcdef"[(no) & 0x0f]); -+#endif /* !4.4BSD-Lite */ -+#define PTMNAME(b, no) PTXNAME(b, PTYDEV, no) -+#define PTSNAME(b, no) PTXNAME(b, TTYDEV, no) -+ -+ PTMNAME(tty_master, ptyno); -+ fprintf(stderr, "trying master <%s>\n", tty_master); /* debug */ -+ if ((ptyfd = open (tty_master, O_RDWR, 0)) != ERROR) - { --#if defined(uniosu) -+# if defined(uniosu) - if (ioctl (ptyfd, PIOCPKT, 1) < 0) - { /* packet mode on */ - fprintf (stderr, "error in ioctl PIOCPKT.\n"); - exit (1); - } --#endif --#ifdef linux -- if (ioctl (0, TCGETA, &buf1) == -1) -- { -- buf1 = terms; -- } -- savetmio = buf1; --#endif -+# endif /* uniosu */ - return; - } - } - uum_err ("Can't get pty."); - } --#endif -+#endif /* !(HAVE_LIBSPT) && !(sgi) && !(HAVE_PTSNAME) && !(HAVE_OPENPTY) */ - - /** ¥¨¥é¡¼¤À¤è¡£¤µ¤è¤¦¤Ê¤é¡£ */ - void --uum_err (s) -- char *s; -+uum_err (char *s) - { - puts (s); - fclose (stdout); -@@ -1720,9 +2097,11 @@ uum_err (s) - - /** Ω¤ÄÄ»¸å¤òÂù¤µ¤º ½ª¤ï¤ê¤Î½èÍý */ - static void --do_end () -+do_end (void) - { -- char nmbuf[20]; -+#ifdef USE_LIBSPT -+ int r; -+#endif - - static int do_end_flg = 0; - if (do_end_flg == 1) -@@ -1731,89 +2110,64 @@ do_end () - - signal (SIGCHLD, SIG_DFL); - fcntl (ttyfd, F_SETFL, 0); -+ j_term_restore (); - --#ifdef BSD42 -- ioctl (ttyfd, TIOCSETP, &savetmio); --#endif /* BSD42 */ --#if defined(BSD43) || defined(DGUX) -- ioctl (ttyfd, TIOCLSET, &local_mode_sv); --#endif /* BSD43 */ -- --#ifdef SYSVR2 -- if (ioctl (ttyfd, TCSETA, &savetmio) < 0) -+#if !defined(HAVE_LIBSPT) && !defined(sgi) -+# ifndef HAVE_PTSNAME -+ if (chown (tty_master, 0, 0) == ERROR) - { -- fprintf (stderr, "error in ioctl TCSETA.\n"); -- exit (1); -+ perror ("Can't restore owner of tty_master."); - } --#endif /* SYSVR2 */ -- --#if defined(uniosu) -- if (ioctl (ttyfd, JTERMSET, &savejtmio) < 0) -+ if (chmod (tty_master, 0666) == ERROR) - { -- fprintf (stderr, "error in ioctl JTERMSET.\n"); -- exit (1); -+ perror ("Can't restore permission of tty_master."); - } --#endif /* defined(uniosu) */ - --#ifndef sgi -- ptyname (nmbuf, ptynm, ptyno); -- if (chown (nmbuf, 0, 0) == ERROR) -+ if (chown (tty_slave, 0, 0) == ERROR) - { -- perror (prog); -+ perror ("Can't restore owner of ttyp."); - } -- if (chmod (nmbuf, 0666) == ERROR) -+ if (chmod (tty_slave, 0666) == ERROR) - { -- perror (prog); -+ perror ("Can't restore permission of ttyp."); - } -+# endif /* HAVE_PTSNAME */ - -- ptyname (nmbuf, ttypnm, ptyno); -- if (chown (nmbuf, 0, 0) == ERROR) -- { -- perror (prog); -- } -- if (chmod (nmbuf, 0666) == ERROR) -- { -- perror (prog); -- } -- --#if !(defined(BSD) && (BSD >= 199306)) -- if (resetutmp (ttypfd) == ERROR) -+#endif /* !HAVE_LIBSPT && !sgi */ -+ close (ttyfd); -+#ifdef HAVE_LIBSPT -+ if (spth && need_utmp_clear && (r = spt_logout_utmp(spth))) -+ spt_perror(NULL, r); -+ if (spth && (r = spt_close_pty(spth))) -+ spt_perror(NULL, r); -+#else -+/* needless? */ -+ /* resetutmp() does utmp handling if USE_UTMP is set to 1 */ -+ if (need_utmp_clear) - { -- printf ("Can't reset utmp."); -+ if (resetutmp (ttypfd) == ERROR) -+ { -+ printf ("Can't reset utmp."); -+ } -+ need_utmp_clear = 0; /* for safety */ - } --#endif --#ifdef TIOCSSIZE -- pty_rowcol.ts_lines = 0; -- pty_rowcol.ts_cols = 0; -- ioctl (ttypfd, TIOCSSIZE, &pty_rowcol); --#endif /* TIOCSSIZE */ --#endif /* !sgi */ -- close (ttyfd); - close (ptyfd); -+#endif /* HAVE_LIBSPT */ - - chdir ("/tmp"); /* to avoid making too many mon.out files */ - -- --#ifdef BSD42 -- killpg (child_id, SIGHUP); --/* killpg(getpgrp(),SIGHUP); */ --#endif --#ifdef SYSVR2 --/* kill(0, SIGHUP); */ -- kill (-child_id, SIGHUP); --#endif /* SYSVR2 */ -- -+ KILLPG (child_id, SIGHUP); - exit (0); - } - - #if defined(uniosu) - /** ²¾Ì¾´Á»úÊÑ´¹¤ò ioctl ¤Ç¥ª¥Õ¤·¤¿»þ¤Î keyin ¤ËÂå¤ï¤ë´Ø¿ô */ - int --ioctl_off () -+ioctl_off (void) - { - static unsigned char buf[BUFSIZ]; - int n; -- int rfds; -+ fd_set rfds; - - kk_restore_cursor (); - clr_line_all (); -@@ -1826,8 +2180,8 @@ ioctl_off () - write (ptyfd, buf, n); - } - rfds = sel_ptn; -- select (20, &rfds, 0, 0, NULL); -- if (rfds & pty_bit) -+ select (FD_SETSIZE, &rfds, 0, 0, NULL); -+ if (FD_ISSET(ptyfd, &rfds)) - { - if ((n = read (ptyfd, buf, BUFSIZ)) <= 0) - { -@@ -1846,7 +2200,7 @@ ioctl_off () - } - } - } -- if (rfds & tty_bit) -+ if (FD_ISSET(ttyfd, &rfds)) - { - if ((n = read (ttyfd, buf, BUFSIZ)) > 0) - { -@@ -1857,47 +2211,15 @@ ioctl_off () - } - #endif /* defined(uniosu) */ - -- --#ifndef sgi --static void --ptyname (b, pty, no) -- char *b, *pty; -- int no; --{ --/* -- * Change pseudo-devices. -- * Because FreeBSD's master pseudo-devices are pty[p-sP-S][0-9a-v]. -- * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/20 -- */ --#if (defined(BSD) && (BSD >= 199306)) /* 4.4BSD-Lite by Taoka */ -- sprintf (b, "%s%1c%1c", pty, "pqrsPQRS"[(no >> 5)], ((no & 0x1f > 9) ? 'a' : '0') + (no & 0x1f)); --#else /* ! 4.4BSD-Lite */ -- sprintf (b, "%s%1c%1x", pty, 'p' + (no >> 4), no & 0x0f); --#endif /* ! 4.4BSD-Lite */ --} --#endif /* !sgi */ -- --/* Move to etc/xutoj.c --int --through(x, y, z) --char *x, *y; --int z; --{ -- bcopy(y, x, z); -- return z; --} --*/ -- - static void --default_usage () -+default_usage (void) - { - fprintf (stderr, "%s: Bad -L option\n", prog); - exit (0); - } - - static void --usage (optstr) -- char *optstr; -+usage (char *optstr) - { - printf ("usage: prog %s by lang \"%s\"\n", optstr, lang_dir); - exit (0); -@@ -1913,10 +2235,9 @@ intfnptr sigwinch; - #endif /* SIGWINCH */ - - static void --save_signals () -+save_signals (void) - { - sigpipe = signal (SIGPIPE, SIG_IGN); --/* sighup = signal(SIGHUP, SIG_IGN); /88/12/27*/ - #ifdef linux /* XXX */ - sighup = signal (SIGHUP, SIG_IGN); - #endif -@@ -1936,7 +2257,7 @@ save_signals () - } - - static void --restore_signals () -+restore_signals (void) - { - signal (SIGPIPE, sigpipe); - signal (SIGHUP, sighup); -@@ -1956,11 +2277,11 @@ restore_signals () - - #if defined(BSD43) || defined(DGUX) - static void --setsize () -+setsize (void) - { -- register int i; -+ int i; - struct winsize win; -- extern Term_LineWidth, Term_RowWidth, maxlength, crow; -+ extern int Term_LineWidth, Term_RowWidth, maxlength; - - if (ioctl (ttyfd, TIOCGWINSZ, &win) < 0) - { -@@ -1983,11 +2304,11 @@ setsize () - - #ifdef SIGWINCH - static void --change_size () -+change_size (void) - { - register int i; - struct winsize win; -- extern Term_LineWidth, Term_RowWidth, maxlength, crow; -+ extern int Term_LineWidth, Term_RowWidth, maxlength; - - if (ioctl (ttyfd, TIOCGWINSZ, &win) < 0) - { -@@ -2002,7 +2323,7 @@ change_size () - if ((i = win.ws_row) != 0) - { - crow = Term_RowWidth = i - conv_lines; --#ifdef linux -+#ifdef TIOCSWINSZ - win.ws_row = crow; - #endif - } -@@ -2010,9 +2331,9 @@ change_size () - { - maxlength = Term_LineWidth = i; - } --#ifdef linux -+#ifdef TIOCSWINSZ - ioctl (ttypfd, TIOCSWINSZ, &win); --#else /* linux */ -+#else /* !TIOCSWINSZ */ - #ifdef TIOCSSIZE - pty_rowcol.ts_lines = crow; /* instead of lines */ - pty_rowcol.ts_cols = maxlength; /* instead of columns */ -@@ -2022,15 +2343,12 @@ change_size () - { - int grp; - ioctl (ptyfd, TIOCGPGRP, &grp); --#ifdef SVR4 -- kill (-grp, SIGWINCH); --#else -- killpg (grp, SIGWINCH); --#endif -+ KILLPG (grp, SIGWINCH); - } - #endif /* sun */ --#endif /* linux */ -+#endif /* !TIOCSWINSZ */ - -+#ifndef CANNA - set_scroll_region (0, crow - 1); - if (henkan_off_flag) - { -@@ -2051,6 +2369,11 @@ change_size () - set_screen_vars_default (); - t_print_l (); - } -+#else /* CANNA */ -+ set_scroll_region(0, crow - 1); -+ set_screen_vars_default(); -+ t_print_l(); -+#endif /* CANNA */ - } - } - #endif /* SIGWINCH */ diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_jikouho.c b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_jikouho.c deleted file mode 100644 index f9044524ad1..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_jikouho.c +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-Wnn_uum_jikouho.c,v 1.1 2011/09/13 07:23:18 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/uum/jikouho.c.orig 2001-06-14 18:16:07.000000000 +0000 -+++ Wnn/uum/jikouho.c -@@ -10,9 +10,9 @@ - * 1987, 1988, 1989, 1990, 1991, 1992 - * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 -- * Copyright FreeWnn Project 1999, 2000 -+ * Copyright FreeWnn Project 1999, 2000, 2006 - * -- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+ * Maintainer: FreeWnn Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -29,7 +29,19 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ - #include <stdio.h> -+#if STDC_HEADERS -+# include <string.h> -+#else -+# if HAVE_STRINGS_H -+# include <strings.h> -+# endif -+#endif /* STDC_HEADERS */ -+ - #include "jllib.h" - #include "commonhd.h" - #include "sdefine.h" diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_printf.c b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_printf.c deleted file mode 100644 index 7f2460ec869..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_printf.c +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-Wnn_uum_printf.c,v 1.1 2011/09/13 07:23:18 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/uum/printf.c.orig 2001-06-14 18:16:07.000000000 +0000 -+++ Wnn/uum/printf.c -@@ -10,9 +10,9 @@ - * 1987, 1988, 1989, 1990, 1991, 1992 - * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 -- * Copyright FreeWnn Project 1999, 2000 -+ * Copyright FreeWnn Project 1999, 2000, 2006 - * -- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+ * Maintainer: FreeWnn Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -29,7 +29,19 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ - #include <stdio.h> -+#if STDC_HEADERS -+# include <string.h> -+#else -+# if HAVE_STRINGS_H -+# include <strings.h> -+# endif -+#endif /* STDC_HEADERS */ -+ - #include "commonhd.h" - #include "sdefine.h" - #include "sheader.h" diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_sdefine.h b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_sdefine.h deleted file mode 100644 index ccbbf889887..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_sdefine.h +++ /dev/null @@ -1,108 +0,0 @@ -$NetBSD: patch-Wnn_uum_sdefine.h,v 1.1 2011/09/13 07:23:18 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/uum/sdefine.h.orig 2001-06-14 18:16:08.000000000 +0000 -+++ Wnn/uum/sdefine.h -@@ -10,9 +10,9 @@ - * 1987, 1988, 1989, 1990, 1991, 1992 - * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 -- * Copyright FreeWnn Project 1999, 2000 -+ * Copyright FreeWnn Project 1999, 2000, 2006 - * -- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+ * Maintainer: FreeWnn Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -33,6 +33,89 @@ - * define of standard i/o - *************************/ - -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include "commonhd.h" -+ -+/* ncurses' term.h defines them to either 0 or 1! */ -+#ifndef HAVE_TERMIOS_H -+# define DONT_HAVE_TERMIOS_H -+#endif -+#ifndef HAVE_TERMIO_H -+# define DONT_HAVE_TERMIO_H -+#endif -+#ifndef HAVE_SYS_TERMIO_H -+# define DONT_HAVE_SYS_TERMIO_H -+#endif -+#ifndef HAVE_SGTTY_H -+# define DONT_HAVE_SGTTY_H -+#endif -+ -+#if defined(HAVE_TERMINFO) -+# if defined(HAVE_CURSES_H) -+# include <curses.h> -+# elif defined(HAVE_NCURSES_H) -+# include <ncurses.h> -+# else -+# error "no terminfo header" -+# endif /* HAVE_CURSES_H */ -+# ifdef HAVE_TERM_H -+# include <term.h> -+# endif -+#else /* HAVE_TERMINFO */ -+# if defined(HAVE_TERMCAP_H) -+# include <termcap.h> -+# endif /* HAVE_TERMCAP_H */ -+#endif /* HAVE_TERMINFO */ -+ -+#ifdef DONT_HAVE_TERMIOS_H -+# undef HAVE_TERMIOS_H -+# undef DONT_HAVE_TERMIOS_H -+#endif -+#ifdef DONT_HAVE_TERMIO_H -+# undef HAVE_TERMIO_H -+# undef DONT_HAVE_TERMIO_H -+#endif -+#ifdef DONT_HAVE_SYS_TERMIO_H -+# undef HAVE_SYS_TERMIO_H -+# undef DONT_HAVE_SYS_TERMIO_H -+#endif -+#ifdef DONT_HAVE_SGTTY_H -+# undef HAVE_SGTTY_H -+# undef DONT_HAVE_SGTTY_H -+#endif -+ -+#ifdef HAVE_KILLPG -+# define KILLPG(pgrp, sig) killpg(pgrp, sig) -+#else -+# define KILLPG(pgrp, sig) kill(-(pgrp), sig) -+#endif /* HAVE_KILLPG */ -+ -+#if defined(HAVE_GETPGID) /* SVR4 and most modern systems */ -+# define GETPGID(pid) getpgid(pid) -+#elif defined(HAVE_GETPGRP) && !defined(GETPGRP_VOID) /* 4.3BSD */ -+# define GETPGID(pid) getpgrp(pid) -+#elif defined(uniosu) -+# define GETPGID(pid) ngetpgrp(pid) -+#else -+/* no way to get process group id */ -+#endif /* GETPGID */ -+ -+#if defined(HAVE_GETPGRP) -+# if defined(GETPGRP_VOID) -+# define GETMYPGRP() getpgrp() /* SYSV, POSIX */ -+# else -+# define GETMYPGRP() getpgrp(0) -+# endif /* !GETPGRP_VOID */ -+#elif defined(GETPGID) -+# define GETMYPGRP() GETPGID(getpid()) -+#else -+/* probably some build error occured */ -+# error "don't know how to get my process group id" -+#endif /* GETMYPGRP */ -+ - #define MAXCHG 80 /* ²òÀϲÄǽʸ»ú¿ô */ - /*´Á»ú¥Ð¥Ã¥Õ¥¡(¼¡¸õÊ䡢ñ¸ì¸¡º÷¤Ê¤É)¤ÎÂ礤µ */ - #define MAX_ICHIRAN_KOSU 36 /* °ìÍ÷ɽ¼¨»ú¤Îɽ¼¨¸Ä¿ô */ diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_setutmp.c b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_setutmp.c deleted file mode 100644 index fa4c9fa15a3..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_setutmp.c +++ /dev/null @@ -1,424 +0,0 @@ -$NetBSD: patch-Wnn_uum_setutmp.c,v 1.1 2011/09/13 07:23:18 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/uum/setutmp.c.orig 2002-06-22 13:26:21.000000000 +0000 -+++ Wnn/uum/setutmp.c -@@ -10,9 +10,9 @@ - * 1987, 1988, 1989, 1990, 1991, 1992 - * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 -- * Copyright FreeWnn Project 1999, 2000, 2002 -+ * Copyright FreeWnn Project 1999, 2000, 2002, 2006, 2009 - * -- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+ * Maintainer: FreeWnn Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -35,7 +35,6 @@ - #include <stdio.h> - #if STDC_HEADERS - # include <string.h> --# include <time.h> - #else - # if HAVE_STRINGS_H - # include <strings.h> -@@ -45,14 +44,40 @@ - # endif - #endif /* STDC_HEADERS */ - #include <sys/types.h> -+#include <pwd.h> - #if HAVE_FCNTL_H - # include <fcntl.h> - #endif --#include <pwd.h> -+#if TIME_WITH_SYS_TIME -+# include <sys/time.h> -+# include <time.h> -+#else -+# if HAVE_SYS_TIME_H -+# include <sys/time.h> -+# else -+# include <time.h> -+# endif /* HAVE_SYS_TIME_H */ -+#endif /* TIME_WITH_SYS_TIME */ - #if HAVE_UNISTD_H - # include <unistd.h> - #endif --#include <utmp.h> -+#if HAVE_UTMPX_H -+# include <utmpx.h> -+#endif -+#if HAVE_UTMP_H -+# include <utmp.h> -+#endif -+#if !HAVE_UTMPX_H && !HAVE_UTMP_H -+# error "No utmp/utmpx header." -+#endif -+ -+#if HAVE_STRUCT_UTMP_UT_NAME -+# define UT_USER ut_name -+#elif HAVE_STRUCT_UTMP_UT_USER -+# define UT_USER ut_user -+#else -+# error "No member that indicates user in struct utmp." -+#endif - - #include "commonhd.h" - #include "sdefine.h" -@@ -60,16 +85,17 @@ - - #define public - --#if defined(SVR4) && !defined(DGUX) --#include <utmpx.h> --static struct utmpx saveut; --static struct utmpx nullut; --#else /* SVR4 */ -+#if USE_UTMP && !HAVE_LIBSPT -+ -+/* Set alias macro UTMP_TRADITIONAL */ -+#if !HAVE_PUTUTXLINE && !HAVE_PUTUTLINE /* && !(defined(BSD) && (BSD >= 199306)) */ -+# define UTMP_TRADITIONAL 1 -+#endif -+ -+#ifdef UTMP_TRADITIONAL - static struct utmp saveut; - static struct utmp nullut; --#endif /* SVR4 */ - --#ifdef BSD42 - static int savslotnum = 0; - static char savttynm[8]; - static int suf = 0; -@@ -82,8 +108,8 @@ static int suf = 0; - # endif - #endif - --public int --saveutmp () -+static int -+saveutmp_traditional (void) - { - register int utmpFd; - register char *p; -@@ -103,16 +129,15 @@ saveutmp () - lseek (utmpFd, savslotnum * (sizeof saveut), 0); - read (utmpFd, &saveut, sizeof saveut); - close (utmpFd); -- strncpy (nullut.ut_line, saveut.ut_line, 8); -- strncpy (nullut.ut_host, saveut.ut_host, 16); -+ strncpy (nullut.ut_line, saveut.ut_line, sizeof(nullut.ut_line)); -+ strncpy (nullut.ut_host, saveut.ut_host, sizeof(nullut.ut_host)); - nullut.ut_time = saveut.ut_time; - suf = 1; - return 0; - } - --public int --setutmp (ttyFd) -- int ttyFd; -+static int -+setutmp_traditional (int ttyFd) - { - int utmpFd; - struct utmp ut; -@@ -124,8 +149,11 @@ setutmp (ttyFd) - bzero (&ut, sizeof ut); - if ((p = ttyname (ttyFd)) == NULL) - return -1; -- strncpy (ut.ut_line, strrchr (p, '/') + 1, 8); -- strncpy (ut.ut_name, getpwuid (getuid ())->pw_name, 8); -+ -+ if (!strncmp(p, "/dev/", 5)) -+ p += 5; -+ strncpy (ut.ut_line, p, sizeof (ut.ut_line)); -+ strncpy (ut.UT_USER, getpwuid (getuid ())->pw_name, sizeof(ut.UT_USER)); - ut.ut_time = time (0); - strncpy (ut.ut_host, savttynm, 8); - if (!(i = ttyfdslot (ttyFd))) -@@ -139,94 +167,230 @@ setutmp (ttyFd) - close (utmpFd); - return 0; - } --#endif /* BSD42 */ - --#ifdef SYSVR2 --public int --setutmp (ttyFd) -- int ttyFd; -+static int -+resetutmp_traditional (int ttyFd) - { -+ int utmpFd; - struct utmp ut; - char *p; -- struct passwd *getpwuid (); -+ int i; - -- memset (&ut, 0, sizeof ut); -+ bzero (&ut, sizeof ut); - if ((p = ttyname (ttyFd)) == NULL) - return -1; -- strncpy (ut.ut_line, strrchr (p, '/') + 1, 12); -- strncpy (ut.ut_user, getpwuid (getuid ())->pw_name, 8); -+ if (!strncmp(p, "/dev/", 5)) -+ p += 5; -+ strncpy (ut.ut_line, p, sizeof(ut.ut_line)); -+ /* strncpy (ut.ut_line, strrchr (p, '/') + 1, 8); */ - ut.ut_time = time (0); -+ if (!(i = ttyfdslot (ttyFd))) -+ return -1; -+ if ((utmpFd = open (_PATH_UTMP, O_RDWR, 0)) < 0) -+ return -1; -+ lseek (utmpFd, savslotnum * (sizeof saveut), 0); -+ write (utmpFd, &saveut, sizeof saveut); -+ lseek (utmpFd, i * (sizeof ut), 0); -+ write (utmpFd, &ut, sizeof ut); -+ close (utmpFd); -+ return 0; -+} -+#endif /* UTMP_TRADITIONAL */ -+ -+static void -+build_utid (char *ut_id, char *ut_line, int size) -+{ - #ifdef DGUX -- strncpy (ut.ut_id, &ut.ut_line[3], 4); -+ strncpy (ut_id, &ut_line[3], size); - #else -- strncpy (ut.ut_id, &ut.ut_line[2], 4); -- ut.ut_id[0] = 't'; -+ /* FIXME: ¤³¤ÎÊÕ¤ê¤Î̿̾ˡ§¤¬¤è¤¯Ê¬¤«¤é¤Ê¤¤ */ -+ strncpy (ut_id, &ut_line[2], size); -+ ut_id[0] = 't'; - #endif /* DGUX */ -- ut.ut_pid = getpid (); -- ut.ut_type = USER_PROCESS; -- setutent (); /* is it necessary? */ -- getutid (&ut); -- pututline (&ut); -- endutent (); -+} -+ -+public int -+saveutmp (void) -+{ -+#if UTMP_TRADITIONAL && !defined(DGUX) -+ return saveutmp_traditional(); -+#else - return 0; -+#endif - } --#endif /* SYSVR2 */ - --#ifdef BSD42 - public int --resetutmp (ttyFd) -- int ttyFd; -+setutmp (int ttyFd) - { -- int utmpFd; -+#if UTMP_TRADITIONAL -+ return setutmp_traditional (ttyFd); -+#else /* !UTMP_TRADITIONAL */ -+ -+#if HAVE_PUTUTXLINE -+ struct utmpx utx; -+ intfnptr saved_handler = NULL; -+#endif - struct utmp ut; -+ int ut_err = -1; - char *p; -- int i; -+ /* struct passwd *getpwuid (); */ - -- bzero (&ut, sizeof ut); -+ memset (&ut, 0, sizeof ut); - if ((p = ttyname (ttyFd)) == NULL) - return -1; -- strncpy (ut.ut_line, strrchr (p, '/') + 1, 8); -+ -+ if (!strncmp(p, "/dev/", 5)) -+ p += 5; -+ strncpy (ut.ut_line, p, sizeof (ut.ut_line)); -+ strncpy (ut.UT_USER, getpwuid (getuid ())->pw_name, sizeof(ut.UT_USER)); - ut.ut_time = time (0); -- if (!(i = ttyfdslot (ttyFd))) -- return -1; -- if ((utmpFd = open (_PATH_UTMP, O_RDWR, 0)) < 0) -+#if HAVE_STRUCT_UTMP_UT_ID -+ build_utid(ut.ut_id, ut.ut_line, 4); -+ /* -+ * Maybe systems that does not have struct utmp.ut_id -+ * does not have utmp.ut_pid / ut_type ... -+ */ -+ ut.ut_pid = getpid (); -+ ut.ut_type = USER_PROCESS; -+#endif -+ -+#if HAVE_PUTUTXLINE -+ getutmpx (&ut, &utx); -+# if ! HAVE_STRUCT_UTMP_UT_ID -+ /* Assume all struct utmpx has this parameters ... */ -+ build_utid(utx.ut_id, utx.ut_line, 4); -+ utx.ut_pid = getpid (); -+ utx.ut_type = USER_PROCESS; -+# endif -+ setutxent (); /* is it necessary? */ -+ getutxid (&utx); -+ /* -+ * For systems that have utmp-update helper (ex. Solaris, NetBSD-4), -+ * we temporally stop using chld_handler to correctly wait() -+ * for helper on its implementation if user is normal user and -+ * uum isn't either setuid or setgid process. -+ * (You may get problem if uum catch SIGCHLD at that time ...) -+ */ -+ if (getuid() != 0 && getuid() == geteuid() && getgid() == getegid()) { -+ saved_handler = signal(SIGCHLD, SIG_DFL); -+ } -+ if (pututxline (&utx) == NULL) { -+ /* perror("pututxline() failed:"); */ /* for DEBUG */ -+ ut_err = 1; -+ } else { -+ ut_err = 0; -+ } -+ if (saved_handler != NULL) { -+ signal(SIGCHLD, saved_handler); /* restore handler */ -+ } -+ endutxent(); -+#endif /* HAVE_PUTUTXLINE */ -+#if HAVE_PUTUTLINE -+ /* Set utmp if setting utmpx fails (or non-utmpx system) */ -+ if (ut_err != 0) { -+ setutent (); /* is it necessary? */ -+ getutid (&ut); -+ pututline (&ut); /* We don't check return value */ -+ endutent (); -+ ut_err = 0; -+ } -+#endif /* HAVE_PUTUTLINE */ -+ if (ut_err == 0) { -+ return 0; -+ } else { - return -1; -- lseek (utmpFd, savslotnum * (sizeof saveut), 0); -- write (utmpFd, &saveut, sizeof saveut); -- lseek (utmpFd, i * (sizeof ut), 0); -- write (utmpFd, &ut, sizeof ut); -- close (utmpFd); -- return 0; -+ } -+#endif /* !UTMP_TRADITIONAL */ - } --#endif /* BSD42 */ - --#ifdef SYSVR2 - public int --resetutmp (ttyFd) -- int ttyFd; -+resetutmp (int ttyFd) - { -+#if UTMP_TRADITIONAL -+ return resetutmp_traditional (ttyFd); -+#else /* !UTMP_TRADITIONAL */ -+ -+#if HAVE_PUTUTXLINE -+ struct utmpx utx; -+#endif - struct utmp ut; -+ int ut_err = -1; - char *p; -- struct passwd *getpwuid (); -+ /* struct passwd *getpwuid (); */ - - memset (&ut, 0, sizeof ut); - if ((p = ttyname (ttyFd)) == NULL) - return -1; -- strncpy (ut.ut_line, strrchr (p, '/') + 1, 12); -- strncpy (ut.ut_user, getpwuid (getuid ())->pw_name, 8); -+ if (!strncmp(p, "/dev/", 5)) -+ p += 5; -+ strncpy (ut.ut_line, p, sizeof (ut.ut_line)); -+/* strncpy (ut.ut_line, strrchr (p, '/') + 1, 12); */ -+ strncpy (ut.UT_USER, getpwuid (getuid ())->pw_name, sizeof(ut.UT_USER)); - ut.ut_time = time (0); --#ifdef DGUX -- strncpy (ut.ut_id, &ut.ut_line[3], 4); --#else -- strncpy (ut.ut_id, &ut.ut_line[2], 4); -- ut.ut_id[0] = 't'; --#endif /* DGUX */ -+#if HAVE_STRUCT_UTMP_UT_ID -+ build_utid(ut.ut_id, ut.ut_line, 4); -+ /* -+ * Maybe systems that does not have struct utmp.ut_id -+ * does not have utmp.ut_pid / ut_type ... -+ */ - ut.ut_pid = getpid (); - ut.ut_type = DEAD_PROCESS; /* not sure */ -- setutent (); /* is it necessary? */ -- getutid (&ut); -- pututline (&ut); -- endutent (); -+#endif -+ -+#if HAVE_PUTUTXLINE -+ getutmpx (&ut, &utx); -+# if ! HAVE_STRUCT_UTMP_UT_ID -+ /* Assume all struct utmpx has this parameters ... */ -+ build_utid(utx.ut_id, utx.ut_line, 4); -+ utx.ut_pid = getpid (); -+ utx.ut_type = DEAD_PROCESS; /* not sure */ -+# endif -+ setutxent (); /* is it necessary? */ -+ getutxid (&utx); -+ /* We don't change SIGCHLD handler for now */ -+ if (pututxline (&utx) == NULL) { -+ ut_err = 1; -+ } else { -+ ut_err = 0; -+ } -+ endutxent(); -+#endif /* HAVE_PUTUTXLINE */ -+#if HAVE_PUTUTLINE -+ /* Set utmp if setting utmpx fails (or non-utmpx system) */ -+ if (ut_err != 0) { -+ setutent (); /* is it necessary? */ -+ getutid (&ut); -+ pututline (&ut); /* We don't check return value */ -+ endutent (); -+ ut_err = 0; -+ } -+#endif /* HAVE_PUTUTLINE */ -+ if (ut_err == 0) { -+ return 0; -+ } else { -+ return -1; -+ } - return 0; -+#endif /* !UTMP_TRADITIONAL */ -+} -+ -+#else /* ! USE_UTMP */ -+/* We don't use setutmp feature. Set dummy function. */ -+public int -+saveutmp (void) -+{ -+ return 1; -+} -+ -+public int -+setutmp (int ttyFd) -+{ -+ return 1; -+} -+ -+public int -+resetutmp (int ttyFd) -+{ -+ return 1; - } --#endif /* SYSVR2 */ -+#endif /* ! USE_UTMP */ diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_sheader.h b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_sheader.h deleted file mode 100644 index 0a7c6954ef5..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_sheader.h +++ /dev/null @@ -1,69 +0,0 @@ -$NetBSD: patch-Wnn_uum_sheader.h,v 1.1 2011/09/13 07:23:19 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/uum/sheader.h.orig 2003-05-11 18:29:24.000000000 +0000 -+++ Wnn/uum/sheader.h -@@ -10,9 +10,9 @@ - * 1987, 1988, 1989, 1990, 1991, 1992 - * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 -- * Copyright FreeWnn Project 1999, 2000, 2002-2003 -+ * Copyright FreeWnn Project 1999, 2000, 2002, 2003, 2006 - * -- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+ * Maintainer: FreeWnn Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -209,9 +209,22 @@ extern void uum_err (char *); - extern void FPRINTF (); - extern void PRINTF (); - -+/* setutmp.c */ -+extern int saveutmp (void); -+extern int resetutmp (int ttyFd); -+extern int setutmp (int ttyFd); -+ - /* ttyfdslot.c */ - extern int ttyfdslot (int fd); - -+#if HAVE_TERMINFO -+/* termio.c */ -+extern int openTermData (void); -+#else -+/* termcap.c */ -+extern int getTermData (void); -+#endif -+ - /* to be classified */ - extern void b_s_off_raw (void); - extern void b_s_on_raw (void); -@@ -249,7 +262,6 @@ extern int find_entry (char *); - extern void flushw_buf (void); - extern int forward_char (void); - extern int backward_char (void); --extern int getTermData (); - extern void get_end_of_history (); - extern void getfname (); - extern void h_r_off (); -@@ -310,11 +322,9 @@ extern int isconect_jserver (); - extern int ren_henkan0 (); - extern void reset_bold (); - extern void reset_cursor_status (); --extern int resetutmp (); - extern void restore_cursor_raw (); - extern void ring_bell (); - extern void save_cursor_raw (); --extern int saveutmp (); - extern void scroll_up (); - extern int select_jikouho1 (); - extern int select_line_element (); -@@ -330,7 +340,6 @@ extern void set_screen_vars_default (); - extern void set_keypad_on (); - extern void set_keypad_off (); - extern void set_scroll_region (); --extern int setutmp (); - extern int st_colum (); - extern void t_cont_line_note_delete (); - extern int t_delete_char (); diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_termcap.c b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_termcap.c deleted file mode 100644 index 204f40e9fe9..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_termcap.c +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-Wnn_uum_termcap.c,v 1.1 2011/09/13 07:23:19 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/uum/termcap.c.orig 2002-06-13 21:27:47.000000000 +0000 -+++ Wnn/uum/termcap.c -@@ -89,7 +89,7 @@ char *Term_UnderScoreEnd; - - char *Term_KeyPadOn; - char *Term_KeyPadOff; --#ifdef TERMCAP -+#if !HAVE_TERMINFO /* Assume TERMCAP */ - char *Term_CursorNormal; - char *Term_CursorInvisible; - -@@ -564,4 +564,4 @@ strascii (dest, str) - *dest = '\0'; - } - --#endif /* TERMCAP */ -+#endif /* !HAVE_TERMINFO */ diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_termio.c b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_termio.c deleted file mode 100644 index c1c01570374..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_termio.c +++ /dev/null @@ -1,93 +0,0 @@ -$NetBSD: patch-Wnn_uum_termio.c,v 1.1 2011/09/13 07:23:19 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/uum/termio.c.orig 2002-06-13 21:27:47.000000000 +0000 -+++ Wnn/uum/termio.c -@@ -10,9 +10,9 @@ - * 1987, 1988, 1989, 1990, 1991, 1992 - * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 -- * Copyright FreeWnn Project 1999, 2000, 2002 -+ * Copyright FreeWnn Project 1999, 2000, 2002, 2006 - * -- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+ * Maintainer: FreeWnn Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -35,13 +35,25 @@ - #include <stdio.h> - #if STDC_HEADERS - # include <stdlib.h> -+# include <string.h> -+#else -+# if defined (HAVE_STRINGS_H) -+# include <strings.h> -+# endif /* HAVE_STRINGS_H */ - #endif /* STDC_HEADERS */ - - #include "commonhd.h" - #include "sdefine.h" - #include "sheader.h" - --#ifdef TERMINFO -+/* -+ * tparm() macro for fixed argument prototype systems: -+ * It may not harm on systems that tparm() has variable argument prototype -+ * (or no prototype for compatibility). -+ */ -+#define TPARM_3ARGS(func, p1, p2) tparm((func), (p1), (p2), 0,0,0,0,0,0,0) -+ -+#ifdef HAVE_TERMINFO - #include <stdio.h> - #include <curses.h> - #include <term.h> -@@ -67,7 +79,7 @@ openTermData () - { - char *cp, *get_kbd_env (); - int status; -- int k; -+ /* int k; */ - char lcode[10]; - char termchar[20]; - char errprefix[1024] = "error"; -@@ -112,9 +124,13 @@ openTermData () - fprintf (stderr, "Your terminal is not strong enough. Goodbye !\n"); - return (-1); - } -+ /* -+ * setenv TERM "${TERM}-j" to prevent starting uum over -+ * uum-controled terminal (disabled for now ...) -+ */ - termchar[0] = 0; - strcat (termchar, cp); -- strcat (termchar, "-j"); -+ /* strcat (termchar, "-j"); */ - if (setenv ("TERM", termchar, 1) != 0) - { - #if HAVE_SNPRINTF -@@ -190,7 +206,7 @@ void - set_scroll_region (start, end) - int start, end; - { -- tputs (tparm (change_scroll_region, start, end), 1, putchar); -+ tputs (TPARM_3ARGS (change_scroll_region, start, end), 1, putchar); - } - - void -@@ -218,7 +234,7 @@ void - throw_cur_raw (col, row) - int col, row; - { -- tputs (tparm (cursor_address, row, col), 1, putchar); -+ tputs (TPARM_3ARGS (cursor_address, row, col), 1, putchar); - } - - void -@@ -294,4 +310,4 @@ cursor_normal_raw () - tputs (cursor_normal, 1, putchar); - } - --#endif /* TERMINFO */ -+#endif /* HAVE_TERMINFO */ diff --git a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_touroku.c b/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_touroku.c deleted file mode 100644 index ea42454e3ea..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_touroku.c +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-Wnn_uum_touroku.c,v 1.1 2011/09/13 07:23:19 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- Wnn/uum/touroku.c.orig 2001-06-14 18:16:08.000000000 +0000 -+++ Wnn/uum/touroku.c -@@ -10,9 +10,9 @@ - * 1987, 1988, 1989, 1990, 1991, 1992 - * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 -- * Copyright FreeWnn Project 1999, 2000 -+ * Copyright FreeWnn Project 1999, 2000, 2006 - * -- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+ * Maintainer: FreeWnn Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -31,7 +31,19 @@ - - /* ÅÐÏ¿¤Î¤¿¤á¤Î¥ë¡¼¥Á¥ó */ - -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ - #include <stdio.h> -+#if STDC_HEADERS -+# include <string.h> -+#else -+# if HAVE_STRINGS_H -+# include <strings.h> -+# endif -+#endif /* STDC_HEADERS */ -+ - #include "jllib.h" - #include "commonhd.h" - #include "sdefine.h" diff --git a/inputmethod/ja-freewnn-lib/patches/patch-aclocal.m4 b/inputmethod/ja-freewnn-lib/patches/patch-aclocal.m4 deleted file mode 100644 index 63d0998dc03..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-aclocal.m4 +++ /dev/null @@ -1,4272 +0,0 @@ -$NetBSD: patch-aclocal.m4,v 1.1 2011/09/13 07:23:19 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- aclocal.m4.orig 2003-06-04 08:35:02.000000000 +0000 -+++ aclocal.m4 -@@ -13,7 +13,7 @@ - - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - --# serial 47 AC_PROG_LIBTOOL -+# serial 52 AC_PROG_LIBTOOL - - - # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -@@ -101,7 +101,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl - AC_REQUIRE([AC_OBJEXT])dnl - AC_REQUIRE([AC_EXEEXT])dnl - dnl -- - AC_LIBTOOL_SYS_MAX_CMD_LEN - AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE - AC_LIBTOOL_OBJDIR -@@ -123,7 +122,7 @@ 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//' -+Xsed='sed -e 1s/^X//' - [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] - - # Same as above, but do not quote variable references. -@@ -143,7 +142,7 @@ rm="rm -f" - default_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" -@@ -163,6 +162,7 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - test -z "$AS" && AS=as - test -z "$CC" && CC=cc - test -z "$LTCC" && LTCC=$CC -+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS - test -z "$DLLTOOL" && DLLTOOL=dlltool - test -z "$LD" && LD=ld - test -z "$LN_S" && LN_S="ln -s" -@@ -175,22 +175,24 @@ 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_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="\$RANLIB -t \$oldlib~$old_postinstall_cmds" -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" - ;; - *) -- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - 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 - case $deplibs_check_method in - file_magic*) -@@ -200,6 +202,8 @@ file_magic*) - ;; - esac - -+_LT_REQUIRED_DARWIN_CHECKS -+ - 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) -@@ -231,11 +235,129 @@ AC_DEFUN([_LT_AC_SYS_COMPILER], - # 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_CC_BASENAME(CC) -+# ------------------- -+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -+AC_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_COMPILER_BOILERPLATE -+# ------------------------ -+# Check for compiler boilerplate output or warnings with -+# the simple compiler test code. -+AC_DEFUN([_LT_COMPILER_BOILERPLATE], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+])# _LT_COMPILER_BOILERPLATE -+ -+ -+# _LT_LINKER_BOILERPLATE -+# ---------------------- -+# Check for linker boilerplate output or warnings with -+# the simple link test code. -+AC_DEFUN([_LT_LINKER_BOILERPLATE], -+[AC_REQUIRE([LT_AC_PROG_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 -+# -------------------------- -+# Check for some things on darwin -+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ -+ case $host_os in -+ rhapsody* | darwin*) -+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) -+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) -+ -+ 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. -+ echo "int foo(void){return 1;}" > conftest.c -+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+ -dynamiclib ${wl}-single_module conftest.c -+ if test -f libconftest.dylib; then -+ lt_cv_apple_cc_single_mod=yes -+ rm -rf libconftest.dylib* -+ fi -+ rm conftest.c -+ 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.[[0123]]) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -+ darwin1.*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ darwin*) -+ # 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_AC_SYS_LIBPATH_AIX - # ---------------------- - # Links a minimal program and checks the executable -@@ -245,12 +367,20 @@ compiler=$CC - # 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; } --}'` -+[AC_REQUIRE([LT_AC_PROG_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 - -@@ -308,15 +438,15 @@ 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 -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - 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`" && -+ 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 -@@ -481,17 +611,21 @@ ia64-*-hpux*) - 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*|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 -+ 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*) -+ ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) -@@ -504,6 +638,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li - ;; - *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" - ;; -@@ -536,6 +673,26 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li - CFLAGS="$SAVE_CFLAGS" - fi - ;; -+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* -+ ;; -+ - AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], - [*-*-cygwin* | *-*-mingw* | *-*-pw32*) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) -@@ -555,10 +712,11 @@ need_locks="$enable_libtool_lock" - # ---------------------------------------------------------------- - # Check whether the given compiler option works - AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], --[AC_CACHE_CHECK([$1], [$2], -+[AC_REQUIRE([LT_AC_PROG_SED]) -+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 -+ 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 +724,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,8 +734,10 @@ 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 -@@ -597,22 +757,28 @@ fi - # ------------------------------------------------------------ - # Check whether the given compiler option works - AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], --[AC_CACHE_CHECK([$1], [$2], -+[AC_REQUIRE([LT_AC_PROG_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" - ]) - -@@ -631,7 +797,7 @@ AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], - 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*) -@@ -660,24 +826,77 @@ 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 -+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ -+ = "XX$teststring") >/dev/null 2>&1 && -+ new_result=`expr "X$teststring" : ".*" 2>&1` && -+ lt_cv_sys_max_cmd_len=$new_result && -+ test $i != 17 # 1/2 MB should be enough -+ do -+ i=`expr $i + 1` -+ teststring=$teststring$teststring -+ done -+ 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 - ]) -@@ -690,7 +909,7 @@ fi - - - # _LT_AC_CHECK_DLFCN --# -------------------- -+# ------------------ - AC_DEFUN([_LT_AC_CHECK_DLFCN], - [AC_CHECK_HEADERS(dlfcn.h)dnl - ])# _LT_AC_CHECK_DLFCN -@@ -698,7 +917,7 @@ AC_DEFUN([_LT_AC_CHECK_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 - if test "$cross_compiling" = yes; then : -@@ -764,17 +983,19 @@ int main () - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } -+ else -+ puts (dlerror ()); - - exit (status); - }] - 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 -@@ -786,7 +1007,7 @@ rm -fr conftest* - - - # AC_LIBTOOL_DLOPEN_SELF --# ------------------- -+# ---------------------- - AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], - [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl - if test "x$enable_dlopen" != xyes; then -@@ -823,12 +1044,12 @@ else - 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 +1057,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,7 +1078,7 @@ 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" -@@ -870,7 +1091,7 @@ else - ]) - - 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( -@@ -902,7 +1123,8 @@ fi - # --------------------------------- - # 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 -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_REQUIRE([_LT_AC_SYS_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 -@@ -910,14 +1132,7 @@ AC_CACHE_CHECK([if $compiler supports -c - 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 +1140,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,13 +1152,18 @@ 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 -+ $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_AC_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* -@@ -1002,8 +1222,8 @@ AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LI - [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 -+ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ -+ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && -@@ -1052,6 +1272,7 @@ else - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" -+ old_striplib="$STRIP -S" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) -@@ -1060,7 +1281,7 @@ fi - *) - AC_MSG_RESULT([no]) - ;; -- esac -+ esac - fi - ])# AC_LIBTOOL_SYS_LIB_STRIP - -@@ -1069,11 +1290,12 @@ fi - # ----------------------------- - # PORTME Fill in your ld.so characteristics - AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], --[AC_MSG_CHECKING([dynamic linker characteristics]) -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_MSG_CHECKING([dynamic linker characteristics]) - library_names_spec= - libname_spec='lib$name' - soname_spec= --shrext=".so" -+shrext_cmds=".so" - postinstall_cmds= - postuninstall_cmds= - finish_cmds= -@@ -1083,20 +1305,58 @@ shlibpath_overrides_runpath=unknown - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" -+m4_if($1,[],[ - 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 -+ 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. -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ lt_search_path_spec=`echo "$lt_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"` -+ 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 -+fi]) - need_lib_prefix=unknown - hardcode_into_libs=no - -@@ -1114,7 +1374,7 @@ aix3*) - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[[4-9]]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -1161,7 +1421,7 @@ 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' -+ 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*) -@@ -1170,7 +1430,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}' -@@ -1186,7 +1446,7 @@ bsdi4*) - - cygwin* | mingw* | pw32*) - version_type=windows -- shrext=".dll" -+ shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - -@@ -1198,7 +1458,8 @@ cygwin* | mingw* | pw32*) - 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' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' -@@ -1208,7 +1469,7 @@ cygwin* | mingw* | pw32*) - 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 DLLs use traditional 'lib' prefix -@@ -1228,7 +1489,7 @@ cygwin* | mingw* | pw32*) - ;; - 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 +1508,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' - 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 +1531,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 +1559,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 +1591,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 -@@ -1338,7 +1608,7 @@ hpux9* | hpux10* | hpux11*) - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) -- shrext='.sl' -+ shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -@@ -1349,7 +1619,7 @@ hpux9* | hpux10* | hpux11*) - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) -- shrext='.sl' -+ 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 +1631,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 +1686,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 -@@ -1418,6 +1700,12 @@ linux*) - # 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, -@@ -1436,7 +1724,7 @@ netbsd*) - 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,7 +1740,7 @@ newsos6) - shlibpath_overrides_runpath=yes - ;; - --nto-qnx) -+nto-qnx*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -1464,8 +1752,13 @@ nto-qnx) - - 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 -@@ -1485,7 +1778,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 +1796,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 +1825,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' -@@ -1568,6 +1858,29 @@ 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 -+ 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' -+ shlibpath_overrides_runpath=no -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ shlibpath_overrides_runpath=yes -+ 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' -+ ;; -+ - uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -1581,13 +1894,26 @@ uts4*) - esac - AC_MSG_RESULT([$dynamic_linker]) - test "$dynamic_linker" = no && can_build_shared=no -+ -+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], -+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], -+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ -+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 - ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER - - - # _LT_AC_TAGCONFIG - # ---------------- - AC_DEFUN([_LT_AC_TAGCONFIG], --[AC_ARG_WITH([tags], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_ARG_WITH([tags], - [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], - [include additional configurations @<:@automatic@:>@])], - [tagnames="$withval"]) -@@ -1605,6 +1931,9 @@ if test -f "$ltmain" && test -n "$tagnam - AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) - fi - fi -+ if test -z "$LTCFLAGS"; then -+ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" -+ fi - - # Extract list of available tagged configurations in $ofile. - # Note that this assumes the entire list is on one line. -@@ -1631,7 +1960,9 @@ if test -f "$ltmain" && test -n "$tagnam - - case $tagname in - CXX) -- if test -n "$CXX" && test "X$CXX" != "Xno"; then -+ if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then - AC_LIBTOOL_LANG_CXX_CONFIG - else - tagname="" -@@ -1693,7 +2024,7 @@ AC_DEFUN([AC_LIBTOOL_DLOPEN], - - # AC_LIBTOOL_WIN32_DLL - # -------------------- --# declare package support for building win32 dll's -+# declare package support for building win32 DLLs - AC_DEFUN([AC_LIBTOOL_WIN32_DLL], - [AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) - ])# AC_LIBTOOL_WIN32_DLL -@@ -1731,7 +2062,7 @@ AC_ARG_ENABLE([shared], - - # AC_DISABLE_SHARED - # ----------------- --#- set the default shared flag to --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) -@@ -1843,7 +2174,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC - - # AC_PATH_TOOL_PREFIX - # ------------------- --# find a file program which can recognise shared library -+# find a file program which can recognize shared library - AC_DEFUN([AC_PATH_TOOL_PREFIX], - [AC_REQUIRE([AC_PROG_EGREP])dnl - AC_MSG_CHECKING([for $1]) -@@ -1867,7 +2198,7 @@ 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 -@@ -1906,7 +2237,7 @@ fi - - # AC_PATH_MAGIC - # ------------- --# find a file program which can recognise a shared library -+# find a file program which can recognize a shared library - AC_DEFUN([AC_PATH_MAGIC], - [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) - if test -z "$lt_cv_path_MAGIC_CMD"; then -@@ -1921,7 +2252,7 @@ fi - - # AC_PROG_LD - # ---------- --# find the path to the GNU or non-GNU linker -+# find the pathname to the GNU or non-GNU linker - AC_DEFUN([AC_PROG_LD], - [AC_ARG_WITH([gnu-ld], - [AC_HELP_STRING([--with-gnu-ld], -@@ -1947,7 +2278,7 @@ if test "$GCC" = yes; then - # Accept absolute paths. - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' -- # Canonicalize the path of ld -+ # 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%/%"` -@@ -1977,7 +2308,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'*) -@@ -2009,8 +2340,8 @@ 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 -+[# 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 - ;; -@@ -2036,6 +2367,15 @@ 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 - ])# AC_PROG_LD_RELOAD_FLAG - - -@@ -2044,7 +2384,7 @@ reload_cmds='$LD$reload_flag -o $output$ - # 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], -+[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 +2401,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 +2409,42 @@ 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 - ;; - - 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*) -+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 +2460,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,37 +2476,24 @@ 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*) -@@ -2181,37 +2510,31 @@ newos6*) - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - --nto-qnx) -+nto-qnx*) - lt_cv_deplibs_check_method=unknown - ;; - - 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' -+ 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*) -+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 +2555,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*) -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - esac -@@ -2248,43 +2574,50 @@ test -z "$deplibs_check_method" && depli - - # AC_PROG_NM - # ---------- --# find the path to a BSD-compatible name lister -+# find the pathname to a BSD-compatible name lister - AC_DEFUN([AC_PROG_NM], - [AC_CACHE_CHECK([for BSD-compatible 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 - fi]) - NM="$lt_cv_path_NM" -@@ -2316,13 +2649,13 @@ esac - # ----------------------------------- - # 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. -+# --enable-ltdl-convenience to the configure arguments. Note that -+# AC_CONFIG_SUBDIRS is not called here. 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 -@@ -2341,13 +2674,13 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE], - # ----------------------------------- - # 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. -+# --enable-ltdl-install to the configure arguments. Note that -+# AC_CONFIG_SUBDIRS is not called here. 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 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 -@@ -2385,10 +2718,21 @@ AC_DEFUN([AC_LIBTOOL_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/^,//'`]) -+AC_REQUIRE([_LT_AC_PROG_CXXCPP]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) - ])# _LT_AC_LANG_CXX - -+# _LT_AC_PROG_CXXCPP -+# ------------------ -+AC_DEFUN([_LT_AC_PROG_CXXCPP], -+[ -+AC_REQUIRE([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 -+fi -+])# _LT_AC_PROG_CXXCPP - - # AC_LIBTOOL_F77 - # -------------- -@@ -2402,7 +2746,7 @@ AC_DEFUN([AC_LIBTOOL_F77], - # --------------- - AC_DEFUN([_LT_AC_LANG_F77], - [AC_REQUIRE([AC_PROG_F77]) --_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,F77" | sed 's/^,//'`]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) - ])# _LT_AC_LANG_F77 - - -@@ -2423,16 +2767,16 @@ AC_DEFUN([_LT_AC_LANG_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_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) - ])# _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/^,//'`]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) - ])# AC_LIBTOOL_RC - - -@@ -2454,55 +2798,28 @@ 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" -+lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests --lt_simple_link_test_code='int main(){return(0);}\n' -+lt_simple_link_test_code='int main(){return(0);}' - - _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 -- -- --# --# 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)=]) -- -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE - - 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_SYS_DYNAMIC_LINKER($1) - AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) - AC_LIBTOOL_SYS_LIB_STRIP --AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) --AC_LIBTOOL_DLOPEN_SELF($1) -+AC_LIBTOOL_DLOPEN_SELF - --# Report which librarie types wil actually be built -+# Report which library types will actually be built - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - -@@ -2511,7 +2828,7 @@ test "$can_build_shared" = "no" && enabl - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. --case "$host_os" in -+case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then -@@ -2520,39 +2837,11 @@ aix3*) - fi - ;; - --aix4*) -+aix[[4-9]]*) - 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 -- _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 -- ;; -+ ;; - esac - AC_MSG_RESULT([$enable_shared]) - -@@ -2577,7 +2866,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [ - AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], - [AC_LANG_PUSH(C++) - AC_REQUIRE([AC_PROG_CXX]) --AC_REQUIRE([AC_PROG_CXXCPP]) -+AC_REQUIRE([_LT_AC_PROG_CXXCPP]) - - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(allow_undefined_flag, $1)= -@@ -2589,6 +2878,7 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, - _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_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(hardcode_automatic, $1)=no - _LT_AC_TAGVAR(module_cmds, $1)= - _LT_AC_TAGVAR(module_expsym_cmds, $1)= -@@ -2604,23 +2894,28 @@ _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(compiler_lib_search_dirs, $1)= - - # Source file extension for C++ test sources. --ac_ext=cc -+ac_ext=cpp - - # 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" -+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); }\n' -+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_AC_SYS_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 -@@ -2631,18 +2926,18 @@ 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 -+ $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 -- unset lt_cv_path_LD -+ $as_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%^.*/%%'` -+_LT_CC_BASENAME([$compiler]) - - # We don't want -fno-exception wen compiling C++ code, so set the - # no_builtin_flag separately -@@ -2687,7 +2982,7 @@ if test "$GXX" = yes; then - # 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' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists -@@ -2709,7 +3004,7 @@ case $host_os in - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- aix4* | aix5*) -+ 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. -@@ -2722,7 +3017,7 @@ case $host_os in - # 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*) -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) -@@ -2731,6 +3026,7 @@ case $host_os in - ;; - esac - done -+ ;; - esac - - exp_sym_flag='-bexport' -@@ -2749,7 +3045,7 @@ case $host_os in - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - if test "$GXX" = yes; then -- case $host_os in aix4.[012]|aix4.[012].*) -+ 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` -@@ -2757,7 +3053,7 @@ case $host_os in - 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 -@@ -2768,8 +3064,12 @@ case $host_os in - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_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 -@@ -2796,12 +3096,12 @@ case $host_os in - _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" -+ _LT_AC_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 "${wl}${allow_undefined_flag}"; else :; fi` '"\${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" -+ _LT_AC_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_AC_SYS_LIBPATH_AIX -@@ -2810,16 +3110,26 @@ case $host_os in - # -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(whole_archive_flag_spec, $1)='$convenience' - _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' -+ # This is similar to how AIX traditionally builds its shared libraries. -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; -+ -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_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 -+ ;; -+ - chorus*) - case $cc_basename in - *) -@@ -2838,7 +3148,7 @@ case $host_os in - _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' -+ _LT_AC_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_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -@@ -2847,57 +3157,53 @@ case $host_os in - 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' -+ $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_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' -- ;; -- *) # Darwin 1.3 on -- test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-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 -- _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 -- ;; -+ darwin* | rhapsody*) -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _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)='' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" -+ if test "$GXX" = yes ; then -+ 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_dar_single_mod${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ _LT_AC_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_AC_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}" -+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then -+ _LT_AC_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_AC_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 -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~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 $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ fi -+ ;; - - dgux*) - case $cc_basename in -- ec++) -+ ec++*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- ghcx) -+ ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no -@@ -2908,14 +3214,14 @@ case $host_os in - ;; - esac - ;; -- freebsd[12]*) -+ 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* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_AC_TAGVAR(ld_shlibs, $1)=yes -@@ -2932,11 +3238,11 @@ case $host_os in - # location of the library. - - case $cc_basename in -- CC) -+ CC*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- aCC) -+ 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 -@@ -2946,7 +3252,7 @@ case $host_os in - # 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' -+ 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 -@@ -2960,33 +3266,20 @@ case $host_os in - ;; - hpux10*|hpux11*) - 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)=: -- ;; -- 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)=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) ;; - *) -- _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' - ;; - esac - fi -- case "$host_cpu" in -- hppa*64*) -- _LT_AC_TAGVAR(hardcode_direct, $1)=no -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -- ia64*) -+ case $host_cpu in -+ hppa*64*|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. - ;; - *) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes -@@ -2997,14 +3290,17 @@ case $host_os in - esac - - case $cc_basename in -- CC) -+ CC*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- aCC) -- case "$host_cpu" in -- hppa*64*|ia64*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' -+ aCC*) -+ case $host_cpu in -+ hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _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' -@@ -3023,9 +3319,12 @@ case $host_os in - *) - 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' -+ case $host_cpu in -+ hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_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_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' -@@ -3039,11 +3338,25 @@ case $host_os in - ;; - esac - ;; -+ interix[[3-9]]*) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_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_AC_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_AC_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) -+ 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' -+ _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 ${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 -@@ -3054,7 +3367,7 @@ case $host_os in - *) - 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' -+ _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}${output_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 -@@ -3065,9 +3378,9 @@ case $host_os in - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; -- linux*) -+ linux* | k*bsd*-gnu) - case $cc_basename in -- KCC) -+ KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file -@@ -3092,17 +3405,41 @@ case $host_os in - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; -- icpc) -+ icpc*) - # 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_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' -+ ;; -+ *) # Version 8.0 or newer -+ tmp_idyn= -+ case $host_cpu in -+ ia64*) tmp_idyn=' -i_dynamic';; -+ esac -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_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_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) -+ pgCC* | pgcpp*) -+ # Portland Group C++ compiler -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ _LT_AC_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' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_AC_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_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' -@@ -3121,6 +3458,29 @@ case $host_os in - # 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' - ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_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' -+ -+ # 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_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' -+ ;; -+ esac -+ ;; - esac - ;; - lynxos*) -@@ -3133,7 +3493,7 @@ case $host_os in - ;; - mvs*) - case $cc_basename in -- cxx) -+ cxx*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -@@ -3154,9 +3514,29 @@ case $host_os in - # 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::"' - ;; -+ openbsd2*) -+ # C++ shared libraries are fairly broken -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ _LT_AC_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_AC_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_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ fi -+ output_verbose_link_cmd='echo' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; - osf3*) - case $cc_basename in -- KCC) -+ KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file -@@ -3172,14 +3552,14 @@ case $host_os in - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - - ;; -- RCC) -+ RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- cxx) -+ 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(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 ${output_objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -@@ -3197,7 +3577,7 @@ case $host_os in - *) - 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(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}${output_objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -@@ -3216,7 +3596,7 @@ case $host_os in - ;; - osf4* | osf5*) - case $cc_basename in -- KCC) -+ KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file -@@ -3231,17 +3611,17 @@ case $host_os in - # the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' - ;; -- RCC) -+ RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- cxx) -+ 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_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 ${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~ -- $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~ -+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ - $rm $lib.exp' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -@@ -3260,7 +3640,7 @@ case $host_os in - *) - 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(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}${output_objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -@@ -3281,27 +3661,14 @@ case $host_os in - # 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 -- ;; -- *) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- esac -- ;; - sunos4*) - case $cc_basename in -- CC) -+ CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- lcc) -+ lcc*) - # Lucid - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no -@@ -3314,36 +3681,28 @@ case $host_os in - ;; - solaris*) - case $cc_basename in -- CC) -+ CC*) - # Sun C++ 4.2, 5.x and Centerline C++ -+ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes - _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_cmds, $1)='$CC -G${allow_undefined_flag} -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' -+ $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_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].*) ;; -+ 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. -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. - # 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' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z 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' -+ 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 -@@ -3351,7 +3710,7 @@ case $host_os in - # in the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; -- gcx) -+ 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' - -@@ -3385,16 +3744,73 @@ case $host_os in - fi - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ ;; -+ esac - fi - ;; - esac - ;; -- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) -+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ ;; -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ # 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. -+ # So that behaviour is only enabled if SCOABSPATH is set to a -+ # non-empty value in the environment. Most likely only useful for -+ # creating official distributions of packages. -+ # This is a hack until libtool officially supports absolute path -+ # names for shared libraries. -+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac - ;; - tandem*) - case $cc_basename in -- NCC) -+ NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no -@@ -3425,10 +3841,8 @@ 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) -+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) - - AC_LIBTOOL_CONFIG($1) - -@@ -3446,12 +3860,13 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld - ])# AC_LIBTOOL_LANG_CXX_CONFIG - - # 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],[ -+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl - 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 -@@ -3500,7 +3915,7 @@ if AC_TRY_EVAL(ac_compile); then - # 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\"`" -+ 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 -@@ -3576,13 +3991,74 @@ fi - - $rm -f confest.$objext - -+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= -+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then -+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -+fi -+ -+# PORTME: override above test on systems where it is broken -+ifelse([$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_AC_TAGVAR(predep_objects,$1)= -+ _LT_AC_TAGVAR(postdep_objects,$1)= -+ _LT_AC_TAGVAR(postdeps,$1)= -+ ;; -+ -+linux*) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ # -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ if test "$solaris_use_stlport4" != yes; then -+ _LT_AC_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 -+ -+ # 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_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+esac -+]) - case " $_LT_AC_TAGVAR(postdeps, $1) " in - *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; - esac - ])# AC_LIBTOOL_POSTDEP_PREDEP - - # 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'. -@@ -3618,20 +4094,31 @@ objext=o - _LT_AC_TAGVAR(objext, $1)=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code=" subroutine t\n return\n end\n" -+lt_simple_compile_test_code="\ -+ subroutine t -+ return -+ end -+" - - # Code to be used in simple link tests --lt_simple_link_test_code=" program t\n end\n" -+lt_simple_link_test_code="\ -+ program t -+ end -+" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_AC_SYS_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" - CC=${F77-"f77"} - compiler=$CC - _LT_AC_TAGVAR(compiler, $1)=$CC --cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` -+_LT_CC_BASENAME([$compiler]) - - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) -@@ -3641,7 +4128,7 @@ test "$can_build_shared" = "no" && enabl - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. --case "$host_os" in -+case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then -@@ -3649,8 +4136,10 @@ aix3*) - postinstall_cmds='$RANLIB $lib' - fi - ;; --aix4*) -- test "$enable_shared" = yes && enable_static=no -+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]) -@@ -3660,8 +4149,6 @@ AC_MSG_CHECKING([whether to build static - 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" - -@@ -3669,9 +4156,8 @@ 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_PROG_LD_HARDCODE_LIBPATH($1) - - AC_LIBTOOL_CONFIG($1) - -@@ -3697,32 +4183,37 @@ objext=o - _LT_AC_TAGVAR(objext, $1)=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code="class foo {}\n" -+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) {}; }\n' -+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_AC_SYS_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" - CC=${GCJ-"gcj"} - compiler=$CC - _LT_AC_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) - - # GCJ did not exist at the time GCC didn't implicitly link libc in. - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - -+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+ - 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) -+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) - - AC_LIBTOOL_CONFIG($1) - -@@ -3732,7 +4223,7 @@ CC="$lt_save_CC" - - - # 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'. -@@ -3748,7 +4239,7 @@ objext=o - _LT_AC_TAGVAR(objext, $1)=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' -+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - - # Code to be used in simple link tests - lt_simple_link_test_code="$lt_simple_compile_test_code" -@@ -3756,11 +4247,16 @@ lt_simple_link_test_code="$lt_simple_com - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_AC_SYS_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" - CC=${RC-"windres"} - compiler=$CC - _LT_AC_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - - AC_LIBTOOL_CONFIG($1) -@@ -3786,11 +4282,12 @@ if test -f "$ltmain"; then - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -- fi -+ 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 \ -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ - 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 \ -@@ -3816,6 +4313,7 @@ if test -f "$ltmain"; then - _LT_AC_TAGVAR(predeps, $1) \ - _LT_AC_TAGVAR(postdeps, $1) \ - _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ -+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ - _LT_AC_TAGVAR(archive_cmds, $1) \ - _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ - _LT_AC_TAGVAR(postinstall_cmds, $1) \ -@@ -3831,6 +4329,7 @@ if test -f "$ltmain"; then - _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(fix_srcfile_path, $1) \ - _LT_AC_TAGVAR(exclude_expsyms, $1) \ - _LT_AC_TAGVAR(include_expsyms, $1); do - -@@ -3840,7 +4339,7 @@ if test -f "$ltmain"; then - _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(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 | \ -@@ -3877,7 +4376,7 @@ ifelse([$1], [], - # 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 -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 - # Free Software Foundation, Inc. - # - # This file is part of GNU Libtool: -@@ -3895,7 +4394,7 @@ ifelse([$1], [], - # - # 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. -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -3906,11 +4405,11 @@ ifelse([$1], [], - SED=$lt_SED - - # Sed that helps us avoid accidentally triggering echo(1) options like -n. --Xsed="$SED -e s/^X//" -+Xsed="$SED -e 1s/^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 -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - # The names of the tagged configurations supported by this script. - available_tags= -@@ -3941,6 +4440,12 @@ 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 - - # An echo program that does not interpret backslashes. - echo=$lt_echo -@@ -3952,6 +4457,9 @@ AR_FLAGS=$lt_AR_FLAGS - # A C compiler. - LTCC=$lt_LTCC - -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS -+ - # A language-specific compiler. - CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) - -@@ -3971,7 +4479,7 @@ LN_S=$lt_LN_S - NM=$lt_NM - - # A symbol stripping program --STRIP=$STRIP -+STRIP=$lt_STRIP - - # Used to examine libraries when file_magic_cmd begins "file" - MAGIC_CMD=$MAGIC_CMD -@@ -4002,7 +4510,7 @@ objext="$ac_objext" - libext="$libext" - - # Shared library suffix (normally ".so"). --shrext='$shrext' -+shrext_cmds='$shrext_cmds' - - # Executable file suffix (normally ""). - exeext="$exeext" -@@ -4017,7 +4525,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len - # Does compiler simultaneously support -c and -o options? - compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) - --# Must we lock files when doing compilation ? -+# Must we lock files when doing compilation? - need_locks=$lt_need_locks - - # Do we need the lib prefix for modules? -@@ -4105,6 +4613,10 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) - # shared library. - postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) -+ - # 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) -@@ -4193,7 +4705,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea - sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - - # Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) -@@ -4246,7 +4758,10 @@ 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" -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi - fi - ])# AC_LIBTOOL_CONFIG - -@@ -4273,6 +4788,7 @@ fi - # --------------------------------- - AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], - [AC_REQUIRE([AC_CANONICAL_HOST]) -+AC_REQUIRE([LT_AC_PROG_SED]) - AC_REQUIRE([AC_PROG_NM]) - AC_REQUIRE([AC_OBJEXT]) - # Check for command to grab the raw symbol name followed by C symbol from nm. -@@ -4288,9 +4804,6 @@ symcode='[[BCDEGRST]]' - # 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'" - -@@ -4312,14 +4825,30 @@ hpux*) # Its linker distinguishes data f - 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'" - ;; -+linux* | k*bsd*-gnu) -+ if test "$host_cpu" = ia64; then -+ symcode='[[ABCDGIRSTW]]' -+ 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'" -+ fi -+ ;; - irix* | nonstopux*) - symcode='[[BCDEGRST]]' - ;; - osf*) - symcode='[[BCDEGQRST]]' - ;; --solaris* | sysv5*) -- symcode='[[BDT]]' -+solaris*) -+ symcode='[[BDRT]]' -+ ;; -+sco3.2v5*) -+ symcode='[[DT]]' -+ ;; -+sysv4.2uw2*) -+ symcode='[[DT]]' -+ ;; -+sysv5* | sco5v6* | unixware* | OpenUNIX*) -+ symcode='[[ABDT]]' - ;; - sysv4) - symcode='[[DFNSTU]]' -@@ -4337,14 +4866,17 @@ esac - # If we're using GNU nm, then use its standard symbol codes. - case `$NM -V 2>&1` in - *GNU* | *'with BFD'*) -- symcode='[[ABCDGISTW]]' ;; -+ symcode='[[ABCDGIRSTW]]' ;; - esac - - # Try without a prefix undercore, 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. -- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" -+ 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 -@@ -4434,7 +4966,7 @@ EOF - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi -- rm -f conftest* conftst* -+ rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then -@@ -4483,13 +5015,16 @@ AC_MSG_CHECKING([for $compiler option to - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; -- mingw* | os2* | pw32*) -+ mingw* | cygwin* | 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' -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ m4_if([$1], [GCJ], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - darwin* | rhapsody*) - # PIC is the default on this platform -@@ -4500,6 +5035,10 @@ AC_MSG_CHECKING([for $compiler option to - # DJGPP does not support shared libraries at all - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - ;; -+ interix[[3-9]]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -@@ -4508,7 +5047,7 @@ AC_MSG_CHECKING([for $compiler option to - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - ;; - *) -@@ -4522,7 +5061,7 @@ AC_MSG_CHECKING([for $compiler option to - esac - else - case $host_os in -- aix4* | aix5*) -+ aix[[4-9]]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor -@@ -4533,18 +5072,28 @@ AC_MSG_CHECKING([for $compiler option to - ;; - chorus*) - case $cc_basename in -- cxch68) -+ 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 - ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ ;; -+ esac -+ ;; - dgux*) - case $cc_basename in -- ec++) -+ ec++*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; -- ghcx) -+ ghcx*) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; -@@ -4552,22 +5101,22 @@ AC_MSG_CHECKING([for $compiler option to - ;; - esac - ;; -- freebsd*) -+ freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in -- CC) -+ 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" -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; -- aCC) -+ 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 -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -4580,9 +5129,13 @@ AC_MSG_CHECKING([for $compiler option to - ;; - esac - ;; -+ interix*) -+ # This is c89, which is MS Visual C++ (no shared libs) -+ # Anyone wants to do a port? -+ ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in -- CC) -+ 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. -@@ -4591,20 +5144,26 @@ AC_MSG_CHECKING([for $compiler option to - ;; - esac - ;; -- linux*) -+ linux* | k*bsd*-gnu) - case $cc_basename in -- KCC) -+ KCC*) - # KAI C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; -- icpc) -+ icpc* | ecpc*) - # 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) -+ ;; -+ pgCC* | pgcpp*) -+ # Portland Group C++ compiler. -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -+ _LT_AC_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. -@@ -4612,6 +5171,14 @@ AC_MSG_CHECKING([for $compiler option to - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ _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 ' -+ ;; -+ esac - ;; - esac - ;; -@@ -4621,7 +5188,7 @@ AC_MSG_CHECKING([for $compiler option to - ;; - mvs*) - case $cc_basename in -- cxx) -+ cxx*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) -@@ -4632,14 +5199,14 @@ AC_MSG_CHECKING([for $compiler option to - ;; - osf3* | osf4* | osf5*) - case $cc_basename in -- KCC) -+ KCC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; -- RCC) -+ RCC*) - # Rational C++ 2.4.1 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; -- cxx) -+ 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 -@@ -4653,24 +5220,15 @@ AC_MSG_CHECKING([for $compiler option to - ;; - psos*) - ;; -- sco*) -- case $cc_basename in -- CC) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -- ;; -- *) -- ;; -- esac -- ;; - solaris*) - case $cc_basename in -- CC) -+ 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) -+ gcx*) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; -@@ -4680,12 +5238,12 @@ AC_MSG_CHECKING([for $compiler option to - ;; - sunos4*) - case $cc_basename in -- CC) -+ CC*) - # Sun C++ 4.x - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; -- lcc) -+ lcc*) - # Lucid - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; -@@ -4695,7 +5253,7 @@ AC_MSG_CHECKING([for $compiler option to - ;; - tandem*) - case $cc_basename in -- NCC) -+ NCC*) - # NonStop-UX NCC 3.20 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; -@@ -4703,7 +5261,14 @@ AC_MSG_CHECKING([for $compiler option to - ;; - esac - ;; -- unixware*) -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ case $cc_basename in -+ CC*) -+ _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' -+ ;; -+ esac - ;; - vxworks*) - ;; -@@ -4734,14 +5299,17 @@ AC_MSG_CHECKING([for $compiler option to - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | 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' -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ m4_if([$1], [GCJ], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - darwin* | rhapsody*) -@@ -4750,6 +5318,11 @@ AC_MSG_CHECKING([for $compiler option to - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - -+ interix[[3-9]]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. -@@ -4766,7 +5339,7 @@ AC_MSG_CHECKING([for $compiler option to - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -4792,18 +5365,29 @@ AC_MSG_CHECKING([for $compiler option to - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ ;; -+ esac -+ ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | 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' -+ m4_if([$1], [GCJ], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - 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 -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -4826,18 +5410,41 @@ AC_MSG_CHECKING([for $compiler option to - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - -- linux*) -- case $CC in -- icc|ecc) -+ linux* | k*bsd*-gnu) -+ case $cc_basename 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) -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ 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' - ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ _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)='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ _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)='' -+ ;; -+ esac -+ ;; - esac - ;; - -@@ -4847,15 +5454,19 @@ AC_MSG_CHECKING([for $compiler option to - _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' -+ rdos*) -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - 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' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -+ esac - ;; - - sunos4*) -@@ -4864,7 +5475,7 @@ AC_MSG_CHECKING([for $compiler option to - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - -- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -+ sysv4 | sysv4.2uw2* | sysv4.3*) - _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' -@@ -4877,6 +5488,17 @@ AC_MSG_CHECKING([for $compiler option to - fi - ;; - -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ _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' -+ ;; -+ -+ unicos*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; -+ - uts4*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -@@ -4895,7 +5517,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_co - # - 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_cv_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 - "" | " "*) ;; -@@ -4904,7 +5526,7 @@ if test -n "$_LT_AC_TAGVAR(lt_prog_compi - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) - fi --case "$host_os" in -+case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -@@ -4913,6 +5535,16 @@ case "$host_os" in - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" - ;; - esac -+ -+# -+# Check to make sure the static flag actually works. -+# -+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" -+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), -+ $lt_tmp_static_flag, -+ [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) - ]) - - -@@ -4920,11 +5552,12 @@ esac - # ------------------------------------ - # 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]) -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+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*) -+ 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 -@@ -4937,12 +5570,13 @@ ifelse([$1],[CXX],[ - _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 -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[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' - ;; - esac -+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - ],[ - runpath_var= - _LT_AC_TAGVAR(allow_undefined_flag, $1)= -@@ -4963,7 +5597,7 @@ ifelse([$1],[CXX],[ - _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(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* -@@ -4973,14 +5607,17 @@ ifelse([$1],[CXX],[ - # 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_" -+ _LT_AC_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= -- -+ # Just being paranoid about ensuring that cc_basename is set. -+ _LT_CC_BASENAME([$compiler]) - case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time -@@ -4990,6 +5627,10 @@ ifelse([$1],[CXX],[ - 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 - ;; -@@ -5000,9 +5641,30 @@ ifelse([$1],[CXX],[ - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ _LT_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 -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` 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 -+ - # See if GNU ld supports shared libraries. - case $host_os in -- aix3* | aix4* | aix5*) -+ aix[[3-9]]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no -@@ -5050,10 +5712,10 @@ EOF - _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_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - - 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' -+ _LT_AC_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_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -@@ -5062,9 +5724,64 @@ EOF - 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' -+ $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 -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ interix[[3-9]]*) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_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_AC_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_AC_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* | k*bsd*-gnu) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_addflag= -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ _LT_AC_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_AC_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' ;; -+ esac -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ _LT_AC_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' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ -+ if test $supports_anon_versioning = yes; then -+ _LT_AC_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 -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - -@@ -5078,7 +5795,7 @@ EOF - fi - ;; - -- solaris* | sysv5*) -+ solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <<EOF 1>&2 -@@ -5099,6 +5816,33 @@ EOF - fi - ;; - -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ cat <<_LT_EOF 1>&2 -+ -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** reliably create shared libraries on SCO systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+_LT_EOF -+ ;; -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ - sunos4*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= -@@ -5116,16 +5860,11 @@ EOF - ;; - 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 -+ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then -+ runpath_var= -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) -@@ -5137,14 +5876,14 @@ EOF - # 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 -+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - fi - ;; - -- aix4* | aix5*) -+ 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. -@@ -5164,13 +5903,14 @@ EOF - # 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*) -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done -+ ;; - esac - - exp_sym_flag='-bexport' -@@ -5189,7 +5929,7 @@ EOF - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - if test "$GCC" = yes; then -- case $host_os in aix4.[012]|aix4.[012].*) -+ 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` -@@ -5197,7 +5937,7 @@ EOF - 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 -@@ -5208,8 +5948,12 @@ EOF - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_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 -@@ -5217,11 +5961,11 @@ EOF - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else -- if test "$aix_use_runtimelinking" = yes; then -+ if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' -- fi -+ fi - fi - fi - -@@ -5235,12 +5979,12 @@ EOF - # 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" -+ _LT_AC_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 "${wl}${allow_undefined_flag}"; else :; fi` '"\${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" -+ _LT_AC_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_AC_SYS_LIBPATH_AIX -@@ -5249,13 +5993,11 @@ EOF - # -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(whole_archive_flag_spec, $1)='$convenience' - _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' -+ # This is similar to how AIX traditionally builds its shared libraries. -+ _LT_AC_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 - ;; -@@ -5268,7 +6010,7 @@ EOF - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - -- bsdi4*) -+ bsdi[[45]]*) - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - -@@ -5282,56 +6024,64 @@ EOF - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. -- shrext=".dll" -+ shrext_cmds=".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(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - - 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' -- ;; -+ case $host_os in -+ rhapsody* | darwin1.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; - 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(archive_cmds_need_lc, $1)=no - _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(whole_archive_flag_spec, $1)='' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- fi -+ if test "$GCC" = yes ; then -+ 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_dar_single_mod${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ _LT_AC_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_AC_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}" -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~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 $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ fi - ;; - - dgux*) -@@ -5364,7 +6114,7 @@ EOF - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd*) -+ freebsd* | dragonfly*) - _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 -@@ -5387,47 +6137,62 @@ EOF - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - -- hpux10* | hpux11*) -+ hpux10*) - 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 -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_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_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' -+ -+ # 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 -+ fi -+ ;; -+ -+ hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case $host_cpu in -+ hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -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' -+ case $host_cpu in -+ hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_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 -- 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, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) - _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 -- -- # 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' - -@@ -5471,23 +6236,28 @@ EOF - ;; - - 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' -+ if test -f /usr/libexec/ld.so; then -+ _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(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ _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 - 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 -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - -@@ -5520,7 +6290,7 @@ EOF - _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' -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - - # Both c and cxx compiler support -rpath directly - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -@@ -5528,21 +6298,15 @@ EOF - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - -- 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 -- ;; -- - solaris*) - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' - if test "$GCC" = yes; then -+ wlarc='${wl}' - _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 -+ wlarc='' - _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' -@@ -5551,8 +6315,17 @@ EOF - _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' ;; -+ *) -+ # 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_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' -+ fi -+ ;; - esac - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; -@@ -5609,36 +6382,45 @@ EOF - fi - ;; - -- 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 -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) -+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- hardcode_runpath_var=yes -- runpath_var=LD_RUN_PATH -- ;; -+ runpath_var='LD_RUN_PATH' - -- 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' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$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' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$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)= -+ 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_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi - ;; - - uts4*) -@@ -5656,11 +6438,6 @@ EOF - 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 -- - # - # Do we need to explicitly link libc? - # -@@ -5680,14 +6457,15 @@ x|xyes) - # 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 -- -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) -+ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= -@@ -5782,6 +6560,30 @@ AC_DEFUN([LT_AC_PROG_RC], - [AC_CHECK_TOOL(RC, windres, no) - ]) - -+ -+# Cheap backport of AS_EXECUTABLE_P and required macros -+# from Autoconf 2.59; we should not use $as_executable_p directly. -+ -+# _AS_TEST_PREPARE -+# ---------------- -+m4_ifndef([_AS_TEST_PREPARE], -+[m4_defun([_AS_TEST_PREPARE], -+[if test -x / >/dev/null 2>&1; then -+ as_executable_p='test -x' -+else -+ as_executable_p='test -f' -+fi -+])])# _AS_TEST_PREPARE -+ -+# AS_EXECUTABLE_P -+# --------------- -+# Check whether a file is executable. -+m4_ifndef([AS_EXECUTABLE_P], -+[m4_defun([AS_EXECUTABLE_P], -+[AS_REQUIRE([_AS_TEST_PREPARE])dnl -+$as_executable_p $1[]dnl -+])])# AS_EXECUTABLE_P -+ - # 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 # -@@ -5802,18 +6604,19 @@ do - 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 -+ 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 && break -+ test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in -@@ -5838,8 +6641,9 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xp - fi - done - done --SED=$lt_cv_path_SED - ]) -+SED=$lt_cv_path_SED -+AC_SUBST([SED]) - AC_MSG_RESULT([$SED]) - ]) - diff --git a/inputmethod/ja-freewnn-lib/patches/patch-cWnn_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-cWnn_Makefile.in deleted file mode 100644 index b80b950984a..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-cWnn_Makefile.in +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-cWnn_Makefile.in,v 1.1 2011/09/13 07:23:20 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- cWnn/Makefile.in.orig 2001-08-14 13:43:21.000000000 +0000 -+++ cWnn/Makefile.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2006 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -29,8 +29,9 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - # - --include @top_srcdir@/makerule.mk --top_builddir = .. -+include @top_builddir@/makerule.mk -+ top_srcdir = @top_srcdir@ -+top_builddir = @top_builddir@ - - WNNOWNER = wnn - -@@ -52,10 +53,14 @@ TDDIR = td - - WNNMANDIR = man - --LIB_SUBDIRS = $(JLIBDIR) $(CDDIR) $(WNNCLIENTSDIR) $(TDDIR) -+UUMDIR = uum -+ -+LIB_SUBDIRS = $(JLIBDIR) $(CDDIR) $(TDDIR) - - SERVER_SUBDIRS = $(JSERVERDIR) $(WNNJUTILDIR) $(CDICDIR) $(TDICDIR) $(WNNMANDIR) - -+CLIENT_SUBDIRS = $(WNNCLIENTSDIR) $(UUMDIR) -+ - SUBDIRS = @SUBDIRS@ - - ALL_SUBDIRS = $(LIB_SUBDIRS) $(SERVER_SUBDIRS) diff --git a/inputmethod/ja-freewnn-lib/patches/patch-cWnn_cdic_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-cWnn_cdic_Makefile.in deleted file mode 100644 index ef674afadd2..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-cWnn_cdic_Makefile.in +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-cWnn_cdic_Makefile.in,v 1.1 2011/09/13 07:23:20 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- cWnn/cdic/Makefile.in.orig 2004-04-24 18:56:40.000000000 +0000 -+++ cWnn/cdic/Makefile.in -@@ -5,10 +5,10 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 2001, 2004 -+# Copyright FreeWnn Project 2001, 2004, 2010 - # - # Author: OMRON SOFTWARE Co., Ltd. <freewnn@rd.kyoto.omronsoft.co.jp> --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -27,6 +27,7 @@ - include @top_builddir@/makerule.mk - top_srcdir = @top_srcdir@ - srcdir = @srcdir@ -+ VPATH = @srcdir@ - top_builddir = @top_builddir@ - CWNNJUTILOBJ = $(top_builddir)/cWnn/jutil - -@@ -63,10 +64,10 @@ all:: $(ALLTGT) - $(DICS): $(HINSI) - - $(FULL):: $(FZK_SRCS) con.master-.c -- $(CPP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ -+ $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ - - $(FULLR):: $(FZK_SRCS) con.masterR-.c -- $(CPP) -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ -+ $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ - - # To avoid circular dependency, we don't use 'con.master?.c' - con.master-.c: con.master diff --git a/inputmethod/ja-freewnn-lib/patches/patch-cWnn_jlib_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-cWnn_jlib_Makefile.in deleted file mode 100644 index 7e3013090b6..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-cWnn_jlib_Makefile.in +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-cWnn_jlib_Makefile.in,v 1.1 2011/09/13 07:23:20 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- cWnn/jlib/Makefile.in.orig 2004-09-12 16:56:55.000000000 +0000 -+++ cWnn/jlib/Makefile.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001, 2003 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2003, 2009 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -39,8 +39,6 @@ INCLUDES = -I$(CWNNINCLUDESRC) -I$(top_b - DEFINES = $(CWNNDEFINES) $(CWNNLANGDEF) $(JLIBDEFINES) - LINTLIBS = - INSTALL = @INSTALL@ $(INSTALLFLAGS) --LT_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) --LT_CC = $(LIBTOOL) --mode=compile $(CC) - - SRC1= jl.c js.c wnnerrmsg.c - OBJ1= jl.o js.o wnnerrmsg.o -@@ -119,7 +117,7 @@ lint1: - all:: libcwnn.la - - libcwnn.la: $(OBJS) $(EXTRALIBRARYDEPS) -- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(CWNNJLIBVERSION) -+ $(LT_LD) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(CWNNJLIBVERSION) @LIBS@ - - lintlib:: llib-lcwnn.ln - diff --git a/inputmethod/ja-freewnn-lib/patches/patch-cWnn_jserver_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-cWnn_jserver_Makefile.in deleted file mode 100644 index 39f5d2162b3..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-cWnn_jserver_Makefile.in +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-cWnn_jserver_Makefile.in,v 1.1 2011/09/13 07:23:20 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- cWnn/jserver/Makefile.in.orig 2004-05-21 16:39:32.000000000 +0000 -+++ cWnn/jserver/Makefile.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2003, 2004 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2003, 2004, 2010 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -126,15 +126,12 @@ clean:: - - instserver:: install - --install:: cserver -- @if [ -d $(DESTDIR)$(CWNNBINDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(CWNNBINDIR)); fi -- $(LIBTOOL) --mode=install $(INSTALL) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) cserver $(DESTDIR)$(CWNNBINDIR)/cserver -- --install:: tserver -- @if [ -d $(DESTDIR)$(CWNNBINDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(CWNNBINDIR)); fi -- $(LIBTOOL) --mode=install $(INSTALL) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) tserver $(DESTDIR)$(CWNNBINDIR)/tserver -+install:: cserver tserver -+ @if [ -d $(DESTDIR)$(CWNNSBINDIR) ]; then set +x; \ -+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(CWNNSBINDIR)); fi -+ for server in $?; do \ -+ $(LT_INSTALL) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) $$server $(DESTDIR)$(CWNNSBINDIR)/`echo $$server | sed '$(transform)'`; \ -+ done - - includes:: $(HDRS) $(SRC0) $(SRC1) $(TSRCS) - diff --git a/inputmethod/ja-freewnn-lib/patches/patch-cWnn_jutil_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-cWnn_jutil_Makefile.in deleted file mode 100644 index 0aa16809729..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-cWnn_jutil_Makefile.in +++ /dev/null @@ -1,60 +0,0 @@ -$NetBSD: patch-cWnn_jutil_Makefile.in,v 1.1 2011/09/13 07:23:20 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- cWnn/jutil/Makefile.in.orig 2004-08-15 09:38:23.000000000 +0000 -+++ cWnn/jutil/Makefile.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001, 2004 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2004, 2010, 2011 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -38,17 +38,20 @@ LT_INSTALL = $(LIBTOOL) --mode=inst - LT_LD = $(LIBTOOL) --mode=link $(CCLINK) - LOCAL_INSTFLAGS = -o $(WNNOWNER) - -- INCLUDES = -I$(CWNNINCLUDESRC) -I$(top_builddir) -+ INCLUDES = -I$(top_builddir) @EXTCWNNJINC@ -I$(CWNNINCLUDESRC) - DEFINES = $(CWNNDEFINES) $(CWNNLANGDEF) - HINSIDEFINE = -DHINSIDATA_FILE=\"/$(CWNNLANG)/cixing.data\" - --CLIENTPROGRAMS = cwnnstat cwnnkill cwddel cwdreg -+CLIENTPROGRAMS = cwddel cwdreg -+ -+# Server status / kill programs -+CLIENT_SV_PROGRAMS = cwnnstat cwnnkill - - DICUTIL2PROGRAMS = catod catof cwnntouch - - DICUTILPROGRAMS = cdtoa - --PROGRAMS = $(CLIENTPROGRAMS) $(DICUTILPROGRAMS) $(DICUTIL2PROGRAMS) -+PROGRAMS = $(CLIENTPROGRAMS) $(CLIENT_SV_PROGRAMS) $(DICUTILPROGRAMS) $(DICUTIL2PROGRAMS) - - LINKS = atod.c atorev.c dic_head.c dtoa.c sort.c ujisf.c utilbdic.c wddel.c wdreg.c wnnkill.c wnnstat.c wnntouch.c atof.c - -@@ -329,10 +332,15 @@ instclient:: install - install:: $(PROGRAMS) - @if [ -d $(DESTDIR)$(CWNNBINDIR) ]; then set +x; \ - else (set -x; $(MKDIRHIER) $(DESTDIR)$(CWNNBINDIR)); fi -+ @if [ -d $(DESTDIR)$(CWNNSBINDIR) ]; then set +x; \ -+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(CWNNSBINDIR)); fi - @for flag in ${MAKEFLAGS} ''; do \ - case "$$flag" in *=*) ;; *[i]*) set +e;; esac; done; \ -- for i in $(PROGRAMS); do \ -- (set -x; $(LT_INSTALL) $(INSTBINFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) $$i $(DESTDIR)$(CWNNBINDIR)); \ -+ for i in $(CLIENTPROGRAMS) $(DICUTILPROGRAMS) $(DICUTIL2PROGRAMS); do \ -+ (set -x; $(LT_INSTALL) $(INSTBINFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) $$i $(DESTDIR)$(CWNNBINDIR)/`echo $$i | sed '$(transform)'`); \ -+ done; \ -+ for i in $(CLIENT_SV_PROGRAMS); do \ -+ (set -x; $(LT_INSTALL) $(INSTBINFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) $$i $(DESTDIR)$(CWNNSBINDIR)/`echo $$i | sed '$(transform)'`); \ - done - - $(OBJ1) : $(SRC1) diff --git a/inputmethod/ja-freewnn-lib/patches/patch-cWnn_man_2.env_ckey.man b/inputmethod/ja-freewnn-lib/patches/patch-cWnn_man_2.env_ckey.man deleted file mode 100644 index a502d051245..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-cWnn_man_2.env_ckey.man +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-cWnn_man_2.env_ckey.man,v 1.1 2011/09/13 07:23:20 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- cWnn/man/2.env/ckey.man.orig 2001-06-14 18:08:35.000000000 +0000 -+++ cWnn/man/2.env/ckey.man -@@ -9,9 +9,9 @@ - .\" 1987, 1988, 1989, 1990, 1991, 1992 - .\" Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - .\" Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --.\" Copyright FreeWnn Project 1999, 2000 -+.\" Copyright FreeWnn Project 1999, 2000, 2007 - .\" --.\" Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+.\" Maintainer: FreeWnn Project - .\" - .\" This program is free software; you can redistribute it and/or modify - .\" it under the terms of the GNU General Public License as published by -@@ -33,6 +33,7 @@ ckey \- The standard definition of each - cWnn system. - - .SH DESCRIPTION -+.nf - ---------------------------------------------------------- - .sp 0 - | Function | Other | Description | Function | Function | -@@ -247,3 +248,4 @@ ckey \- The standard definition of each - | | | | | (if press| - | | | | | twice ) | - ---------------------------------------------------------- -+.fi diff --git a/inputmethod/ja-freewnn-lib/patches/patch-cWnn_man_4.cmd_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-cWnn_man_4.cmd_Makefile.in deleted file mode 100644 index 39c9a07ff66..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-cWnn_man_4.cmd_Makefile.in +++ /dev/null @@ -1,79 +0,0 @@ -$NetBSD: patch-cWnn_man_4.cmd_Makefile.in,v 1.1 2011/09/13 07:23:20 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- cWnn/man/4.cmd/Makefile.in.orig 2001-08-14 13:43:22.000000000 +0000 -+++ cWnn/man/4.cmd/Makefile.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2010 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -29,41 +29,30 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - # - --include @top_srcdir@/makerule.mk --top_builddir = ../../.. -+include @top_builddir@/makerule.mk -+top_builddir = @top_builddir@ -+ srcdir = @srcdir@ - - MANSUFFIX = 1 - - INSTALL = @INSTALL@ $(INSTALLFLAGS) - --install.man:: cserver.man -- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -- $(RM) $(DESTDIR)$(MANDIR)/cserver.$(MANSUFFIX)* -- $(INSTALL) $(INSTMANFLAGS) cserver.man \ -- $(DESTDIR)$(MANDIR)/cserver.$(MANSUFFIX) -- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/cserver.$(MANSUFFIX) -- --install.man:: cuum.man -- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -- $(RM) $(DESTDIR)$(MANDIR)/cuum.$(MANSUFFIX)* -- $(INSTALL) $(INSTMANFLAGS) cuum.man \ -- $(DESTDIR)$(MANDIR)/cuum.$(MANSUFFIX) -- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/cuum.$(MANSUFFIX) -- --install.man:: cwnnkill.man -- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -- $(RM) $(DESTDIR)$(MANDIR)/cwnnkill.$(MANSUFFIX)* -- $(INSTALL) $(INSTMANFLAGS) cwnnkill.man \ -- $(DESTDIR)$(MANDIR)/cwnnkill.$(MANSUFFIX) -- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/cwnnkill.$(MANSUFFIX) -+SERVER_MAN = cserver.man -+CLIENT_MAN = cuum.man -+SVTOOL_MAN = cwnnkill.man cwnnstat.man -+ MANUALS = $(SERVER_MAN) $(CLIENT_MAN) $(SVTOOL_MAN) - --install.man:: cwnnstat.man -+# Probably we don't need $(MANUALS) as dependency ... -+install.man:: - @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ - else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -- $(RM) $(DESTDIR)$(MANDIR)/cwnnstat.$(MANSUFFIX)* -- $(INSTALL) $(INSTMANFLAGS) cwnnstat.man \ -- $(DESTDIR)$(MANDIR)/cwnnstat.$(MANSUFFIX) -- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/cwnnstat.$(MANSUFFIX) -+ for m in $(MANUALS); do \ -+ manname=`basename $$m .man | sed '$(transform)'`; \ -+ $(RM) $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX)*; \ -+ $(INSTALL) $(INSTMANFLAGS) $(srcdir)/$$m \ -+ $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX); \ -+ done -+ -for m in $(MANUALS); do \ -+ manname=`basename $$m .man | sed '$(transform)'`; \ -+ $(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX); \ -+ done diff --git a/inputmethod/ja-freewnn-lib/patches/patch-cWnn_man_6.jutil_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-cWnn_man_6.jutil_Makefile.in deleted file mode 100644 index 5c659dd1fde..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-cWnn_man_6.jutil_Makefile.in +++ /dev/null @@ -1,105 +0,0 @@ -$NetBSD: patch-cWnn_man_6.jutil_Makefile.in,v 1.1 2011/09/13 07:23:21 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- cWnn/man/6.jutil/Makefile.in.orig 2001-08-14 13:43:22.000000000 +0000 -+++ cWnn/man/6.jutil/Makefile.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2010 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -29,65 +29,29 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - # - --include @top_srcdir@/makerule.mk --top_builddir = ../../.. -+include @top_builddir@/makerule.mk -+top_builddir = @top_builddir@ -+ srcdir = @srcdir@ - - INSTALL = @INSTALL@ $(INSTALLFLAGS) - - MANSUFFIX = 1 - --install.man:: catod.man -- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -- $(RM) $(DESTDIR)$(MANDIR)/catod.$(MANSUFFIX)* -- $(INSTALL) $(INSTMANFLAGS) catod.man \ -- $(DESTDIR)$(MANDIR)/catod.$(MANSUFFIX) -- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/catod.$(MANSUFFIX) -- --install.man:: catof.man -- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -- $(RM) $(DESTDIR)$(MANDIR)/catof.$(MANSUFFIX)* -- $(INSTALL) $(INSTMANFLAGS) catof.man \ -- $(DESTDIR)$(MANDIR)/catof.$(MANSUFFIX) -- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/catof.$(MANSUFFIX) -- --install.man:: cdicsort.man -- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -- $(RM) $(DESTDIR)$(MANDIR)/cdicsort.$(MANSUFFIX)* -- $(INSTALL) $(INSTMANFLAGS) cdicsort.man \ -- $(DESTDIR)$(MANDIR)/cdicsort.$(MANSUFFIX) -- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/cdicsort.$(MANSUFFIX) -- --install.man:: cdtoa.man -- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -- $(RM) $(DESTDIR)$(MANDIR)/cdtoa.$(MANSUFFIX)* -- $(INSTALL) $(INSTMANFLAGS) cdtoa.man \ -- $(DESTDIR)$(MANDIR)/cdtoa.$(MANSUFFIX) -- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/cdtoa.$(MANSUFFIX) -- --install.man:: cwddel.man -- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -- $(RM) $(DESTDIR)$(MANDIR)/cwddel.$(MANSUFFIX)* -- $(INSTALL) $(INSTMANFLAGS) cwddel.man \ -- $(DESTDIR)$(MANDIR)/cwddel.$(MANSUFFIX) -- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/cwddel.$(MANSUFFIX) -- --install.man:: cwdreg.man -- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -- $(RM) $(DESTDIR)$(MANDIR)/cwdreg.$(MANSUFFIX)* -- $(INSTALL) $(INSTMANFLAGS) cwdreg.man \ -- $(DESTDIR)$(MANDIR)/cwdreg.$(MANSUFFIX) -- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/cwdreg.$(MANSUFFIX) -- --install.man:: cwnntouch.man -- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -- $(RM) $(DESTDIR)$(MANDIR)/cwnntouch.$(MANSUFFIX)* -- $(INSTALL) $(INSTMANFLAGS) cwnntouch.man \ -- $(DESTDIR)$(MANDIR)/cwnntouch.$(MANSUFFIX) -- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/cwnntouch.$(MANSUFFIX) -+MANUALS = catod.man catof.man cdtoa.man cwddel.man cwdreg.man cwnntouch.man -+# Please add cdicsort.man to MANUALS if you need this. -+# (Currently we don't install cdicsort by default.) -+ -+# Probably we don't need $(MANUALS) as dependency ... -+install.man:: -+ @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ -+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -+ for m in $(MANUALS); do \ -+ manname=`basename $$m .man | sed '$(transform)'`; \ -+ $(RM) $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX)*; \ -+ $(INSTALL) $(INSTMANFLAGS) $(srcdir)/$$m \ -+ $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX); \ -+ done -+ -for m in $(MANUALS); do \ -+ manname=`basename $$m .man | sed '$(transform)'`; \ -+ $(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX); \ -+ done diff --git a/inputmethod/ja-freewnn-lib/patches/patch-cWnn_romkan_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-cWnn_romkan_Makefile.in deleted file mode 100644 index 406b70d2eaa..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-cWnn_romkan_Makefile.in +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-cWnn_romkan_Makefile.in,v 1.1 2011/09/13 07:23:21 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- cWnn/romkan/Makefile.in.orig 2002-03-30 09:34:46.000000000 +0000 -+++ cWnn/romkan/Makefile.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2006 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -29,10 +29,11 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - # - --include ../../makerule.mk --top_builddir = ../.. -+include @top_builddir@/makerule.mk -+ top_srcdir = @top_srcdir@ -+top_builddir = @top_builddir@ - -- INCLUDES = -I$(CWNNINCLUDESRC) -I$(TOP) -+ INCLUDES = -I$(CWNNINCLUDESRC) -I$(top_builddir) - DEFINES = $(CWNNDEFINES) -DWNNDEFAULT $(CWNNLANGDEF) - LINTLIBS = - -@@ -48,7 +49,7 @@ includes:: - - .c.o: - $(RM) $@ -- $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $< -+ $(LT_CC) -c $(CFLAGS) $(_NOOP_) $< - - clean:: - $(RM) -r .libs diff --git a/inputmethod/ja-freewnn-lib/patches/patch-cWnn_tdic_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-cWnn_tdic_Makefile.in deleted file mode 100644 index 2b3c5076ab1..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-cWnn_tdic_Makefile.in +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-cWnn_tdic_Makefile.in,v 1.1 2011/09/13 07:23:21 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- cWnn/tdic/Makefile.in.orig 2004-04-24 18:56:40.000000000 +0000 -+++ cWnn/tdic/Makefile.in -@@ -5,10 +5,10 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 2001, 2004 -+# Copyright FreeWnn Project 2001, 2004, 2010 - # - # Author: OMRON SOFTWARE Co., Ltd. <freewnn@rd.kyoto.omronsoft.co.jp> --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -27,6 +27,7 @@ - include @top_builddir@/makerule.mk - top_srcdir = @top_srcdir@ - srcdir = @srcdir@ -+ VPATH = @srcdir@ - top_builddir = @top_builddir@ - CWNNJUTILOBJ = $(top_builddir)/cWnn/jutil - -@@ -63,10 +64,10 @@ all:: $(ALLTGT) - $(DICS): $(HINSI) - - $(FULL):: $(FZK_SRCS) con.master-.c -- $(CPP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ -+ $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ - - $(FULLR):: $(FZK_SRCS) con.masterR-.c -- $(CPP) -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ -+ $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ - - # To avoid circular dependency, we don't use 'con.master?.c' - con.master-.c: con.master diff --git a/inputmethod/ja-freewnn-lib/patches/patch-cWnn_uum_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-cWnn_uum_Makefile.in deleted file mode 100644 index 07a0fad6c1a..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-cWnn_uum_Makefile.in +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-cWnn_uum_Makefile.in,v 1.1 2011/09/13 07:23:21 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- cWnn/uum/Makefile.in.orig 2005-11-20 16:10:28.000000000 +0000 -+++ cWnn/uum/Makefile.in -@@ -10,7 +10,7 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001, 2005 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2005, 2006, 2007, 2010, 2011 - # - # Maintainer: FreeWnn Project - # -@@ -30,15 +30,18 @@ - # - - include @top_builddir@/makerule.mk -+ top_srcdir = @top_srcdir@ - top_builddir = @top_builddir@ - --INSTALL = @INSTALL@ -+INSTALL = @INSTALL@ -+LOCAL_INSTFLAGS = $(INSTUUMFLAGS) - -- UUMOWNER = root -- INCLUDES = -I$(CWNNINCLUDESRC) -I$(CWNNROMKANSRC) -I$(top_builddir) -+ INCLUDES = -I$(top_builddir) @EXTCWNNJINC@ -I$(CWNNINCLUDESRC) -I$(CWNNROMKANSRC) - DEFINES = $(CWNNDEFINES) $(CWNNLANGDEF) --LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(UUMOWNER) - LOCAL_LIBRARIES = $(CWNNJLIB) $(CWNNCONVLIB) @LIBS@ -+# FIXME: libspt: need configure support ... -+# LIBSPT_CFLAGS = @LIBSPT_CFLAGS@ -+# LIBSPT_LIBS = @LIBSPT_LIBS@ - - HDRS= buffer.h cvtcode.h sdefine.h sheader.h - SRC1= epilogue.c header.c kensaku.c kuten.c jis_in.c prologue.c touroku.c jikouho.c jutil.c w_string.c printf.c termio.c hinsi.c termcap.c ttyfdslot.c setutmp.c redraw.c history.c key_bind.c screen.c basic_op.c uif.c cursor.c jhlp.c select_ele.c inspect.c wnnrc_op.c functions.c -@@ -62,7 +65,7 @@ all:: $(HDRS) $(SRC1) cuum - - cuum: $(OBJS) @DEPCWNNJLIB@ $(CWNNCONVLIB) - $(RM) $@ -- $(LIBTOOL) --mode=link $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LOCAL_LIBRARIES) $(WNNTERM_LIB) -+ $(LT_LD) -o $@ $(LDOPTIONS) $(OBJS) $(LOCAL_LIBRARIES) $(LIBSPT_LIBS) @TERMLIB@ - - clean:: - $(RM) -r .libs -@@ -427,7 +430,7 @@ instclient:: install - install:: cuum - @if [ -d $(DESTDIR)$(CWNNBINDIR) ]; then set +x; \ - else (set -x; $(MKDIRHIER) $(DESTDIR)$(CWNNBINDIR)); fi -- $(LIBTOOL) --mode=install $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) cuum $(DESTDIR)$(CWNNBINDIR)/cuum -+ $(LT_INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) cuum $(DESTDIR)$(CWNNBINDIR)/`echo cuum | sed '$(transform)'` - - $(OBJ2) : $(SRC2) - $(CC) -c $(CFLAGS) $(CWNNETCSRC)/`basename $@ .o`.c diff --git a/inputmethod/ja-freewnn-lib/patches/patch-config.guess b/inputmethod/ja-freewnn-lib/patches/patch-config.guess deleted file mode 100644 index 22282540b02..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-config.guess +++ /dev/null @@ -1,1333 +0,0 @@ -$NetBSD: patch-config.guess,v 1.1 2011/09/13 07:23:21 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- config.guess.orig 2003-06-04 08:35:02.000000000 +0000 -+++ config.guess -@@ -1,9 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -+# Free Software Foundation, Inc. - --timestamp='2003-02-22' -+timestamp='2008-01-23' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -17,13 +18,15 @@ timestamp='2003-02-22' - # - # 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. -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -+# 02110-1301, 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. - -+ - # Originally written by Per Bothner <per@bothner.com>. - # Please send patches to <config-patches@gnu.org>. Submit a context - # diff and a properly formatted ChangeLog entry. -@@ -53,8 +56,8 @@ version="\ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -+2002, 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." -@@ -66,11 +69,11 @@ Try \`$me --help' for more information." - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -104,8 +107,9 @@ set_cc_for_build=' - trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; - trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; - : ${TMPDIR=/tmp} ; -- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || -+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || -+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; - dummy=$tmp/dummy ; - tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -@@ -122,7 +126,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; --esac ;' -+esac ; set_cc_for_build= ;' - - # This is needed to find uname on a Pyramid OSx when run in the BSD universe. - # (ghazi@noc.rutgers.edu 1994-08-24) -@@ -157,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; -+ sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched -@@ -195,50 +200,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" -- exit 0 ;; -- amiga:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- arc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- hp300:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mac68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- macppc:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme88k:OpenBSD:*:*) -- echo m88k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvmeppc:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- pmax:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sgi:OpenBSD:*:*) -- echo mipseb-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sun3:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- wgrisc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:OpenBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -+ exit ;; -+ *:ekkoBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} -+ exit ;; -+ *:SolidBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} -+ exit ;; -+ macppc:MirBSD:*:*) -+ echo powerpc-unknown-mirbsd${UNAME_RELEASE} -+ exit ;; -+ *:MirBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} -+ exit ;; - alpha:OSF1:*:*) -- if test $UNAME_RELEASE = "V4.0"; then -+ case $UNAME_RELEASE in -+ *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` -- fi -+ ;; -+ *5.*) -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ ;; -+ esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU -@@ -276,39 +263,49 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac -+ # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. -- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit 0 ;; -+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -+ exit ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix -- exit 0 ;; -+ exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 -- exit 0 ;; -+ exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 -- exit 0;; -+ exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos -- exit 0 ;; -+ exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos -- exit 0 ;; -+ exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition -- exit 0 ;; -+ exit ;; -+ *:z/VM:*:*) -+ echo s390-ibm-zvmoe -+ exit ;; -+ *:OS400:*:*) -+ echo powerpc-ibm-os400 -+ exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} -- exit 0;; -+ exit ;; -+ arm:riscos:*:*|arm:RISCOS:*:*) -+ echo arm-unknown-riscos -+ exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp -- exit 0;; -+ exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then -@@ -316,29 +313,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - else - echo pyramid-pyramid-bsd - fi -- exit 0 ;; -+ exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 -- exit 0 ;; -- DRS?6000:UNIX_SV:4.2*:7*) -+ exit ;; -+ DRS?6000:unix:4.0:6*) -+ echo sparc-icl-nx6 -+ exit ;; -+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in -- sparc) echo sparc-icl-nx7 && exit 0 ;; -+ sparc) echo sparc-icl-nx7; exit ;; - esac ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -- i86pc:SunOS:5.*:*) -+ exit ;; -+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) -@@ -347,10 +347,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` -- exit 0 ;; -+ exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 -@@ -362,10 +362,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac -- exit 0 ;; -+ exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor -@@ -376,37 +376,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ m68k:machten:*:*) -+ echo m68k-apple-machten${UNAME_RELEASE} -+ exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 -- exit 0 ;; -+ exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -430,32 +433,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - exit (-1); - } - EOF -- $CC_FOR_BUILD -o $dummy $dummy.c \ -- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ -- && exit 0 -+ $CC_FOR_BUILD -o $dummy $dummy.c && -+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && -+ SYSTEM_NAME=`$dummy $dummyarg` && -+ { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax -- exit 0 ;; -+ exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax -- exit 0 ;; -+ exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax -- exit 0 ;; -+ exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix -- exit 0 ;; -+ exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 -- exit 0 ;; -+ exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 -- exit 0 ;; -+ exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` -@@ -471,29 +475,29 @@ EOF - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 -- exit 0 ;; -+ exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 -- exit 0 ;; -+ exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd -- exit 0 ;; -+ exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` -- exit 0 ;; -+ exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. -- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' -+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix -- exit 0 ;; -+ exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` -@@ -501,7 +505,7 @@ EOF - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build -@@ -516,15 +520,19 @@ EOF - exit(0); - } - EOF -- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 -- echo rs6000-ibm-aix3.2.5 -+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` -+ then -+ echo "$SYSTEM_NAME" -+ else -+ echo rs6000-ibm-aix3.2.5 -+ fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi -- exit 0 ;; -- *:AIX:*:[45]) -+ exit ;; -+ *:AIX:*:[456]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -537,28 +545,28 @@ EOF - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix -- exit 0 ;; -+ exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 -- exit 0 ;; -+ exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to -- exit 0 ;; # report: romp-ibm BSD 4.3 -+ exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx -- exit 0 ;; -+ exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 -- exit 0 ;; -+ exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd -- exit 0 ;; -+ exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 -- exit 0 ;; -+ exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in -@@ -620,9 +628,19 @@ EOF - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then -- # avoid double evaluation of $set_cc_for_build -- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build -- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null -+ eval $set_cc_for_build -+ -+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating -+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler -+ # generating 64-bit code. GNU and HP use different nomenclature: -+ # -+ # $ CC_FOR_BUILD=cc ./config.guess -+ # => hppa2.0w-hp-hpux11.23 -+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess -+ # => hppa64-hp-hpux11.23 -+ -+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -+ grep __LP64__ >/dev/null - then - HP_ARCH="hppa2.0w" - else -@@ -630,11 +648,11 @@ EOF - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -662,147 +680,192 @@ EOF - exit (0); - } - EOF -- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 -+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 -- exit 0 ;; -+ exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd -- exit 0 ;; -+ exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd -- exit 0 ;; -+ exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix -- exit 0 ;; -+ exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf -- exit 0 ;; -+ exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf -- exit 0 ;; -+ exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi -- exit 0 ;; -+ exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites -- exit 0 ;; -+ exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit 0 ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - *:UNICOS/mp:*:*) -- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -+ exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit 0 ;; -+ exit ;; -+ 5000:UNIX_System_V:4.*:*) -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:FreeBSD:*:*) -- # Determine whether the default compiler uses glibc. -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #include <features.h> -- #if __GLIBC__ >= 2 -- LIBC=gnu -- #else -- LIBC= -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} -- exit 0 ;; -+ case ${UNAME_MACHINE} in -+ pc98) -+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ amd64) -+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ *) -+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ esac -+ exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin -- exit 0 ;; -- i*:MINGW*:*) -+ exit ;; -+ *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 -- exit 0 ;; -+ exit ;; -+ i*:windows32*:*) -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 -+ exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 -- exit 0 ;; -- x86:Interix*:3*) -- echo i586-pc-interix3 -- exit 0 ;; -+ exit ;; -+ *:Interix*:[3456]*) -+ case ${UNAME_MACHINE} in -+ x86) -+ echo i586-pc-interix${UNAME_RELEASE} -+ exit ;; -+ EM64T | authenticamd) -+ echo x86_64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ IA64) -+ echo ia64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks -- exit 0 ;; -+ exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix -- exit 0 ;; -+ exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin -- exit 0 ;; -+ exit ;; -+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) -+ echo x86_64-unknown-cygwin -+ exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin -- exit 0 ;; -+ exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - *:GNU:*:*) -+ # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` -- exit 0 ;; -+ exit ;; -+ *:GNU/*:*:*) -+ # other systems with GNU libc and userland -+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -+ exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix -- exit 0 ;; -+ exit ;; - arm*:Linux:*:*) -+ eval $set_cc_for_build -+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_EABI__ -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ fi -+ exit ;; -+ avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ cris:Linux:*:*) -+ echo cris-axis-linux-gnu -+ exit ;; -+ crisv32:Linux:*:*) -+ echo crisv32-axis-linux-gnu -+ exit ;; -+ frv:Linux:*:*) -+ echo frv-unknown-linux-gnu -+ exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ m32r*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -819,8 +882,12 @@ EOF - #endif - #endif - EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^CPU/{ -+ s: ::g -+ p -+ }'`" -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build -@@ -838,15 +905,22 @@ EOF - #endif - #endif - EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^CPU/{ -+ s: ::g -+ p -+ }'`" -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; -+ or32:Linux:*:*) -+ echo or32-unknown-linux-gnu -+ exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; -@@ -860,7 +934,7 @@ EOF - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -- exit 0 ;; -+ exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -@@ -868,22 +942,31 @@ EOF - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac -- exit 0 ;; -+ exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux -- exit 0 ;; -+ exit ;; -+ sh64*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ vax:Linux:*:*) -+ echo ${UNAME_MACHINE}-dec-linux-gnu -+ exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ xtensa*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent -@@ -901,15 +984,15 @@ EOF - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" -- exit 0 ;; -+ exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" -- exit 0 ;; -+ exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -- exit 0 ;; -+ exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build -@@ -926,23 +1009,33 @@ EOF - LIBC=gnulibc1 - # endif - #else -- #ifdef __INTEL_COMPILER -+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif -+ #ifdef __dietlibc__ -+ LIBC=dietlibc -+ #endif - EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 -- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^LIBC/{ -+ s: ::g -+ p -+ }'`" -+ test x"${LIBC}" != x && { -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -+ exit -+ } -+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 -- exit 0 ;; -+ exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... -@@ -950,24 +1043,27 @@ EOF - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} -- exit 0 ;; -+ exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx -- exit 0 ;; -+ exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop -- exit 0 ;; -+ exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos -- exit 0 ;; -+ exit ;; -+ i*86:syllable:*:*) -+ echo ${UNAME_MACHINE}-pc-syllable -+ exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp -- exit 0 ;; -+ exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then -@@ -975,15 +1071,16 @@ EOF - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi -- exit 0 ;; -- i*86:*:5:[78]*) -+ exit ;; -+ i*86:*:5:[678]*) -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} -- exit 0 ;; -+ exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` -@@ -1001,73 +1098,73 @@ EOF - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi -- exit 0 ;; -+ exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp -- exit 0 ;; -+ exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 -- exit 0 ;; -+ exit ;; - paragon:*:*:*) - echo i860-intel-osf1 -- exit 0 ;; -+ exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi -- exit 0 ;; -+ exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv -- exit 0 ;; -+ exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv -- exit 0 ;; -+ exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix -- exit 0 ;; -- M68*:*:R3V[567]*:*) -- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; -- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0) -+ exit ;; -+ M68*:*:R3V[5678]*:*) -+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; -+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4 && exit 0 ;; -+ && { echo i486-ncr-sysv4; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 -- exit 0 ;; -+ exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -1075,68 +1172,81 @@ EOF - else - echo ns32k-sni-sysv - fi -- exit 0 ;; -+ exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says <Richard.M.Bartel@ccMail.Census.GOV> - echo i586-unisys-sysv4 -- exit 0 ;; -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes <hewes@openmarket.com>. - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 -- exit 0 ;; -+ exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 -- exit 0 ;; -+ exit ;; -+ i*86:VOS:*:*) -+ # From Paul.Green@stratus.com. -+ echo ${UNAME_MACHINE}-stratus-vos -+ exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos -- exit 0 ;; -+ exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 -- exit 0 ;; -+ exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos -- exit 0 ;; -+ exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos -- exit 0 ;; -+ exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos -- exit 0 ;; -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ SX-7:SUPER-UX:*:*) -+ echo sx7-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8:SUPER-UX:*:*) -+ echo sx8-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8R:SUPER-UX:*:*) -+ echo sx8r-nec-superux${UNAME_RELEASE} -+ exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Darwin:*:*) -- case `uname -p` in -- *86) UNAME_PROCESSOR=i686 ;; -- powerpc) UNAME_PROCESSOR=powerpc ;; -+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown -+ case $UNAME_PROCESSOR in -+ unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then -@@ -1144,22 +1254,25 @@ EOF - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:QNX:*:4*) - echo i386-pc-qnx -- exit 0 ;; -- NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) -+ exit ;; -+ NSE-?:NONSTOP_KERNEL:*:*) -+ echo nse-tandem-nsk${UNAME_RELEASE} -+ exit ;; -+ NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux -- exit 0 ;; -+ exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv -- exit 0 ;; -+ exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 -@@ -1170,25 +1283,47 @@ EOF - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 -- exit 0 ;; -+ exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 -- exit 0 ;; -+ exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex -- exit 0 ;; -+ exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 -- exit 0 ;; -+ exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 -- exit 0 ;; -+ exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 -- exit 0 ;; -+ exit ;; - *:ITS:*:*) - echo pdp10-unknown-its -- exit 0 ;; -+ exit ;; -+ SEI:*:*:SEIUX) -+ echo mips-sei-seiux${UNAME_RELEASE} -+ exit ;; -+ *:DragonFly:*:*) -+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -+ exit ;; -+ *:*VMS:*:*) -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ case "${UNAME_MACHINE}" in -+ A*) echo alpha-dec-vms ; exit ;; -+ I*) echo ia64-dec-vms ; exit ;; -+ V*) echo vax-dec-vms ; exit ;; -+ esac ;; -+ *:XENIX:*:SysV) -+ echo i386-pc-xenix -+ exit ;; -+ i*86:skyos:*:*) -+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' -+ exit ;; -+ i*86:rdos:*:*) -+ echo ${UNAME_MACHINE}-pc-rdos -+ exit ;; - esac - - #echo '(No uname command or uname output not recognized.)' 1>&2 -@@ -1220,7 +1355,7 @@ main () - #endif - - #if defined (__arm) && defined (__acorn) && defined (__unix) -- printf ("arm-acorn-riscix"); exit (0); -+ printf ("arm-acorn-riscix\n"); exit (0); - #endif - - #if defined (hp300) && !defined (hpux) -@@ -1309,11 +1444,12 @@ main () - } - EOF - --$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 -+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - - # Apollos put the system type in the environment. - --test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } -+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - - # Convex versions that predate uname can use getsysinfo(1) - -@@ -1322,22 +1458,22 @@ then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - c34*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - c38*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - c4*) - echo c4-convex-bsd -- exit 0 ;; -+ exit ;; - esac - fi - -@@ -1348,7 +1484,9 @@ This script, last modified $timestamp, h - the operating system you are using. It is advised that you - download the most up to date version of the config scripts from - -- ftp://ftp.gnu.org/pub/gnu/config/ -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -+and -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - - If the version you run ($0) is already up to date, please - send the following data and any information you think might be diff --git a/inputmethod/ja-freewnn-lib/patches/patch-config.h.in b/inputmethod/ja-freewnn-lib/patches/patch-config.h.in deleted file mode 100644 index a026efb446d..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-config.h.in +++ /dev/null @@ -1,116 +0,0 @@ -$NetBSD: patch-config.h.in,v 1.1 2011/09/13 07:23:21 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- config.h.in.orig 2005-11-27 17:30:23.000000000 +0000 -+++ config.h.in -@@ -63,12 +63,15 @@ - /* Define to 1 if you have the `bind' library (-lbind). */ - #undef HAVE_LIBBIND - --/* Define to 1 if you have the `nsl' library (-lnsl). */ --#undef HAVE_LIBNSL -- - /* Define to 1 if you have the `socket' library (-lsocket). */ - #undef HAVE_LIBSOCKET - -+/* Define to 1 if you have the `util' library (-lutil). */ -+#undef HAVE_LIBUTIL -+ -+/* Define to 1 if you have the <libutil.h> header file. */ -+#undef HAVE_LIBUTIL_H -+ - /* Define if you have libwrap (TCP wrapper) support. */ - #undef HAVE_LIBWRAP - -@@ -93,6 +96,21 @@ - /* Define to 1 if you have the <ncurses.h> header file. */ - #undef HAVE_NCURSES_H - -+/* Define to 1 if you have the `openpty' function. */ -+#undef HAVE_OPENPTY -+ -+/* Define to 1 if you have the `posix_openpt' function. */ -+#undef HAVE_POSIX_OPENPT -+ -+/* Define to 1 if you have the `ptsname' function. */ -+#undef HAVE_PTSNAME -+ -+/* Define to 1 if you have the `pututline' function. */ -+#undef HAVE_PUTUTLINE -+ -+/* Define to 1 if you have the `pututxline' function. */ -+#undef HAVE_PUTUTXLINE -+ - /* Define to 1 if you have the `random' function. */ - #undef HAVE_RANDOM - -@@ -114,6 +132,9 @@ - /* Define to 1 if you have the `setpgrp' function. */ - #undef HAVE_SETPGRP - -+/* Define to 1 if you have the `setsid' function. */ -+#undef HAVE_SETSID -+ - /* Define to 1 if you have the `setsockopt' function. */ - #undef HAVE_SETSOCKOPT - -@@ -147,6 +168,15 @@ - /* Define to 1 if you have the `strrchr' function. */ - #undef HAVE_STRRCHR - -+/* Define to 1 if `ut_id' is member of `struct utmp'. */ -+#undef HAVE_STRUCT_UTMP_UT_ID -+ -+/* Define to 1 if `ut_name' is member of `struct utmp'. */ -+#undef HAVE_STRUCT_UTMP_UT_NAME -+ -+/* Define to 1 if `ut_user' is member of `struct utmp'. */ -+#undef HAVE_STRUCT_UTMP_UT_USER -+ - /* Define to 1 if you have the `syslog' function. */ - #undef HAVE_SYSLOG - -@@ -165,6 +195,9 @@ - /* Define to 1 if you have the <sys/stat.h> header file. */ - #undef HAVE_SYS_STAT_H - -+/* Define to 1 if you have the <sys/termio.h> header file. */ -+#undef HAVE_SYS_TERMIO_H -+ - /* Define to 1 if you have the <sys/time.h> header file. */ - #undef HAVE_SYS_TIME_H - -@@ -174,6 +207,12 @@ - /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */ - #undef HAVE_SYS_WAIT_H - -+/* Define to 1 if you have the <termcap.h> header file. */ -+#undef HAVE_TERMCAP_H -+ -+/* terminfo spoken here */ -+#undef HAVE_TERMINFO -+ - /* Define to 1 if you have the <termios.h> header file. */ - #undef HAVE_TERMIOS_H - -@@ -201,6 +240,9 @@ - /* Define to 1 if you have the `wait3' function. */ - #undef HAVE_WAIT3 - -+/* Define to 1 if you have the file `AC_File'. */ -+#undef HAVE__DEV_PTMX -+ - /* Define to the address where bug reports for this package should be sent. */ - #undef PACKAGE_BUGREPORT - -@@ -231,6 +273,9 @@ - /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ - #undef TIME_WITH_SYS_TIME - -+/* Define to 1 if uum writes utmp entry */ -+#undef USE_UTMP -+ - /* Define to allow writing to other than JSERVERDIR. */ - #undef WNN_ALLOW_UNSAFE_PATH - diff --git a/inputmethod/ja-freewnn-lib/patches/patch-config.sub b/inputmethod/ja-freewnn-lib/patches/patch-config.sub deleted file mode 100644 index 0c1a5bdc9cd..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-config.sub +++ /dev/null @@ -1,738 +0,0 @@ -$NetBSD: patch-config.sub,v 1.1 2011/09/13 07:23:21 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- config.sub.orig 2003-06-04 08:35:02.000000000 +0000 -+++ config.sub -@@ -1,9 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -+# Free Software Foundation, Inc. - --timestamp='2003-02-22' -+timestamp='2008-01-16' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -21,14 +22,15 @@ timestamp='2003-02-22' - # - # 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. -- -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -+# 02110-1301, 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. - -+ - # Please send patches to <config-patches@gnu.org>. Submit a context - # diff and a properly formatted ChangeLog entry. - # -@@ -70,8 +72,8 @@ Report bugs and patches to <config-patch - version="\ - GNU config.sub ($timestamp) - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -+2002, 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." -@@ -83,11 +85,11 @@ Try \`$me --help' for more information." - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -99,7 +101,7 @@ while test $# -gt 0 ; do - *local*) - # First pass through any local machine types. - echo $1 -- exit 0;; -+ exit ;; - - * ) - break ;; -@@ -118,7 +120,9 @@ esac - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) -+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -+ storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -@@ -144,7 +148,7 @@ case $os in - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis) -+ -apple | -axis | -knuth | -cray) - os= - basic_machine=$1 - ;; -@@ -169,6 +173,10 @@ case $os in - -hiux*) - os=-hiuxwe2 - ;; -+ -sco6) -+ os=-sco5v6 -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -185,6 +193,10 @@ case $os in - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -sco5v6*) -+ # Don't forget version if it is 3.2v4 or newer. -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -228,14 +240,17 @@ case $basic_machine in - | a29k \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ -- | clipper \ -+ | am33_2.0 \ -+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | bfin \ -+ | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ -- | fr30 | frv \ -+ | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ -- | ip2k \ -- | m32r | m68000 | m68k | m88k | mcore \ -+ | ip2k | iq2000 \ -+ | m32c | m32r | m32rle | m68000 | m68k | m88k \ -+ | maxq | mb | microblaze | mcore | mep \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -@@ -244,27 +259,33 @@ case $basic_machine in - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ -+ | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ -+ | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ -+ | mt \ - | msp430 \ -+ | nios | nios2 \ - | ns16k | ns32k \ -- | openrisc | or32 \ -+ | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ -- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ -+ | score \ -+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ -- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ -- | strongarm \ -- | tahoe | thumb | tic80 | tron \ -+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ -+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -+ | spu | strongarm \ -+ | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ - | we32k \ -- | x86 | xscale | xstormy16 | xtensa \ -+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) - basic_machine=$basic_machine-unknown - ;; -@@ -275,6 +296,9 @@ case $basic_machine in - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; -+ ms1) -+ basic_machine=mt-unknown -+ ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and -@@ -294,20 +318,20 @@ case $basic_machine in - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -- | avr-* \ -- | bs2000-* \ -+ | avr-* | avr32-* \ -+ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ -- | clipper-* | cydra-* \ -+ | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ -- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ -+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ -- | ip2k-* \ -- | m32r-* \ -+ | ip2k-* | iq2000-* \ -+ | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | mcore-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ -@@ -316,33 +340,43 @@ case $basic_machine in - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ -+ | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ -+ | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ -+ | mmix-* \ -+ | mt-* \ - | msp430-* \ -- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ -+ | nios-* | nios2-* \ -+ | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ -- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ -- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ -- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ -+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ -+ | sparclite-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ -- | xtensa-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-*) - ;; -+ # Recognize the basic CPU types without company name, with glob match. -+ xtensa*) -+ basic_machine=$basic_machine-unknown -+ ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) -@@ -359,6 +393,9 @@ case $basic_machine in - basic_machine=a29k-amd - os=-udi - ;; -+ abacus) -+ basic_machine=abacus-unknown -+ ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout -@@ -373,6 +410,12 @@ case $basic_machine in - basic_machine=a29k-none - os=-bsd - ;; -+ amd64) -+ basic_machine=x86_64-pc -+ ;; -+ amd64-*) -+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - amdahl) - basic_machine=580-amdahl - os=-sysv -@@ -404,6 +447,14 @@ case $basic_machine in - basic_machine=ns32k-sequent - os=-dynix - ;; -+ blackfin) -+ basic_machine=bfin-unknown -+ os=-linux -+ ;; -+ blackfin-*) -+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - c90) - basic_machine=c90-cray - os=-unicos -@@ -432,12 +483,27 @@ case $basic_machine in - basic_machine=j90-cray - os=-unicos - ;; -+ craynv) -+ basic_machine=craynv-cray -+ os=-unicosmp -+ ;; -+ cr16) -+ basic_machine=cr16-unknown -+ os=-elf -+ ;; - crds | unos) - basic_machine=m68k-crds - ;; -+ crisv32 | crisv32-* | etraxfs*) -+ basic_machine=crisv32-axis -+ ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; -+ crx) -+ basic_machine=crx-unknown -+ os=-elf -+ ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; -@@ -460,6 +526,10 @@ case $basic_machine in - basic_machine=m88k-motorola - os=-sysv3 - ;; -+ djgpp) -+ basic_machine=i586-pc -+ os=-msdosdjgpp -+ ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx -@@ -610,6 +680,14 @@ case $basic_machine in - basic_machine=m68k-isi - os=-sysv - ;; -+ m68knommu) -+ basic_machine=m68k-unknown -+ os=-linux -+ ;; -+ m68knommu-*) -+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - m88k-omron*) - basic_machine=m88k-omron - ;; -@@ -625,6 +703,10 @@ case $basic_machine in - basic_machine=i386-pc - os=-mingw32 - ;; -+ mingw32ce) -+ basic_machine=arm-unknown -+ os=-mingw32ce -+ ;; - miniframe) - basic_machine=m68000-convergent - ;; -@@ -638,10 +720,6 @@ case $basic_machine in - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; -- mmix*) -- basic_machine=mmix-knuth -- os=-mmixware -- ;; - monitor) - basic_machine=m68k-rom68k - os=-coff -@@ -654,6 +732,9 @@ case $basic_machine in - basic_machine=i386-pc - os=-msdos - ;; -+ ms1-*) -+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs -@@ -722,10 +803,6 @@ case $basic_machine in - np1) - basic_machine=np1-gould - ;; -- nv1) -- basic_machine=nv1-cray -- os=-unicosmp -- ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; -@@ -733,9 +810,12 @@ case $basic_machine in - basic_machine=hppa1.1-oki - os=-proelf - ;; -- or32 | or32-*) -+ openrisc | openrisc-*) - basic_machine=or32-unknown -- os=-coff -+ ;; -+ os400) -+ basic_machine=powerpc-ibm -+ os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson -@@ -753,6 +833,14 @@ case $basic_machine in - basic_machine=i860-intel - os=-osf - ;; -+ parisc) -+ basic_machine=hppa-unknown -+ os=-linux -+ ;; -+ parisc-*) -+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - pbd) - basic_machine=sparc-tti - ;; -@@ -762,24 +850,36 @@ case $basic_machine in - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; -+ pc98) -+ basic_machine=i386-pc -+ ;; -+ pc98-*) -+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; -- pentiumii | pentium2) -+ pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; -+ pentium4) -+ basic_machine=i786-pc -+ ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -- pentiumii-* | pentium2-*) -+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -+ pentium4-*) -+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - pn) - basic_machine=pn-gould - ;; -@@ -812,6 +912,10 @@ case $basic_machine in - basic_machine=i586-unknown - os=-pw32 - ;; -+ rdos) -+ basic_machine=i386-pc -+ os=-rdos -+ ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff -@@ -838,6 +942,14 @@ case $basic_machine in - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; -+ sde) -+ basic_machine=mipsisa32-sde -+ os=-elf -+ ;; -+ sei) -+ basic_machine=mips-sei -+ os=-seiux -+ ;; - sequent) - basic_machine=i386-sequent - ;; -@@ -845,6 +957,12 @@ case $basic_machine in - basic_machine=sh-hitachi - os=-hms - ;; -+ sh5el) -+ basic_machine=sh5le-unknown -+ ;; -+ sh64) -+ basic_machine=sh64-unknown -+ ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks -@@ -919,10 +1037,6 @@ case $basic_machine in - basic_machine=t90-cray - os=-unicos - ;; -- tic4x | c4x*) -- basic_machine=tic4x-unknown -- os=-coff -- ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff -@@ -935,6 +1049,10 @@ case $basic_machine in - basic_machine=tic6x-unknown - os=-coff - ;; -+ tile*) -+ basic_machine=tile-unknown -+ os=-linux-gnu -+ ;; - tx39) - basic_machine=mipstx39-unknown - ;; -@@ -948,6 +1066,10 @@ case $basic_machine in - tower | tower-32) - basic_machine=m68k-ncr - ;; -+ tpf) -+ basic_machine=s390x-ibm -+ os=-tpf -+ ;; - udi29k) - basic_machine=a29k-amd - os=-udi -@@ -991,6 +1113,10 @@ case $basic_machine in - basic_machine=hppa1.1-winbond - os=-proelf - ;; -+ xbox) -+ basic_machine=i686-pc -+ os=-mingw32 -+ ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; -@@ -1021,6 +1147,9 @@ case $basic_machine in - romp) - basic_machine=romp-ibm - ;; -+ mmix) -+ basic_machine=mmix-knuth -+ ;; - rs6000) - basic_machine=rs6000-ibm - ;; -@@ -1037,13 +1166,10 @@ case $basic_machine in - we32k) - basic_machine=we32k-att - ;; -- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) -+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; -- sh64) -- basic_machine=sh64-unknown -- ;; -- sparc | sparcv9 | sparcv9b) -+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) -@@ -1116,19 +1242,23 @@ case $os in - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ -- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ -- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ -+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -+ | -openbsd* | -solidbsd* \ -+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ -+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ -+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ -- | -powermax* | -dnix*) -+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1146,12 +1276,15 @@ case $os in - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ -- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ -+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; -+ -linux-dietlibc) -+ os=-linux-dietlibc -+ ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; -@@ -1164,6 +1297,9 @@ case $os in - -opened*) - os=-openedition - ;; -+ -os400*) -+ os=-os400 -+ ;; - -wince*) - os=-wince - ;; -@@ -1185,6 +1321,9 @@ case $os in - -atheos*) - os=-atheos - ;; -+ -syllable*) -+ os=-syllable -+ ;; - -386bsd) - os=-bsd - ;; -@@ -1207,6 +1346,9 @@ case $os in - -sinix*) - os=-sysv4 - ;; -+ -tpf*) -+ os=-tpf -+ ;; - -triton*) - os=-sysv3 - ;; -@@ -1243,6 +1385,9 @@ case $os in - -kaos*) - os=-kaos - ;; -+ -zvmoe) -+ os=-zvmoe -+ ;; - -none) - ;; - *) -@@ -1265,6 +1410,12 @@ else - # system, and we'll never get to this point. - - case $basic_machine in -+ score-*) -+ os=-elf -+ ;; -+ spu-*) -+ os=-elf -+ ;; - *-acorn) - os=-riscix1.2 - ;; -@@ -1274,6 +1425,9 @@ case $basic_machine in - arm*-semi) - os=-aout - ;; -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 -@@ -1299,6 +1453,9 @@ case $basic_machine in - m68*-cisco) - os=-aout - ;; -+ mep-*) -+ os=-elf -+ ;; - mips*-cisco) - os=-elf - ;; -@@ -1317,9 +1474,15 @@ case $basic_machine in - *-be) - os=-beos - ;; -+ *-haiku) -+ os=-haiku -+ ;; - *-ibm) - os=-aix - ;; -+ *-knuth) -+ os=-mmixware -+ ;; - *-wec) - os=-proelf - ;; -@@ -1452,9 +1615,15 @@ case $basic_machine in - -mvs* | -opened*) - vendor=ibm - ;; -+ -os400*) -+ vendor=ibm -+ ;; - -ptx*) - vendor=sequent - ;; -+ -tpf*) -+ vendor=ibm -+ ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; -@@ -1479,7 +1648,7 @@ case $basic_machine in - esac - - echo $basic_machine$os --exit 0 -+exit - - # Local variables: - # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/inputmethod/ja-freewnn-lib/patches/patch-configure b/inputmethod/ja-freewnn-lib/patches/patch-configure deleted file mode 100644 index ddb37760ce8..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-configure +++ /dev/null @@ -1,13026 +0,0 @@ -$NetBSD: patch-configure,v 1.1 2011/09/13 07:23:21 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- configure.orig 2005-11-27 17:30:23.000000000 +0000 -+++ configure -@@ -1,6 +1,8 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.53. -+# Generated by GNU Autoconf 2.53 for FreeWnn 1.1.1-cvs-a022. -+# -+# Report bugs to <freewnn-users-owner@lists.sourceforge.jp>. - # - # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 - # Free Software Foundation, Inc. -@@ -44,15 +46,15 @@ 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 -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - 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`" && -+ 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 -@@ -157,9 +159,9 @@ fi - - - --tagnames=`echo "$tagnames,CXX" | sed 's/^,//'` -+tagnames=${tagnames+${tagnames},}CXX - --tagnames=`echo "$tagnames,F77" | sed 's/^,//'` -+tagnames=${tagnames+${tagnames},}F77 - - if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -@@ -406,11 +408,11 @@ SHELL=${CONFIG_SHELL-/bin/sh} - : ${ac_max_here_lines=38} - - # Identity of this package. --PACKAGE_NAME= --PACKAGE_TARNAME= --PACKAGE_VERSION= --PACKAGE_STRING= --PACKAGE_BUGREPORT= -+PACKAGE_NAME='FreeWnn' -+PACKAGE_TARNAME='FreeWnn' -+PACKAGE_VERSION='1.1.1-cvs-a022' -+PACKAGE_STRING='FreeWnn 1.1.1-cvs-a022' -+PACKAGE_BUGREPORT='freewnn-users-owner@lists.sourceforge.jp' - - ac_unique_file="Wnn/conv/cvt_head.h" - # Factoring default headers for most tests. -@@ -934,7 +936,7 @@ if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF --\`configure' configures this package to adapt to many kinds of systems. -+\`configure' configures FreeWnn 1.1.1-cvs-a022 to adapt to many kinds of systems. - - Usage: $0 [OPTION]... [VAR=VALUE]... - -@@ -987,9 +989,10 @@ _ACEOF - - cat <<\_ACEOF - --X features: -- --x-includes=DIR X include files are in DIR -- --x-libraries=DIR X library files are in DIR -+Program names: -+ --program-prefix=PREFIX prepend PREFIX to installed program names -+ --program-suffix=SUFFIX append SUFFIX to installed program names -+ --program-transform-name=PROGRAM run sed PROGRAM on installed program names - - System types: - --build=BUILD configure for building on BUILD [guessed] -@@ -998,7 +1001,9 @@ _ACEOF - fi - - if test -n "$ac_init_help"; then -- -+ case $ac_init_help in -+ short | recursive ) echo "Configuration of FreeWnn 1.1.1-cvs-a022:";; -+ esac - cat <<\_ACEOF - - Optional Features: -@@ -1008,11 +1013,16 @@ Optional Features: - --enable-libraries build and install libraries [default=yes] - --enable-server build and install server [default=yes] - --enable-client build and install clients [default=no] -+ --enable-client-utmp write utmp with client [default=yes if not modern BSD] -+ --enable-client-setuid[=user] Install client with setuid and specified user [default=guess if your system need this] -+ --enable-client-setgid=group Install client with setgid and specified group [default=guess if your system need this] - --enable-Wnn build and install Wnn [default=yes] - --enable-cWnn build and install cWnn [default=yes] - --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] -+ --enable-traditional-layout Install files in traditional directories [default=yes] -+ --enable-sub-bindir Install executables to (ex.) $(bindir)/Wnn4 [default=yes if --enable-traditional-layout, no otherwise] - --enable-shared[=PKGS] - build shared libraries [default=yes] - --enable-static[=PKGS] -@@ -1025,20 +1035,20 @@ Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-libwnn use installed Wnn library [default=no] -- --with-wnn-includes=DIR WNN include files are in DIR -- --with-wnn-libraries=DIR Search for WNN libraries in DIR [default=/usr/local/lib] -+ --with-wnn-includes=DIR Installed Wnn include files are in DIR -+ --with-wnn-libraries=DIR Search for Wnn libraries in DIR [default=/usr/local/lib] - --with-libcwnn use installed cWnn library [default=no] -- --with-cwnn-includes=DIR CWNN include files are in DIR -- --with-cwnn-libraries=DIR Search for CWNN libraries in DIR [default=/usr/local/lib] -+ --with-cwnn-includes=DIR Installed cWnn include files are in DIR -+ --with-cwnn-libraries=DIR Search for cWnn libraries in DIR [default=/usr/local/lib] - --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-kwnn-includes=DIR Installed 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-x use the X Window System -+ --with-term-libs=-lLIB terminal library to be used - --with-libwrap[=DIR] Compile in libwrap (tcp_wrappers) support [default=try to find libwrap] - - Some influential environment variables: -@@ -1058,6 +1068,7 @@ Some influential environment variables: - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. - -+Report bugs to <freewnn-users-owner@lists.sourceforge.jp>. - _ACEOF - fi - -@@ -1120,6 +1131,8 @@ fi - test -n "$ac_init_help" && exit 0 - if $ac_init_version; then - cat <<\_ACEOF -+FreeWnn configure 1.1.1-cvs-a022 -+generated by GNU Autoconf 2.53 - - Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 - Free Software Foundation, Inc. -@@ -1133,7 +1146,7 @@ cat >&5 <<_ACEOF - This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - --It was created by $as_me, which was -+It was created by FreeWnn $as_me 1.1.1-cvs-a022, which was - generated by GNU Autoconf 2.53. Invocation command line was - - $ $0 $@ -@@ -1403,11 +1416,20 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ - ac_config_headers="$ac_config_headers config.h" - - - --# Quick and Dirty workaround for Autoconf-2.53 and Libtools-1.5 pair ... -+# Quick and Dirty workaround for Autoconf-2.53 and Libtools-1.5.* pair ... - # not to use additional tagged configuration. (default: CXX F77) - # NOTICE: Please remove next line if situation changes. (aono) - tagnames= -@@ -1492,6 +1514,20 @@ host_os=`echo $ac_cv_host | sed 's/^\([^ - - - -+test "$program_prefix" != NONE && -+ program_transform_name="s,^,$program_prefix,;$program_transform_name" -+# Use a double $ so make ignores it. -+test "$program_suffix" != NONE && -+ program_transform_name="s,\$,$program_suffix,;$program_transform_name" -+# Double any \ or $. echo might interpret backslashes. -+# By default was `s,x,x', remove it if useless. -+cat <<\_ACEOF >conftest.sed -+s/[\\$]/&&/g;s/;s,x,x,$// -+_ACEOF -+program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -+rm conftest.sed -+ -+ - - # Check whether --enable-debug or --disable-debug was given. - if test "${enable_debug+set}" = set; then -@@ -1549,6 +1585,57 @@ else - client=false - fi; - -+# Check whether --enable-client-utmp or --disable-client-utmp was given. -+if test "${enable_client_utmp+set}" = set; then -+ enableval="$enable_client_utmp" -+ case "${enableval}" in -+ yes) client_utmp=true ;; -+ no) client_utmp=false ;; -+ *) { { echo "$as_me:$LINENO: error: bad value for --enable-client-utmp" >&5 -+echo "$as_me: error: bad value for --enable-client-utmp" >&2;} -+ { (exit 1); exit 1; }; } ;; -+esac -+else -+ client_utmp=auto -+ -+fi; -+ -+# Check whether --enable-client-setuid or --disable-client-setuid was given. -+if test "${enable_client_setuid+set}" = set; then -+ enableval="$enable_client_setuid" -+ case "${enableval}" in -+ yes) client_setuid=true; UUMOWNER=${UUMOWNER:-root} ;; -+ no) client_setuid=false ;; -+ *) client_setuid=true; UUMOWNER=${enableval} ;; -+esac -+else -+ client_setuid=auto # guess later ... -+ UUMOWNER=root -+ -+fi; -+ -+# Check whether --enable-client-setgid or --disable-client-setgid was given. -+if test "${enable_client_setgid+set}" = set; then -+ enableval="$enable_client_setgid" -+ case "${enableval}" in -+ yes) -+ if test "x$UUMGROUP" = "x"; then -+ { { echo "$as_me:$LINENO: error: You must set group name with --enable-client-setgid." >&5 -+echo "$as_me: error: You must set group name with --enable-client-setgid." >&2;} -+ { (exit 1); exit 1; }; } -+ else -+ client_setgid=true; # we already defined UUMGROUP ... -+ fi -+ ;; -+ no) client_setgid=false ;; -+ *) client_setgid=true; UUMGROUP=${enableval} ;; -+esac -+else -+ client_setgid=auto # guess later ... -+UUMGROUP= -+ -+fi; -+ - if test $libraries = true; then - SUBDIRS="\$(LIB_SUBDIRS)" - WNNMANDIR="\$(LIB_WNNMANDIR)" -@@ -1621,11 +1708,13 @@ fi; - - - -- - # Check whether --with-libwnn or --without-libwnn was given. - if test "${with_libwnn+set}" = set; then - withval="$with_libwnn" - with_libwnn="${withval}" -+else -+ with_libwnn=no -+fi; - - # Check whether --with-wnn-includes or --without-wnn-includes was given. - if test "${with_wnn_includes+set}" = set; then -@@ -1642,22 +1731,28 @@ if test "${with_wnn_libraries+set}" = se - else - wnnlibdir='/usr/local/lib' - fi; -- if test "X${with_libwnn}" = X-lwnn; then -- WNNJLIB="-L${wnnlibdir} -lwnn" -- elif test X"`echo ${with_libwnn} | grep '^/.*'`" != X ; then -- WNNJLIB="${with_libwnn}" -- else -- WNNJLIB="${wnnlibdir}/libwnn.a" -- fi -- DEPWNNJLIB="" -- HINSI_DATA="\$(JWNNWNNDIR)/hinsi.data" - -+if test X${with_libwnn} != Xno; then -+ case X${with_libwnn} in -+ Xyes | X-lwnn) -+ WNNJLIB="-L${wnnlibdir} -lwnn" ;; -+ X/*) -+ WNNJLIB="${wnnlibdir}/libwnn.a" ;; -+ *) -+ # Honor specified value --with-libwnn -+ # (maybe wrong in most cases) -+ WNNJLIB="${with_libwnn}" ;; -+ esac -+ DEPWNNJLIB="" -+ HINSI_DATA="\$(JWNNWNNDIR)/hinsi.data" -+ EXTWNNJINC=${wnnincludedir} - else -- WNNJLIB="\$(top_builddir)/Wnn/jlib/libwnn.la" -+ WNNJLIB="\$(top_builddir)/Wnn/jlib/libwnn.la" - DEPWNNJLIB="\$(WNNJLIB)" - HINSI_DATA="\$(top_builddir)/Wnn/jd/hinsi.data" -+ EXTWNNJINC="" -+fi - --fi; - - - -@@ -1666,7 +1761,10 @@ fi; - # Check whether --with-libcwnn or --without-libcwnn was given. - if test "${with_libcwnn+set}" = set; then - withval="$with_libcwnn" -- -+ with_libcwnn="${withval}" -+else -+ with_libcwnn=no -+fi; - - # Check whether --with-cwnn-includes or --without-cwnn-includes was given. - if test "${with_cwnn_includes+set}" = set; then -@@ -1683,24 +1781,30 @@ if test "${with_cwnn_libraries+set}" = s - else - cwnnlibdir='/usr/local/lib' - fi; -- if test "X${with_libcwnn}" = X-lcwnn; then -- CWNNJLIB="-L${cwnnlibdir} -lcwnn" -- elif test X"`echo ${with_libcwnn} | grep '^/.*'`" != X ; then -- CWNNJLIB="${with_libcwnn}" -- else -- CWNNJLIB="${cwnnlibdir}/libcwnn.a" -- fi -- DEPCWNNJLIB="" -- CHINSI_DATA="\$(CWNNWNNDIR)/cixing.data" -- THINSI_DATA="\$(TWNNTDSRC)/cixing.data" - -+if test X${with_libcwnn} != Xno; then -+ case X${with_libcwnn} in -+ Xyes | X-lcwnn) -+ CWNNJLIB="-L${cwnnlibdir} -lcwnn" ;; -+ X/*) -+ CWNNJLIB="${cwnnlibdir}/libcwnn.a" ;; -+ *) -+ # Honor specified value --with-libcwnn -+ # (maybe wrong in most cases) -+ CWNNJLIB="${with_libcwnn}" ;; -+ esac -+ DEPCWNNJLIB="" -+ CHINSI_DATA="\$(CWNNWNNDIR)/cixing.data" -+ THINSI_DATA="\$(TWNNWNNDIR)/cixing.data" -+ EXTCWNNJINC=${cwnnincludedir} - else -- CWNNJLIB="\$(top_builddir)/cWnn/jlib/libcwnn.la" -+ CWNNJLIB="\$(top_builddir)/cWnn/jlib/libcwnn.la" - DEPCWNNJLIB="\$(CWNNJLIB)" - CHINSI_DATA="\$(CWNNCDSRC)/cixing.data" - THINSI_DATA="\$(TWNNTDSRC)/cixing.data" -+ EXTCWNNJINC="" -+fi - --fi; - - - -@@ -1710,7 +1814,10 @@ fi; - # Check whether --with-libkwnn or --without-libkwnn was given. - if test "${with_libkwnn+set}" = set; then - withval="$with_libkwnn" -- -+ with_libkwnn="${withval}" -+else -+ with_libkwnn=no -+fi; - - # Check whether --with-kwnn-includes or --without-kwnn-includes was given. - if test "${with_kwnn_includes+set}" = set; then -@@ -1727,22 +1834,28 @@ if test "${with_kwnn_libraries+set}" = s - else - kwnnlibdir='/usr/local/lib' - fi; -- if test "X${with_libkwnn}" = X-lkwnn; then -- KWNNJLIB="-L${kwnnlibdir} -lkwnn" -- elif test X"`echo ${with_libkwnn} | grep '^/.*'`" != X ; then -- KWNNJLIB="${with_libkwnn}" -- else -- KWNNJLIB="${kwnnlibdir}/libkwnn.a" -- fi -- DEPKWNNJLIB="" -- KHINSI_DATA="\$(KWNNWNNDIR)/hinsi.data" - -+if test X${with_libkwnn} != Xno; then -+ case X${with_libkwnn} in -+ Xyes | X-lkwnn) -+ KWNNJLIB="-L${kwnnlibdir} -lkwnn" ;; -+ X/*) -+ KWNNJLIB="${kwnnlibdir}/libkwnn.a" ;; -+ *) -+ # Honor specified value --with-libkwnn -+ # (maybe wrong in most cases) -+ KWNNJLIB="${with_libkwnn}" ;; -+ esac -+ DEPKWNNJLIB="" -+ KHINSI_DATA="\$(KWNNWNNDIR)/hinsi.data" -+ EXTKWNNJINC=${kwnnincludedir} - else -- KWNNJLIB="\$(top_builddir)/kWnn/jlib/libkwnn.la" -+ KWNNJLIB="\$(top_builddir)/kWnn/jlib/libkwnn.la" - DEPKWNNJLIB="\$(KWNNJLIB)" - KHINSI_DATA="\$(KWNNKDSRC)/hinsi.data" -+ EXTKWNNJINC="" -+fi - --fi; - - - -@@ -1786,6 +1899,81 @@ _ACEOF - - fi - -+# Check whether --enable-traditional-layout or --disable-traditional-layout was given. -+if test "${enable_traditional_layout+set}" = set; then -+ enableval="$enable_traditional_layout" -+ case "${enableval}" in -+ yes) trad_layout=true ;; -+ no) trad_layout=false ;; -+ *) { { echo "$as_me:$LINENO: error: bad value for --enable-traditional-layout" >&5 -+echo "$as_me: error: bad value for --enable-traditional-layout" >&2;} -+ { (exit 1); exit 1; }; } ;; -+esac -+else -+ trad_layout=true -+fi; -+ -+if test $trad_layout = "true"; then -+ WNNSBINDIR="\$(bindir)" -+ # More path settings will come later ... -+else -+ WNNSBINDIR="\$(sbindir)" -+ # Same as above. -+fi -+ -+ -+# Check whether --enable-sub-bindir or --disable-sub-bindir was given. -+if test "${enable_sub_bindir+set}" = set; then -+ enableval="$enable_sub_bindir" -+ case "${enableval}" in -+ yes) sub_bindir=true ;; -+ no) sub_bindir=false ;; -+ *) { { echo "$as_me:$LINENO: error: bad value for --enable-sub-bindir" >&5 -+echo "$as_me: error: bad value for --enable-sub-bindir" >&2;} -+ { (exit 1); exit 1; }; } ;; -+esac -+else -+ sub_bindir=guess -+fi; -+ -+if test $sub_bindir = "guess"; then -+ if test $trad_layout = "true"; then -+ sub_bindir=true -+ else -+ sub_bindir=false -+ fi -+fi -+if test $sub_bindir = "true"; then -+ if_enable_sub_bindir=' ' -+ if_disable_sub_bindir='#' -+else -+ if_enable_sub_bindir='#' -+ if_disable_sub_bindir=' ' -+fi -+ -+ -+ -+# for debug -+echo "$as_me:$LINENO: checking if we use traditional layout" >&5 -+echo $ECHO_N "checking if we use traditional layout... $ECHO_C" >&6 -+if test $trad_layout = "true"; then -+ 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: checking if we install binaries on \$(bindir)/Wnn4 (etc.)" >&5 -+echo $ECHO_N "checking if we install binaries on \$(bindir)/Wnn4 (etc.)... $ECHO_C" >&6 -+if test $sub_bindir = "true"; then -+ 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 -+ - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -2549,15 +2737,9 @@ case $host in - *-*-linux*) - CCOPTIONS="-Dlinux -D_GNU_SOURCE -D_POSIX_SOURCE -D_BSD_SOURCE" - ;; --*-*-darwin*) -- if test $GCC = yes; then -- # Unfortunately, autoconf (at least 2.57) does not recognize -- # proper CPP. (Normal cpp-precomp nor auto-retrying in basic mode does -- # not work with pubdic+ processing.) So define here .... -- # Note: It seems gcc-3.3 (or (probably) later) does not need this. -- CPP=${CPP:-"$CC -E -no-cpp-precomp"} -- fi -- # Don't care other CC-s. -+*-*-*-gnu) -+ # Non-Linux kernel with GNU libc. -+ CCOPTIONS="-D_GNU_SOURCE" - ;; - *-*-sunos*) - if test $GCC = yes; then -@@ -2571,6 +2753,7 @@ case $host in - if test $GCC = yes; then - CCOPTIONS="-Dsun -D`uname -p` -DSVR4 -DSYSV" - else -+ # TODO: need change for sparcv9 / x64 architecture ... - CCOPTIONS="-Xc -xF -xcg92 -Dsun -D`uname -p` -DSVR4 -DSYSV" - fi - ;; -@@ -2590,13 +2773,12 @@ powerpc-*-beos*) - *-*-aix*) - CCOPTIONS="-DSYSV" - ;; --*) -- ;; - esac - - if test $debug = true; then - if test $GCC = yes; then -- CDEBUGFLAGS=${CDEBUGFLAGS:-"-g2 -O2 -Wall -fstack-check"} -+ # FIXME: gcc -fstack-check doesn't work well on Linux/i386 ... -+ CDEBUGFLAGS=${CDEBUGFLAGS:-"-g2 -O2 -Wall"} - else - CDEBUGFLAGS=${CDEBUGFLAGS:-""} - fi -@@ -2814,6 +2996,18 @@ ac_link='$CC -o conftest$ac_exeext $CFLA - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -+echo "$as_me:$LINENO: checking cpp for text processing" >&5 -+echo $ECHO_N "checking cpp for text processing... $ECHO_C" >&6 -+if test "$GCC" = "yes" -a "$CPP" = "$CC -E"; then -+ # Need checking your gcc accepts '-traditional-cpp' option? -+ FZK_PP=${FZK_PP:-"$CPP -traditional-cpp"} -+else -+ FZK_PP=${FZK_PP:-"$CPP"} -+fi -+echo "$as_me:$LINENO: result: $FZK_PP" >&5 -+echo "${ECHO_T}$FZK_PP" >&6 -+ -+ - # Find a good install program. We prefer a C program (faster), - # so one script is as good as another. But avoid the broken or - # incompatible versions: -@@ -3023,12 +3217,13 @@ do - 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 && break -+ test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in -@@ -3053,10 +3248,11 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xp - fi - done - done --SED=$lt_cv_path_SED - - fi - -+SED=$lt_cv_path_SED -+ - echo "$as_me:$LINENO: result: $SED" >&5 - echo "${ECHO_T}$SED" >&6 - -@@ -3099,7 +3295,7 @@ echo $ECHO_N "checking for ld used by $C - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' -- # Canonicalize the path of ld -+ # 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%/%"` -@@ -3133,7 +3329,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'*) -@@ -3167,8 +3363,8 @@ echo $ECHO_N "checking if the linker ($L - if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&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 -+ # 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 - ;; -@@ -3197,6 +3393,15 @@ 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 - - echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 - echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 -@@ -3207,36 +3412,43 @@ else - # 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 - fi - fi -@@ -3244,8 +3456,8 @@ echo "$as_me:$LINENO: result: $lt_cv_pat - echo "${ECHO_T}$lt_cv_path_NM" >&6 - NM="$lt_cv_path_NM" - --echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 --echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 -+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6 - if test "${lt_cv_deplibs_check_method+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -3264,7 +3476,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 - ;; - -@@ -3272,40 +3484,42 @@ 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 - ;; - - 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*) -+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 +3535,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,37 +3551,24 @@ 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*) -@@ -3384,37 +3585,31 @@ newos6*) - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - --nto-qnx) -+nto-qnx*) - lt_cv_deplibs_check_method=unknown - ;; - - 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' -+ 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*) -+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,10 +3630,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*) -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - esac -@@ -3456,6 +3654,9 @@ test -z "$deplibs_check_method" && depli - # 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 - -@@ -3526,7 +3727,8 @@ ia64-*-hpux*) - 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*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -@@ -3534,13 +3736,16 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- case "`/usr/bin/file conftest.o`" in -+ 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*) -+ ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) -@@ -3553,6 +3758,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li - ;; - *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" - ;; -@@ -3638,6 +3846,30 @@ echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 - 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=$? -+ 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 - -@@ -4280,7 +4512,12 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS - 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 -+ -+ -+if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ ac_ext=cc - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -4476,6 +4713,8 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -+fi -+ - - ac_ext=f - ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -@@ -4692,7 +4931,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -- - # 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 -@@ -4700,7 +4938,7 @@ if test "${lt_cv_sys_max_cmd_len+set}" = - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - i=0 -- testring="ABCD" -+ teststring="ABCD" - - case $build_os in - msdosdjgpp*) -@@ -4729,24 +4967,77 @@ else - 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 -+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -+ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ -+ = "XX$teststring") >/dev/null 2>&1 && -+ new_result=`expr "X$teststring" : ".*" 2>&1` && -+ lt_cv_sys_max_cmd_len=$new_result && -+ test $i != 17 # 1/2 MB should be enough -+ do -+ i=`expr $i + 1` -+ teststring=$teststring$teststring -+ done -+ 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 - -@@ -4763,6 +5054,7 @@ fi - - - -+ - # 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 -@@ -4779,9 +5071,6 @@ symcode='[BCDEGRST]' - # 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'" - -@@ -4803,14 +5092,30 @@ hpux*) # Its linker distinguishes data f - 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'" - ;; -+linux* | k*bsd*-gnu) -+ if test "$host_cpu" = ia64; then -+ symcode='[ABCDGIRSTW]' -+ 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'" -+ fi -+ ;; - irix* | nonstopux*) - symcode='[BCDEGRST]' - ;; - osf*) - symcode='[BCDEGQRST]' - ;; --solaris* | sysv5*) -- symcode='[BDT]' -+solaris*) -+ symcode='[BDRT]' -+ ;; -+sco3.2v5*) -+ symcode='[DT]' -+ ;; -+sysv4.2uw2*) -+ symcode='[DT]' -+ ;; -+sysv5* | sco5v6* | unixware* | OpenUNIX*) -+ symcode='[ABDT]' - ;; - sysv4) - symcode='[DFNSTU]' -@@ -4828,14 +5133,17 @@ esac - # If we're using GNU nm, then use its standard symbol codes. - case `$NM -V 2>&1` in - *GNU* | *'with BFD'*) -- symcode='[ABCDGISTW]' ;; -+ symcode='[ABCDGIRSTW]' ;; - esac - - # Try without a prefix undercore, 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. -- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" -+ 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 -@@ -4937,7 +5245,7 @@ EOF - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - fi -- rm -f conftest* conftst* -+ rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then -@@ -4997,7 +5305,7 @@ 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//' -+Xsed='sed -e 1s/^X//' - sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' - - # Same as above, but do not quote variable references. -@@ -5017,7 +5325,7 @@ rm="rm -f" - default_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" -@@ -5274,6 +5582,7 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - test -z "$AS" && AS=as - test -z "$CC" && CC=cc - test -z "$LTCC" && LTCC=$CC -+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS - test -z "$DLLTOOL" && DLLTOOL=dlltool - test -z "$LD" && LD=ld - test -z "$LN_S" && LN_S="ln -s" -@@ -5286,22 +5595,33 @@ 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_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="\$RANLIB -t \$oldlib~$old_postinstall_cmds" -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" - ;; - *) -- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" - fi - -+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-%%"` -+ -+ - # Only perform the check for file, if the check method requires it - case $deplibs_check_method in - file_magic*) -@@ -5327,7 +5647,7 @@ else - 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 -@@ -5389,7 +5709,7 @@ else - 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 -@@ -5437,27 +5757,301 @@ fi - ;; - esac - --enable_dlopen=no --enable_win32_dll=no -- --# Check whether --enable-libtool-lock or --disable-libtool-lock was given. --if test "${enable_libtool_lock+set}" = set; then -- enableval="$enable_libtool_lock" -- --fi; --test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -- --# Check whether --with-pic or --without-pic was given. --if test "${with_pic+set}" = set; then -- withval="$with_pic" -- pic_mode="$withval" -+ 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 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- pic_mode=default --fi; --test -z "$pic_mode" && pic_mode=default -- --# Use C for the default configuration in the libtool script -+ if test -n "$DSYMUTIL"; then -+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+fi -+fi -+DSYMUTIL=$ac_cv_prog_DSYMUTIL -+if test -n "$DSYMUTIL"; then -+ echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 -+echo "${ECHO_T}$DSYMUTIL" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+fi -+if test -z "$ac_cv_prog_DSYMUTIL"; then -+ ac_ct_DSYMUTIL=$DSYMUTIL -+ # Extract the first word of "dsymutil", so it can be a program name with args. -+set dummy dsymutil; ac_word=$2 -+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_DSYMUTIL+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_DSYMUTIL"; then -+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+ test -z "$ac_cv_prog_ac_ct_DSYMUTIL" && ac_cv_prog_ac_ct_DSYMUTIL=":" -+fi -+fi -+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -+if test -n "$ac_ct_DSYMUTIL"; then -+ echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 -+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+ DSYMUTIL=$ac_ct_DSYMUTIL -+else -+ DSYMUTIL="$ac_cv_prog_DSYMUTIL" -+fi -+ -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -+set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_prog_NMEDIT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$NMEDIT"; then -+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+fi -+fi -+NMEDIT=$ac_cv_prog_NMEDIT -+if test -n "$NMEDIT"; then -+ echo "$as_me:$LINENO: result: $NMEDIT" >&5 -+echo "${ECHO_T}$NMEDIT" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+fi -+if test -z "$ac_cv_prog_NMEDIT"; then -+ ac_ct_NMEDIT=$NMEDIT -+ # Extract the first word of "nmedit", so it can be a program name with args. -+set dummy nmedit; ac_word=$2 -+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_NMEDIT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_NMEDIT"; then -+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_NMEDIT="nmedit" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+ test -z "$ac_cv_prog_ac_ct_NMEDIT" && ac_cv_prog_ac_ct_NMEDIT=":" -+fi -+fi -+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT -+if test -n "$ac_ct_NMEDIT"; then -+ echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 -+echo "${ECHO_T}$ac_ct_NMEDIT" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+ NMEDIT=$ac_ct_NMEDIT -+else -+ NMEDIT="$ac_cv_prog_NMEDIT" -+fi -+ -+ -+ echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 -+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6 -+if test "${lt_cv_apple_cc_single_mod+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_apple_cc_single_mod=no -+ if test -z "${LT_MULTI_MODULE}"; then -+ # By default we will add the -single_module flag. You can override -+ # by either setting the environment variable LT_MULTI_MODULE -+ # non-empty at configure time, or by adding -multi_module to the -+ # link flags. -+ echo "int foo(void){return 1;}" > conftest.c -+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+ -dynamiclib ${wl}-single_module conftest.c -+ if test -f libconftest.dylib; then -+ lt_cv_apple_cc_single_mod=yes -+ rm -rf libconftest.dylib* -+ fi -+ rm conftest.c -+ fi -+fi -+echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 -+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6 -+ echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 -+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6 -+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&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 -+#line $LINENO "configure" -+#include "confdefs.h" -+ -+#ifdef F77_DUMMY_MAIN -+# ifdef __cplusplus -+ extern "C" -+# endif -+ int F77_DUMMY_MAIN() { return 1; } -+#endif -+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=$? -+ 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 -+ lt_cv_ld_exported_symbols_list=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+lt_cv_ld_exported_symbols_list=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+ LDFLAGS="$save_LDFLAGS" -+ -+fi -+echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 -+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6 -+ case $host_os in -+ rhapsody* | darwin1.[0123]) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -+ darwin1.*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ darwin*) -+ # 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 -+ -+ -+enable_dlopen=no -+enable_win32_dll=no -+ -+# Check whether --enable-libtool-lock or --disable-libtool-lock was given. -+if test "${enable_libtool_lock+set}" = set; then -+ enableval="$enable_libtool_lock" -+ -+fi; -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+ -+ -+# Check whether --with-pic or --without-pic was given. -+if test "${with_pic+set}" = set; then -+ withval="$with_pic" -+ pic_mode="$withval" -+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 -@@ -5475,77 +6069,34 @@ objext=o - objext=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code="int some_variable = 0;\n" -+lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests --lt_simple_link_test_code='int main(){return(0);}\n' -+lt_simple_link_test_code='int main(){return(0);}' - - - # If no C compiler was specified, use CC. - LTCC=${LTCC-"$CC"} - -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ - # Allow CC to be a program name with arguments. - compiler=$CC - - --# --# 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;} -- 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;} -- 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 --if test "${lt_prog_compiler_static_works+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --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 --echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 --echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 -- --if test x"$lt_prog_compiler_static_works" = xyes; then -- : --else -- lt_prog_compiler_static= --fi -- -+# 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* - - - -@@ -5554,14 +6105,15 @@ 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 "$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 - if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ 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. -@@ -5569,10 +6121,10 @@ else - # 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:5575: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:6127: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -@@ -5576,11 +6128,13 @@ else - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:5579: \$? = $ac_status" >&5 -+ echo "$as_me:6131: \$? = $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 -- 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 - lt_cv_prog_compiler_rtti_exceptions=yes - fi - fi -@@ -5625,13 +6179,15 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | 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). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - -@@ -5641,6 +6197,11 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_pic='-fno-common' - ;; - -+ interix[3-9]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. -@@ -5657,7 +6218,7 @@ echo $ECHO_N "checking for $compiler opt - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -5683,8 +6244,18 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' - fi - ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic='-qnocommon' -+ lt_prog_compiler_wl='-Wl,' -+ ;; -+ esac -+ ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | 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' -@@ -5694,7 +6265,7 @@ echo $ECHO_N "checking for $compiler opt - 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 -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -5717,18 +6288,41 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static='-Bstatic' - ;; - -- linux*) -- case $CC in -- icc|ecc) -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ icc* | ecc*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-static' - ;; -- ccc) -+ 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' - ;; -+ *) -+ 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 - ;; - -@@ -5738,15 +6332,19 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static='-non_shared' - ;; - -- sco3.2v5*) -- lt_prog_compiler_pic='-Kpic' -- lt_prog_compiler_static='-dn' -+ rdos*) -+ lt_prog_compiler_static='-non_shared' - ;; - - solaris*) -- lt_prog_compiler_wl='-Wl,' - 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 - ;; - - sunos4*) -@@ -5755,7 +6353,7 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static='-Bstatic' - ;; - -- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -+ sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' -@@ -5768,6 +6366,17 @@ echo $ECHO_N "checking for $compiler opt - fi - ;; - -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; -+ -+ unicos*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_can_build_shared=no -+ ;; -+ - uts4*) - lt_prog_compiler_pic='-pic' - lt_prog_compiler_static='-Bstatic' -@@ -5786,14 +6395,15 @@ echo "${ECHO_T}$lt_prog_compiler_pic" >& - # 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 "$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 --if test "${lt_prog_compiler_pic_works+set}" = set; then -+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_pic_works=no -+ lt_cv_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ 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. -@@ -5801,10 +6411,10 @@ else - # 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:5807: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:6417: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -@@ -5808,21 +6418,23 @@ else - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:5811: \$? = $ac_status" >&5 -+ echo "$as_me:6421: \$? = $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 -- if test ! -s conftest.err; then -- lt_prog_compiler_pic_works=yes -+ # 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 --echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6 -+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6 - --if test x"$lt_prog_compiler_pic_works" = xyes; then -+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" ;; -@@ -5833,7 +6445,7 @@ else - fi - - fi --case "$host_os" in -+case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic= -@@ -5843,9 +6455,51 @@ case "$host_os" in - ;; - 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 --if test "${lt_cv_prog_compiler_c_o+set}" = set; then -+# -+# Check to make sure the static flag actually works. -+# -+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 -+if test "${lt_cv_prog_compiler_static_works+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_static_works=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext -+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -+ # The linker can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&5 -+ $echo "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" -+ -+fi -+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6 -+ -+if test x"$lt_cv_prog_compiler_static_works" = xyes; then -+ : -+else -+ lt_prog_compiler_static= -+fi -+ -+ -+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 -+if test "${lt_cv_prog_compiler_c_o+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_prog_compiler_c_o=no -@@ -5853,14 +6507,7 @@ else - 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 -@@ -5868,10 +6515,10 @@ else - # 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:5874: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:6521: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -@@ -5880,13 +6527,18 @@ else - 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 -+ $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 . -- $rm conftest* out/* -- rmdir out -+ 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 .. - rmdir conftest - $rm conftest* -@@ -5950,13 +6602,24 @@ echo $ECHO_N "checking whether the $comp - # 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_" -+ 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= -+ # Just being paranoid about ensuring that cc_basename is set. -+ 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-%%"` - - case $host_os in - cygwin* | mingw* | pw32*) -@@ -5967,6 +6630,10 @@ echo $ECHO_N "checking whether the $comp - 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 - ;; -@@ -5977,9 +6644,30 @@ echo $ECHO_N "checking whether the $comp - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` 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 -+ - # See if GNU ld supports shared libraries. - case $host_os in -- aix3* | aix4* | aix5*) -+ aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no -@@ -6027,10 +6715,10 @@ EOF - 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' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -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' -+ 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 -@@ -6039,7 +6727,62 @@ EOF - 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' -+ $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 -+ ;; -+ -+ interix[3-9]*) -+ hardcode_direct=no -+ hardcode_shlibpath_var=no -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ ;; -+ -+ gnu* | linux* | k*bsd*-gnu) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_addflag= -+ 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' ;; -+ 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' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ -+ if test $supports_anon_versioning = yes; 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 - else - ld_shlibs=no - fi -@@ -6055,7 +6798,7 @@ EOF - fi - ;; - -- solaris* | sysv5*) -+ solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - cat <<EOF 1>&2 -@@ -6076,6 +6819,33 @@ EOF - fi - ;; - -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) -+ ld_shlibs=no -+ cat <<_LT_EOF 1>&2 -+ -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** reliably create shared libraries on SCO systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+_LT_EOF -+ ;; -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ esac -+ ;; -+ - sunos4*) - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= -@@ -6093,16 +6863,11 @@ EOF - ;; - 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 -+ 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) -@@ -6114,14 +6879,14 @@ EOF - # 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 -+ 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 - ;; - -- aix4* | aix5*) -+ 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. -@@ -6141,13 +6906,14 @@ EOF - # 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*) -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done -+ ;; - esac - - exp_sym_flag='-bexport' -@@ -6166,7 +6932,7 @@ EOF - link_all_deplibs=yes - - if test "$GCC" = yes; then -- case $host_os in aix4.012|aix4.012.*) -+ 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` -@@ -6174,7 +6940,7 @@ EOF - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 -- hardcode_direct=yes -+ : - else - # We have old collect2 - hardcode_direct=unsupported -@@ -6185,8 +6951,12 @@ EOF - 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 -@@ -6194,11 +6964,11 @@ EOF - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else -- if test "$aix_use_runtimelinking" = yes; then -+ if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' -- fi -+ fi - fi - fi - -@@ -6241,11 +7011,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - 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; } --}'` -+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 - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 -@@ -6254,12 +7031,12 @@ rm -f conftest.$ac_objext conftest$ac_ex - 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" -+ 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 "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-z nodefs" -- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" -+ 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 -@@ -6293,11 +7070,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - 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; } --}'` -+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 - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 -@@ -6310,13 +7094,11 @@ if test -z "$aix_libpath"; then aix_libp - # -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=' ' -+ whole_archive_flag_spec='$convenience' - 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' -+ # 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 - ;; -@@ -6329,7 +7111,7 @@ if test -z "$aix_libpath"; then aix_libp - ld_shlibs=no - ;; - -- bsdi4*) -+ bsdi[45]*) - export_dynamic_flag_spec=-rdynamic - ;; - -@@ -6343,55 +7125,63 @@ if test -z "$aix_libpath"; then aix_libp - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. -- shrext=".dll" -+ shrext_cmds=".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' -+ 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' -- ;; -+ case $host_os in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; - 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}' -+ archive_cmds_need_lc=no - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported -- whole_archive_flag_spec='-all_load $convenience' -+ whole_archive_flag_spec='' - link_all_deplibs=yes -+ if test "$GCC" = 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}" -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~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 $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs=no -+ ;; -+ esac - fi - ;; - -@@ -6425,7 +7215,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd*) -+ freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes -@@ -6448,47 +7238,62 @@ if test -z "$aix_libpath"; then aix_libp - export_dynamic_flag_spec='${wl}-E' - ;; - -- hpux10* | hpux11*) -+ hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then -- case "$host_cpu" in -- hppa*64*|ia64*) -+ 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_separator=: -+ -+ hardcode_direct=yes -+ export_dynamic_flag_spec='${wl}-E' -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L=yes -+ fi -+ ;; -+ -+ hpux11*) -+ if test "$GCC" = yes -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 ${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*|ia64*) -- archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' -+ 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='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_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 -- case "$host_cpu" in -- hppa*64*) -- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) - 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 -- -- # 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' - -@@ -6532,23 +7337,28 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - 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' -+ if test -f /usr/libexec/ld.so; then -+ 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' -+ 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 -- 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 -+ ld_shlibs=no - fi - ;; - -@@ -6581,7 +7391,7 @@ if test -z "$aix_libpath"; then aix_libp - 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' -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' -@@ -6589,21 +7399,15 @@ if test -z "$aix_libpath"; then aix_libp - hardcode_libdir_separator=: - ;; - -- 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 -+ wlarc='${wl}' - 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 -+ 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' -@@ -6612,8 +7416,17 @@ if test -z "$aix_libpath"; then aix_libp - 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' ;; -+ *) -+ # 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 - ;; -@@ -6670,36 +7483,45 @@ if test -z "$aix_libpath"; then aix_libp - fi - ;; - -- sysv4.2uw2*) -- archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes -- hardcode_minus_L=no -+ 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 -- hardcode_runpath_var=yes -- runpath_var=LD_RUN_PATH -- ;; -+ 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' -+ 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 ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ 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 -- runpath_var='LD_RUN_PATH' -- hardcode_shlibpath_var=no - ;; - -- 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= -+ 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='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ hardcode_libdir_separator=':' -+ link_all_deplibs=yes -+ export_dynamic_flag_spec='${wl}-Bexport' - runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi - ;; - - uts4*) -@@ -6718,11 +7540,6 @@ echo "$as_me:$LINENO: result: $ld_shlibs - echo "${ECHO_T}$ld_shlibs" >&6 - test "$ld_shlibs" = 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? - # -@@ -6743,7 +7560,7 @@ x|xyes) - 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 -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 -@@ -6755,6 +7572,7 @@ echo $ECHO_N "checking whether -lc shoul - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl -+ pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= -@@ -6785,78 +7603,12 @@ echo "${ECHO_T}$archive_cmds_need_lc" >& - ;; - 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= --if test -n "$hardcode_libdir_flag_spec" || \ -- test -n "$runpath_var " || \ -- test "X$hardcode_automatic"="Xyes" ; then -- -- # 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 -- --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 -- --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" -+shrext_cmds=".so" - postinstall_cmds= - postuninstall_cmds= - finish_cmds= -@@ -6866,17 +7618,55 @@ 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 -+ 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. -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ lt_search_path_spec=`echo "$lt_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"` -+ 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 -@@ -6897,7 +7687,7 @@ aix3*) - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -6944,7 +7734,7 @@ 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' -+ 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*) -@@ -6953,7 +7743,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}' -@@ -6969,7 +7759,7 @@ bsdi4*) - - cygwin* | mingw* | pw32*) - version_type=windows -- shrext=".dll" -+ shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - -@@ -6981,7 +7771,8 @@ cygwin* | mingw* | pw32*) - 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' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' -@@ -6991,7 +7782,7 @@ cygwin* | mingw* | pw32*) - 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 DLLs use traditional 'lib' prefix -@@ -7011,7 +7802,7 @@ cygwin* | mingw* | pw32*) - ;; - 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 - ;; -@@ -7030,18 +7821,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' - 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' - ;; - -@@ -7058,8 +7844,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*) -@@ -7077,16 +7872,21 @@ 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 - ;; -- esac -- ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ esac -+ ;; - - gnu*) - version_type=linux -@@ -7104,9 +7904,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 -@@ -7121,7 +7921,7 @@ hpux9* | hpux10* | hpux11*) - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) -- shrext='.sl' -+ shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -@@ -7132,7 +7932,7 @@ hpux9* | hpux10* | hpux11*) - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) -- shrext='.sl' -+ shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -@@ -7144,6 +7944,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 ;; -@@ -7187,7 +7999,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 -@@ -7201,6 +8013,12 @@ linux*) - # 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, -@@ -7219,7 +8037,7 @@ netbsd*) - 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 -@@ -7235,7 +8053,7 @@ newsos6) - shlibpath_overrides_runpath=yes - ;; - --nto-qnx) -+nto-qnx*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -7247,8 +8065,13 @@ nto-qnx) - - 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 -@@ -7268,7 +8091,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' -@@ -7286,11 +8109,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*) -@@ -7318,7 +8138,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' -@@ -7351,6 +8171,29 @@ 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 -+ 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' -+ shlibpath_overrides_runpath=no -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ shlibpath_overrides_runpath=yes -+ 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' -+ ;; -+ - uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -7366,6 +8209,93 @@ echo "$as_me:$LINENO: result: $dynamic_l - echo "${ECHO_T}$dynamic_linker" >&6 - test "$dynamic_linker" = no && can_build_shared=no - -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi -+ -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi -+ -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ -+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 -+ -+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= -+if test -n "$hardcode_libdir_flag_spec" || \ -+ test -n "$runpath_var" || \ -+ test "X$hardcode_automatic" = "Xyes" ; then -+ -+ # 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 -+ -+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 -+ -+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" -+ old_striplib="$STRIP -S" -+ 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 -+ - if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown -@@ -7584,7 +8514,7 @@ fi - echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 - echo "${ECHO_T}$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="-ldld" - else - echo "$as_me:$LINENO: checking for dlopen" >&5 - echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 -@@ -7825,7 +8755,7 @@ fi - echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 - echo "${ECHO_T}$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="-ldld" - fi - - -@@ -7858,7 +8788,7 @@ 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" -@@ -7931,6 +8861,8 @@ int main () - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } -+ else -+ puts (dlerror ()); - - exit (status); - } -@@ -7940,12 +8872,12 @@ EOF - 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 -+ (./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_unknown|x*) lt_cv_dlopen_self=no ;; -+ x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed -@@ -7960,7 +8892,7 @@ echo "$as_me:$LINENO: result: $lt_cv_dlo - echo "${ECHO_T}$lt_cv_dlopen_self" >&6 - - 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\" - 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 -@@ -8029,6 +8961,8 @@ int main () - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } -+ else -+ puts (dlerror ()); - - exit (status); - } -@@ -8038,12 +8972,12 @@ EOF - 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 -+ (./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_unknown|x*) lt_cv_dlopen_self_static=no ;; -+ x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed -@@ -8076,7 +9010,7 @@ echo "${ECHO_T}$lt_cv_dlopen_self_static - fi - - --# Report which librarie types wil actually be built -+# Report which library types will 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 -@@ -8088,7 +9022,7 @@ test "$can_build_shared" = "no" && enabl - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. --case "$host_os" in -+case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then -@@ -8097,38 +9031,10 @@ aix3*) - fi - ;; - --aix4*) -+aix[4-9]*) - 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 -- fi - ;; - esac - echo "$as_me:$LINENO: result: $enable_shared" >&5 -@@ -8154,7 +9060,8 @@ if test -f "$ltmain"; then - # 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 \ -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ - 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 \ -@@ -8180,6 +9087,7 @@ if test -f "$ltmain"; then - predeps \ - postdeps \ - compiler_lib_search_path \ -+ compiler_lib_search_dirs \ - archive_cmds \ - archive_expsym_cmds \ - postinstall_cmds \ -@@ -8195,6 +9103,7 @@ if test -f "$ltmain"; then - module_cmds \ - module_expsym_cmds \ - lt_cv_prog_compiler_c_o \ -+ fix_srcfile_path \ - exclude_expsyms \ - include_expsyms; do - -@@ -8239,7 +9148,7 @@ echo "$as_me: creating $ofile" >&6;} - # 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 -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 - # Free Software Foundation, Inc. - # - # This file is part of GNU Libtool: -@@ -8257,7 +9166,7 @@ echo "$as_me: creating $ofile" >&6;} - # - # 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. -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -8268,11 +9177,11 @@ echo "$as_me: creating $ofile" >&6;} - SED=$lt_SED - - # Sed that helps us avoid accidentally triggering echo(1) options like -n. --Xsed="$SED -e s/^X//" -+Xsed="$SED -e 1s/^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 -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - # The names of the tagged configurations supported by this script. - available_tags= -@@ -8302,6 +9211,12 @@ 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 - - # An echo program that does not interpret backslashes. - echo=$lt_echo -@@ -8313,6 +9228,9 @@ AR_FLAGS=$lt_AR_FLAGS - # A C compiler. - LTCC=$lt_LTCC - -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS -+ - # A language-specific compiler. - CC=$lt_compiler - -@@ -8332,7 +9250,7 @@ LN_S=$lt_LN_S - NM=$lt_NM - - # A symbol stripping program --STRIP=$STRIP -+STRIP=$lt_STRIP - - # Used to examine libraries when file_magic_cmd begins "file" - MAGIC_CMD=$MAGIC_CMD -@@ -8363,7 +9281,7 @@ objext="$ac_objext" - libext="$libext" - - # Shared library suffix (normally ".so"). --shrext='$shrext' -+shrext_cmds='$shrext_cmds' - - # Executable file suffix (normally ""). - exeext="$exeext" -@@ -8378,7 +9296,7 @@ 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 ? -+# Must we lock files when doing compilation? - need_locks=$lt_need_locks - - # Do we need the lib prefix for modules? -@@ -8466,6 +9384,10 @@ predeps=$lt_predeps - # shared library. - postdeps=$lt_postdeps - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs -+ - # The library search path used internally by the compiler when linking - # a shared library. - compiler_lib_search_path=$lt_compiler_lib_search_path -@@ -8554,7 +9476,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea - 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" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$always_export_symbols -@@ -8605,7 +9527,10 @@ 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" -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi - fi - - -@@ -8640,6 +9565,9 @@ echo "$as_me: WARNING: output file \`$of - echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} - fi - fi -+ if test -z "$LTCFLAGS"; then -+ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" -+ fi - - # Extract list of available tagged configurations in $ofile. - # Note that this assumes the entire list is on one line. -@@ -8670,7 +9598,9 @@ echo "$as_me: error: tag name \"$tagname - - case $tagname in - CXX) -- if test -n "$CXX" && test "X$CXX" != "Xno"; then -+ if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then - ac_ext=cc - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -8690,6 +9620,7 @@ hardcode_libdir_flag_spec_CXX= - hardcode_libdir_flag_spec_ld_CXX= - hardcode_libdir_separator_CXX= - hardcode_minus_L_CXX=no -+hardcode_shlibpath_var_CXX=unsupported - hardcode_automatic_CXX=no - module_cmds_CXX= - module_expsym_cmds_CXX= -@@ -8705,29 +9636,47 @@ postdep_objects_CXX= - predeps_CXX= - postdeps_CXX= - compiler_lib_search_path_CXX= -+compiler_lib_search_dirs_CXX= - - # Source file extension for C++ test sources. --ac_ext=cc -+ac_ext=cpp - - # 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" -+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); }\n' -+lt_simple_link_test_code='int main(int, char *[]) { return(0); }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - - # If no C compiler was specified, use CC. - LTCC=${LTCC-"$CC"} - -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ - # Allow CC to be a program name with arguments. - compiler=$CC - - -+# save warnings/boilerplate of simple test code -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm -r conftest* -+ -+ - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_LD=$LD -@@ -8738,18 +9687,27 @@ 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 -+ $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 -- unset lt_cv_path_LD -+ $as_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%^.*/%%'` -+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-%%"` -+ - - # We don't want -fno-exception wen compiling C++ code, so set the - # no_builtin_flag separately -@@ -8786,7 +9744,7 @@ echo $ECHO_N "checking for ld used by $C - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' -- # Canonicalize the path of ld -+ # 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%/%"` -@@ -8820,7 +9778,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'*) -@@ -8854,8 +9812,8 @@ echo $ECHO_N "checking if the linker ($L - if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&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 -+ # 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 - ;; -@@ -8900,7 +9858,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld - # 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' -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists -@@ -8923,7 +9881,7 @@ case $host_os in - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- aix4* | aix5*) -+ 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. -@@ -8936,7 +9894,7 @@ case $host_os in - # 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*) -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) -@@ -8945,6 +9903,7 @@ case $host_os in - ;; - esac - done -+ ;; - esac - - exp_sym_flag='-bexport' -@@ -8963,7 +9922,7 @@ case $host_os in - link_all_deplibs_CXX=yes - - if test "$GXX" = yes; then -- case $host_os in aix4.012|aix4.012.*) -+ 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` -@@ -8971,7 +9930,7 @@ case $host_os in - 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 -@@ -8982,8 +9941,12 @@ case $host_os in - hardcode_libdir_flag_spec_CXX='-L$libdir' - hardcode_libdir_separator_CXX= - fi -+ ;; - esac - shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi - else - # not using gcc - if test "$host_cpu" = ia64; then -@@ -9038,11 +10001,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - 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; } --}'` -+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 - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 -@@ -9052,12 +10022,12 @@ if test -z "$aix_libpath"; then aix_libp - - 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" -+ archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag_CXX="-z nodefs" -- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" -+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -@@ -9091,11 +10061,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - 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; } --}'` -+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 - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 -@@ -9108,16 +10085,26 @@ if test -z "$aix_libpath"; then aix_libp - # -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=' ' -+ whole_archive_flag_spec_CXX='$convenience' - 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' -+ # This is similar to how AIX traditionally builds its shared libraries. -+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; -+ -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ allow_undefined_flag_CXX=unsupported -+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ - chorus*) - case $cc_basename in - *) -@@ -9136,7 +10123,7 @@ if test -z "$aix_libpath"; then aix_libp - 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' -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -@@ -9145,57 +10132,53 @@ if test -z "$aix_libpath"; then aix_libp - 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' -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs_CXX=no - fi - ;; -- -- 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}' -+ darwin* | rhapsody*) -+ archive_cmds_need_lc_CXX=no -+ hardcode_direct_CXX=no -+ hardcode_automatic_CXX=yes -+ hardcode_shlibpath_var_CXX=unsupported -+ whole_archive_flag_spec_CXX='' -+ link_all_deplibs_CXX=yes -+ allow_undefined_flag_CXX="$_lt_dar_allow_undefined" -+ if test "$GXX" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" -+ fi - else -- 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}' -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs_CXX=no -+ ;; -+ esac - 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++) -+ ec++*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- ghcx) -+ ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no -@@ -9206,14 +10189,14 @@ if test -z "$aix_libpath"; then aix_libp - ;; - esac - ;; -- freebsd12*) -+ freebsd[12]*) - # 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* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - ld_shlibs_CXX=yes -@@ -9230,11 +10213,11 @@ if test -z "$aix_libpath"; then aix_libp - # location of the library. - - case $cc_basename in -- CC) -+ CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- aCC) -+ 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 -@@ -9244,7 +10227,7 @@ if test -z "$aix_libpath"; then aix_libp - # 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' -+ 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 -@@ -9258,33 +10241,20 @@ if test -z "$aix_libpath"; then aix_libp - ;; - 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=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) ;; - *) -- 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*) -+ case $host_cpu in -+ hppa*64*|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 -@@ -9295,14 +10265,17 @@ if test -z "$aix_libpath"; then aix_libp - esac - - case $cc_basename in -- CC) -+ 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' -+ aCC*) -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -@@ -9321,9 +10294,12 @@ if test -z "$aix_libpath"; then aix_libp - *) - 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' -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - 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' -@@ -9337,11 +10313,25 @@ if test -z "$aix_libpath"; then aix_libp - ;; - esac - ;; -+ interix[3-9]*) -+ hardcode_direct_CXX=no -+ hardcode_shlibpath_var_CXX=no -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ ;; - irix5* | irix6*) - case $cc_basename in -- CC) -+ 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' -+ 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 ${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 -@@ -9352,7 +10342,7 @@ if test -z "$aix_libpath"; then aix_libp - *) - 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' -+ 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}${output_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 -@@ -9363,9 +10353,9 @@ if test -z "$aix_libpath"; then aix_libp - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - ;; -- linux*) -+ linux* | k*bsd*-gnu) - case $cc_basename in -- KCC) -+ KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file -@@ -9390,17 +10380,41 @@ if test -z "$aix_libpath"; then aix_libp - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - ;; -- icpc) -+ icpc*) - # Intel C++ - with_gnu_ld=yes -+ # version 8.0 and above of icpc choke on multiply defined symbols -+ # if we add $predep_objects and $postdep_objects, however 7.1 and -+ # earlier do not add the objects themselves. -+ case `$CC -V 2>&1` in -+ *"Version 7."*) -+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ *) # Version 8.0 or newer -+ tmp_idyn= -+ case $host_cpu in -+ ia64*) tmp_idyn=' -i_dynamic';; -+ esac -+ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ esac - archive_cmds_need_lc_CXX=no -- 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) -+ pgCC* | pgcpp*) -+ # Portland Group C++ compiler -+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -+ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ ;; -+ cxx*) - # Compaq C++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -@@ -9419,6 +10433,29 @@ if test -z "$aix_libpath"; then aix_libp - # 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' - ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ no_undefined_flag_CXX=' -zdefs' -+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' -+ hardcode_libdir_flag_spec_CXX='-R$libdir' -+ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ -+ # 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. -+ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' -+ ;; -+ esac -+ ;; - esac - ;; - lynxos*) -@@ -9431,7 +10468,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - mvs*) - case $cc_basename in -- cxx) -+ cxx*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -@@ -9452,9 +10489,29 @@ if test -z "$aix_libpath"; then aix_libp - # 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::"' - ;; -+ openbsd2*) -+ # C++ shared libraries are fairly broken -+ ld_shlibs_CXX=no -+ ;; -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ hardcode_direct_CXX=yes -+ hardcode_shlibpath_var_CXX=no -+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ fi -+ output_verbose_link_cmd='echo' -+ else -+ ld_shlibs_CXX=no -+ fi -+ ;; - osf3*) - case $cc_basename in -- KCC) -+ KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file -@@ -9470,14 +10527,14 @@ if test -z "$aix_libpath"; then aix_libp - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - - ;; -- RCC) -+ RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- cxx) -+ 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' -+ 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 ${output_objdir}/so_locations -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: -@@ -9495,7 +10552,7 @@ if test -z "$aix_libpath"; then aix_libp - *) - 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' -+ 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}${output_objdir}/so_locations -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: -@@ -9514,7 +10571,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - osf4* | osf5*) - case $cc_basename in -- KCC) -+ KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file -@@ -9529,17 +10586,17 @@ if test -z "$aix_libpath"; then aix_libp - # the KAI C++ compiler. - old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' - ;; -- RCC) -+ RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- cxx) -+ 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_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 ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ -- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ -+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ - $rm $lib.exp' - - hardcode_libdir_flag_spec_CXX='-rpath $libdir' -@@ -9558,7 +10615,7 @@ if test -z "$aix_libpath"; then aix_libp - *) - 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' -+ 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}${output_objdir}/so_locations -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: -@@ -9579,27 +10636,14 @@ if test -z "$aix_libpath"; then aix_libp - # 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) -+ CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- lcc) -+ lcc*) - # Lucid - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no -@@ -9612,36 +10656,28 @@ if test -z "$aix_libpath"; then aix_libp - ;; - solaris*) - case $cc_basename in -- CC) -+ CC*) - # Sun C++ 4.2, 5.x and Centerline C++ -+ archive_cmds_need_lc_CXX=yes - no_undefined_flag_CXX=' -zdefs' -- archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_shlibpath_var_CXX=no - case $host_os in -- solaris2.0-5 | solaris2.0-5.*) ;; -+ 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. -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) -- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ whole_archive_flag_spec_CXX='-z allextract$convenience -z 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' -+ 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 -@@ -9649,7 +10685,7 @@ if test -z "$aix_libpath"; then aix_libp - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; -- gcx) -+ gcx*) - # Green Hills C++ Compiler - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - -@@ -9683,16 +10719,73 @@ if test -z "$aix_libpath"; then aix_libp - fi - - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' -+ case $host_os in -+ solaris2.[0-5] | solaris2.[0-5].*) ;; -+ *) -+ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ ;; -+ esac - fi - ;; - esac - ;; -- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) -+ no_undefined_flag_CXX='${wl}-z,text' -+ archive_cmds_need_lc_CXX=no -+ hardcode_shlibpath_var_CXX=no -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ ;; -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ # 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. -+ # So that behaviour is only enabled if SCOABSPATH is set to a -+ # non-empty value in the environment. Most likely only useful for -+ # creating official distributions of packages. -+ # This is a hack until libtool officially supports absolute path -+ # names for shared libraries. -+ no_undefined_flag_CXX='${wl}-z,text' -+ allow_undefined_flag_CXX='${wl}-z,nodefs' - archive_cmds_need_lc_CXX=no -+ hardcode_shlibpath_var_CXX=no -+ hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ hardcode_libdir_separator_CXX=':' -+ link_all_deplibs_CXX=yes -+ export_dynamic_flag_spec_CXX='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac - ;; - tandem*) - case $cc_basename in -- NCC) -+ NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no -@@ -9719,7 +10812,6 @@ test "$ld_shlibs_CXX" = no && can_build_ - GCC_CXX="$GXX" - LD_CXX="$LD" - -- - cat > conftest.$ac_ext <<EOF - class Foo - { -@@ -9745,7 +10837,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - # 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\"`" -+ 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 -@@ -9821,9 +10913,69 @@ fi - - $rm -f confest.$objext - --case " $postdeps_CXX " in --*" -lc "*) archive_cmds_need_lc_CXX=no ;; --esac -+compiler_lib_search_dirs_CXX= -+if test -n "$compiler_lib_search_path_CXX"; then -+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -+fi -+ -+# PORTME: override above test on systems where it is broken -+case $host_os in -+interix[3-9]*) -+ # Interix 3.5 installs completely hosed .la files for C++, so rather than -+ # hack all around it, let's just trust "g++" to DTRT. -+ predep_objects_CXX= -+ postdep_objects_CXX= -+ postdeps_CXX= -+ ;; -+ -+linux*) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ # -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ if test "$solaris_use_stlport4" != yes; then -+ postdeps_CXX='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+ -+solaris*) -+ case $cc_basename in -+ CC*) -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ -+ # Adding this requires a known-good setup of shared libraries for -+ # Sun compiler versions before 5.6, else PIC objects from an old -+ # archive will be linked into the output, leading to subtle bugs. -+ if test "$solaris_use_stlport4" != yes; then -+ postdeps_CXX='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+esac -+ -+case " $postdeps_CXX " in -+*" -lc "*) archive_cmds_need_lc_CXX=no ;; -+esac - - lt_prog_compiler_wl_CXX= - lt_prog_compiler_pic_CXX= -@@ -9851,12 +11003,14 @@ echo $ECHO_N "checking for $compiler opt - # like `-m68040'. - lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' - ;; -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; -- mingw* | os2* | pw32*) -+ mingw* | cygwin* | 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). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) -@@ -9868,6 +11022,10 @@ echo $ECHO_N "checking for $compiler opt - # DJGPP does not support shared libraries at all - lt_prog_compiler_pic_CXX= - ;; -+ interix[3-9]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic_CXX=-Kconform_pic -@@ -9876,7 +11034,7 @@ echo $ECHO_N "checking for $compiler opt - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - ;; - *) -@@ -9890,7 +11048,7 @@ echo $ECHO_N "checking for $compiler opt - esac - else - case $host_os in -- aix4* | aix5*) -+ aix[4-9]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor -@@ -9901,18 +11059,28 @@ echo $ECHO_N "checking for $compiler opt - ;; - chorus*) - case $cc_basename in -- cxch68) -+ 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 - ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic_CXX='-qnocommon' -+ lt_prog_compiler_wl_CXX='-Wl,' -+ ;; -+ esac -+ ;; - dgux*) - case $cc_basename in -- ec++) -+ ec++*) - lt_prog_compiler_pic_CXX='-KPIC' - ;; -- ghcx) -+ ghcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-pic' - ;; -@@ -9920,22 +11088,22 @@ echo $ECHO_N "checking for $compiler opt - ;; - esac - ;; -- freebsd*) -+ freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in -- CC) -+ CC*) - lt_prog_compiler_wl_CXX='-Wl,' -- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" -+ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - lt_prog_compiler_pic_CXX='+Z' - fi - ;; -- aCC) -+ 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 -+ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -9948,9 +11116,13 @@ echo $ECHO_N "checking for $compiler opt - ;; - esac - ;; -+ interix*) -+ # This is c89, which is MS Visual C++ (no shared libs) -+ # Anyone wants to do a port? -+ ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in -- CC) -+ CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-non_shared' - # CC pic flag -KPIC is the default. -@@ -9959,20 +11131,26 @@ echo $ECHO_N "checking for $compiler opt - ;; - esac - ;; -- linux*) -+ linux* | k*bsd*-gnu) - case $cc_basename in -- KCC) -+ KCC*) - # KAI C++ Compiler - lt_prog_compiler_wl_CXX='--backend -Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - ;; -- icpc) -+ icpc* | ecpc*) - # Intel C++ - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-static' - ;; -- cxx) -+ pgCC* | pgcpp*) -+ # Portland Group C++ compiler. -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_pic_CXX='-fpic' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ ;; -+ cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. -@@ -9980,6 +11158,14 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ lt_prog_compiler_pic_CXX='-KPIC' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ lt_prog_compiler_wl_CXX='-Qoption ld ' -+ ;; -+ esac - ;; - esac - ;; -@@ -9989,7 +11175,7 @@ echo $ECHO_N "checking for $compiler opt - ;; - mvs*) - case $cc_basename in -- cxx) -+ cxx*) - lt_prog_compiler_pic_CXX='-W c,exportall' - ;; - *) -@@ -10000,14 +11186,14 @@ echo $ECHO_N "checking for $compiler opt - ;; - osf3* | osf4* | osf5*) - case $cc_basename in -- KCC) -+ KCC*) - lt_prog_compiler_wl_CXX='--backend -Wl,' - ;; -- RCC) -+ RCC*) - # Rational C++ 2.4.1 - lt_prog_compiler_pic_CXX='-pic' - ;; -- cxx) -+ cxx*) - # Digital/Compaq C++ - lt_prog_compiler_wl_CXX='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha -@@ -10021,24 +11207,15 @@ echo $ECHO_N "checking for $compiler opt - ;; - psos*) - ;; -- sco*) -- case $cc_basename in -- CC) -- lt_prog_compiler_pic_CXX='-fPIC' -- ;; -- *) -- ;; -- esac -- ;; - solaris*) - case $cc_basename in -- CC) -+ 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) -+ gcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-PIC' - ;; -@@ -10048,12 +11225,12 @@ echo $ECHO_N "checking for $compiler opt - ;; - sunos4*) - case $cc_basename in -- CC) -+ CC*) - # Sun C++ 4.x - lt_prog_compiler_pic_CXX='-pic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; -- lcc) -+ lcc*) - # Lucid - lt_prog_compiler_pic_CXX='-pic' - ;; -@@ -10063,7 +11240,7 @@ echo $ECHO_N "checking for $compiler opt - ;; - tandem*) - case $cc_basename in -- NCC) -+ NCC*) - # NonStop-UX NCC 3.20 - lt_prog_compiler_pic_CXX='-KPIC' - ;; -@@ -10071,7 +11248,14 @@ echo $ECHO_N "checking for $compiler opt - ;; - esac - ;; -- unixware*) -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ case $cc_basename in -+ CC*) -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_pic_CXX='-KPIC' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ ;; -+ esac - ;; - vxworks*) - ;; -@@ -10088,14 +11272,15 @@ echo "${ECHO_T}$lt_prog_compiler_pic_CXX - # 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 "$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 --if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then -+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_pic_works_CXX=no -+ lt_cv_prog_compiler_pic_works_CXX=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. -@@ -10103,10 +11288,10 @@ else - # 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:10109: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:11294: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -@@ -10110,21 +11295,23 @@ else - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:10113: \$? = $ac_status" >&5 -+ echo "$as_me:11298: \$? = $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 -- if test ! -s conftest.err; then -- lt_prog_compiler_pic_works_CXX=yes -+ # 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_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 -+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6 - --if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then -+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then - case $lt_prog_compiler_pic_CXX in - "" | " "*) ;; - *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; -@@ -10135,7 +11322,7 @@ else - fi - - fi --case "$host_os" in -+case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_CXX= -@@ -10145,6 +11332,48 @@ case "$host_os" in - ;; - esac - -+# -+# Check to make sure the static flag actually works. -+# -+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 -+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_static_works_CXX=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext -+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -+ # The linker can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&5 -+ $echo "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_CXX=yes -+ fi -+ else -+ lt_cv_prog_compiler_static_works_CXX=yes -+ fi -+ fi -+ $rm -r conftest* -+ LDFLAGS="$save_LDFLAGS" -+ -+fi -+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6 -+ -+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then -+ : -+else -+ lt_prog_compiler_static_CXX= -+fi -+ -+ - 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 - if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then -@@ -10155,14 +11384,7 @@ else - 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 -@@ -10170,10 +11392,10 @@ else - # 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:10176: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:11398: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -@@ -10182,13 +11404,18 @@ else - 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 -+ $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_CXX=yes - fi - fi -- chmod u+w . -- $rm conftest* out/* -- rmdir out -+ 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 .. - rmdir conftest - $rm conftest* -@@ -10225,7 +11452,7 @@ echo $ECHO_N "checking whether the $comp - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in -- aix4* | aix5*) -+ 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 -@@ -10238,22 +11465,18 @@ echo $ECHO_N "checking whether the $comp - 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 -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac -+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - - echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 - echo "${ECHO_T}$ld_shlibs_CXX" >&6 - 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? - # -@@ -10274,7 +11497,7 @@ x|xyes) - 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 -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 -@@ -10286,6 +11509,7 @@ echo $ECHO_N "checking whether -lc shoul - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_CXX -+ pic_flag=$lt_prog_compiler_pic_CXX - compiler_flags=-v - linker_flags=-v - verstring= -@@ -10316,78 +11540,12 @@ echo "${ECHO_T}$archive_cmds_need_lc_CXX - ;; - 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_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 -- --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 --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" -+shrext_cmds=".so" - postinstall_cmds= - postuninstall_cmds= - finish_cmds= -@@ -10397,20 +11555,7 @@ 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 - -@@ -10428,7 +11573,7 @@ aix3*) - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -10475,7 +11620,7 @@ 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' -+ 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*) -@@ -10484,7 +11629,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}' -@@ -10500,7 +11645,7 @@ bsdi4*) - - cygwin* | mingw* | pw32*) - version_type=windows -- shrext=".dll" -+ shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - -@@ -10512,7 +11657,8 @@ cygwin* | mingw* | pw32*) - 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' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' -@@ -10522,7 +11668,7 @@ cygwin* | mingw* | pw32*) - 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 DLLs use traditional 'lib' prefix -@@ -10542,7 +11688,7 @@ cygwin* | mingw* | pw32*) - ;; - 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 - ;; -@@ -10561,18 +11707,12 @@ 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' - 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_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -@@ -10589,8 +11729,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*) -@@ -10608,14 +11757,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 - ;; - -@@ -10635,9 +11789,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 -@@ -10652,7 +11806,7 @@ hpux9* | hpux10* | hpux11*) - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) -- shrext='.sl' -+ shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -@@ -10663,7 +11817,7 @@ hpux9* | hpux10* | hpux11*) - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) -- shrext='.sl' -+ shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -@@ -10675,6 +11829,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 ;; -@@ -10718,7 +11884,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 -@@ -10732,6 +11898,12 @@ linux*) - # 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, -@@ -10750,7 +11922,7 @@ netbsd*) - 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 -@@ -10766,7 +11938,7 @@ newsos6) - shlibpath_overrides_runpath=yes - ;; - --nto-qnx) -+nto-qnx*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -10778,8 +11950,13 @@ nto-qnx) - - 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 -@@ -10799,7 +11976,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' -@@ -10817,11 +11994,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*) -@@ -10849,7 +12023,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' -@@ -10882,6 +12056,29 @@ 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 -+ 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' -+ shlibpath_overrides_runpath=no -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ shlibpath_overrides_runpath=yes -+ 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' -+ ;; -+ - uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -10897,928 +12094,288 @@ echo "$as_me:$LINENO: result: $dynamic_l - echo "${ECHO_T}$dynamic_linker" >&6 - 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 -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_cv_dlopen=no -- lt_cv_dlopen_libs= -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi - -- case $host_os in -- beos*) -- lt_cv_dlopen="load_add_on" -- lt_cv_dlopen_libs= -- lt_cv_dlopen_self=yes -- ;; -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi - -- mingw* | pw32*) -- lt_cv_dlopen="LoadLibrary" -- lt_cv_dlopen_libs= -- ;; -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - -- cygwin*) -- lt_cv_dlopen="dlopen" -- lt_cv_dlopen_libs= -- ;; -+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 - -- 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 --if test "${ac_cv_lib_dl_dlopen+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldl $LIBS" --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+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_CXX= -+if test -n "$hardcode_libdir_flag_spec_CXX" || \ -+ test -n "$runpath_var_CXX" || \ -+ test "X$hardcode_automatic_CXX" = "Xyes" ; then - --/* 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 (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif --int --main () --{ --dlopen (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_dl_dlopen=yes -+ # 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 -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_lib_dl_dlopen=no -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ hardcode_action_CXX=unsupported - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -+echo "${ECHO_T}$hardcode_action_CXX" >&6 -+ -+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 --echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 --echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 --if test $ac_cv_lib_dl_dlopen = yes; then -- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" --else - -- lt_cv_dlopen="dyld" -- lt_cv_dlopen_libs= -- lt_cv_dlopen_self=yes - --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 LTCFLAGS NM \ -+ SED SHELL STRIP \ -+ 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 \ -+ compiler_lib_search_dirs_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 \ -+ fix_srcfile_path_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 - -- *) -- echo "$as_me:$LINENO: checking for shl_load" >&5 --echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 --if test "${ac_cv_func_shl_load+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 shl_load (); 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 shl_load (); --char (*f) (); -+ 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 () --{ --/* 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) --choke me --#else --f = shl_load; --#endif -+cfgfile="$ofile" - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_func_shl_load=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_func_shl_load=no --fi --rm -f conftest.$ac_objext 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 --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 --if test "${ac_cv_lib_dld_shl_load+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldld $LIBS" --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+ cat <<__EOF__ >> "$cfgfile" -+# ### BEGIN LIBTOOL TAG CONFIG: $tagname - --/* 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 (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif --int --main () --{ --shl_load (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_dld_shl_load=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_lib_dld_shl_load=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_dld_shl_load" >&5 --echo "${ECHO_T}$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 -- echo "$as_me:$LINENO: checking for dlopen" >&5 --echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 --if test "${ac_cv_func_dlopen+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 dlopen (); 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 dlopen (); --char (*f) (); -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - --#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_dlopen) || defined (__stub___dlopen) --choke me --#else --f = dlopen; --#endif -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_func_dlopen=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_func_dlopen=no --fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 --echo "${ECHO_T}$ac_cv_func_dlopen" >&6 --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 --if test "${ac_cv_lib_dl_dlopen+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldl $LIBS" --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+# Whether or not to build shared libraries. -+build_libtool_libs=$enable_shared - --/* 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 (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif --int --main () --{ --dlopen (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_dl_dlopen=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_lib_dl_dlopen=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_dl_dlopen" >&5 --echo "${ECHO_T}$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 -- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 --echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 --if test "${ac_cv_lib_svld_dlopen+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lsvld $LIBS" --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+# Whether or not to build static libraries. -+build_old_libs=$enable_static - --/* 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 (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif --int --main () --{ --dlopen (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_svld_dlopen=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_lib_svld_dlopen=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_svld_dlopen" >&5 --echo "${ECHO_T}$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 -- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 --echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 --if test "${ac_cv_lib_dld_dld_link+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldld $LIBS" --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+# Whether or not to add -lc for building shared libraries. -+build_libtool_need_lc=$archive_cmds_need_lc_CXX - --/* 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 dld_link (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif --int --main () --{ --dld_link (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_dld_dld_link=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_lib_dld_dld_link=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_dld_dld_link" >&5 --echo "${ECHO_T}$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 -+# 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 - --fi -+# 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 - --fi -+# An echo program that does not interpret backslashes. -+echo=$lt_echo - -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS - --fi -+# A C compiler. -+LTCC=$lt_LTCC - -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS - --fi -+# A language-specific compiler. -+CC=$lt_compiler_CXX - -+# Is the compiler the GNU C compiler? -+with_gcc=$GCC_CXX - --fi -+# An ERE matcher. -+EGREP=$lt_EGREP - -- ;; -- esac -+# The linker used to build libraries. -+LD=$lt_LD_CXX - -- if test "x$lt_cv_dlopen" != xno; then -- enable_dlopen=yes -- else -- enable_dlopen=no -- fi -+# Whether we need hard or soft links. -+LN_S=$lt_LN_S - -- case $lt_cv_dlopen in -- dlopen) -- save_CPPFLAGS="$CPPFLAGS" -- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+# A BSD-compatible nm program. -+NM=$lt_NM - -- save_LDFLAGS="$LDFLAGS" -- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -+# A symbol stripping program -+STRIP=$lt_STRIP - -- save_LIBS="$LIBS" -- LIBS="$lt_cv_dlopen_libs $LIBS" -+# Used to examine libraries when file_magic_cmd begins "file" -+MAGIC_CMD=$MAGIC_CMD - -- 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 --if test "${lt_cv_dlopen_self+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test "$cross_compiling" = yes; then : -- lt_cv_dlopen_self=cross --else -- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -- lt_status=$lt_dlunknown -- cat > conftest.$ac_ext <<EOF --#line 11408 "configure" --#include "confdefs.h" -+# Used on cygwin: DLL creation program. -+DLLTOOL="$DLLTOOL" - --#if HAVE_DLFCN_H --#include <dlfcn.h> --#endif -+# Used on cygwin: object dumper. -+OBJDUMP="$OBJDUMP" - --#include <stdio.h> -+# Used on cygwin: assembler. -+AS="$AS" - --#ifdef RTLD_GLOBAL --# define LT_DLGLOBAL RTLD_GLOBAL --#else --# ifdef DL_GLOBAL --# define LT_DLGLOBAL DL_GLOBAL --# else --# define LT_DLGLOBAL 0 --# endif --#endif -+# The name of the directory that contains temporary libtool files. -+objdir=$objdir - --/* 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 -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds - --#ifdef __cplusplus --extern "C" void exit (int); --#endif -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl_CXX - --void fnord() { int i=42;} --int main () --{ -- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -- int status = $lt_dlunknown; -+# Object file suffix (normally "o"). -+objext="$ac_objext" - -- if (self) -- { -- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -- /* dlclose (self); */ -- } -+# Old archive suffix (normally "a"). -+libext="$libext" - -- 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 -- fi --fi --rm -fr conftest* -+# Shared library suffix (normally ".so"). -+shrext_cmds='$shrext_cmds' - -+# Executable file suffix (normally ""). -+exeext="$exeext" - --fi --echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 --echo "${ECHO_T}$lt_cv_dlopen_self" >&6 -+# Additional compiler flags for building library objects. -+pic_flag=$lt_lt_prog_compiler_pic_CXX -+pic_mode=$pic_mode - -- 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 --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" --#include "confdefs.h" -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len - --#if HAVE_DLFCN_H --#include <dlfcn.h> --#endif -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX - --#include <stdio.h> -+# Must we lock files when doing compilation? -+need_locks=$lt_need_locks - --#ifdef RTLD_GLOBAL --# define LT_DLGLOBAL RTLD_GLOBAL --#else --# ifdef DL_GLOBAL --# define LT_DLGLOBAL DL_GLOBAL --# else --# define LT_DLGLOBAL 0 --# endif --#endif -+# Do we need the lib prefix for modules? -+need_lib_prefix=$need_lib_prefix - --/* 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 -+# Do we need a version for libraries? -+need_version=$need_version - --#ifdef __cplusplus --extern "C" void exit (int); --#endif -+# Whether dlopen is supported. -+dlopen_support=$enable_dlopen - --void fnord() { int i=42;} --int main () --{ -- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -- int status = $lt_dlunknown; -+# Whether dlopen of programs is supported. -+dlopen_self=$enable_dlopen_self - -- if (self) -- { -- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -- /* dlclose (self); */ -- } -+# Whether dlopen of statically linked programs is supported. -+dlopen_self_static=$enable_dlopen_self_static - -- 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_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* -+# Compiler flag to prevent dynamic linking. -+link_static_flag=$lt_lt_prog_compiler_static_CXX - -- --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 -- -- 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 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 -@@ -11884,6 +12441,10 @@ predeps=$lt_predeps_CXX - # shared library. - postdeps=$lt_postdeps_CXX - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_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 -@@ -11972,7 +12533,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea - 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" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$always_export_symbols_CXX -@@ -11998,7 +12559,10 @@ 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" -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi - fi - - -@@ -12060,26 +12624,59 @@ 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" -+lt_simple_compile_test_code="\ -+ subroutine t -+ return -+ end -+" - - # Code to be used in simple link tests --lt_simple_link_test_code=" program t\n end\n" -+lt_simple_link_test_code="\ -+ program t -+ end -+" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - - # If no C compiler was specified, use CC. - LTCC=${LTCC-"$CC"} - -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ - # Allow CC to be a program name with arguments. - compiler=$CC - - -+# save warnings/boilerplate of simple test code -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm -r conftest* -+ -+ - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - CC=${F77-"f77"} - compiler=$CC - compiler_F77=$CC --cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` -+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-%%"` -+ - - echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 - echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -@@ -12092,7 +12689,7 @@ test "$can_build_shared" = "no" && enabl - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. --case "$host_os" in -+case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then -@@ -12100,8 +12697,10 @@ aix3*) - postinstall_cmds='$RANLIB $lib' - fi - ;; --aix4*) -- test "$enable_shared" = yes && enable_static=no -+aix[4-9]*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi - ;; - esac - echo "$as_me:$LINENO: result: $enable_shared" >&5 -@@ -12114,8 +12713,6 @@ test "$enable_shared" = yes || enable_st - echo "$as_me:$LINENO: result: $enable_static" >&5 - echo "${ECHO_T}$enable_static" >&6 - --test "$ld_shlibs_F77" = no && can_build_shared=no -- - GCC_F77="$G77" - LD_F77="$LD" - -@@ -12146,13 +12743,15 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | 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). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries - lt_prog_compiler_pic_F77='-DDLL_EXPORT' - ;; - -@@ -12162,6 +12761,11 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_pic_F77='-fno-common' - ;; - -+ interix[3-9]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. -@@ -12178,7 +12782,7 @@ echo $ECHO_N "checking for $compiler opt - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -12204,8 +12808,18 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' - fi - ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic_F77='-qnocommon' -+ lt_prog_compiler_wl_F77='-Wl,' -+ ;; -+ esac -+ ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | 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' -@@ -12215,7 +12829,7 @@ echo $ECHO_N "checking for $compiler opt - 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 -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -12238,18 +12852,41 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static_F77='-Bstatic' - ;; - -- linux*) -- case $CC in -- icc|ecc) -+ linux* | k*bsd*-gnu) -+ case $cc_basename 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. -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_pic_F77='-fpic' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; -+ ccc*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ # All Alpha code is PIC. - lt_prog_compiler_static_F77='-non_shared' - ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ lt_prog_compiler_wl_F77='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ lt_prog_compiler_wl_F77='' -+ ;; -+ esac -+ ;; - esac - ;; - -@@ -12259,15 +12896,19 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static_F77='-non_shared' - ;; - -- sco3.2v5*) -- lt_prog_compiler_pic_F77='-Kpic' -- lt_prog_compiler_static_F77='-dn' -+ rdos*) -+ lt_prog_compiler_static_F77='-non_shared' - ;; - - solaris*) -- lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ lt_prog_compiler_wl_F77='-Qoption ld ';; -+ *) -+ lt_prog_compiler_wl_F77='-Wl,';; -+ esac - ;; - - sunos4*) -@@ -12276,7 +12917,7 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static_F77='-Bstatic' - ;; - -- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -+ sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' -@@ -12289,6 +12930,17 @@ echo $ECHO_N "checking for $compiler opt - fi - ;; - -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; -+ -+ unicos*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_can_build_shared_F77=no -+ ;; -+ - uts4*) - lt_prog_compiler_pic_F77='-pic' - lt_prog_compiler_static_F77='-Bstatic' -@@ -12307,14 +12959,15 @@ echo "${ECHO_T}$lt_prog_compiler_pic_F77 - # 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 "$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 --if test "${lt_prog_compiler_pic_works_F77+set}" = set; then -+if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_pic_works_F77=no -+ lt_cv_prog_compiler_pic_works_F77=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$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. -@@ -12322,10 +12975,10 @@ else - # 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:12328: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:12981: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -@@ -12329,21 +12982,23 @@ else - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:12332: \$? = $ac_status" >&5 -+ echo "$as_me:12985: \$? = $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 -- if test ! -s conftest.err; then -- lt_prog_compiler_pic_works_F77=yes -+ # 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_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 -+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6 - --if test x"$lt_prog_compiler_pic_works_F77" = xyes; then -+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then - case $lt_prog_compiler_pic_F77 in - "" | " "*) ;; - *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; -@@ -12354,7 +13009,7 @@ else - fi - - fi --case "$host_os" in -+case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_F77= -@@ -12364,6 +13019,48 @@ case "$host_os" in - ;; - esac - -+# -+# Check to make sure the static flag actually works. -+# -+wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" -+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 -+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_static_works_F77=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_F77=yes -+ fi -+ else -+ lt_cv_prog_compiler_static_works_F77=yes -+ fi -+ fi -+ $rm -r conftest* -+ LDFLAGS="$save_LDFLAGS" -+ -+fi -+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6 -+ -+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then -+ : -+else -+ lt_prog_compiler_static_F77= -+fi -+ -+ - 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 - if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then -@@ -12374,14 +13071,7 @@ else - 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 -@@ -12389,10 +13079,10 @@ else - # 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:12395: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13085: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -@@ -12401,13 +13091,18 @@ else - 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 -+ $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_F77=yes - fi - fi -- chmod u+w . -- $rm conftest* out/* -- rmdir out -+ 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 .. - rmdir conftest - $rm conftest* -@@ -12471,13 +13166,24 @@ echo $ECHO_N "checking whether the $comp - # 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_" -+ exclude_expsyms_F77='_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= -+ # Just being paranoid about ensuring that cc_basename is set. -+ 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-%%"` - - case $host_os in - cygwin* | mingw* | pw32*) -@@ -12488,6 +13194,10 @@ echo $ECHO_N "checking whether the $comp - 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 - ;; -@@ -12498,9 +13208,30 @@ echo $ECHO_N "checking whether the $comp - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec_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 -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` 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 -+ - # See if GNU ld supports shared libraries. - case $host_os in -- aix3* | aix4* | aix5*) -+ aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs_F77=no -@@ -12548,10 +13279,10 @@ EOF - 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' -+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -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' -+ archive_cmds_F77='$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_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -@@ -12560,9 +13291,64 @@ EOF - 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' -+ $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 -+ ld_shlibs_F77=no -+ fi -+ ;; -+ -+ interix[3-9]*) -+ hardcode_direct_F77=no -+ hardcode_shlibpath_var_F77=no -+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_F77='${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_F77='$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_F77='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* | k*bsd*-gnu) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_addflag= -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ whole_archive_flag_spec_F77='${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_F77='${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' ;; -+ esac -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ whole_archive_flag_spec_F77='${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' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds_F77='$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 -+ else -+ ld_shlibs_F77=no - fi - ;; - -@@ -12576,7 +13362,7 @@ EOF - fi - ;; - -- solaris* | sysv5*) -+ solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs_F77=no - cat <<EOF 1>&2 -@@ -12597,6 +13383,33 @@ EOF - fi - ;; - -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) -+ ld_shlibs_F77=no -+ cat <<_LT_EOF 1>&2 -+ -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** reliably create shared libraries on SCO systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+_LT_EOF -+ ;; -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -+ else -+ ld_shlibs_F77=no -+ fi -+ ;; -+ esac -+ ;; -+ - sunos4*) - archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= -@@ -12614,16 +13427,11 @@ EOF - ;; - 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 -+ if test "$ld_shlibs_F77" = no; then -+ runpath_var= -+ hardcode_libdir_flag_spec_F77= -+ export_dynamic_flag_spec_F77= -+ whole_archive_flag_spec_F77= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) -@@ -12635,14 +13443,14 @@ EOF - # 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 -+ 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_F77=unsupported - fi - ;; - -- aix4* | aix5*) -+ 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. -@@ -12662,13 +13470,14 @@ EOF - # 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*) -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done -+ ;; - esac - - exp_sym_flag='-bexport' -@@ -12687,7 +13496,7 @@ EOF - link_all_deplibs_F77=yes - - if test "$GCC" = yes; then -- case $host_os in aix4.012|aix4.012.*) -+ 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` -@@ -12695,7 +13504,7 @@ EOF - 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 -@@ -12706,8 +13515,12 @@ EOF - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_libdir_separator_F77= - 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 -@@ -12715,11 +13528,11 @@ EOF - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else -- if test "$aix_use_runtimelinking" = yes; then -+ if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' -- fi -+ fi - fi - fi - -@@ -12749,11 +13562,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - 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; } --}'` -+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 - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 -@@ -12762,12 +13582,12 @@ rm -f conftest.$ac_objext conftest$ac_ex - 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" -+ archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_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" -+ archive_expsym_cmds_F77="\$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 -@@ -12788,11 +13608,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - 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; } --}'` -+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 - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 -@@ -12805,13 +13632,11 @@ if test -z "$aix_libpath"; then aix_libp - # -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=' ' -+ whole_archive_flag_spec_F77='$convenience' - 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' -+ # This is similar to how AIX traditionally builds its shared libraries. -+ archive_expsym_cmds_F77="\$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 - ;; -@@ -12824,7 +13649,7 @@ if test -z "$aix_libpath"; then aix_libp - ld_shlibs_F77=no - ;; - -- bsdi4*) -+ bsdi[45]*) - export_dynamic_flag_spec_F77=-rdynamic - ;; - -@@ -12838,55 +13663,63 @@ if test -z "$aix_libpath"; then aix_libp - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. -- shrext=".dll" -+ shrext_cmds=".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"`' -+ old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ fix_srcfile_path_F77='`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' -- ;; -+ case $host_os in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; - 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}' -+ archive_cmds_need_lc_F77=no - hardcode_direct_F77=no - hardcode_automatic_F77=yes - hardcode_shlibpath_var_F77=unsupported -- whole_archive_flag_spec_F77='-all_load $convenience' -+ whole_archive_flag_spec_F77='' - link_all_deplibs_F77=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_F77="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_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs_F77=no -+ ;; -+ esac - fi - ;; - -@@ -12920,7 +13753,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd*) -+ freebsd* | dragonfly*) - archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes -@@ -12943,47 +13776,62 @@ if test -z "$aix_libpath"; then aix_libp - export_dynamic_flag_spec_F77='${wl}-E' - ;; - -- hpux10* | hpux11*) -+ hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then -- case "$host_cpu" in -- hppa*64*|ia64*) -+ archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_F77='$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_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 -+ fi -+ ;; -+ -+ hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case $host_cpu in -+ hppa*64*) - archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; -+ ia64*) -+ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -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' -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ archive_cmds_F77='$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 -- case "$host_cpu" in -- hppa*64*) -- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' -+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_F77=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) - 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' - -@@ -13027,23 +13875,28 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - 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' -+ if test -f /usr/libexec/ld.so; then -+ 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' -+ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ 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 - 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 -+ ld_shlibs_F77=no - fi - ;; - -@@ -13076,7 +13929,7 @@ if test -z "$aix_libpath"; then aix_libp - 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' -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec_F77='-rpath $libdir' -@@ -13084,21 +13937,15 @@ if test -z "$aix_libpath"; then aix_libp - 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 -+ wlarc='${wl}' - 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 -+ wlarc='' - 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' -@@ -13107,8 +13954,17 @@ if test -z "$aix_libpath"; then aix_libp - 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' ;; -+ *) -+ # 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_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' -+ fi -+ ;; - esac - link_all_deplibs_F77=yes - ;; -@@ -13165,36 +14021,45 @@ if test -z "$aix_libpath"; then aix_libp - fi - ;; - -- sysv4.2uw2*) -- archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct_F77=yes -- hardcode_minus_L_F77=no -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) -+ no_undefined_flag_F77='${wl}-z,text' -+ archive_cmds_need_lc_F77=no - hardcode_shlibpath_var_F77=no -- hardcode_runpath_var=yes -- runpath_var=LD_RUN_PATH -- ;; -+ 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' -+ archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else -- archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$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= -+ 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_F77='${wl}-z,text' -+ allow_undefined_flag_F77='${wl}-z,nodefs' -+ archive_cmds_need_lc_F77=no - hardcode_shlibpath_var_F77=no -+ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ hardcode_libdir_separator_F77=':' -+ link_all_deplibs_F77=yes -+ export_dynamic_flag_spec_F77='${wl}-Bexport' - runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi - ;; - - uts4*) -@@ -13213,11 +14078,6 @@ echo "$as_me:$LINENO: result: $ld_shlibs - 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? - # -@@ -13238,7 +14098,7 @@ x|xyes) - 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 -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 -@@ -13250,6 +14110,7 @@ echo $ECHO_N "checking whether -lc shoul - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_F77 -+ pic_flag=$lt_prog_compiler_pic_F77 - compiler_flags=-v - linker_flags=-v - verstring= -@@ -13280,107 +14141,28 @@ echo "${ECHO_T}$archive_cmds_need_lc_F77 - ;; - 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 -+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_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+version_type=none -+dynamic_linker="$host_os ld.so" -+sys_lib_dlsearch_path_spec="/lib /usr/lib" - -- # 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 -+need_lib_prefix=unknown -+hardcode_into_libs=no - --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 -+# 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*) -@@ -13392,7 +14174,7 @@ aix3*) - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -13439,7 +14221,7 @@ 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' -+ 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*) -@@ -13448,7 +14230,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}' -@@ -13464,7 +14246,7 @@ bsdi4*) - - cygwin* | mingw* | pw32*) - version_type=windows -- shrext=".dll" -+ shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - -@@ -13476,7 +14258,8 @@ cygwin* | mingw* | pw32*) - 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' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' -@@ -13486,7 +14269,7 @@ cygwin* | mingw* | pw32*) - 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 DLLs use traditional 'lib' prefix -@@ -13506,7 +14289,7 @@ cygwin* | mingw* | pw32*) - ;; - 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 - ;; -@@ -13525,18 +14308,12 @@ 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' - 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_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -@@ -13553,8 +14330,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*) -@@ -13572,14 +14358,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 - ;; - -@@ -13599,9 +14390,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 -@@ -13616,7 +14407,7 @@ hpux9* | hpux10* | hpux11*) - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) -- shrext='.sl' -+ shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -@@ -13627,7 +14418,7 @@ hpux9* | hpux10* | hpux11*) - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) -- shrext='.sl' -+ shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -@@ -13639,6 +14430,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 ;; -@@ -13682,7 +14485,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 -@@ -13696,6 +14499,12 @@ linux*) - # 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, -@@ -13714,7 +14523,7 @@ netbsd*) - 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 -@@ -13730,7 +14539,7 @@ newsos6) - shlibpath_overrides_runpath=yes - ;; - --nto-qnx) -+nto-qnx*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -13742,8 +14551,13 @@ nto-qnx) - - 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 -@@ -13763,7 +14577,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' -@@ -13781,11 +14595,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*) -@@ -13813,7 +14624,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' -@@ -13846,6 +14657,29 @@ 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 -+ 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' -+ shlibpath_overrides_runpath=no -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ shlibpath_overrides_runpath=yes -+ 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' -+ ;; -+ - uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -13861,6 +14695,63 @@ echo "$as_me:$LINENO: result: $dynamic_l - echo "${ECHO_T}$dynamic_linker" >&6 - test "$dynamic_linker" = no && can_build_shared=no - -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi -+ -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi -+ -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ -+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 -+ -+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 -+ - - # The else clause should only fire when bootstrapping the - # libtool distribution, otherwise you forgot to ship ltmain.sh -@@ -13875,7 +14766,8 @@ if test -f "$ltmain"; then - # 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 \ -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ - 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 \ -@@ -13901,6 +14793,7 @@ if test -f "$ltmain"; then - predeps_F77 \ - postdeps_F77 \ - compiler_lib_search_path_F77 \ -+ compiler_lib_search_dirs_F77 \ - archive_cmds_F77 \ - archive_expsym_cmds_F77 \ - postinstall_cmds_F77 \ -@@ -13916,6 +14809,7 @@ if test -f "$ltmain"; then - module_cmds_F77 \ - module_expsym_cmds_F77 \ - lt_cv_prog_compiler_c_o_F77 \ -+ fix_srcfile_path_F77 \ - exclude_expsyms_F77 \ - include_expsyms_F77; do - -@@ -13975,6 +14869,12 @@ 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 - - # An echo program that does not interpret backslashes. - echo=$lt_echo -@@ -13986,6 +14886,9 @@ AR_FLAGS=$lt_AR_FLAGS - # A C compiler. - LTCC=$lt_LTCC - -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS -+ - # A language-specific compiler. - CC=$lt_compiler_F77 - -@@ -14005,7 +14908,7 @@ LN_S=$lt_LN_S - NM=$lt_NM - - # A symbol stripping program --STRIP=$STRIP -+STRIP=$lt_STRIP - - # Used to examine libraries when file_magic_cmd begins "file" - MAGIC_CMD=$MAGIC_CMD -@@ -14036,7 +14939,7 @@ objext="$ac_objext" - libext="$libext" - - # Shared library suffix (normally ".so"). --shrext='$shrext' -+shrext_cmds='$shrext_cmds' - - # Executable file suffix (normally ""). - exeext="$exeext" -@@ -14051,7 +14954,7 @@ 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_F77 - --# Must we lock files when doing compilation ? -+# Must we lock files when doing compilation? - need_locks=$lt_need_locks - - # Do we need the lib prefix for modules? -@@ -14139,6 +15042,10 @@ predeps=$lt_predeps_F77 - # shared library. - postdeps=$lt_postdeps_F77 - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_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 -@@ -14227,7 +15134,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea - 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" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$always_export_symbols_F77 -@@ -14253,7 +15160,10 @@ 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" -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi - fi - - -@@ -14283,43 +15193,73 @@ objext=o - objext_GCJ=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code="class foo {}\n" -+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) {}; }\n' -+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. - - # If no C compiler was specified, use CC. - LTCC=${LTCC-"$CC"} - -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ - # Allow CC to be a program name with arguments. - compiler=$CC - - -+# save warnings/boilerplate of simple test code -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm -r conftest* -+ -+ - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - CC=${GCJ-"gcj"} - compiler=$CC - compiler_GCJ=$CC -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ - - # GCJ did not exist at the time GCC didn't implicitly link libc in. - archive_cmds_need_lc_GCJ=no - -+old_archive_cmds_GCJ=$old_archive_cmds -+ - - 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 "$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 - if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ 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. -@@ -14327,10 +15267,10 @@ else - # 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:14333: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15273: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -@@ -14334,11 +15274,13 @@ else - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:14337: \$? = $ac_status" >&5 -+ echo "$as_me:15277: \$? = $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 -- 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 - lt_cv_prog_compiler_rtti_exceptions=yes - fi - fi -@@ -14383,14 +15325,16 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | 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' -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ - ;; - - darwin* | rhapsody*) -@@ -14399,6 +15343,11 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_pic_GCJ='-fno-common' - ;; - -+ interix[3-9]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. -@@ -14415,7 +15364,7 @@ echo $ECHO_N "checking for $compiler opt - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -14441,18 +15390,28 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' - fi - ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic_GCJ='-qnocommon' -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ ;; -+ esac -+ ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | 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 -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -14475,18 +15434,41 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - -- linux*) -- case $CC in -- icc|ecc) -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ icc* | ecc*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-static' - ;; -- ccc) -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_pic_GCJ='-fpic' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ ;; -+ ccc*) - lt_prog_compiler_wl_GCJ='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static_GCJ='-non_shared' - ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ lt_prog_compiler_wl_GCJ='' -+ ;; -+ esac -+ ;; - esac - ;; - -@@ -14496,15 +15478,19 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static_GCJ='-non_shared' - ;; - -- sco3.2v5*) -- lt_prog_compiler_pic_GCJ='-Kpic' -- lt_prog_compiler_static_GCJ='-dn' -+ rdos*) -+ lt_prog_compiler_static_GCJ='-non_shared' - ;; - - solaris*) -- lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ lt_prog_compiler_wl_GCJ='-Qoption ld ';; -+ *) -+ lt_prog_compiler_wl_GCJ='-Wl,';; -+ esac - ;; - - sunos4*) -@@ -14513,7 +15499,7 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - -- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -+ sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' -@@ -14526,6 +15512,17 @@ echo $ECHO_N "checking for $compiler opt - fi - ;; - -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ ;; -+ -+ unicos*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_can_build_shared_GCJ=no -+ ;; -+ - uts4*) - lt_prog_compiler_pic_GCJ='-pic' - lt_prog_compiler_static_GCJ='-Bstatic' -@@ -14544,14 +15541,15 @@ echo "${ECHO_T}$lt_prog_compiler_pic_GCJ - # 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 "$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 --if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then -+if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_pic_works_GCJ=no -+ lt_cv_prog_compiler_pic_works_GCJ=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$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. -@@ -14559,10 +15557,10 @@ else - # 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:14565: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15563: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -@@ -14566,21 +15564,23 @@ else - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:14569: \$? = $ac_status" >&5 -+ echo "$as_me:15567: \$? = $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 -- if test ! -s conftest.err; then -- lt_prog_compiler_pic_works_GCJ=yes -+ # 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_GCJ=yes - fi - fi - $rm conftest* - - fi --echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6 -+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6 - --if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then -+if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then - case $lt_prog_compiler_pic_GCJ in - "" | " "*) ;; - *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; -@@ -14591,7 +15591,7 @@ else - fi - - fi --case "$host_os" in -+case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_GCJ= -@@ -14601,6 +15601,48 @@ case "$host_os" in - ;; - esac - -+# -+# Check to make sure the static flag actually works. -+# -+wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" -+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 -+if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_static_works_GCJ=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_GCJ=yes -+ fi -+ else -+ lt_cv_prog_compiler_static_works_GCJ=yes -+ fi -+ fi -+ $rm -r conftest* -+ LDFLAGS="$save_LDFLAGS" -+ -+fi -+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6 -+ -+if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then -+ : -+else -+ lt_prog_compiler_static_GCJ= -+fi -+ -+ - 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 - if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then -@@ -14611,14 +15653,7 @@ else - 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 -@@ -14626,10 +15661,10 @@ else - # 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:14632: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15667: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -@@ -14638,13 +15673,18 @@ else - 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 -+ $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_GCJ=yes - fi - fi -- chmod u+w . -- $rm conftest* out/* -- rmdir out -+ 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 .. - rmdir conftest - $rm conftest* -@@ -14708,13 +15748,24 @@ echo $ECHO_N "checking whether the $comp - # 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_" -+ exclude_expsyms_GCJ='_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= -+ # Just being paranoid about ensuring that cc_basename is set. -+ 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-%%"` - - case $host_os in - cygwin* | mingw* | pw32*) -@@ -14725,6 +15776,10 @@ echo $ECHO_N "checking whether the $comp - 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 - ;; -@@ -14735,9 +15790,30 @@ echo $ECHO_N "checking whether the $comp - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec_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 -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` 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 -+ - # See if GNU ld supports shared libraries. - case $host_os in -- aix3* | aix4* | aix5*) -+ aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs_GCJ=no -@@ -14785,10 +15861,10 @@ EOF - 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' -+ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -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' -+ archive_cmds_GCJ='$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_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -@@ -14797,9 +15873,64 @@ EOF - 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' -+ $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 -+ ld_shlibs_GCJ=no -+ fi -+ ;; -+ -+ interix[3-9]*) -+ hardcode_direct_GCJ=no -+ hardcode_shlibpath_var_GCJ=no -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_GCJ='${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_GCJ='$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_GCJ='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* | k*bsd*-gnu) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_addflag= -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ whole_archive_flag_spec_GCJ='${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_GCJ='${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' ;; -+ esac -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ whole_archive_flag_spec_GCJ='${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' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds_GCJ='$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 -+ else -+ ld_shlibs_GCJ=no - fi - ;; - -@@ -14813,7 +15944,7 @@ EOF - fi - ;; - -- solaris* | sysv5*) -+ solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs_GCJ=no - cat <<EOF 1>&2 -@@ -14834,14 +15965,41 @@ EOF - 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 -- ;; -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) -+ ld_shlibs_GCJ=no -+ cat <<_LT_EOF 1>&2 - -- *) -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** reliably create shared libraries on SCO systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+_LT_EOF -+ ;; -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -+ else -+ ld_shlibs_GCJ=no -+ fi -+ ;; -+ esac -+ ;; -+ -+ 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' -@@ -14851,16 +16009,11 @@ EOF - ;; - 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 -+ if test "$ld_shlibs_GCJ" = no; then -+ runpath_var= -+ hardcode_libdir_flag_spec_GCJ= -+ export_dynamic_flag_spec_GCJ= -+ whole_archive_flag_spec_GCJ= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) -@@ -14872,14 +16025,14 @@ EOF - # 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 -+ 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_GCJ=unsupported - fi - ;; - -- aix4* | aix5*) -+ 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. -@@ -14899,13 +16052,14 @@ EOF - # 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*) -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done -+ ;; - esac - - exp_sym_flag='-bexport' -@@ -14924,7 +16078,7 @@ EOF - link_all_deplibs_GCJ=yes - - if test "$GCC" = yes; then -- case $host_os in aix4.012|aix4.012.*) -+ 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` -@@ -14932,7 +16086,7 @@ EOF - 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 -@@ -14943,8 +16097,12 @@ EOF - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_libdir_separator_GCJ= - 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 -@@ -14952,11 +16110,11 @@ EOF - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else -- if test "$aix_use_runtimelinking" = yes; then -+ if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' -- fi -+ fi - fi - fi - -@@ -14999,11 +16157,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - 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; } --}'` -+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 - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 -@@ -15012,12 +16177,12 @@ rm -f conftest.$ac_objext conftest$ac_ex - 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" -+ archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_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" -+ archive_expsym_cmds_GCJ="\$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 -@@ -15051,11 +16216,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - 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; } --}'` -+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 - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 -@@ -15068,13 +16240,11 @@ if test -z "$aix_libpath"; then aix_libp - # -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=' ' -+ whole_archive_flag_spec_GCJ='$convenience' - 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' -+ # This is similar to how AIX traditionally builds its shared libraries. -+ archive_expsym_cmds_GCJ="\$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 - ;; -@@ -15087,7 +16257,7 @@ if test -z "$aix_libpath"; then aix_libp - ld_shlibs_GCJ=no - ;; - -- bsdi4*) -+ bsdi[45]*) - export_dynamic_flag_spec_GCJ=-rdynamic - ;; - -@@ -15101,55 +16271,63 @@ if test -z "$aix_libpath"; then aix_libp - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. -- shrext=".dll" -+ shrext_cmds=".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"`' -+ old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ fix_srcfile_path_GCJ='`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' -- ;; -+ case $host_os in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; - 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}' -+ archive_cmds_need_lc_GCJ=no - hardcode_direct_GCJ=no - hardcode_automatic_GCJ=yes - hardcode_shlibpath_var_GCJ=unsupported -- whole_archive_flag_spec_GCJ='-all_load $convenience' -+ whole_archive_flag_spec_GCJ='' - link_all_deplibs_GCJ=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_GCJ="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_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs_GCJ=no -+ ;; -+ esac - fi - ;; - -@@ -15183,7 +16361,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd*) -+ freebsd* | dragonfly*) - archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_direct_GCJ=yes -@@ -15206,47 +16384,62 @@ if test -z "$aix_libpath"; then aix_libp - export_dynamic_flag_spec_GCJ='${wl}-E' - ;; - -- hpux10* | hpux11*) -+ hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then -- case "$host_cpu" in -- hppa*64*|ia64*) -+ archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_GCJ='$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_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 -+ fi -+ ;; -+ -+ hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case $host_cpu in -+ hppa*64*) - archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; -+ ia64*) -+ archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -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' -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ archive_cmds_GCJ='$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 -- case "$host_cpu" in -- hppa*64*) -- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' -+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_GCJ=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) - 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' - -@@ -15290,23 +16483,28 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - 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' -+ if test -f /usr/libexec/ld.so; then -+ 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' -+ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ 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 - 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 -+ ld_shlibs_GCJ=no - fi - ;; - -@@ -15339,7 +16537,7 @@ if test -z "$aix_libpath"; then aix_libp - 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' -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec_GCJ='-rpath $libdir' -@@ -15347,21 +16545,15 @@ if test -z "$aix_libpath"; then aix_libp - 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 -+ wlarc='${wl}' - 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 -+ wlarc='' - 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' -@@ -15370,8 +16562,17 @@ if test -z "$aix_libpath"; then aix_libp - 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' ;; -+ *) -+ # 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_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' -+ fi -+ ;; - esac - link_all_deplibs_GCJ=yes - ;; -@@ -15428,36 +16629,45 @@ if test -z "$aix_libpath"; then aix_libp - fi - ;; - -- sysv4.2uw2*) -- archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct_GCJ=yes -- hardcode_minus_L_GCJ=no -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) -+ no_undefined_flag_GCJ='${wl}-z,text' -+ archive_cmds_need_lc_GCJ=no - hardcode_shlibpath_var_GCJ=no -- hardcode_runpath_var=yes -- runpath_var=LD_RUN_PATH -- ;; -+ 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' -+ archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else -- archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$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= -+ 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_GCJ='${wl}-z,text' -+ allow_undefined_flag_GCJ='${wl}-z,nodefs' -+ archive_cmds_need_lc_GCJ=no - hardcode_shlibpath_var_GCJ=no -+ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ hardcode_libdir_separator_GCJ=':' -+ link_all_deplibs_GCJ=yes -+ export_dynamic_flag_spec_GCJ='${wl}-Bexport' - runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi - ;; - - uts4*) -@@ -15476,11 +16686,6 @@ echo "$as_me:$LINENO: result: $ld_shlibs - echo "${ECHO_T}$ld_shlibs_GCJ" >&6 - 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? - # -@@ -15492,1345 +16697,667 @@ x|xyes) - 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 -- $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_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 -- (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 -- ;; -- 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_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 -- --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= --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 -- ;; -- *) # 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 --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 --if test "${ac_cv_lib_dl_dlopen+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldl $LIBS" --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char dlopen (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif --int --main () --{ --dlopen (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_dl_dlopen=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_lib_dl_dlopen=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_dl_dlopen" >&5 --echo "${ECHO_T}$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 -- -- 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 --if test "${ac_cv_func_shl_load+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 shl_load (); 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 shl_load (); --char (*f) (); -- --#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_shl_load) || defined (__stub___shl_load) --choke me --#else --f = shl_load; --#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=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_func_shl_load=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_func_shl_load=no --fi --rm -f conftest.$ac_objext 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 --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 --if test "${ac_cv_lib_dld_shl_load+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldld $LIBS" --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char shl_load (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif --int --main () --{ --shl_load (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_dld_shl_load=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_lib_dld_shl_load=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_dld_shl_load" >&5 --echo "${ECHO_T}$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 -- echo "$as_me:$LINENO: checking for dlopen" >&5 --echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 --if test "${ac_cv_func_dlopen+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 dlopen (); 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 dlopen (); --char (*f) (); -- --#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_dlopen) || defined (__stub___dlopen) --choke me --#else --f = dlopen; --#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=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_func_dlopen=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_func_dlopen=no --fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 --echo "${ECHO_T}$ac_cv_func_dlopen" >&6 --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 --if test "${ac_cv_lib_dl_dlopen+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldl $LIBS" --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char dlopen (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif --int --main () --{ --dlopen (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_dl_dlopen=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_lib_dl_dlopen=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_dl_dlopen" >&5 --echo "${ECHO_T}$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 -- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 --echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 --if test "${ac_cv_lib_svld_dlopen+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lsvld $LIBS" --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char dlopen (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif --int --main () --{ --dlopen (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_svld_dlopen=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_lib_svld_dlopen=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_svld_dlopen" >&5 --echo "${ECHO_T}$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 -- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 --echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 --if test "${ac_cv_lib_dld_dld_link+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldld $LIBS" --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+ # 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* -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - --/* 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 dld_link (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif --int --main () --{ --dld_link (); -- ; -- 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 -+ 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' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ (exit $ac_status); } 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$lt_prog_compiler_wl_GCJ -+ pic_flag=$lt_prog_compiler_pic_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 -- (exit $ac_status); }; }; then -- ac_cv_lib_dld_dld_link=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_lib_dld_dld_link=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_dld_dld_link" >&5 --echo "${ECHO_T}$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 -+ (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 -+ ;; -+ esac -+ fi -+ ;; -+esac - -+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_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+version_type=none -+dynamic_linker="$host_os ld.so" -+sys_lib_dlsearch_path_spec="/lib /usr/lib" - --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' -+ ;; - --fi -+aix[4-9]*) -+ 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 -+ ;; - --fi -+bsdi[45]*) -+ 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_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no - --fi -+ 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~ -+ chmod a+x \$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="/usr/lib /lib/w32api /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 -+ ;; - -- if test "x$lt_cv_dlopen" != xno; then -- enable_dlopen=yes -- else -- enable_dlopen=no -- fi -+darwin* | rhapsody*) -+ dynamic_linker="$host_os dyld" -+ version_type=darwin -+ need_lib_prefix=no -+ need_version=no -+ 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_cmds='`test .$module = .yes && echo .so || echo .dylib`' - -- case $lt_cv_dlopen in -- dlopen) -- save_CPPFLAGS="$CPPFLAGS" -- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+ 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 -+ ;; - -- save_LDFLAGS="$LDFLAGS" -- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -+freebsd1*) -+ dynamic_linker=no -+ ;; - -- save_LIBS="$LIBS" -- LIBS="$lt_cv_dlopen_libs $LIBS" -+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*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ need_version=no -+ need_lib_prefix=no -+ ;; -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_os in -+ freebsd2*) -+ shlibpath_overrides_runpath=yes -+ ;; -+ freebsd3.[01]* | freebsdelf3.[01]*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ -+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ esac -+ ;; - -- 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 --if test "${lt_cv_dlopen_self+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test "$cross_compiling" = yes; then : -- lt_cv_dlopen_self=cross --else -- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -- lt_status=$lt_dlunknown -- cat > conftest.$ac_ext <<EOF --#line 16635 "configure" --#include "confdefs.h" -+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 -+ ;; - --#if HAVE_DLFCN_H --#include <dlfcn.h> --#endif -+hpux9* | hpux10* | hpux11*) -+ # Give a soname corresponding to the major version so that dld.sl refuses to -+ # link against other versions. -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ case $host_cpu in -+ ia64*) -+ shrext_cmds='.so' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.so" -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ if test "X$HPUX_IA64_MODE" = X32; then -+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -+ else -+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -+ fi -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) -+ shrext_cmds='.sl' -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=SHLIB_PATH -+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ esac -+ # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ postinstall_cmds='chmod 555 $lib' -+ ;; - --#include <stdio.h> -+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 -+ ;; - --#ifdef RTLD_GLOBAL --# define LT_DLGLOBAL RTLD_GLOBAL --#else --# ifdef DL_GLOBAL --# define LT_DLGLOBAL DL_GLOBAL --# else --# define LT_DLGLOBAL 0 --# endif --#endif -+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 -+ ;; - --/* 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 -+# No shared lib support for Linux oldld, aout, or coff. -+linux*oldld* | linux*aout* | linux*coff*) -+ dynamic_linker=no -+ ;; - --#ifdef __cplusplus --extern "C" void exit (int); --#endif -+# This must be Linux ELF. -+linux* | k*bsd*-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' -+ 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 - --void fnord() { int i=42;} --int main () --{ -- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -- int status = $lt_dlunknown; -+ # 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 - -- if (self) -- { -- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -- /* dlclose (self); */ -- } -+ # 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' -+ ;; - -- 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 -+netbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ dynamic_linker='NetBSD (a.out) ld.so' -+ else -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='NetBSD ld.elf_so' - fi --fi --rm -fr conftest* -+ 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 -+ ;; - --fi --echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 --echo "${ECHO_T}$lt_cv_dlopen_self" >&6 -+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 -+ ;; - -- 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 --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 16733 "configure" --#include "confdefs.h" -+openbsd*) -+ version_type=sunos -+ sys_lib_dlsearch_path_spec="/usr/lib" -+ need_lib_prefix=no -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ case $host_os in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ shlibpath_overrides_runpath=yes -+ fi -+ ;; - --#if HAVE_DLFCN_H --#include <dlfcn.h> --#endif -+os2*) -+ libname_spec='$name' -+ shrext_cmds=".dll" -+ need_lib_prefix=no -+ library_names_spec='$libname${shared_ext} $libname.a' -+ dynamic_linker='OS/2 ld.exe' -+ shlibpath_var=LIBPATH -+ ;; - --#include <stdio.h> -+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" -+ ;; - --#ifdef RTLD_GLOBAL --# define LT_DLGLOBAL RTLD_GLOBAL --#else --# ifdef DL_GLOBAL --# define LT_DLGLOBAL DL_GLOBAL --# else --# define LT_DLGLOBAL 0 --# endif --#endif -+rdos*) -+ dynamic_linker=no -+ ;; - --/* 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 -+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' -+ ;; - --#ifdef __cplusplus --extern "C" void exit (int); --#endif -+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 -+ ;; - --void fnord() { int i=42;} --int main () --{ -- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -- int status = $lt_dlunknown; -+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' -+ 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 -+ ;; - -- if (self) -- { -- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -- /* dlclose (self); */ -- } -+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 -+ ;; - -- 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_static=yes ;; -- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; -- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; -+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 -+ 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' -+ shlibpath_overrides_runpath=no -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ shlibpath_overrides_runpath=yes -+ case $host_os in -+ sco3.2v5*) -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -+ ;; - esac -- else : -- # compilation failed -- lt_cv_dlopen_self_static=no - fi -+ sys_lib_dlsearch_path_spec='/usr/lib' -+ ;; -+ -+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 -+test "$dynamic_linker" = no && can_build_shared=no -+ -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi -+ -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" - fi --rm -fr conftest* - -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - -+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 --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 how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -+hardcode_action_GCJ= -+if test -n "$hardcode_libdir_flag_spec_GCJ" || \ -+ test -n "$runpath_var_GCJ" || \ -+ test "X$hardcode_automatic_GCJ" = "Xyes" ; then - -- case $lt_cv_dlopen_self in -- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -- *) enable_dlopen_self=unknown ;; -- esac -+ # 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 - -- case $lt_cv_dlopen_self_static in -- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -- *) enable_dlopen_self_static=unknown ;; -- esac -+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 - - -@@ -16847,7 +17374,8 @@ if test -f "$ltmain"; then - # 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 \ -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ - 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 \ -@@ -16873,6 +17401,7 @@ if test -f "$ltmain"; then - predeps_GCJ \ - postdeps_GCJ \ - compiler_lib_search_path_GCJ \ -+ compiler_lib_search_dirs_GCJ \ - archive_cmds_GCJ \ - archive_expsym_cmds_GCJ \ - postinstall_cmds_GCJ \ -@@ -16888,6 +17417,7 @@ if test -f "$ltmain"; then - module_cmds_GCJ \ - module_expsym_cmds_GCJ \ - lt_cv_prog_compiler_c_o_GCJ \ -+ fix_srcfile_path_GCJ \ - exclude_expsyms_GCJ \ - include_expsyms_GCJ; do - -@@ -16947,6 +17477,12 @@ 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 - - # An echo program that does not interpret backslashes. - echo=$lt_echo -@@ -16958,6 +17494,9 @@ AR_FLAGS=$lt_AR_FLAGS - # A C compiler. - LTCC=$lt_LTCC - -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS -+ - # A language-specific compiler. - CC=$lt_compiler_GCJ - -@@ -16977,7 +17516,7 @@ LN_S=$lt_LN_S - NM=$lt_NM - - # A symbol stripping program --STRIP=$STRIP -+STRIP=$lt_STRIP - - # Used to examine libraries when file_magic_cmd begins "file" - MAGIC_CMD=$MAGIC_CMD -@@ -17008,7 +17547,7 @@ objext="$ac_objext" - libext="$libext" - - # Shared library suffix (normally ".so"). --shrext='$shrext' -+shrext_cmds='$shrext_cmds' - - # Executable file suffix (normally ""). - exeext="$exeext" -@@ -17023,7 +17562,7 @@ 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_GCJ - --# Must we lock files when doing compilation ? -+# Must we lock files when doing compilation? - need_locks=$lt_need_locks - - # Do we need the lib prefix for modules? -@@ -17111,6 +17650,10 @@ predeps=$lt_predeps_GCJ - # shared library. - postdeps=$lt_postdeps_GCJ - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_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 -@@ -17199,7 +17742,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea - 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_GCJ" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$always_export_symbols_GCJ -@@ -17225,7 +17768,10 @@ 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" -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi - fi - - -@@ -17254,7 +17800,7 @@ objext=o - objext_RC=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' -+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - - # Code to be used in simple link tests - lt_simple_link_test_code="$lt_simple_compile_test_code" -@@ -17264,15 +17810,42 @@ lt_simple_link_test_code="$lt_simple_com - # If no C compiler was specified, use CC. - LTCC=${LTCC-"$CC"} - -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ - # Allow CC to be a program name with arguments. - compiler=$CC - - -+# save warnings/boilerplate of simple test code -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm -r conftest* -+ -+ - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - CC=${RC-"windres"} - compiler=$CC - compiler_RC=$CC -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ - lt_cv_prog_compiler_c_o_RC=yes - - # The else clause should only fire when bootstrapping the -@@ -17288,7 +17861,8 @@ if test -f "$ltmain"; then - # 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 \ -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ - 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 \ -@@ -17314,6 +17888,7 @@ if test -f "$ltmain"; then - predeps_RC \ - postdeps_RC \ - compiler_lib_search_path_RC \ -+ compiler_lib_search_dirs_RC \ - archive_cmds_RC \ - archive_expsym_cmds_RC \ - postinstall_cmds_RC \ -@@ -17329,6 +17904,7 @@ if test -f "$ltmain"; then - module_cmds_RC \ - module_expsym_cmds_RC \ - lt_cv_prog_compiler_c_o_RC \ -+ fix_srcfile_path_RC \ - exclude_expsyms_RC \ - include_expsyms_RC; do - -@@ -17388,6 +17964,12 @@ 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 - - # An echo program that does not interpret backslashes. - echo=$lt_echo -@@ -17399,6 +17981,9 @@ AR_FLAGS=$lt_AR_FLAGS - # A C compiler. - LTCC=$lt_LTCC - -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS -+ - # A language-specific compiler. - CC=$lt_compiler_RC - -@@ -17418,7 +18003,7 @@ LN_S=$lt_LN_S - NM=$lt_NM - - # A symbol stripping program --STRIP=$STRIP -+STRIP=$lt_STRIP - - # Used to examine libraries when file_magic_cmd begins "file" - MAGIC_CMD=$MAGIC_CMD -@@ -17449,7 +18034,7 @@ objext="$ac_objext" - libext="$libext" - - # Shared library suffix (normally ".so"). --shrext='$shrext' -+shrext_cmds='$shrext_cmds' - - # Executable file suffix (normally ""). - exeext="$exeext" -@@ -17464,7 +18049,7 @@ 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_RC - --# Must we lock files when doing compilation ? -+# Must we lock files when doing compilation? - need_locks=$lt_need_locks - - # Do we need the lib prefix for modules? -@@ -17552,6 +18137,10 @@ predeps=$lt_predeps_RC - # shared library. - postdeps=$lt_postdeps_RC - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_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 -@@ -17640,7 +18229,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea - 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" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$always_export_symbols_RC -@@ -17666,7 +18255,10 @@ 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" -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi - fi - - -@@ -17738,6 +18330,11 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo - - - -+# Libtool-2.4 needs more powerful shell (other than /bin/sh), -+# so we explicitly use this SHELL directly. -+LIBTOOL_MOD=`echo $LIBTOOL | sed 's,\$(SHELL),'${SHELL}','` -+ -+ - - echo "$as_me:$LINENO: checking for library containing crypt" >&5 - echo $ECHO_N "checking for library containing crypt... $ECHO_C" >&6 -@@ -17977,14 +18574,13 @@ _ACEOF - - fi - -- --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 "$as_me:$LINENO: checking for library containing gethostbyname" >&5 -+echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6 -+if test "${ac_cv_search_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lnsl $LIBS" -+ ac_func_search_save_LIBS=$LIBS -+ac_cv_search_gethostbyname=no - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" -@@ -18022,171 +18618,89 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_nsl_gethostbyname=yes -+ ac_cv_search_gethostbyname="none required" - 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" -- --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 --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 -- --# Standard set of common directories for X headers. --# Check X11 before X11Rn because it is often a symlink to the current release. --ac_x_header_dirs=' --/usr/X11/include --/usr/X11R6/include --/usr/X11R5/include --/usr/X11R4/include -- --/usr/include/X11 --/usr/include/X11R6 --/usr/include/X11R5 --/usr/include/X11R4 -- --/usr/local/X11/include --/usr/local/X11R6/include --/usr/local/X11R5/include --/usr/local/X11R4/include -- --/usr/local/include/X11 --/usr/local/include/X11R6 --/usr/local/include/X11R5 --/usr/local/include/X11R4 -- --/usr/X386/include --/usr/x386/include --/usr/XFree86/include/X11 -- --/usr/include --/usr/local/include --/usr/unsupported/include --/usr/athena/include --/usr/local/x11r5/include --/usr/lpp/Xamples/include -- --/usr/openwin/include --/usr/openwin/share/include' -- --if test "$ac_x_includes" = no; then -- # Guess where to find include files, by looking for Intrinsic.h. -- # First, try using that file with no special directory specified. -- cat >conftest.$ac_ext <<_ACEOF -+if test "$ac_cv_search_gethostbyname" = no; then -+ for ac_lib in nsl; do -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" --#include <X11/Intrinsic.h> -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char gethostbyname (); -+#ifdef F77_DUMMY_MAIN -+# ifdef __cplusplus -+ extern "C" -+# endif -+ int F77_DUMMY_MAIN() { return 1; } -+#endif -+int -+main () -+{ -+gethostbyname (); -+ ; -+ return 0; -+} - _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 conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 - 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 --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= -+ (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_gethostbyname="-l$ac_lib" -+break - 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 -+cat conftest.$ac_ext >&5 - fi --rm -f conftest.err conftest.$ac_ext --fi # $ac_x_includes = no -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+ done -+fi -+LIBS=$ac_func_search_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5 -+echo "${ECHO_T}$ac_cv_search_gethostbyname" >&6 -+if test "$ac_cv_search_gethostbyname" != no; then -+ test "$ac_cv_search_gethostbyname" = "none required" || LIBS="$ac_cv_search_gethostbyname $LIBS" - --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 -+fi -+ -+ -+echo "$as_me:$LINENO: checking for openpty in -lutil" >&5 -+echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 -+if test "${ac_cv_lib_util_openpty+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lutil $LIBS" -+cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" --#include <X11/Intrinsic.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 openpty (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" -@@ -18196,7 +18710,7 @@ if test "$ac_x_libraries" = no; then - int - main () - { --XtMalloc (0) -+openpty (); - ; - return 0; - } -@@ -18213,56 +18727,27 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - 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= -+ ac_cv_lib_util_openpty=yes - 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 -+ac_cv_lib_util_openpty=no - 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" --fi -+LIBS=$ac_check_lib_save_LIBS - fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_util_openpty" >&5 -+echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 -+if test $ac_cv_lib_util_openpty = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBUTIL 1 -+_ACEOF - -- fi -- eval "$ac_cv_have_x" --fi # $with_x != no -+ LIBS="-lutil $LIBS" - --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 -@@ -18541,10 +19026,14 @@ 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 \ -+ termcap.h sys/termio.h libutil.h\ - - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -@@ -18656,7 +19145,190 @@ _ACEOF - - fi - --done -+done -+ -+ -+olibs="$LIBS" -+CNVFILE_SUBDIR=bsd -+echo "$as_me:$LINENO: checking --with-term-libs argument" >&5 -+echo $ECHO_N "checking --with-term-libs argument... $ECHO_C" >&6 -+ -+# Check whether --with-tlib or --without-tlib was given. -+if test "${with_tlib+set}" = set; then -+ withval="$with_tlib" -+ -+fi; -+if test -n "$with_term_libs"; then -+ echo "$as_me:$LINENO: result: $with_term_libs" >&5 -+echo "${ECHO_T}$with_term_libs" >&6 -+ TERMLIB=$with_term_libs -+else -+ echo "$as_me:$LINENO: result: automatic terminal library selection" >&5 -+echo "${ECHO_T}automatic terminal library selection" >&6 -+ case "`uname -s 2>/dev/null`" in -+ OSF1) tlibs="ncurses curses termlib termcap";; -+ *) tlibs="ncurses termlib termcap curses";; -+ esac -+ for libname in $tlibs; do -+ as_ac_Lib=`echo "ac_cv_lib_${libname}''_tgetent" | $as_tr_sh` -+echo "$as_me:$LINENO: checking for tgetent in -l${libname}" >&5 -+echo $ECHO_N "checking for tgetent in -l${libname}... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Lib+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-l${libname} $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+#line $LINENO "configure" -+#include "confdefs.h" -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char tgetent (); -+#ifdef F77_DUMMY_MAIN -+# ifdef __cplusplus -+ extern "C" -+# endif -+ int F77_DUMMY_MAIN() { return 1; } -+#endif -+int -+main () -+{ -+tgetent (); -+ ; -+ 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_Lib=yes" -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+eval "$as_ac_Lib=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: `eval echo '${'$as_ac_Lib'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 -+if test `eval echo '${'$as_ac_Lib'}'` = yes; then -+ -+ LIBS="${LIBS} -l${libname}" -+ if test "$cross_compiling" = yes; then -+ res="FAIL" -+else -+ cat >conftest.$ac_ext <<_ACEOF -+#line $LINENO "configure" -+#include "confdefs.h" -+ -+#ifdef HAVE_TERMCAP_H -+# include <termcap.h> -+#endif -+main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); } -+_ACEOF -+rm -f conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ res="OK" -+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 ) -+res="FAIL" -+fi -+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ if test "$res" = "OK"; then -+ TERMLIB="${TERMLIB} -l${libname}" -+ break -+ fi -+ echo "$as_me:$LINENO: result: $libname library is not usable" >&5 -+echo "${ECHO_T}$libname library is not usable" >&6 -+ -+fi -+ -+ LIBS=${olibs} -+ done -+fi -+if test "x$TERMLIB" != "x"; then -+ LIBS="${LIBS} ${TERMLIB}" -+ echo "$as_me:$LINENO: checking whether we talk terminfo" >&5 -+echo $ECHO_N "checking whether we talk terminfo... $ECHO_C" >&6 -+ if test "$cross_compiling" = yes; then -+ { { echo "$as_me:$LINENO: error: failed to compile test program." >&5 -+echo "$as_me: error: failed to compile test program." >&2;} -+ { (exit 1); exit 1; }; } -+else -+ cat >conftest.$ac_ext <<_ACEOF -+#line $LINENO "configure" -+#include "confdefs.h" -+ -+#ifdef HAVE_TERMCAP_H -+# include <termcap.h> -+#endif -+main() -+{char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); } -+_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 -+ echo "$as_me:$LINENO: result: no -- we are in termcap land" >&5 -+echo "${ECHO_T}no -- we are in termcap land" >&6 -+ CNVFILE_SUBDIR=bsd -+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 ) -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_TERMINFO 1 -+_ACEOF -+ -+ echo "$as_me:$LINENO: result: yes -- terminfo spoken here" >&5 -+echo "${ECHO_T}yes -- terminfo spoken here" >&6 -+ CNVFILE_SUBDIR=sysV -+fi -+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+else -+ echo "$as_me:$LINENO: result: none found" >&5 -+echo "${ECHO_T}none found" >&6 -+fi -+LIBS=${olibs} -+ - - - echo "$as_me:$LINENO: checking for mode_t" >&5 -@@ -18844,6 +19516,197 @@ _ACEOF - fi - - -+echo "$as_me:$LINENO: checking for struct utmp.ut_user" >&5 -+echo $ECHO_N "checking for struct utmp.ut_user... $ECHO_C" >&6 -+if test "${ac_cv_member_struct_utmp_ut_user+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> -+#if HAVE_UTMPX_H -+# include <utmpx.h> -+#endif -+#if HAVE_UTMP_H -+# include <utmp.h> -+#endif -+ -+#ifdef F77_DUMMY_MAIN -+# ifdef __cplusplus -+ extern "C" -+# endif -+ int F77_DUMMY_MAIN() { return 1; } -+#endif -+int -+main () -+{ -+static struct utmp ac_aggr; -+if (ac_aggr.ut_user) -+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_member_struct_utmp_ut_user=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_cv_member_struct_utmp_ut_user=no -+fi -+rm -f conftest.$ac_objext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $ac_cv_member_struct_utmp_ut_user" >&5 -+echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_user" >&6 -+if test $ac_cv_member_struct_utmp_ut_user = yes; then -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_STRUCT_UTMP_UT_USER 1 -+_ACEOF -+ -+ -+fi -+echo "$as_me:$LINENO: checking for struct utmp.ut_name" >&5 -+echo $ECHO_N "checking for struct utmp.ut_name... $ECHO_C" >&6 -+if test "${ac_cv_member_struct_utmp_ut_name+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> -+#if HAVE_UTMPX_H -+# include <utmpx.h> -+#endif -+#if HAVE_UTMP_H -+# include <utmp.h> -+#endif -+ -+#ifdef F77_DUMMY_MAIN -+# ifdef __cplusplus -+ extern "C" -+# endif -+ int F77_DUMMY_MAIN() { return 1; } -+#endif -+int -+main () -+{ -+static struct utmp ac_aggr; -+if (ac_aggr.ut_name) -+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_member_struct_utmp_ut_name=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_cv_member_struct_utmp_ut_name=no -+fi -+rm -f conftest.$ac_objext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $ac_cv_member_struct_utmp_ut_name" >&5 -+echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_name" >&6 -+if test $ac_cv_member_struct_utmp_ut_name = yes; then -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_STRUCT_UTMP_UT_NAME 1 -+_ACEOF -+ -+ -+fi -+echo "$as_me:$LINENO: checking for struct utmp.ut_id" >&5 -+echo $ECHO_N "checking for struct utmp.ut_id... $ECHO_C" >&6 -+if test "${ac_cv_member_struct_utmp_ut_id+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> -+#if HAVE_UTMPX_H -+# include <utmpx.h> -+#endif -+#if HAVE_UTMP_H -+# include <utmp.h> -+#endif -+ -+#ifdef F77_DUMMY_MAIN -+# ifdef __cplusplus -+ extern "C" -+# endif -+ int F77_DUMMY_MAIN() { return 1; } -+#endif -+int -+main () -+{ -+static struct utmp ac_aggr; -+if (ac_aggr.ut_id) -+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_member_struct_utmp_ut_id=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_cv_member_struct_utmp_ut_id=no -+fi -+rm -f conftest.$ac_objext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $ac_cv_member_struct_utmp_ut_id" >&5 -+echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_id" >&6 -+if test $ac_cv_member_struct_utmp_ut_id = yes; then -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_STRUCT_UTMP_UT_ID 1 -+_ACEOF -+ -+ -+fi -+ -+ - - if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5 -@@ -19255,10 +20118,17 @@ fi - - - -+ -+ -+ -+ -+ -+ - for ac_func in random drand48 fchmod getopt killpg \ - FD_SET \ - gethostname select socket closesocket setsockopt send recv \ -- getdtablesize getrlimit syslog vsyslog setenv snprintf -+ getdtablesize getrlimit syslog vsyslog setenv snprintf \ -+ ptsname posix_openpt openpty pututxline pututline setsid - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` - echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -19502,6 +20372,191 @@ done - - - -+if test $client = true; then -+ if test $client_utmp = auto; then -+ cat >conftest.$ac_ext <<_ACEOF -+#line $LINENO "configure" -+#include "confdefs.h" -+ -+#if HAVE_SYS_PARAM_H -+# include <sys/param.h> -+#endif -+#if defined(BSD) && (BSD >= 199306) && !defined(HAVE_PUTUTXLINE) && !defined(HAVE_PUTUTLINE) -+ yes -+#endif -+ -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "yes" >/dev/null 2>&1; then -+ client_utmp=false -+else -+ client_utmp=true -+fi -+rm -f conftest* -+ -+ fi -+ -+ echo "$as_me:$LINENO: checking whether we're using utmp with uum" >&5 -+echo $ECHO_N "checking whether we're using utmp with uum... $ECHO_C" >&6 -+ if test $client_utmp = true; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define USE_UTMP 1 -+_ACEOF -+ -+ 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 -+fi -+ -+if test $client = true; then -+ guess_setuid= -+ guess_setgid=false -+ if test $client_utmp = true; then -+ cat >conftest.$ac_ext <<_ACEOF -+#line $LINENO "configure" -+#include "confdefs.h" -+ -+#if HAVE_SYS_IOCTL_H -+# include <sys/ioctl.h> -+#endif -+#if HAVE_PTSNAME || (HAVE_OPENPTY && defined(TIOCPTMGET)) -+# if HAVE_PUTUTLINE || HAVE_PUTUTXLINE -+ yes -+# endif -+#endif -+ -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "yes" >/dev/null 2>&1; then -+ -+ case $host_os in -+ linux*) -+ # On recent Linux, it has both ptsname() and putut*line(). -+ # But putut*line() will take effect only if prog is installed -+ # with set-gid to group utmp. -+ guess_setgid=true -+ UUMGROUP=${UUMGROUP:-utmp} -+ ;; -+ esac -+ guess_setuid=false -+ -+else -+ guess_setuid=true -+fi -+rm -f conftest* -+ -+ else -+ # $client_utmp != true -+ cat >conftest.$ac_ext <<_ACEOF -+#line $LINENO "configure" -+#include "confdefs.h" -+ -+#if HAVE_SYS_IOCTL_H -+# include <sys/ioctl.h> -+#endif -+#if HAVE_PTSNAME || (HAVE_OPENPTY && defined(TIOCPTMGET)) -+ yes -+#endif -+ -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "yes" >/dev/null 2>&1; then -+ guess_setuid=false -+else -+ guess_setuid=true -+fi -+rm -f conftest* -+ -+ fi -+ # $client_utmp != true -+ -+ if test $client_setuid = auto; then -+ client_setuid=$guess_setuid -+ # UUMOWNER is already set ... -+ fi -+ if test $client_setgid = auto; then -+ client_setgid=$guess_setgid -+ # UUMGROUP is already set (if it needs) -+ fi -+ -+ if test $client_setuid = true; then -+ INSTUUMFLAGS="-o \$(UUMOWNER)" -+ if test $client_setgid = true; then -+ INSTUUMFLAGS="-m 6711 $INSTUUMFLAGS -g \$(UUMGROUP)" -+ else -+ # client_setuid && !client_setgid -+ INSTUUMFLAGS="-m 4711 $INSTUUMFLAGS" -+ fi -+ else -+ if test $client_setgid = true; then -+ # !client_setuid && client_setgid -+ INSTUUMFLAGS="-m 2711 -g \$(UUMGROUP)" -+ else -+ # !client_setuid && !client_setgid -+ INSTUUMFLAGS="-m 0711" -+ fi -+ fi -+ -+ echo "$as_me:$LINENO: checking whether we need to install uum as setuid program" >&5 -+echo $ECHO_N "checking whether we need to install uum as setuid program... $ECHO_C" >&6 -+ if test $client_setuid = true; then -+ echo "$as_me:$LINENO: result: yes, $UUMOWNER" >&5 -+echo "${ECHO_T}yes, $UUMOWNER" >&6 -+ else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+ fi -+ echo "$as_me:$LINENO: checking whether we need to install uum as setgid program" >&5 -+echo $ECHO_N "checking whether we need to install uum as setgid program... $ECHO_C" >&6 -+ if test $client_setgid = true; then -+ echo "$as_me:$LINENO: result: yes, $UUMGROUP" >&5 -+echo "${ECHO_T}yes, $UUMGROUP" >&6 -+ else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+ fi -+else -+# $client != true -+ INSTUUMFLAGS="-m 4711 -o \$(UUMOWNER)" -+fi -+# $client = true -+ -+ -+ -+ -+ -+echo "$as_me:$LINENO: checking for /dev/ptmx" >&5 -+echo $ECHO_N "checking for /dev/ptmx... $ECHO_C" >&6 -+if test "${ac_cv_file__dev_ptmx+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ test "$cross_compiling" = yes && -+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} -+ { (exit 1); exit 1; }; } -+if test -r "/dev/ptmx"; then -+ ac_cv_file__dev_ptmx=yes -+else -+ ac_cv_file__dev_ptmx=no -+fi -+fi -+echo "$as_me:$LINENO: result: $ac_cv_file__dev_ptmx" >&5 -+echo "${ECHO_T}$ac_cv_file__dev_ptmx" >&6 -+if test $ac_cv_file__dev_ptmx = yes; then -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE__DEV_PTMX 1 -+_ACEOF -+ -+ -+fi -+ -+ -+ - - WRAPLIB= - echo "$as_me:$LINENO: checking whether to use libwrap" >&5 -@@ -19990,7 +21045,7 @@ _ASBOX - } >&5 - cat >&5 <<_CSEOF - --This file was extended by $as_me, which was -+This file was extended by FreeWnn $as_me 1.1.1-cvs-a022, which was - generated by GNU Autoconf 2.53. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES -@@ -20049,7 +21104,7 @@ _ACEOF - - cat >>$CONFIG_STATUS <<_ACEOF - ac_cs_version="\\ --config.status -+FreeWnn config.status 1.1.1-cvs-a022 - configured by $0, generated by GNU Autoconf 2.53, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" - -@@ -20241,16 +21296,22 @@ s,@cWnn@,$cWnn,;t t - s,@kWnn@,$kWnn,;t t - s,@WNNJLIB@,$WNNJLIB,;t t - s,@DEPWNNJLIB@,$DEPWNNJLIB,;t t -+s,@EXTWNNJINC@,$EXTWNNJINC,;t t - s,@HINSI_DATA@,$HINSI_DATA,;t t - s,@CWNNJLIB@,$CWNNJLIB,;t t - s,@DEPCWNNJLIB@,$DEPCWNNJLIB,;t t -+s,@EXTCWNNJINC@,$EXTCWNNJINC,;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,@EXTKWNNJINC@,$EXTKWNNJINC,;t t - s,@KHINSI_DATA@,$KHINSI_DATA,;t t - s,@ipv6@,$ipv6,;t t - s,@unsafe_path@,$unsafe_path,;t t -+s,@WNNSBINDIR@,$WNNSBINDIR,;t t -+s,@if_enable_sub_bindir@,$if_enable_sub_bindir,;t t -+s,@if_disable_sub_bindir@,$if_disable_sub_bindir,;t t - s,@CC@,$CC,;t t - s,@CFLAGS@,$CFLAGS,;t t - s,@LDFLAGS@,$LDFLAGS,;t t -@@ -20262,11 +21323,13 @@ s,@CCOPTIONS@,$CCOPTIONS,;t t - s,@CDEBUGFLAGS@,$CDEBUGFLAGS,;t t - s,@INSTPGMFLAGS@,$INSTPGMFLAGS,;t t - s,@CPP@,$CPP,;t t -+s,@FZK_PP@,$FZK_PP,;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,@SED@,$SED,;t t - s,@EGREP@,$EGREP,;t t - s,@ECHO@,$ECHO,;t t - s,@AR@,$AR,;t t -@@ -20275,6 +21338,10 @@ 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,@DSYMUTIL@,$DSYMUTIL,;t t -+s,@ac_ct_DSYMUTIL@,$ac_ct_DSYMUTIL,;t t -+s,@NMEDIT@,$NMEDIT,;t t -+s,@ac_ct_NMEDIT@,$ac_ct_NMEDIT,;t t - s,@CXX@,$CXX,;t t - s,@CXXFLAGS@,$CXXFLAGS,;t t - s,@ac_ct_CXX@,$ac_ct_CXX,;t t -@@ -20284,8 +21351,14 @@ 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,@LIBTOOL_MOD@,$LIBTOOL_MOD,;t t -+s,@TERMLIB@,$TERMLIB,;t t -+s,@CNVFILE_SUBDIR@,$CNVFILE_SUBDIR,;t t - s,@LIBOBJS@,$LIBOBJS,;t t - s,@JS_SUPPORTOBJS@,$JS_SUPPORTOBJS,;t t -+s,@INSTUUMFLAGS@,$INSTUUMFLAGS,;t t -+s,@UUMOWNER@,$UUMOWNER,;t t -+s,@UUMGROUP@,$UUMGROUP,;t t - s,@WRAPLIB@,$WRAPLIB,;t t - CEOF - diff --git a/inputmethod/ja-freewnn-lib/patches/patch-configure.in b/inputmethod/ja-freewnn-lib/patches/patch-configure.in deleted file mode 100644 index fc98c7df553..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-configure.in +++ /dev/null @@ -1,682 +0,0 @@ -$NetBSD: patch-configure.in,v 1.1 2011/09/13 07:23:21 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- configure.in.orig 2005-11-27 17:30:23.000000000 +0000 -+++ configure.in -@@ -10,7 +10,9 @@ dnl Copyright Kyoto University Research - dnl 1987, 1988, 1989, 1990, 1991, 1992 - dnl Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - dnl Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --dnl Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+dnl Copyright FreeWnn Project -+dnl 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -+dnl 2010, 2011 - dnl - dnl Maintainer: FreeWnn Project - dnl -@@ -32,20 +34,26 @@ dnl - dnl - dnl Process this file with autoconf to produce a configure script. - dnl --AC_INIT(Wnn/conv/cvt_head.h) -+AC_INIT(FreeWnn, [1.1.1-cvs-a022], [freewnn-users-owner@lists.sourceforge.jp], FreeWnn) -+AC_CONFIG_SRCDIR(Wnn/conv/cvt_head.h) -+dnl old-style AC_INIT ... -+dnl AC_INIT(Wnn/conv/cvt_head.h) - AC_CONFIG_HEADER(config.h) - - dnl ==================================================================== - dnl Check optional features - dnl ==================================================================== - --# Quick and Dirty workaround for Autoconf-2.53 and Libtools-1.5 pair ... -+# Quick and Dirty workaround for Autoconf-2.53 and Libtools-1.5.* pair ... - # not to use additional tagged configuration. (default: CXX F77) - # NOTICE: Please remove next line if situation changes. (aono) - tagnames= - - AC_CANONICAL_HOST - -+dnl -+AC_ARG_PROGRAM -+ - dnl build and install libraries, server or client - - AC_ARG_ENABLE(debug, -@@ -80,6 +88,46 @@ AC_ARG_ENABLE(client, - *) AC_MSG_ERROR(bad value for --enable-client) ;; - esac], client=false) - -+AC_ARG_ENABLE(client-utmp, -+[ --enable-client-utmp write utmp with client [[default=yes if not modern BSD]]], -+[case "${enableval}" in -+ yes) client_utmp=true ;; -+ no) client_utmp=false ;; -+ *) AC_MSG_ERROR(bad value for --enable-client-utmp) ;; -+esac], -+client_utmp=auto -+) -+ -+dnl If you set set-[ug]id user/group to (ex.) 'yes', -+dnl you can configure this with setting UUMOWNER / UUMGROUP . -+AC_ARG_ENABLE(client-setuid, -+[ --enable-client-setuid[[=user]] Install client with setuid and specified user [[default=guess if your system need this]]], -+[case "${enableval}" in -+ yes) client_setuid=true; UUMOWNER=${UUMOWNER:-root} ;; -+ no) client_setuid=false ;; -+ *) client_setuid=true; UUMOWNER=${enableval} ;; -+esac], -+[client_setuid=auto # guess later ... -+ UUMOWNER=root] -+) -+ -+AC_ARG_ENABLE(client-setgid, -+[ --enable-client-setgid=group Install client with setgid and specified group [[default=guess if your system need this]]], -+[case "${enableval}" in -+ yes) -+ if test "x$UUMGROUP" = "x"; then -+ AC_ERROR([You must set group name with --enable-client-setgid.]) -+ else -+ client_setgid=true; # we already defined UUMGROUP ... -+ fi -+ ;; -+ no) client_setgid=false ;; -+ *) client_setgid=true; UUMGROUP=${enableval} ;; -+esac], -+[client_setgid=auto # guess later ... -+UUMGROUP=] -+) -+ - if test $libraries = true; then - SUBDIRS="\$(LIB_SUBDIRS)" - WNNMANDIR="\$(LIB_WNNMANDIR)" -@@ -138,96 +186,115 @@ AC_SUBST(kWnn) - - dnl For a library libwnn - --dnl AC_ARG_WITH(libwnn, --dnl [ --with-libwnn use installed Wnn library [default=no]], --dnl [case "${withval}" in --dnl yes|no) with_libwnn=${withval};; --dnl *) AC_MSG_ERROR(invalid argument to --with-libwnn) ;; --dnl esac], with_libwnn=no) --dnl -- - AC_ARG_WITH(libwnn, - [ --with-libwnn use installed Wnn library [[default=no]]], --[ with_libwnn="${withval}" -+[ with_libwnn="${withval}"], [with_libwnn=no]) - AC_ARG_WITH(wnn-includes, --[ --with-wnn-includes=DIR WNN include files are in DIR], -+[ --with-wnn-includes=DIR Installed Wnn include files are in DIR], - [wnnincludedir="-I${withval}"], [wnnincludedir='']) - AC_ARG_WITH(wnn-libraries, --[ --with-wnn-libraries=DIR Search for WNN libraries in DIR [[default=/usr/local/lib]]], -+[ --with-wnn-libraries=DIR Search for Wnn libraries in DIR [[default=/usr/local/lib]]], - [wnnlibdir="${withval}"], [wnnlibdir='/usr/local/lib']) -- if test "X${with_libwnn}" = X-lwnn; then -- WNNJLIB="-L${wnnlibdir} -lwnn" -- elif test X"`echo ${with_libwnn} | grep '^/.*'`" != X ; then -- WNNJLIB="${with_libwnn}" -- else -- WNNJLIB="${wnnlibdir}/libwnn.a" -- fi -+ -+if test X${with_libwnn} != Xno; then -+ case X${with_libwnn} in -+ Xyes | X-lwnn) -+ WNNJLIB="-L${wnnlibdir} -lwnn" ;; -+ X/*) -+ WNNJLIB="${wnnlibdir}/libwnn.a" ;; -+ *) -+ # Honor specified value --with-libwnn -+ # (maybe wrong in most cases) -+ WNNJLIB="${with_libwnn}" ;; -+ esac - DEPWNNJLIB="" -+ dnl NOTICE: HINSI_DATA depends on --prefix (and makerule.mk). - HINSI_DATA="\$(JWNNWNNDIR)/hinsi.data" --], --[ WNNJLIB="\$(top_builddir)/Wnn/jlib/libwnn.la" -+ EXTWNNJINC=${wnnincludedir} -+else -+ WNNJLIB="\$(top_builddir)/Wnn/jlib/libwnn.la" - DEPWNNJLIB="\$(WNNJLIB)" - HINSI_DATA="\$(top_builddir)/Wnn/jd/hinsi.data" --]) -+ EXTWNNJINC="" -+fi - AC_SUBST(WNNJLIB) - AC_SUBST(DEPWNNJLIB) -+AC_SUBST(EXTWNNJINC) - AC_SUBST(HINSI_DATA) - - AC_ARG_WITH(libcwnn, - [ --with-libcwnn use installed cWnn library [[default=no]]], --[ -+[ with_libcwnn="${withval}"], [with_libcwnn=no]) - AC_ARG_WITH(cwnn-includes, --[ --with-cwnn-includes=DIR CWNN include files are in DIR], -+[ --with-cwnn-includes=DIR Installed cWnn include files are in DIR], - [cwnnincludedir="-I${withval}"], [cwnnincludedir='']) - AC_ARG_WITH(cwnn-libraries, --[ --with-cwnn-libraries=DIR Search for CWNN libraries in DIR [[default=/usr/local/lib]]], -+[ --with-cwnn-libraries=DIR Search for cWnn libraries in DIR [[default=/usr/local/lib]]], - [cwnnlibdir="${withval}"], [cwnnlibdir='/usr/local/lib']) -- if test "X${with_libcwnn}" = X-lcwnn; then -- CWNNJLIB="-L${cwnnlibdir} -lcwnn" -- elif test X"`echo ${with_libcwnn} | grep '^/.*'`" != X ; then -- CWNNJLIB="${with_libcwnn}" -- else -- CWNNJLIB="${cwnnlibdir}/libcwnn.a" -- fi -+ -+if test X${with_libcwnn} != Xno; then -+ case X${with_libcwnn} in -+ Xyes | X-lcwnn) -+ CWNNJLIB="-L${cwnnlibdir} -lcwnn" ;; -+ X/*) -+ CWNNJLIB="${cwnnlibdir}/libcwnn.a" ;; -+ *) -+ # Honor specified value --with-libcwnn -+ # (maybe wrong in most cases) -+ CWNNJLIB="${with_libcwnn}" ;; -+ esac - DEPCWNNJLIB="" -+ dnl NOTICE: [CT]HINSI_DATA also depends on --prefix (and makerule.mk). - CHINSI_DATA="\$(CWNNWNNDIR)/cixing.data" -- THINSI_DATA="\$(TWNNTDSRC)/cixing.data" --], --[ CWNNJLIB="\$(top_builddir)/cWnn/jlib/libcwnn.la" -+ THINSI_DATA="\$(TWNNWNNDIR)/cixing.data" -+ EXTCWNNJINC=${cwnnincludedir} -+else -+ CWNNJLIB="\$(top_builddir)/cWnn/jlib/libcwnn.la" - DEPCWNNJLIB="\$(CWNNJLIB)" - CHINSI_DATA="\$(CWNNCDSRC)/cixing.data" - THINSI_DATA="\$(TWNNTDSRC)/cixing.data" --]) -+ EXTCWNNJINC="" -+fi - AC_SUBST(CWNNJLIB) - AC_SUBST(DEPCWNNJLIB) -+AC_SUBST(EXTCWNNJINC) - AC_SUBST(CHINSI_DATA) - AC_SUBST(THINSI_DATA) - - AC_ARG_WITH(libkwnn, - [ --with-libkwnn use installed kWnn library [[default=no]]], --[ -+[ with_libkwnn="${withval}"], [with_libkwnn=no]) - AC_ARG_WITH(kwnn-includes, --[ --with-kwnn-includes=DIR KWNN include files are in DIR], -+[ --with-kwnn-includes=DIR Installed kWnn include files are in DIR], - [kwnnincludedir="-I${withval}"], [kwnnincludedir='']) - AC_ARG_WITH(kwnn-libraries, --[ --with-kwnn-libraries=DIR Search for KWNN libraries in DIR [[default=/usr/local/lib]]], -+[ --with-kwnn-libraries=DIR Search for kWnn libraries in DIR [[default=/usr/local/lib]]], - [kwnnlibdir="${withval}"], [kwnnlibdir='/usr/local/lib']) -- if test "X${with_libkwnn}" = X-lkwnn; then -- KWNNJLIB="-L${kwnnlibdir} -lkwnn" -- elif test X"`echo ${with_libkwnn} | grep '^/.*'`" != X ; then -- KWNNJLIB="${with_libkwnn}" -- else -- KWNNJLIB="${kwnnlibdir}/libkwnn.a" -- fi -+ -+if test X${with_libkwnn} != Xno; then -+ case X${with_libkwnn} in -+ Xyes | X-lkwnn) -+ KWNNJLIB="-L${kwnnlibdir} -lkwnn" ;; -+ X/*) -+ KWNNJLIB="${kwnnlibdir}/libkwnn.a" ;; -+ *) -+ # Honor specified value --with-libkwnn -+ # (maybe wrong in most cases) -+ KWNNJLIB="${with_libkwnn}" ;; -+ esac - DEPKWNNJLIB="" -+ dnl NOTICE: KHINSI_DATA also depends on --prefix (and makerule.mk). - KHINSI_DATA="\$(KWNNWNNDIR)/hinsi.data" --], --[ KWNNJLIB="\$(top_builddir)/kWnn/jlib/libkwnn.la" -+ EXTKWNNJINC=${kwnnincludedir} -+else -+ KWNNJLIB="\$(top_builddir)/kWnn/jlib/libkwnn.la" - DEPKWNNJLIB="\$(KWNNJLIB)" - KHINSI_DATA="\$(KWNNKDSRC)/hinsi.data" --]) -+ EXTKWNNJINC="" -+fi - AC_SUBST(KWNNJLIB) - AC_SUBST(DEPKWNNJLIB) -+AC_SUBST(EXTKWNNJINC) - AC_SUBST(KHINSI_DATA) - - dnl -@@ -258,25 +325,81 @@ if test ${unsafe_path} = true; then - fi - - dnl -+dnl Install layout controlling -+dnl -+AC_ARG_ENABLE(traditional-layout, -+[ --enable-traditional-layout Install files in traditional directories [[default=yes]]], -+[case "${enableval}" in -+ yes) trad_layout=true ;; -+ no) trad_layout=false ;; -+ *) AC_MSG_ERROR([bad value for --enable-traditional-layout]) ;; -+esac], trad_layout=true) -+ -+if test $trad_layout = "true"; then -+ WNNSBINDIR="\$(bindir)" -+ # More path settings will come later ... -+else -+ WNNSBINDIR="\$(sbindir)" -+ # Same as above. -+fi -+AC_SUBST(WNNSBINDIR) -+dnl Same as above. -+ -+AC_ARG_ENABLE(sub-bindir, -+[ --enable-sub-bindir Install executables to (ex.) $(bindir)/Wnn4 [[default=yes if --enable-traditional-layout, no otherwise]]], -+[case "${enableval}" in -+ yes) sub_bindir=true ;; -+ no) sub_bindir=false ;; -+ *) AC_MSG_ERROR([bad value for --enable-sub-bindir]) ;; -+esac], sub_bindir=guess) -+ -+if test $sub_bindir = "guess"; then -+ if test $trad_layout = "true"; then -+ sub_bindir=true -+ else -+ sub_bindir=false -+ fi -+fi -+if test $sub_bindir = "true"; then -+ if_enable_sub_bindir=' ' -+ if_disable_sub_bindir='#' -+else -+ if_enable_sub_bindir='#' -+ if_disable_sub_bindir=' ' -+fi -+AC_SUBST(if_enable_sub_bindir) -+AC_SUBST(if_disable_sub_bindir) -+ -+# for debug -+AC_MSG_CHECKING([if we use traditional layout]) -+if test $trad_layout = "true"; then -+ AC_MSG_RESULT(yes) -+else -+ AC_MSG_RESULT(no) -+fi -+ -+AC_MSG_CHECKING([if we install binaries on \$(bindir)/Wnn4 (etc.)]) -+if test $sub_bindir = "true"; then -+ AC_MSG_RESULT(yes) -+else -+ AC_MSG_RESULT(no) -+fi -+ -+dnl - dnl Checks for cc and cpp. - dnl - AC_PROG_CC - - dnl System specific options - dnl Now that we are using autoconf, CCOPTIONS should be nuked... -+dnl But please report if your system needs specific settings (CCOPTIONS etc.) - case $host in - *-*-linux*) - CCOPTIONS="-Dlinux -D_GNU_SOURCE -D_POSIX_SOURCE -D_BSD_SOURCE" - ;; --*-*-darwin*) -- if test $GCC = yes; then -- # Unfortunately, autoconf (at least 2.57) does not recognize -- # proper CPP. (Normal cpp-precomp nor auto-retrying in basic mode does -- # not work with pubdic+ processing.) So define here .... -- # Note: It seems gcc-3.3 (or (probably) later) does not need this. -- CPP=${CPP:-"$CC -E -no-cpp-precomp"} -- fi -- # Don't care other CC-s. -+*-*-*-gnu) -+ # Non-Linux kernel with GNU libc. -+ CCOPTIONS="-D_GNU_SOURCE" - ;; - *-*-sunos*) - if test $GCC = yes; then -@@ -290,6 +413,7 @@ case $host in - if test $GCC = yes; then - CCOPTIONS="-Dsun -D`uname -p` -DSVR4 -DSYSV" - else -+ # TODO: need change for sparcv9 / x64 architecture ... - CCOPTIONS="-Xc -xF -xcg92 -Dsun -D`uname -p` -DSVR4 -DSYSV" - fi - ;; -@@ -309,16 +433,13 @@ powerpc-*-beos*) - *-*-aix*) - CCOPTIONS="-DSYSV" - ;; --*) --dnl AC_MSG_WARN("It is not reported if FreeWnn works on this system. But continuing...") --dnl AC_MSG_WARN([(It may or may not work if you set CCOPTIONS properly.)]) -- ;; - esac - - dnl Checking if we use gcc or not - if test $debug = true; then - if test $GCC = yes; then -- CDEBUGFLAGS=${CDEBUGFLAGS:-"-g2 -O2 -Wall -fstack-check"} -+ # FIXME: gcc -fstack-check doesn't work well on Linux/i386 ... -+ CDEBUGFLAGS=${CDEBUGFLAGS:-"-g2 -O2 -Wall"} - else - CDEBUGFLAGS=${CDEBUGFLAGS:-""} - fi -@@ -341,6 +462,17 @@ dnl ¡ÖCPP=${CPP:-"/usr/ccs/lib/cpp"}¡×¤Î - dnl ¤è¤¤¤È»×¤ï¤ì¤ë¡£ - AC_PROG_CPP - -+dnl Define cpp for text processing. -+AC_MSG_CHECKING([cpp for text processing]) -+if test "$GCC" = "yes" -a "$CPP" = "$CC -E"; then -+ # Need checking your gcc accepts '-traditional-cpp' option? -+ FZK_PP=${FZK_PP:-"$CPP -traditional-cpp"} -+else -+ FZK_PP=${FZK_PP:-"$CPP"} -+fi -+AC_MSG_RESULT($FZK_PP) -+AC_SUBST(FZK_PP) -+ - dnl - dnl Checks for programs. - dnl -@@ -352,21 +484,27 @@ AC_PROG_MAKE_SET - AC_PROG_LIBTOOL - AC_SUBST(LIBTOOL_DEPS) - -+# Libtool-2.4 needs more powerful shell (other than /bin/sh), -+# so we explicitly use this SHELL directly. -+LIBTOOL_MOD=`echo $LIBTOOL | sed 's,\$(SHELL),'${SHELL}','` -+AC_SUBST(LIBTOOL_MOD) -+ - dnl Checks for libraries. - dnl ### dnl Replace `main' with a function in -lX11: - dnl ### AC_CHECK_LIB(X11, main) --dnl ### dnl Replace `main' with a function in -lcurses: --dnl ### AC_CHECK_LIB(curses, main) - - AC_SEARCH_LIBS(crypt, crypt) - AC_CHECK_LIB(socket, connect) - AC_CHECK_LIB(bind, getservbyname) --AC_CHECK_LIB(nsl, gethostbyname) -+AC_SEARCH_LIBS(gethostbyname, nsl) -+dnl libutil only needed by uum w/openpty... -+dnl FIXME: deals with Linux that have both ptsname & openpty -+AC_CHECK_LIB(util, openpty) - - dnl - dnl Checks for header files. - dnl --AC_PATH_X -+dnl disabled for now ...: dnl AC_PATH_X - AC_HEADER_STDC - AC_HEADER_SYS_WAIT - AC_HEADER_TIME -@@ -374,9 +512,82 @@ AC_CHECK_HEADERS(fcntl.h syslog.h unistd - 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 \ -+ termcap.h sys/termio.h libutil.h\ - ) - - dnl -+dnl Terminal library selection. -+dnl ported from vim6.1 via canuum (Canna 3.6p3) for uum. -+dnl FIXME: cross compilation -+dnl -+olibs="$LIBS" -+CNVFILE_SUBDIR=bsd -+AC_MSG_CHECKING(--with-term-libs argument) -+AC_ARG_WITH(tlib, -+[ --with-term-libs=-lLIB terminal library to be used ],) -+if test -n "$with_term_libs"; then -+ AC_MSG_RESULT($with_term_libs) -+dnl LIBS="$LIBS $with_term_libs" -+ TERMLIB=$with_term_libs -+else -+ AC_MSG_RESULT([automatic terminal library selection]) -+ dnl On HP-UX 10.10 termcap or termlib should be used instead of -+ dnl curses, because curses is much slower. -+ dnl Newer versions of ncurses are preferred over anything. -+ dnl Older versions of ncurses have bugs, get a new one! -+ dnl Digital Unix (OSF1) should use curses (Ronald Schild). -+ case "`uname -s 2>/dev/null`" in -+ OSF1) tlibs="ncurses curses termlib termcap";; -+ *) tlibs="ncurses termlib termcap curses";; -+ esac -+ for libname in $tlibs; do -+ AC_CHECK_LIB(${libname}, tgetent, [ -+ dnl It's possible that a library is found but it doesn't work -+ dnl e.g., shared library that cannot be found. -+ dnl compile and run a test program to be sure -+ LIBS="${LIBS} -l${libname}" -+ AC_TRY_RUN([ -+#ifdef HAVE_TERMCAP_H -+# include <termcap.h> -+#endif -+main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); }], -+ res="OK", res="FAIL", res="FAIL") -+ if test "$res" = "OK"; then -+ TERMLIB="${TERMLIB} -l${libname}" -+ dnl lname=`echo ${libname} | sed 'y/termcaplibnus/TERMCAPLIBNUS/'` -+ dnl AC_DEFINE_UNQUOTED(HAVE_${lname}, 1, [use ${libname} for terminal control]) -+ dnl We need to define AH_TEMPLATE (if we really need this) -+ dnl ex. AH_TEMPLATE(HAVE_NCURSES, [use ncurses for terminal control]) -+ break -+ fi -+ AC_MSG_RESULT($libname library is not usable) -+ ],) -+ LIBS=${olibs} -+ done -+fi -+if test "x$TERMLIB" != "x"; then -+ LIBS="${LIBS} ${TERMLIB}" -+ AC_MSG_CHECKING(whether we talk terminfo) -+ AC_TRY_RUN([ -+#ifdef HAVE_TERMCAP_H -+# include <termcap.h> -+#endif -+main() -+{char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); }], -+ [ AC_MSG_RESULT([no -- we are in termcap land]) -+ CNVFILE_SUBDIR=bsd ], -+ [ AC_DEFINE(HAVE_TERMINFO, 1, [terminfo spoken here]) -+ AC_MSG_RESULT([yes -- terminfo spoken here]) -+ CNVFILE_SUBDIR=sysV ], -+ AC_MSG_ERROR(failed to compile test program.)) -+else -+ AC_MSG_RESULT(none found) -+fi -+LIBS=${olibs} -+AC_SUBST(TERMLIB) -+AC_SUBST(CNVFILE_SUBDIR) -+ -+dnl - dnl Checks for typedefs, structures, and compiler characteristics. - dnl - AC_TYPE_MODE_T -@@ -392,6 +603,15 @@ AC_CHECK_TYPES(socklen_t,, - #endif - #include <sys/socket.h>]) - -+AC_CHECK_MEMBERS([struct utmp.ut_user, struct utmp.ut_name, struct utmp.ut_id],,,[ -+#include <sys/types.h> -+#if HAVE_UTMPX_H -+# include <utmpx.h> -+#endif -+#if HAVE_UTMP_H -+# include <utmp.h> -+#endif]) -+ - dnl - dnl Checks for symbol - dnl -@@ -414,10 +634,13 @@ AC_FUNC_SETPGRP - dnl FreeWnn do not use the 3rd parameter of wait3(). - dnl AC_FUNC_WAIT3 - -+dnl NOTE: FD_SET is defined as macro on many systems. But this check -+dnl will be done in Wnn/include/wnn_os.h , so don't care... - AC_CHECK_FUNCS(random drand48 fchmod getopt killpg \ - FD_SET \ - gethostname select socket closesocket setsockopt send recv \ -- getdtablesize getrlimit syslog vsyslog setenv snprintf) -+ getdtablesize getrlimit syslog vsyslog setenv snprintf \ -+ ptsname posix_openpt openpty pututxline pututline setsid) - dnl for bcopy/index -> memcpy/strchr conversion (preparation): - AC_CHECK_FUNCS(bcopy bzero bcmp index rindex \ - memcpy memmove memset strchr strrchr) -@@ -428,6 +651,142 @@ AC_CHECK_FUNCS(mkdir vasprintf, , - [JS_SUPPORTOBJS="${JS_SUPPORTOBJS} ${ac_func}.o"]) - AC_SUBST(JS_SUPPORTOBJS) - -+dnl delayed check for --enable-client-utmp -+if test $client = true; then -+ if test $client_utmp = auto; then -+ AC_EGREP_CPP(yes, [ -+#if HAVE_SYS_PARAM_H -+# include <sys/param.h> -+#endif -+#if defined(BSD) && (BSD >= 199306) && !defined(HAVE_PUTUTXLINE) && !defined(HAVE_PUTUTLINE) -+ yes -+#endif -+ ], client_utmp=false, client_utmp=true) -+ fi -+ -+ dnl for Debug -+ AC_MSG_CHECKING([whether we're using utmp with uum]) -+ if test $client_utmp = true; then -+ dnl We need to look again if we introduce libspt check -+ AC_DEFINE(USE_UTMP, 1, [Define to 1 if uum writes utmp entry]) -+ AC_MSG_RESULT(yes) -+ else -+ AC_MSG_RESULT(no) -+ fi -+fi -+ -+dnl delayed check for --enable-client-set[ug]id -+if test $client = true; then -+ guess_setuid= -+ guess_setgid=false -+ dnl Note: (HAVE_OPENPTY && defined(TIOCPTMGET)): for recent OpenBSD -+ if test $client_utmp = true; then -+ AC_EGREP_CPP(yes, [ -+#if HAVE_SYS_IOCTL_H -+# include <sys/ioctl.h> -+#endif -+#if HAVE_PTSNAME || (HAVE_OPENPTY && defined(TIOCPTMGET)) -+# if HAVE_PUTUTLINE || HAVE_PUTUTXLINE -+ yes -+# endif -+#endif -+ ], [ -+ case $host_os in -+ linux*) -+ # On recent Linux, it has both ptsname() and putut*line(). -+ # But putut*line() will take effect only if prog is installed -+ # with set-gid to group utmp. -+ guess_setgid=true -+ UUMGROUP=${UUMGROUP:-utmp} -+ ;; -+ esac -+ guess_setuid=false -+ ], guess_setuid=true) -+ else -+ # $client_utmp != true -+ AC_EGREP_CPP(yes, [ -+#if HAVE_SYS_IOCTL_H -+# include <sys/ioctl.h> -+#endif -+#if HAVE_PTSNAME || (HAVE_OPENPTY && defined(TIOCPTMGET)) -+ yes -+#endif -+ ], guess_setuid=false, guess_setuid=true) -+ fi -+ # $client_utmp != true -+ -+ if test $client_setuid = auto; then -+ client_setuid=$guess_setuid -+ # UUMOWNER is already set ... -+ fi -+ if test $client_setgid = auto; then -+ client_setgid=$guess_setgid -+ # UUMGROUP is already set (if it needs) -+ fi -+ -+ dnl set install flag (at last) -+ if test $client_setuid = true; then -+ INSTUUMFLAGS="-o \$(UUMOWNER)" -+ if test $client_setgid = true; then -+ INSTUUMFLAGS="-m 6711 $INSTUUMFLAGS -g \$(UUMGROUP)" -+ else -+ # client_setuid && !client_setgid -+ INSTUUMFLAGS="-m 4711 $INSTUUMFLAGS" -+ fi -+ else -+ if test $client_setgid = true; then -+ # !client_setuid && client_setgid -+ INSTUUMFLAGS="-m 2711 -g \$(UUMGROUP)" -+ else -+ # !client_setuid && !client_setgid -+ INSTUUMFLAGS="-m 0711" -+ fi -+ fi -+ -+ dnl for Debug -+ AC_MSG_CHECKING([whether we need to install uum as setuid program]) -+ if test $client_setuid = true; then -+ AC_MSG_RESULT([yes, $UUMOWNER]) -+ else -+ AC_MSG_RESULT(no) -+ fi -+ AC_MSG_CHECKING([whether we need to install uum as setgid program]) -+ if test $client_setgid = true; then -+ AC_MSG_RESULT([yes, $UUMGROUP]) -+ else -+ AC_MSG_RESULT(no) -+ fi -+else -+# $client != true -+ INSTUUMFLAGS="-m 4711 -o \$(UUMOWNER)" -+fi -+# $client = true -+ -+AC_SUBST(INSTUUMFLAGS) -+AC_SUBST(UUMOWNER) -+AC_SUBST(UUMGROUP) -+ -+dnl -+dnl File Existence -+dnl Checking file at compile time may bring false result when cross- -+dnl compiling. So, one have to check generated config.h and edit it -+dnl if necessary after running configure. -+dnl -+dnl AC_CHECK_FILE(/dev/ptmx, AC_DEFINE(HAVE_DEV_PTMX, 1, [/dev/ptmx found]),) -+AC_CHECK_FILES(/dev/ptmx,,) -+ -+ -+dnl -+dnl FIXME: libspt support -+dnl for example: -+dnl -+dnl --with-libspt[=/path/to/libspt-config] -+dnl -+dnl LIBSPT_CFLAGS=`/path/to/libspt-config --cflags` -+dnl LIBSPT_LIBS=`/path/to/libspt-config --libs` -+dnl AC_SUBST(LIBSPT_CFLAGS) -+dnl AC_SUBST(LIBSPT_LIBS) -+dnl AC_DEFINE(HAVE_LIBSPT, 1, [Define if you have libspt support.]) - - dnl - dnl TCP Wrapper. diff --git a/inputmethod/ja-freewnn-lib/patches/patch-kWnn_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-kWnn_Makefile.in deleted file mode 100644 index 980d22e1618..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-kWnn_Makefile.in +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-kWnn_Makefile.in,v 1.1 2011/09/13 07:23:21 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- kWnn/Makefile.in.orig 2001-08-14 13:43:22.000000000 +0000 -+++ kWnn/Makefile.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2006 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -29,8 +29,9 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - # - --include @top_srcdir@/makerule.mk --top_builddir = .. -+include @top_builddir@/makerule.mk -+ top_srcdir = @top_srcdir@ -+top_builddir = @top_builddir@ - - WNNOWNER = wnn - -@@ -46,10 +47,14 @@ KDICDIR = kdic - - KDDIR = kd - --LIB_SUBDIRS = $(KDDIR) $(JLIBDIR) $(WNNCLIENTSDIR) -+UUMDIR = uum -+ -+LIB_SUBDIRS = $(KDDIR) $(JLIBDIR) - - SERVER_SUBDIRS = $(JSERVERDIR) $(WNNJUTILDIR) $(KDICDIR) $(WNNMANDIR) - -+CLIENT_SUBDIRS = $(WNNCLIENTSDIR) $(UUMDIR) -+ - SUBDIRS = @SUBDIRS@ - - ALL_SUBDIRS = $(LIB_SUBDIRS) $(SERVER_SUBDIRS) diff --git a/inputmethod/ja-freewnn-lib/patches/patch-kWnn_jlib_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-kWnn_jlib_Makefile.in deleted file mode 100644 index 56b82096d72..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-kWnn_jlib_Makefile.in +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-kWnn_jlib_Makefile.in,v 1.1 2011/09/13 07:23:21 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- kWnn/jlib/Makefile.in.orig 2004-09-12 16:56:55.000000000 +0000 -+++ kWnn/jlib/Makefile.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001, 2003 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2003, 2009 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -41,8 +41,6 @@ DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF) - # # -- S. Taoka - LINTLIBS = - INSTALL = @INSTALL@ $(INSTALLFLAGS) --LT_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) --LT_CC = $(LIBTOOL) --mode=compile $(CC) - - SRC1= js.c wnnerrmsg.c jl.c - OBJ1= js.o wnnerrmsg.o jl.o -@@ -130,7 +128,7 @@ lint: - all:: libkwnn.la - - libkwnn.la: $(OBJS) $(EXTRALIBRARYDEPS) -- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(KWNNJLIBVERSION) -+ $(LT_LD) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(KWNNJLIBVERSION) @LIBS@ - - lintlib:: llib-lkwnn.ln - diff --git a/inputmethod/ja-freewnn-lib/patches/patch-kWnn_jserver_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-kWnn_jserver_Makefile.in deleted file mode 100644 index 44ea5d35c1a..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-kWnn_jserver_Makefile.in +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-kWnn_jserver_Makefile.in,v 1.1 2011/09/13 07:23:21 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- kWnn/jserver/Makefile.in.orig 2004-05-21 16:39:32.000000000 +0000 -+++ kWnn/jserver/Makefile.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2003, 2004 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2003, 2004, 2010 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -105,7 +105,7 @@ instserver:: install - install:: kserver - @if [ -d $(DESTDIR)$(KWNNBINDIR) ]; then set +x; \ - else (set -x; $(MKDIRHIER) $(DESTDIR)$(KWNNBINDIR)); fi -- $(LIBTOOL) --mode=install $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) kserver $(DESTDIR)$(KWNNBINDIR)/kserver -+ $(LT_INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) kserver $(DESTDIR)$(KWNNSBINDIR)/`echo kserver | sed '$(transform)'` - - includes:: $(HDRS) $(SRC0) $(SRC1) - diff --git a/inputmethod/ja-freewnn-lib/patches/patch-kWnn_jutil_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-kWnn_jutil_Makefile.in deleted file mode 100644 index 854b417f708..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-kWnn_jutil_Makefile.in +++ /dev/null @@ -1,61 +0,0 @@ -$NetBSD: patch-kWnn_jutil_Makefile.in,v 1.1 2011/09/13 07:23:21 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- kWnn/jutil/Makefile.in.orig 2004-08-15 09:38:23.000000000 +0000 -+++ kWnn/jutil/Makefile.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001, 2004 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2004, 2010, 2011 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -37,18 +37,21 @@ INSTALL = @INSTALL@ $(INSTALLFLA - LT_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) - LT_LD = $(LIBTOOL) --mode=link $(CCLINK) - -- INCLUDES = -I$(KWNNINCLUDESRC) -I$(top_builddir) -+ INCLUDES = -I$(top_builddir) @EXTKWNNJINC@ -I$(KWNNINCLUDESRC) - DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF) - LOCAL_INSTFLAGS = -o $(WNNOWNER) - HINSIDEFINE = -DHINSIDATA_FILE=\"/$(KWNNLANG)/hinsi.data\" - --CLIENTPROGRAMS = kwnnstat kwnnkill kwddel kwdreg -+CLIENTPROGRAMS = kwddel kwdreg -+ -+# Server status / kill programs -+CLIENT_SV_PROGRAMS = kwnnstat kwnnkill - - DICUTIL2PROGRAMS = katod katof kwnntouch - - DICUTILPROGRAMS = kdtoa - --PROGRAMS = $(CLIENTPROGRAMS) $(DICUTILPROGRAMS) $(DICUTIL2PROGRAMS) -+PROGRAMS = $(CLIENTPROGRAMS) $(CLIENT_SV_PROGRAMS) $(DICUTILPROGRAMS) $(DICUTIL2PROGRAMS) - - LINKS = atod.c atorev.c dic_head.c dtoa.c sort.c ujisf.c wddel.c wdreg.c wnnkill.c wnnstat.c wnntouch.c atof.c - -@@ -326,10 +329,15 @@ instclient:: install - install:: $(PROGRAMS) - @if [ -d $(DESTDIR)$(KWNNBINDIR) ]; then set +x; \ - else (set -x; $(MKDIRHIER) $(DESTDIR)$(KWNNBINDIR)); fi -+ @if [ -d $(DESTDIR)$(KWNNSBINDIR) ]; then set +x; \ -+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(KWNNSBINDIR)); fi - @for flag in ${MAKEFLAGS} ''; do \ - case "$$flag" in *=*) ;; *[i]*) set +e;; esac; done; \ -- for i in $(PROGRAMS); do \ -- (set -x; $(LT_INSTALL) $(INSTBINFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) $$i $(DESTDIR)$(KWNNBINDIR)); \ -+ for i in $(CLIENTPROGRAMS) $(DICUTILPROGRAMS) $(DICUTIL2PROGRAMS); do \ -+ (set -x; $(LT_INSTALL) $(INSTBINFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) $$i $(DESTDIR)$(KWNNBINDIR)/`echo $$i | sed '$(transform)'`); \ -+ done; \ -+ for i in $(CLIENT_SV_PROGRAMS); do \ -+ (set -x; $(LT_INSTALL) $(INSTBINFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) $$i $(DESTDIR)$(KWNNSBINDIR)/`echo $$i | sed '$(transform)'`); \ - done - - $(OBJ1) : $(SRC1) diff --git a/inputmethod/ja-freewnn-lib/patches/patch-kWnn_kdic_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-kWnn_kdic_Makefile.in deleted file mode 100644 index b174a9b5ec4..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-kWnn_kdic_Makefile.in +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-kWnn_kdic_Makefile.in,v 1.1 2011/09/13 07:23:21 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- kWnn/kdic/Makefile.in.orig 2004-04-24 18:56:40.000000000 +0000 -+++ kWnn/kdic/Makefile.in -@@ -5,10 +5,10 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 2001, 2004 -+# Copyright FreeWnn Project 2001, 2004, 2010 - # - # Author: OMRON SOFTWARE Co., Ltd. <freewnn@rd.kyoto.omronsoft.co.jp> --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -27,6 +27,7 @@ - include @top_builddir@/makerule.mk - top_srcdir = @top_srcdir@ - srcdir = @srcdir@ -+ VPATH = @srcdir@ - top_builddir = @top_builddir@ - KWNNJUTILOBJ = $(top_builddir)/kWnn/jutil - -@@ -61,7 +62,7 @@ all:: $(ALLTGT) - $(DICS): $(HINSI) - - $(FULL):: $(FZK_SRCS) fzk.master-.c -- $(CPP) -I$(srcdir) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ -+ $(FZK_PP) -I$(srcdir) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ - - # To avoid circular dependency, we don't use 'fzk.master.c' - fzk.master-.c: fzk.master diff --git a/inputmethod/ja-freewnn-lib/patches/patch-kWnn_romkan_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-kWnn_romkan_Makefile.in deleted file mode 100644 index 7726cf1f9b6..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-kWnn_romkan_Makefile.in +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-kWnn_romkan_Makefile.in,v 1.1 2011/09/13 07:23:21 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- kWnn/romkan/Makefile.in.orig 2002-03-30 09:34:46.000000000 +0000 -+++ kWnn/romkan/Makefile.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2006 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -29,10 +29,11 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - # - --include ../../makerule.mk --top_builddir = ../.. -+include @top_builddir@/makerule.mk -+ top_srcdir = @top_srcdir@ -+top_builddir = @top_builddir@ - -- INCLUDES = -I$(KWNNINCLUDESRC) -I$(TOP) -+ INCLUDES = -I$(KWNNINCLUDESRC) -I$(top_builddir) - DEFINES = $(KWNNDEFINES) -DWNNDEFAULT $(KWNNLANGDEF) - LINTLIBS = - -@@ -48,7 +49,7 @@ includes:: - - .c.o: - $(RM) $@ -- $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $< -+ $(LT_CC) -c $(CFLAGS) $(_NOOP_) $< - - clean:: - $(RM) -r .libs diff --git a/inputmethod/ja-freewnn-lib/patches/patch-kWnn_uum_Makefile.in b/inputmethod/ja-freewnn-lib/patches/patch-kWnn_uum_Makefile.in deleted file mode 100644 index d530887437d..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-kWnn_uum_Makefile.in +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-kWnn_uum_Makefile.in,v 1.1 2011/09/13 07:23:21 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- kWnn/uum/Makefile.in.orig 2005-11-20 16:10:28.000000000 +0000 -+++ kWnn/uum/Makefile.in -@@ -10,7 +10,7 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001, 2005 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2005, 2006, 2007, 2010, 2011 - # - # Maintainer: FreeWnn Project - # -@@ -30,15 +30,18 @@ - # - - include @top_builddir@/makerule.mk -+ top_srcdir = @top_srcdir@ - top_builddir = @top_builddir@ - --INSTALL = @INSTALL@ -+INSTALL = @INSTALL@ -+LOCAL_INSTFLAGS = $(INSTUUMFLAGS) - -- UUMOWNER = root -- INCLUDES = -I$(KWNNINCLUDESRC) -I$(KWNNROMKANSRC) -I$(top_builddir) -+ INCLUDES = -I$(top_builddir) @EXTKWNNJINC@ -I$(KWNNINCLUDESRC) -I$(KWNNROMKANSRC) - DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF) --LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(UUMOWNER) - LOCAL_LIBRARIES = $(KWNNJLIB) $(KWNNCONVLIB) @LIBS@ -+# FIXME: libspt: need configure support ... -+# LIBSPT_CFLAGS = @LIBSPT_CFLAGS@ -+# LIBSPT_LIBS = @LIBSPT_LIBS@ - - HDRS= buffer.h cvtcode.h sdefine.h sheader.h - SRC1= epilogue.c header.c kensaku.c kuten.c jis_in.c prologue.c touroku.c jikouho.c jutil.c w_string.c printf.c termio.c hinsi.c termcap.c ttyfdslot.c setutmp.c redraw.c history.c key_bind.c screen.c basic_op.c uif.c cursor.c jhlp.c select_ele.c inspect.c wnnrc_op.c functions.c -@@ -62,7 +65,7 @@ all:: $(HDRS) $(SRC1) kuum - - kuum: $(OBJS) @DEPKWNNJLIB@ $(KWNNCONVLIB) - $(RM) $@ -- $(LIBTOOL) --mode=link $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LOCAL_LIBRARIES) $(WNNTERM_LIB) -+ $(LT_LD) -o $@ $(LDOPTIONS) $(OBJS) $(LOCAL_LIBRARIES) $(LIBSPT_LIBS) @TERMLIB@ - - clean:: - $(RM) -r .libs -@@ -427,7 +430,7 @@ instclient:: install - install:: kuum - @if [ -d $(DESTDIR)$(KWNNBINDIR) ]; then set +x; \ - else (set -x; $(MKDIRHIER) $(DESTDIR)$(KWNNBINDIR)); fi -- $(LIBTOOL) --mode=install $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) kuum $(DESTDIR)$(KWNNBINDIR)/kuum -+ $(LT_INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) kuum $(DESTDIR)$(KWNNBINDIR)/`echo kuum | sed '$(transform)'` - - $(OBJ2) : $(SRC2) - $(CC) -c $(CFLAGS) $(KWNNETCSRC)/`basename $@ .o`.c diff --git a/inputmethod/ja-freewnn-lib/patches/patch-ltmain.sh b/inputmethod/ja-freewnn-lib/patches/patch-ltmain.sh deleted file mode 100644 index 6dafaa46883..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-ltmain.sh +++ /dev/null @@ -1,4174 +0,0 @@ -$NetBSD: patch-ltmain.sh,v 1.1 2011/09/13 07:23:21 mef Exp $ - -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 - ---- ltmain.sh.orig 2003-06-04 08:35:02.000000000 +0000 -+++ ltmain.sh -@@ -1,8 +1,8 @@ - # 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. -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -+# 2007, 2008 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 -@@ -17,13 +17,49 @@ - # - # 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. -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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. - -+basename="s,^.*/,,g" -+ -+# 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: -+progname=`echo "$progpath" | $SED $basename` -+modename="$progname" -+ -+# Global variables: -+EXIT_SUCCESS=0 -+EXIT_FAILURE=1 -+ -+PROGRAM=ltmain.sh -+PACKAGE=libtool -+VERSION=1.5.26 -+TIMESTAMP=" (1.1220.2.492 2008/01/30 06:40:56)" -+ -+# Be Bourne compatible (taken from Autoconf:_AS_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 -+ - # Check that we have a working $echo. - if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. -@@ -36,7 +72,7 @@ elif test "X`($echo '\t') 2>/dev/null`" - : - else - # Restart under the correct shell, and then maybe $echo will work. -- exec $SHELL "$0" --no-reexec ${1+"$@"} -+ exec $SHELL "$progpath" --no-reexec ${1+"$@"} - fi - - if test "X$1" = X--fallback-echo; then -@@ -45,19 +81,9 @@ if test "X$1" = X--fallback-echo; then - cat <<EOF - $* - EOF -- exit 0 -+ exit $EXIT_SUCCESS - fi - --# The name of this program. --progname=`$echo "$0" | ${SED} 's%^.*/%%'` --modename="$progname" -- --# 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%%%" -@@ -70,14 +96,15 @@ rm="rm -f" - 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'" -+case `echo X|tr X '\101'` in -+ A) # ASCII based system -+ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr -+ SP2NL='tr \040 \012' -+ NL2SP='tr \015\012 \040\040' - ;; -- *) # Assume ASCII based system -- SP2NL="tr '\040' '\012'" -- NL2SP="tr '\015\012' '\040\040'" -+ *) # EBCDIC based system -+ SP2NL='tr \100 \n' -+ NL2SP='tr \r\n \100\100' - ;; - esac - -@@ -86,20 +113,30 @@ esac - # 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 -+lt_env= -+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_env=\"$lt_var=\$$lt_var \$lt_env\" -+ $lt_var=C -+ export $lt_var -+ fi" -+done -+ -+if test -n "$lt_env"; then -+ lt_env="env $lt_env" - fi - - # Make sure IFS has a sensible default --: ${IFS=" "} -+lt_nl=' -+' -+IFS=" $lt_nl" - - 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 -+ exit $EXIT_FAILURE - fi - - # Global variables. -@@ -111,17 +148,62 @@ run= - show="$echo" - show_help= - execute_dlfiles= -+duplicate_deps=no -+preserve_args= - lo2o="s/\\.lo\$/.${objext}/" - o2lo="s/\\.${objext}\$/.lo/" -+extracted_archives= -+extracted_serial=0 - - ##################################### - # Shell function definitions: - # This seems to be the best place for them - -+# func_mktempdir [string] -+# Make a temporary directory that won't clash with other running -+# libtool processes, and avoids race conditions if possible. If -+# given, STRING is the basename for that directory. -+func_mktempdir () -+{ -+ my_template="${TMPDIR-/tmp}/${1-$progname}" -+ -+ if test "$run" = ":"; then -+ # Return a directory name, but don't create it in dry-run mode -+ my_tmpdir="${my_template}-$$" -+ else -+ -+ # If mktemp works, use that first and foremost -+ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` -+ -+ if test ! -d "$my_tmpdir"; then -+ # Failing that, at least try and use $RANDOM to avoid a race -+ my_tmpdir="${my_template}-${RANDOM-0}$$" -+ -+ save_mktempdir_umask=`umask` -+ umask 0077 -+ $mkdir "$my_tmpdir" -+ umask $save_mktempdir_umask -+ fi -+ -+ # If we're not in dry-run mode, bomb out on failure -+ test -d "$my_tmpdir" || { -+ $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 -+ exit $EXIT_FAILURE -+ } -+ fi -+ -+ $echo "X$my_tmpdir" | $Xsed -+} -+ -+ -+# 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. --win32_libid () { -+func_win32_libid () -+{ - win32_libid_type="unknown" - win32_fileres=`file -L $1 2>/dev/null` - case $win32_fileres in -@@ -130,17 +212,22 @@ win32_libid () { - ;; - *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 -+ $EGREP -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 -+ $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*) -+ *DLL*) - win32_libid_type="x86 DLL" - ;; - *executable*) # but shell scripts are "executable" too... -@@ -154,9 +241,191 @@ win32_libid () { - $echo $win32_libid_type - } - -+ -+# 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 () -+{ -+ if test -n "$available_tags" && test -z "$tagname"; then -+ CC_quoted= -+ for arg in $CC; do -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" -+ ;; -+ esac -+ CC_quoted="$CC_quoted $arg" -+ 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_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$" < "$progpath" > /dev/null; then -+ # Evaluate the configuration. -+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" -+ CC_quoted= -+ for arg in $CC; do -+ # Double-quote args containing other shell metacharacters. -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" -+ ;; -+ esac -+ CC_quoted="$CC_quoted $arg" -+ 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. -+ 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 $EXIT_FAILURE -+# else -+# $echo "$modename: using $tagname tagged configuration" -+ fi -+ ;; -+ esac -+ fi -+} -+ -+ -+# func_extract_an_archive dir oldlib -+func_extract_an_archive () -+{ -+ f_ex_an_ar_dir="$1"; shift -+ f_ex_an_ar_oldlib="$1" -+ -+ $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" -+ $run 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 -+ $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+} -+ -+# func_extract_archives gentop oldlib ... -+func_extract_archives () -+{ -+ my_gentop="$1"; shift -+ my_oldlibs=${1+"$@"} -+ my_oldobjs="" -+ my_xlib="" -+ my_xabs="" -+ my_xdir="" -+ my_status="" -+ -+ $show "${rm}r $my_gentop" -+ $run ${rm}r "$my_gentop" -+ $show "$mkdir $my_gentop" -+ $run $mkdir "$my_gentop" -+ my_status=$? -+ if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then -+ exit $my_status -+ fi -+ -+ 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 -+ my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` -+ my_xlib_u=$my_xlib -+ while :; do -+ case " $extracted_archives " in -+ *" $my_xlib_u "*) -+ extracted_serial=`expr $extracted_serial + 1` -+ 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" -+ -+ $show "${rm}r $my_xdir" -+ $run ${rm}r "$my_xdir" -+ $show "$mkdir $my_xdir" -+ $run $mkdir "$my_xdir" -+ exit_status=$? -+ if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then -+ exit $exit_status -+ fi -+ case $host in -+ *-darwin*) -+ $show "Extracting $my_xabs" -+ # Do not bother doing anything if just a dry run -+ if test -z "$run"; then -+ darwin_orig_dir=`pwd` -+ cd $my_xdir || exit $? -+ darwin_archive=$my_xabs -+ darwin_curdir=`pwd` -+ darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` -+ darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` -+ if test -n "$darwin_arches"; then -+ darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` -+ darwin_arch= -+ $show "$darwin_base_archive has multiple architectures $darwin_arches" -+ for darwin_arch in $darwin_arches ; do -+ 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 have a bunch of thin objects, gotta fatten them up :) -+ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP` -+ 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}r unfat-$$ -+ cd "$darwin_orig_dir" -+ else -+ cd "$darwin_orig_dir" -+ func_extract_an_archive "$my_xdir" "$my_xabs" -+ fi # $darwin_arches -+ fi # $run -+ ;; -+ *) -+ 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 -+ func_extract_archives_result="$my_oldobjs" -+} - # End of Shell function definitions - ##################################### - -+# Darwin sucks -+eval std_shrext=\"$shrext_cmds\" -+ -+disable_libs=no -+ - # Parse our command line options once, thoroughly. - while test "$#" -gt 0 - do -@@ -176,12 +445,13 @@ do - ;; - tag) - tagname="$arg" -+ preserve_args="${preserve_args}=$arg" - - # Check whether tagname contains only valid characters - case $tagname in - *[!-_A-Za-z0-9,/]*) - $echo "$progname: invalid tag name: $tagname" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - -@@ -191,10 +461,10 @@ do - # not specially marked. - ;; - *) -- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then -+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /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`" -+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" - else - $echo "$progname: ignoring unknown tag $tagname" 1>&2 - fi -@@ -218,26 +488,28 @@ do - ;; - - --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 -+ echo "\ -+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP -+ -+Copyright (C) 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." -+ exit $? - ;; - - --config) -- ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 -+ ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath - # 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" -+ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" - done -- exit 0 -+ exit $? - ;; - - --debug) - $echo "$progname: enabling shell trace mode" - set -x -+ preserve_args="$preserve_args $arg" - ;; - - --dry-run | -n) -@@ -256,7 +528,7 @@ do - else - $echo "disable static libraries" - fi -- exit 0 -+ exit $? - ;; - - --finish) mode="finish" ;; -@@ -268,13 +540,19 @@ do - - --quiet | --silent) - show=: -+ preserve_args="$preserve_args $arg" - ;; - -- --tag) prevopt="--tag" prev=tag ;; -+ --tag) -+ prevopt="--tag" -+ prev=tag -+ preserve_args="$preserve_args --tag" -+ ;; - --tag=*) - set tag "$optarg" ${1+"$@"} - shift - prev=tag -+ preserve_args="$preserve_args --tag" - ;; - - -dlopen) -@@ -285,7 +563,7 @@ do - -*) - $echo "$modename: unrecognized option \`$arg'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - - *) -@@ -298,9 +576,21 @@ done - if test -n "$prevopt"; then - $echo "$modename: option \`$prevopt' requires an argument" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - -+case $disable_libs in -+no) -+ ;; -+shared) -+ build_libtool_libs=no -+ build_old_libs=yes -+ ;; -+static) -+ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` -+ ;; -+esac -+ - # 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. -@@ -311,7 +601,7 @@ if test -z "$show_help"; then - # 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 -+ $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 - case $nonopt in - *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) - mode=link -@@ -354,7 +644,7 @@ if test -z "$show_help"; then - if test -n "$execute_dlfiles" && test "$mode" != execute; then - $echo "$modename: unrecognized option \`-dlopen'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Change the help message to a mode-specific one. -@@ -369,13 +659,15 @@ if test -z "$show_help"; then - # 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= - - for arg - do -- case "$arg_mode" in -+ case $arg_mode in - arg ) - # do not "continue". Instead, add this to base_compile - lastarg="$arg" -@@ -394,24 +686,19 @@ if test -z "$show_help"; then - -o) - if test -n "$libobj" ; then - $echo "$modename: you cannot specify \`-o' more than once" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - arg_mode=target - continue - ;; - -- -static) -- build_old_libs=yes -- continue -- ;; -- -- -prefer-pic) -- pic_mode=yes -+ -static | -prefer-pic | -prefer-non-pic) -+ later="$later $arg" - continue - ;; - -- -prefer-non-pic) -- pic_mode=no -+ -no-suppress) -+ suppress_opt=no - continue - ;; - -@@ -424,7 +711,7 @@ if test -z "$show_help"; then - args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` - lastarg= - save_ifs="$IFS"; IFS=',' -- for arg in $args; do -+ for arg in $args; do - IFS="$save_ifs" - - # Double-quote args containing other shell metacharacters. -@@ -462,7 +749,10 @@ if test -z "$show_help"; then - 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. -+ # in scan sets, and some SunOS ksh mistreat backslash-escaping -+ # in scan sets (worked around with variable expansion), -+ # and furthermore cannot handle '|' '&' '(' ')' in scan sets -+ # at all, so we specify them separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - lastarg="\"$lastarg\"" - ;; -@@ -474,11 +764,11 @@ if test -z "$show_help"; then - case $arg_mode in - arg) - $echo "$modename: you must specify an argument for -Xcompile" -- exit 1 -+ exit $EXIT_FAILURE - ;; - target) - $echo "$modename: you must specify a target with \`-o'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - *) - # Get the name of the library object. -@@ -500,9 +790,11 @@ if test -z "$show_help"; then - *.class) xform=class ;; - *.cpp) xform=cpp ;; - *.cxx) xform=cxx ;; -- *.f90) xform=f90 ;; -+ *.[fF][09]?) xform=[fF][09]. ;; - *.for) xform=for ;; - *.java) xform=java ;; -+ *.obj) xform=obj ;; -+ *.sx) xform=sx ;; - esac - - libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` -@@ -511,51 +803,39 @@ if test -z "$show_help"; then - *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; - *) - $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - -- # 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 -- # 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 the base compile command matches -- # the one in the tagged configuration. -- # Assume this is the tagged configuration we want. -- tagname=$z -- break -- ;; -- esac -- fi -- done -- # If $tagname still isn't set, then no tagged configuration -- # was found and let the user know that the "--tag" command -- # line option must be used. -- if test -z "$tagname"; then -- $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 -+ func_infer_tag $base_compile -+ -+ for arg in $later; do -+ case $arg in -+ -static) -+ build_old_libs=yes -+ continue -+ ;; -+ -+ -prefer-pic) -+ pic_mode=yes -+ continue -+ ;; -+ -+ -prefer-non-pic) -+ pic_mode=no -+ continue - ;; - esac -- fi -+ done - -+ qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` -+ case $qlibobj in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ qlibobj="\"$qlibobj\"" ;; -+ esac -+ test "X$libobj" != "X$qlibobj" \ -+ && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \ -+ && $echo "$modename: libobj name \`$libobj' may not contain shell special characters." - objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$obj"; then -@@ -568,7 +848,7 @@ if test -z "$show_help"; then - if test -z "$base_compile"; then - $echo "$modename: you must specify a compilation command" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Delete any leftover library objects. -@@ -579,7 +859,7 @@ if test -z "$show_help"; then - fi - - $run $rm $removelist -- trap "$run $rm $removelist; exit 1" 1 2 15 -+ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 - - # On Cygwin there's no "real" PIC flag so we must build both object types - case $host_os in -@@ -598,7 +878,7 @@ if test -z "$show_help"; 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 -+ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 - else - output_obj= - need_locks=no -@@ -608,7 +888,7 @@ if test -z "$show_help"; then - # 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 -+ until $run ln "$progpath" "$lockfile" 2>/dev/null; do - $show "Waiting for $lockfile to be removed" - sleep 2 - done -@@ -626,14 +906,19 @@ avoid parallel builds (make -j) in this - compiler." - - $run $rm $removelist -- exit 1 -+ exit $EXIT_FAILURE - fi -- $echo $srcfile > "$lockfile" -+ $echo "$srcfile" > "$lockfile" - fi - - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi -+ qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` -+ case $qsrcfile in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ qsrcfile="\"$qsrcfile\"" ;; -+ esac - - $run $rm "$libobj" "${libobj}T" - -@@ -655,18 +940,18 @@ 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 -+ exit_status=$? -+ if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then -+ exit $exit_status - fi - fi - -@@ -678,10 +963,10 @@ EOF - $run $rm "$lobj" "$output_obj" - - $show "$command" -- if $run eval "$command"; then : -+ if $run eval $lt_env "$command"; then : - else - test -n "$output_obj" && $run $rm $removelist -- exit 1 -+ exit $EXIT_FAILURE - fi - - if test "$need_locks" = warn && -@@ -701,7 +986,7 @@ avoid parallel builds (make -j) in this - compiler." - - $run $rm $removelist -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Just move the object if needed, then go on to compile the next one -@@ -722,7 +1007,9 @@ pic_object='$objdir/$objname' - EOF - - # Allow error messages only from the first compilation. -- suppress_output=' >/dev/null 2>&1' -+ if test "$suppress_opt" = yes; then -+ suppress_output=' >/dev/null 2>&1' -+ fi - else - # No PIC object so indicate it doesn't exist in the libtool - # object file. -@@ -736,9 +1023,9 @@ EOF - 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" - 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" -@@ -748,10 +1035,10 @@ EOF - command="$command$suppress_output" - $run $rm "$obj" "$output_obj" - $show "$command" -- if $run eval "$command"; then : -+ if $run eval $lt_env "$command"; then : - else - $run $rm $removelist -- exit 1 -+ exit $EXIT_FAILURE - fi - - if test "$need_locks" = warn && -@@ -771,7 +1058,7 @@ avoid parallel builds (make -j) in this - compiler." - - $run $rm $removelist -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Just move the object if needed -@@ -809,7 +1096,7 @@ EOF - $run $rm "$lockfile" - fi - -- exit 0 -+ exit $EXIT_SUCCESS - ;; - - # libtool link mode -@@ -835,7 +1122,7 @@ EOF - ;; - esac - libtool_args="$nonopt" -- base_compile="$nonopt" -+ base_compile="$nonopt $@" - compile_command="$nonopt" - finalize_command="$nonopt" - -@@ -867,6 +1154,8 @@ EOF - no_install=no - objs= - non_pic_objects= -+ notinst_path= # paths that contain not-installed libtool libraries -+ precious_files_regex= - prefer_static_libs=no - preload=no - prev= -@@ -879,27 +1168,40 @@ EOF - thread_safe=no - vinfo= - vinfo_number=no -+ 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 -- -all-static | -static) -- if test "X$arg" = "X-all-static"; then -+ -all-static | -static | -static-libtool-libs) -+ case $arg in -+ -all-static) - 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 -+ prefer_static_libs=yes -+ ;; -+ -static) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi -- 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 -- prefer_static_libs=yes - break - ;; - esac -@@ -911,7 +1213,6 @@ EOF - # 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 - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -@@ -975,7 +1276,7 @@ EOF - export_symbols="$arg" - if test ! -f "$arg"; then - $echo "$modename: symbol file \`$arg' does not exist" -- exit 1 -+ exit $EXIT_FAILURE - fi - prev= - continue -@@ -990,6 +1291,11 @@ EOF - prev= - continue - ;; -+ precious_regex) -+ precious_files_regex="$arg" -+ prev= -+ continue -+ ;; - release) - release="-$arg" - prev= -@@ -1022,7 +1328,7 @@ EOF - test "$pic_object" = none && \ - test "$non_pic_object" = none; then - $echo "$modename: cannot find name of object for \`$arg'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Extract subdirectory from the argument. -@@ -1070,12 +1376,17 @@ EOF - 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" -+ non_pic_objects="$non_pic_objects $non_pic_object" - 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 -+ exit $EXIT_FAILURE - else - # Dry-run case. - -@@ -1096,7 +1407,7 @@ EOF - done - else - $echo "$modename: link input file \`$save_arg' does not exist" -- exit 1 -+ exit $EXIT_FAILURE - fi - arg=$save_arg - prev= -@@ -1108,7 +1419,7 @@ EOF - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - if test "$prev" = rpath; then -@@ -1148,6 +1459,18 @@ EOF - finalize_command="$finalize_command $qarg" - continue - ;; -+ shrext) -+ shrext_cmds="$arg" -+ prev= -+ continue -+ ;; -+ darwin_framework|darwin_framework_skip) -+ test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" -+ compile_command="$compile_command $arg" -+ finalize_command="$finalize_command $arg" -+ prev= -+ continue -+ ;; - *) - eval "$prev=\"\$arg\"" - prev= -@@ -1196,7 +1519,7 @@ EOF - -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 -+ exit $EXIT_FAILURE - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms -@@ -1206,6 +1529,18 @@ EOF - continue - ;; - -+ -framework|-arch|-isysroot) -+ case " $CC " in -+ *" ${arg} ${1} "* | *" ${arg} ${1} "*) -+ prev=darwin_framework_skip ;; -+ *) compiler_flags="$compiler_flags $arg" -+ prev=darwin_framework ;; -+ esac -+ compile_command="$compile_command $arg" -+ finalize_command="$finalize_command $arg" -+ continue -+ ;; -+ - -inst-prefix-dir) - prev=inst_prefix - continue -@@ -1232,7 +1567,8 @@ EOF - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 -- exit 1 -+ absdir="$dir" -+ notinst_path="$notinst_path $dir" - fi - dir="$absdir" - ;; -@@ -1246,10 +1582,15 @@ EOF - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -+ testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - *) dllsearchpath="$dllsearchpath:$dir";; - esac -+ case :$dllsearchpath: in -+ *":$testbindir:"*) ;; -+ *) dllsearchpath="$dllsearchpath:$testbindir";; -+ esac - ;; - esac - continue -@@ -1258,15 +1599,15 @@ EOF - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in -- *-*-cygwin* | *-*-pw32* | *-*-beos*) -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) - # These systems don't actually have a C or math library (as such) - continue - ;; -- *-*-mingw* | *-*-os2*) -+ *-*-os2*) - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; -@@ -1274,10 +1615,19 @@ EOF - # Rhapsody C and math libraries are in the System framework - deplibs="$deplibs -framework System" - 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*) -+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1287,18 +1637,47 @@ EOF - continue - ;; - -+ # Tru64 UNIX uses -model [arg] to determine the layout of C++ -+ # classes, name mangling, and exception handling. -+ -model) -+ compile_command="$compile_command $arg" -+ compiler_flags="$compiler_flags $arg" -+ finalize_command="$finalize_command $arg" -+ prev=xcompiler -+ continue -+ ;; -+ -+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) -+ compiler_flags="$compiler_flags $arg" -+ compile_command="$compile_command $arg" -+ finalize_command="$finalize_command $arg" -+ continue -+ ;; -+ -+ -multi_module) -+ single_module="${wl}-multi_module" -+ continue -+ ;; -+ - -module) - module=yes - continue - ;; - -- # 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*) -+ # -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* pass through architecture-specific compiler args for GCC -+ # -m*, -t[45]*, -txscale* pass through architecture-specific -+ # compiler args for GCC -+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC -+ # -F/path gives path to uninstalled frameworks, gcc on darwin -+ # @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*|@*) -+ - # 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"` -@@ -1309,9 +1688,7 @@ EOF - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" -- if test "$with_gcc" = "yes" ; then -- compiler_flags="$compiler_flags $arg" -- fi -+ compiler_flags="$compiler_flags $arg" - continue - ;; - -@@ -1327,9 +1704,9 @@ EOF - - -no-install) - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) - # The PATH hackery in wrapper scripts is required on Windows -- # in order for the loader to find any dlls it needs. -+ # and Darwin 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 -@@ -1351,6 +1728,11 @@ EOF - - -o) prev=output ;; - -+ -precious-files-regex) -+ prev=precious_regex -+ continue -+ ;; -+ - -release) - prev=release - continue -@@ -1373,7 +1755,7 @@ EOF - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - case "$xrpath " in -@@ -1383,7 +1765,7 @@ EOF - continue - ;; - -- -static) -+ -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 -@@ -1496,7 +1878,7 @@ EOF - test "$pic_object" = none && \ - test "$non_pic_object" = none; then - $echo "$modename: cannot find name of object for \`$arg'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Extract subdirectory from the argument. -@@ -1544,12 +1926,17 @@ EOF - 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" -+ non_pic_objects="$non_pic_objects $non_pic_object" - 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 -+ exit $EXIT_FAILURE - else - # Dry-run case. - -@@ -1616,48 +2003,7 @@ EOF - if test -n "$prev"; then - $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 - $echo "$help" 1>&2 -- exit 1 -- 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 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 -- ;; -- esac -+ exit $EXIT_FAILURE - fi - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then -@@ -1690,9 +2036,9 @@ EOF - 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 -+ exit_status=$? -+ if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then -+ exit $exit_status - fi - fi - -@@ -1701,7 +2047,7 @@ EOF - "") - $echo "$modename: you must specify an output file" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; -@@ -1711,7 +2057,7 @@ EOF - - case $host in - *cygwin* | *mingw* | *pw32*) -- # don't eliminate duplcations in $postdeps and $predeps -+ # don't eliminate duplications in $postdeps and $predeps - duplicate_compiler_generated_deps=yes - ;; - *) -@@ -1755,7 +2101,6 @@ EOF - 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" -@@ -1764,7 +2109,7 @@ EOF - *.la) ;; - *) - $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - done -@@ -1802,23 +2147,39 @@ EOF - 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 -+ continue -+ ;; - -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 -+ if test "$linkmode" = lib; then -+ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" -+ else -+ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" -+ fi -+ for searchdir in $searchdirs; do -+ for search_ext in .la $std_shrext .so .a; do -+ # Search the libtool library -+ lib="$searchdir/lib${name}${search_ext}" -+ if test -f "$lib"; then -+ if test "$search_ext" = ".la"; then -+ found=yes -+ else -+ found=no -+ fi -+ break 2 -+ fi -+ done - done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library -@@ -1883,11 +2244,11 @@ EOF - 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" - fi -+ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - *) - $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 -@@ -1915,7 +2276,22 @@ EOF - fi - case $linkmode in - lib) -- if test "$deplibs_check_method" != pass_all; then -+ valid_a_lib=no -+ case $deplibs_check_method in -+ match_pattern*) -+ set dummy $deplibs_check_method -+ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` -+ if eval $echo \"$deplib\" 2>/dev/null \ -+ | $SED 10q \ -+ | $EGREP "$match_pattern_regex" > /dev/null; then -+ valid_a_lib=yes -+ fi -+ ;; -+ pass_all) -+ valid_a_lib=yes -+ ;; -+ esac -+ if test "$valid_a_lib" != yes; then - $echo - $echo "*** Warning: Trying to link with static lib archive $deplib." - $echo "*** I have the capability to make that library automatically link in when" -@@ -1965,15 +2341,15 @@ EOF - esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else -- $echo "$modename: cannot find the library \`$lib'" 1>&2 -- exit 1 -+ $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 -+ exit $EXIT_FAILURE - fi - - # 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 -+ exit $EXIT_FAILURE - fi - - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` -@@ -1989,6 +2365,8 @@ EOF - # it will not redefine variables installed, or shouldnotlink - installed=yes - shouldnotlink=no -+ avoidtemprpath= -+ - - # Read the .la file - case $lib in -@@ -2009,7 +2387,7 @@ EOF - 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 -+ exit $EXIT_FAILURE - fi - # It is a libtool convenience library, so add in its objects. - convenience="$convenience $ladir/$objdir/$old_library" -@@ -2026,12 +2404,12 @@ EOF - done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - $echo "$modename: \`$lib' is not a convenience library" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - continue - fi # $pass = conv - -- -+ - # Get the name of the library we link against. - linklib= - for l in $old_library $library_names; do -@@ -2039,16 +2417,18 @@ EOF - done - if test -z "$linklib"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - 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 -+ exit $EXIT_FAILURE - fi -- if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then -+ 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 -@@ -2085,11 +2465,19 @@ EOF - dir="$libdir" - absdir="$libdir" - fi -+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else -- dir="$ladir/$objdir" -- absdir="$abs_ladir/$objdir" -- # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ 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 - name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - -@@ -2097,7 +2485,7 @@ EOF - if test "$pass" = dlpreopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). -@@ -2124,7 +2512,7 @@ EOF - continue - fi - -- -+ - if test "$linkmode" = prog && test "$pass" != link; then - newlib_search_path="$newlib_search_path $ladir" - deplibs="$lib $deplibs" -@@ -2160,14 +2548,16 @@ EOF - - if test "$linkmode,$pass" = "prog,link"; then - if test -n "$library_names" && -- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then -+ { { 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"; then -+ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath " in - *" $dir "*) ;; - *" $absdir "*) ;; -- *) temp_rpath="$temp_rpath $dir" ;; -+ *) temp_rpath="$temp_rpath $absdir" ;; - esac - fi - -@@ -2204,24 +2594,29 @@ EOF - fi - - link_static=no # Whether the deplib will be linked statically -+ use_static_libs=$prefer_static_libs -+ if test "$use_static_libs" = built && test "$installed" = yes ; then -+ use_static_libs=no -+ fi - if test -n "$library_names" && -- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then -+ { test "$use_static_libs" = no || test -z "$old_library"; }; then - if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes - 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 -+ -+ # 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 -+ $echo "*** $linklib is not portable!" -+ fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then - # Hardcode the library path. -@@ -2279,9 +2674,10 @@ EOF - else - $show "extracting exported symbol list from \`$soname'" - save_ifs="$IFS"; IFS='~' -- eval cmds=\"$extract_expsyms_cmds\" -+ cmds=$extract_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done -@@ -2292,9 +2688,10 @@ EOF - 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\" -+ cmds=$old_archive_from_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done -@@ -2315,11 +2712,15 @@ EOF - if test "$hardcode_direct" = no; then - add="$dir/$linklib" - case $host in -- *-*-sco3.2v5* ) add_dir="-L$dir" ;; -+ *-*-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 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 -+ # 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 | -+ $EGREP ": [^:]* bundle" >/dev/null ; then - $echo "** Warning, lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then - $echo -@@ -2327,7 +2728,7 @@ EOF - $echo "** The link will probably fail, sorry" - else - add="$dir/$old_library" -- fi -+ fi - fi - esac - elif test "$hardcode_minus_L" = no; then -@@ -2350,9 +2751,9 @@ EOF - 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 -+ case $libdir in - [\\/]*) -- add_dir="-L$inst_prefix_dir$libdir $add_dir" -+ add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; - esac - fi -@@ -2369,7 +2770,7 @@ EOF - - if test "$lib_linked" != yes; then - $echo "$modename: configuration error: unsupported hardcode properties" -- exit 1 -+ exit $EXIT_FAILURE - fi - - if test -n "$add_shlibpath"; then -@@ -2412,7 +2813,8 @@ EOF - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then -- if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; 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" -@@ -2422,9 +2824,9 @@ EOF - 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 -+ case $libdir in - [\\/]*) -- add_dir="-L$inst_prefix_dir$libdir $add_dir" -+ add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; - esac - fi -@@ -2483,8 +2885,6 @@ EOF - fi - fi - else -- convenience="$convenience $dir/$old_library" -- old_convenience="$old_convenience $dir/$old_library" - deplibs="$dir/$old_library $deplibs" - link_static=yes - fi -@@ -2492,7 +2892,8 @@ EOF - - if test "$linkmode" = lib; then - if test -n "$dependency_libs" && -- { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes || -+ { test "$hardcode_into_libs" != yes || -+ test "$build_old_libs" = yes || - test "$link_static" = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= -@@ -2549,7 +2950,7 @@ EOF - 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 -+ exit $EXIT_FAILURE - fi - if test "$absdir" != "$libdir"; then - $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 -@@ -2559,50 +2960,60 @@ EOF - depdepl= - case $host in - *-*-darwin*) -- # we do not want to link against static libs, but need to link against shared -+ # 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` -+ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp - done -- if test -f "$path/$depdepl" ; then -+ if test -f "$deplibdir/$depdepl" ; then -+ depdepl="$deplibdir/$depdepl" -+ elif test -f "$path/$depdepl" ; then - depdepl="$path/$depdepl" -- fi -- newlib_search_path="$newlib_search_path $path" -- path="" -+ else -+ # Can't find it, oh well... -+ depdepl= -+ fi -+ # do not add paths which are already there -+ case " $newlib_search_path " in -+ *" $path "*) ;; -+ *) newlib_search_path="$newlib_search_path $path";; -+ esac - fi -+ path="" - ;; - *) -- path="-L$path" -- ;; -- esac -- -+ path="-L$path" -+ ;; -+ esac - ;; -- -l*) -+ -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="" -+ # 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 -+ esac - ;; - *) continue ;; - esac - case " $deplibs " in -- *" $depdepl "*) ;; -- *) deplibs="$deplibs $depdepl" ;; -- esac -- case " $deplibs " in - *" $path "*) ;; -- *) deplibs="$deplibs $path" ;; -+ *) deplibs="$path $deplibs" ;; -+ esac -+ case " $deplibs " in -+ *" $depdepl "*) ;; -+ *) deplibs="$depdepl $deplibs" ;; - esac - done - fi # link_all_deplibs != no -@@ -2689,7 +3100,8 @@ EOF - eval $var=\"$tmp_libs\" - done # for var - fi -- # Last step: remove runtime libs from dependency_libs (they stay in deplibs) -+ # 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 -@@ -2710,9 +3122,10 @@ EOF - - case $linkmode in - oldlib) -- if test -n "$deplibs"; then -- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 -- fi -+ case " $deplibs" in -+ *\ -l* | *\ -L*) -+ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; -+ esac - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 -@@ -2749,19 +3162,19 @@ EOF - case $outputname in - lib*) - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` -- eval shared_ext=\"$shrext\" -+ eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - ;; - *) - if test "$module" = no; then - $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - 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 shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - else - libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` -@@ -2772,7 +3185,7 @@ EOF - 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 -+ exit $EXIT_FAILURE - else - $echo - $echo "*** Warning: Linking the shared library $output against the non-libtool" -@@ -2820,13 +3233,13 @@ EOF - if test -n "$8"; then - $echo "$modename: too many parameters to \`-version-info'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # 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" -@@ -2840,7 +3253,7 @@ EOF - # which has an extra 1 added just for fun - # - case $version_type in -- darwin|linux|osf|windows) -+ darwin|linux|osf|windows|none) - current=`expr $number_major + $number_minor` - age="$number_minor" - revision="$number_revision" -@@ -2851,9 +3264,10 @@ EOF - age="0" - ;; - irix|nonstopux) -- current=`expr $number_major + $number_minor - 1` -+ current=`expr $number_major + $number_minor` - age="$number_minor" - revision="$number_minor" -+ lt_irix_increment=no - ;; - esac - ;; -@@ -2866,36 +3280,36 @@ 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]) ;; -+ 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]) ;; - *) -- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 -+ $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - - case $revision in -- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; -+ 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]) ;; - *) -- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 -+ $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - - case $age in -- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; -+ 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]) ;; - *) -- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 -+ $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - - 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 -+ exit $EXIT_FAILURE - fi - - # Calculate the version variables. -@@ -2912,6 +3326,7 @@ EOF - versuffix="$major.$age.$revision" - # Darwin ld doesn't like 0 for these options... - minor_current=`expr $current + 1` -+ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" - ;; - -@@ -2926,8 +3341,11 @@ EOF - ;; - - irix | nonstopux) -- major=`expr $current - $age + 1` -- -+ if test "X$lt_irix_increment" = "Xno"; then -+ major=`expr $current - $age` -+ else -+ major=`expr $current - $age + 1` -+ fi - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; - *) verstring_prefix=sgi ;; -@@ -2984,7 +3402,7 @@ EOF - *) - $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 -+ exit $EXIT_FAILURE - ;; - esac - -@@ -3038,6 +3456,12 @@ EOF - *.$objext) - ;; - $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" - ;; - *) ;; -@@ -3058,11 +3482,11 @@ EOF - fi - - # 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 -+ #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 - - if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. -@@ -3112,9 +3536,14 @@ EOF - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. -- test "X$arg" = "X-lc" && continue -+ ;; -+ *-*-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. -@@ -3158,13 +3587,12 @@ EOF - int main() { return 0; } - EOF - $rm conftest -- $LTCC -o conftest conftest.c $deplibs -- if test "$?" -eq 0 ; then -+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then - ldd_output=`ldd conftest` - for i in $deplibs; do -- name="`expr $i : '-l\(.*\)'`" -+ 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 "$name" != "" && test "$name" != "0"; then - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -@@ -3199,13 +3627,11 @@ EOF - # 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\(.*\)'`" -+ 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 -+ 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 -@@ -3237,7 +3663,7 @@ EOF - 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 "*** 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 -@@ -3251,7 +3677,7 @@ EOF - set dummy $deplibs_check_method - file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - for a_deplib in $deplibs; do -- name="`expr $a_deplib : '-l\(.*\)'`" -+ 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 -@@ -3320,7 +3746,7 @@ EOF - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - for a_deplib in $deplibs; do -- name="`expr $a_deplib : '-l\(.*\)'`" -+ 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 -@@ -3450,6 +3876,35 @@ EOF - deplibs=$newdeplibs - fi - -+ -+ # 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" -+ -+ - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= -@@ -3494,7 +3949,10 @@ EOF - 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\" -+ case $archive_cmds in -+ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;; -+ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;; -+ esac - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi -@@ -3517,7 +3975,7 @@ EOF - fi - - # Get the real and link names of the library. -- eval shared_ext=\"$shrext\" -+ eval shared_ext=\"$shrext_cmds\" - eval library_names=\"$library_names_spec\" - set dummy $library_names - realname="$2" -@@ -3533,6 +3991,7 @@ EOF - fi - - lib="$output_objdir/$realname" -+ linknames= - for link - do - linknames="$linknames $link" -@@ -3547,10 +4006,11 @@ EOF - $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $run $rm $export_symbols -- eval cmds=\"$export_symbols_cmds\" -+ cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - if len=`expr "X$cmd" : ".*"` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - $show "$cmd" -@@ -3560,6 +4020,9 @@ EOF - # The command line is too long to execute in one step. - $show "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" -@@ -3580,12 +4043,12 @@ EOF - for test_deplib in $deplibs; do - case " $convenience " in - *" $test_deplib "*) ;; -- *) -+ *) - tmp_deplibs="$tmp_deplibs $test_deplib" - ;; - esac - done -- deplibs="$tmp_deplibs" -+ deplibs="$tmp_deplibs" - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then -@@ -3593,67 +4056,13 @@ EOF - 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" - -- 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" -- -- $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 -- -- libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -- done -+ func_extract_archives $gentop $convenience -+ libobjs="$libobjs $func_extract_archives_result" - 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" -@@ -3667,19 +4076,24 @@ EOF - # 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\" -+ eval test_cmds=\"$module_expsym_cmds\" -+ cmds=$module_expsym_cmds - else -- eval cmds=\"$module_cmds\" -+ eval test_cmds=\"$module_cmds\" -+ cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -- eval cmds=\"$archive_expsym_cmds\" -+ eval test_cmds=\"$archive_expsym_cmds\" -+ cmds=$archive_expsym_cmds - else -- eval cmds=\"$archive_cmds\" -+ eval test_cmds=\"$archive_cmds\" -+ cmds=$archive_cmds - fi - fi - -- if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` && -+ if test "X$skipped_export" != "X:" && -+ len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : - else -@@ -3698,6 +4112,7 @@ EOF - save_libobjs=$libobjs - fi - save_output=$output -+ output_la=`$echo "X$output" | $Xsed -e "$basename"` - - # Clear the reloadable object creation command queue and - # initialize k to one. -@@ -3707,13 +4122,13 @@ EOF - delfiles= - last_robj= - k=1 -- output=$output_objdir/$save_output-${k}.$objext -+ output=$output_objdir/$output_la-${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" : ".*"` && -+ { len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len"; }; then - objlist="$objlist $obj" - else -@@ -3727,9 +4142,9 @@ EOF - # the last one created. - eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" - fi -- last_robj=$output_objdir/$save_output-${k}.$objext -+ last_robj=$output_objdir/$output_la-${k}.$objext - k=`expr $k + 1` -- output=$output_objdir/$save_output-${k}.$objext -+ output=$output_objdir/$output_la-${k}.$objext - objlist=$obj - len=1 - fi -@@ -3749,13 +4164,13 @@ EOF - eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" - fi - -- # Set up a command to remove the reloadale object files -+ # Set up a command to remove the reloadable 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" -+ delfiles="$delfiles $output_objdir/$output_la-${i}.$objext" - done - - $echo "creating a temporary reloadable object file: $output" -@@ -3780,28 +4195,54 @@ EOF - # 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 -- eval cmds=\"$archive_expsym_cmds\" -+ cmds=$archive_expsym_cmds - else -- eval cmds=\"$archive_cmds\" -+ cmds=$archive_cmds -+ fi - fi - - # Append the command to remove the reloadable object files - # to the just-reset $cmds. -- eval cmds=\"\$cmds~$rm $delfiles\" -+ eval cmds=\"\$cmds~\$rm $delfiles\" - fi - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" -- $run eval "$cmd" || exit $? -+ $run eval "$cmd" || { -+ lt_exit=$? -+ -+ # Restore the uninstalled library and exit -+ if test "$mode" = relink; then -+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' -+ fi -+ -+ exit $lt_exit -+ } - done - IFS="$save_ifs" - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? -- exit 0 -+ -+ if test -n "$convenience"; then -+ if test -z "$whole_archive_flag_spec"; then -+ $show "${rm}r $gentop" -+ $run ${rm}r "$gentop" -+ fi -+ fi -+ -+ exit $EXIT_SUCCESS - fi - - # Create links to the real library. -@@ -3821,9 +4262,10 @@ EOF - ;; - - obj) -- if test -n "$deplibs"; then -- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 -- fi -+ case " $deplibs" in -+ *\ -l* | *\ -L*) -+ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; -+ esac - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 -@@ -3849,7 +4291,7 @@ EOF - *.lo) - if test -n "$objs$old_deplibs"; then - $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - libobj="$output" - obj=`$echo "X$output" | $Xsed -e "$lo2o"` -@@ -3870,72 +4312,20 @@ EOF - reload_conv_objs= - gentop= - # reload_cmds runs $LD directly, so let us get rid of -- # -Wl from whole_archive_flag_spec -+ # -Wl from whole_archive_flag_spec and hope we can get by with -+ # turning comma into space.. - wl= - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then -- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" -+ 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" -- $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" - -- 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" -- -- $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 -- -- reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -- done -+ func_extract_archives $gentop $convenience -+ reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - -@@ -3943,10 +4333,11 @@ EOF - 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 - - output="$obj" -- eval cmds=\"$reload_cmds\" -+ cmds=$reload_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done -@@ -3959,7 +4350,7 @@ EOF - $run ${rm}r $gentop - fi - -- exit 0 -+ exit $EXIT_SUCCESS - fi - - if test "$build_libtool_libs" != yes; then -@@ -3972,17 +4363,18 @@ EOF - # accidentally link it into a program. - # $show "echo timestamp > $libobj" - # $run eval "echo timestamp > $libobj" || exit $? -- exit 0 -+ 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" -- eval cmds=\"$reload_cmds\" -+ cmds=$reload_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done -@@ -3994,7 +4386,7 @@ EOF - $run ${rm}r $gentop - fi - -- exit 0 -+ exit $EXIT_SUCCESS - ;; - - prog) -@@ -4034,6 +4426,35 @@ EOF - ;; - esac - -+ -+ # move library search paths that coincide with paths to not yet -+ # installed libraries to the beginning of the library search list -+ new_libs= -+ for path in $notinst_path; do -+ case " $new_libs " in -+ *" -L$path/$objdir "*) ;; -+ *) -+ case " $compile_deplibs " in -+ *" -L$path/$objdir "*) -+ new_libs="$new_libs -L$path/$objdir" ;; -+ esac -+ ;; -+ esac -+ done -+ for deplib in $compile_deplibs; do -+ case $deplib in -+ -L*) -+ case " $new_libs " in -+ *" $deplib "*) ;; -+ *) new_libs="$new_libs $deplib" ;; -+ esac -+ ;; -+ *) new_libs="$new_libs $deplib" ;; -+ esac -+ done -+ compile_deplibs="$new_libs" -+ -+ - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" - -@@ -4078,10 +4499,15 @@ EOF - fi - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -+ testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$libdir:"*) ;; - *) dllsearchpath="$dllsearchpath:$libdir";; - esac -+ case :$dllsearchpath: in -+ *":$testbindir:"*) ;; -+ *) dllsearchpath="$dllsearchpath:$testbindir";; -+ esac - ;; - esac - done -@@ -4195,13 +4621,25 @@ extern \"C\" { - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then -- export_symbols="$output_objdir/$output.exp" -+ export_symbols="$output_objdir/$outputname.exp" - $run $rm $export_symbols -- $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' -+ $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' -+ case $host in -+ *cygwin* | *mingw* ) -+ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' -+ ;; -+ esac - 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 "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' -+ $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - $run eval 'mv "$nlist"T "$nlist"' -+ case $host in -+ *cygwin* | *mingw* ) -+ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' -+ ;; -+ esac - fi - fi - -@@ -4252,7 +4690,26 @@ extern \"C\" { - #endif - - /* The mapping between symbol names and symbols. */ -+" -+ -+ case $host in -+ *cygwin* | *mingw* ) -+ $echo >> "$output_objdir/$dlsyms" "\ -+/* DATA imports from DLLs on WIN32 can't be const, because -+ runtime relocations are performed -- see ld's documentation -+ on pseudo-relocs */ -+struct { -+" -+ ;; -+ * ) -+ $echo >> "$output_objdir/$dlsyms" "\ - const struct { -+" -+ ;; -+ esac -+ -+ -+ $echo >> "$output_objdir/$dlsyms" "\ - const char *name; - lt_ptr address; - } -@@ -4299,20 +4756,33 @@ static const void *lt_preloaded_setup() - 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 $? -+ $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" -+ $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -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}%"` -+ case $host in -+ *cygwin* | *mingw* ) -+ if test -f "$output_objdir/${outputname}.def" ; then -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` -+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` -+ else -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` -+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` -+ fi -+ ;; -+ * ) -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` -+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` -+ ;; -+ esac - ;; - *) - $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - else -@@ -4321,19 +4791,19 @@ static const void *lt_preloaded_setup() - # 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@%%"` -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` -+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` - 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'` -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. - $show "$link_command" - $run eval "$link_command" -- status=$? -+ exit_status=$? - - # Delete the generated files. - if test -n "$dlsyms"; then -@@ -4341,7 +4811,7 @@ static const void *lt_preloaded_setup() - $run $rm "$output_objdir/${outputname}S.${objext}" - fi - -- exit $status -+ exit $exit_status - fi - - if test -n "$shlibpath_var"; then -@@ -4400,7 +4870,7 @@ static const void *lt_preloaded_setup() - # Link the executable and exit - $show "$link_command" - $run eval "$link_command" || exit $? -- exit 0 -+ exit $EXIT_SUCCESS - fi - - if test "$hardcode_action" = relink; then -@@ -4414,7 +4884,7 @@ static const void *lt_preloaded_setup() - 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'` -+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP` - else - # fast_install is set to needless - relink_command= -@@ -4451,14 +4921,14 @@ static const void *lt_preloaded_setup() - fi - done - relink_command="(cd `pwd`; $relink_command)" -- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` -+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` - fi - - # 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";; -+ 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 - qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` - else -@@ -4481,10 +4951,12 @@ static const void *lt_preloaded_setup() - 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 -+ output_name=`basename $output` -+ output_path=`dirname $output` -+ 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 - - cat > $cwrappersource <<EOF - -@@ -4493,7 +4965,7 @@ static const void *lt_preloaded_setup() - - 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. - -@@ -4509,6 +4981,9 @@ EOF - #include <malloc.h> - #include <stdarg.h> - #include <assert.h> -+#include <string.h> -+#include <ctype.h> -+#include <sys/stat.h> - - #if defined(PATH_MAX) - # define LT_PATHMAX PATH_MAX -@@ -4519,15 +4994,19 @@ EOF - #endif - - #ifndef DIR_SEPARATOR --#define DIR_SEPARATOR '/' -+# define DIR_SEPARATOR '/' -+# define PATH_SEPARATOR ':' - #endif - - #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) --#define HAVE_DOS_BASED_FILE_SYSTEM --#ifndef DIR_SEPARATOR_2 --#define DIR_SEPARATOR_2 '\\' --#endif -+# define HAVE_DOS_BASED_FILE_SYSTEM -+# ifndef DIR_SEPARATOR_2 -+# define DIR_SEPARATOR_2 '\\' -+# endif -+# ifndef PATH_SEPARATOR_2 -+# define PATH_SEPARATOR_2 ';' -+# endif - #endif - - #ifndef DIR_SEPARATOR_2 -@@ -4537,17 +5016,32 @@ EOF - (((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 */ -+ - #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) - #define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ - } while (0) - -+/* -DDEBUG is fairly common in CFLAGS. */ -+#undef DEBUG -+#if defined DEBUGWRAPPER -+# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) -+#else -+# define DEBUG(format, ...) -+#endif -+ - const char *program_name = NULL; - - void * xmalloc (size_t num); - char * xstrdup (const char *string); --char * basename (const char *name); --char * fnqualify(const char *path); -+const char * base_name (const char *name); -+char * find_executable(const char *wrapper); -+int check_executable(const char *path); - char * strendzap(char *str, const char *pat); - void lt_fatal (const char *message, ...); - -@@ -4556,30 +5050,52 @@ main (int argc, char *argv[]) - { - char **newargz; - int i; -- -- program_name = (char *) xstrdup ((char *) basename (argv[0])); -+ -+ program_name = (char *) xstrdup (base_name (argv[0])); -+ DEBUG("(main) argv[0] : %s\n",argv[0]); -+ DEBUG("(main) program_name : %s\n",program_name); - newargz = XMALLOC(char *, argc+2); - EOF - -- cat >> $cwrappersource <<EOF -- newargz[0] = "$SHELL"; -+ cat >> $cwrappersource <<EOF -+ newargz[0] = (char *) xstrdup("$SHELL"); - EOF - -- cat >> $cwrappersource <<"EOF" -- newargz[1] = fnqualify(argv[0]); -+ cat >> $cwrappersource <<"EOF" -+ newargz[1] = find_executable(argv[0]); -+ if (newargz[1] == NULL) -+ lt_fatal("Couldn't find %s", argv[0]); -+ DEBUG("(main) found exe at : %s\n",newargz[1]); - /* 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"); -+ strendzap(newargz[1],".exe"); - for (i = 1; i < argc; i++) - newargz[i+1] = xstrdup(argv[i]); - newargz[argc+1] = NULL; -+ -+ for (i=0; i<argc+1; i++) -+ { -+ DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]); -+ ; -+ } -+ - EOF - -- cat >> $cwrappersource <<EOF -+ case $host_os in -+ mingw*) -+ cat >> $cwrappersource <<EOF -+ execv("$SHELL",(char const **)newargz); -+EOF -+ ;; -+ *) -+ cat >> $cwrappersource <<EOF - execv("$SHELL",newargz); - EOF -+ ;; -+ esac - -- cat >> $cwrappersource <<"EOF" -+ cat >> $cwrappersource <<"EOF" -+ return 127; - } - - void * -@@ -4592,59 +5108,159 @@ xmalloc (size_t num) - return p; - } - --char * -+char * - xstrdup (const char *string) - { - return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL - ; - } - --char * --basename (const char *name) -+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 (name[0]) && name[1] == ':') -+ 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 (char *) base; -+ return base; -+} -+ -+int -+check_executable(const char * path) -+{ -+ struct stat st; -+ -+ DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); -+ if ((!path) || (!*path)) -+ return 0; -+ -+ if ((stat (path, &st) >= 0) && -+ ( -+ /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ -+#if defined (S_IXOTH) -+ ((st.st_mode & S_IXOTH) == S_IXOTH) || -+#endif -+#if defined (S_IXGRP) -+ ((st.st_mode & S_IXGRP) == S_IXGRP) || -+#endif -+ ((st.st_mode & S_IXUSR) == S_IXUSR)) -+ ) -+ return 1; -+ else -+ return 0; - } - --char * --fnqualify(const char *path) -+/* Searches for the full path of the wrapper. Returns -+ newly allocated full path name if found, NULL otherwise */ -+char * -+find_executable (const char* wrapper) - { -- size_t size; -- char *p; -+ 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; -+ -+ DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); - -- assert(path != NULL); -+ if ((wrapper == NULL) || (*wrapper == '\0')) -+ return NULL; - -- /* Is it qualified already? */ -+ /* 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) -- if (isalpha (path[0]) && path[1] == ':') -- return xstrdup (path); -+ } - #endif -- if (IS_DIR_SEPARATOR (path[0])) -- return xstrdup (path); - -- /* prepend the current directory */ -- /* doesn't handle '~' */ -+ 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 -+ { -+ 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"); -- 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; -+ 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 * --strendzap(char *str, const char *pat) -+strendzap(char *str, const char *pat) - { - size_t len, patlen; - -@@ -4664,7 +5280,7 @@ strendzap(char *str, const char *pat) - } - - static void --lt_error_core (int exit_status, const char * mode, -+lt_error_core (int exit_status, const char * mode, - const char * message, va_list ap) - { - fprintf (stderr, "%s: %s: ", program_name, mode); -@@ -4684,16 +5300,16 @@ lt_fatal (const char *message, ...) - va_end (ap); - } - 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 -- ;; -- esac -- $rm $output -- trap "$rm $output; exit 1" 1 2 15 -+ # 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 $LTCFLAGS -s -o $cwrapper $cwrappersource -+ ;; -+ esac -+ $rm $output -+ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 - - $echo > $output "\ - #! $SHELL -@@ -4712,9 +5328,23 @@ EOF - Xsed='${SED} -e 1s/^X//' - sed_quote_subst='$sed_quote_subst' - -+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '\${1+\"\$@\"}'='\"\$@\"' -+ setopt NO_GLOB_SUBST -+else -+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac -+fi -+BIN_SH=xpg4; export BIN_SH # for Tru64 -+DUALCASE=1; export DUALCASE # for MKS sh -+ - # The HP-UX ksh and POSIX shell print the target directory to stdout - # if CDPATH is set. --if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - relink_command=\"$relink_command\" - -@@ -4793,7 +5423,7 @@ else - else - $echo \"\$relink_command_output\" >&2 - $rm \"\$progdir/\$file\" -- exit 1 -+ exit $EXIT_FAILURE - fi - fi - -@@ -4843,32 +5473,32 @@ else - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2*) - $echo >> $output "\ -- exec \$progdir\\\\\$program \${1+\"\$@\"} -+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} - " - ;; - - *) - $echo >> $output "\ -- exec \$progdir/\$program \${1+\"\$@\"} -+ exec \"\$progdir/\$program\" \${1+\"\$@\"} - " - ;; - esac - $echo >> $output "\ -- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" -- exit 1 -+ \$echo \"\$0: cannot exec \$program \$*\" -+ exit $EXIT_FAILURE - fi - else - # The program doesn't exist. -- \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 -+ \$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 -+ exit $EXIT_FAILURE - fi - fi\ - " - chmod +x $output - fi -- exit 0 -+ exit $EXIT_SUCCESS - ;; - esac - -@@ -4891,76 +5521,78 @@ 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 -- 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" ;; -- 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 -- : -- 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 -- -- oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` -- done -+ func_extract_archives $gentop $addlibs -+ oldobjs="$oldobjs $func_extract_archives_result" - fi - - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then -- eval cmds=\"$old_archive_from_new_cmds\" -+ cmds=$old_archive_from_new_cmds - else -+ # 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 -+ $echo "X$obj" | $Xsed -e 's%^.*/%%' -+ done | sort | sort -uc >/dev/null 2>&1); then -+ : -+ else -+ $echo "copying selected object files to avoid basename conflicts..." -+ -+ if test -z "$gentop"; then -+ gentop="$output_objdir/${outputname}x" -+ generated="$generated $gentop" -+ -+ $show "${rm}r $gentop" -+ $run ${rm}r "$gentop" -+ $show "$mkdir $gentop" -+ $run $mkdir "$gentop" -+ exit_status=$? -+ if test "$exit_status" -ne 0 && test ! -d "$gentop"; then -+ exit $exit_status -+ fi -+ fi -+ -+ save_oldobjs=$oldobjs -+ oldobjs= -+ counter=1 -+ for obj in $save_oldobjs -+ do -+ objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` -+ case " $oldobjs " in -+ " ") oldobjs=$obj ;; -+ *[\ /]"$objbase "*) -+ while :; do -+ # Make sure we don't pick an alternate name that also -+ # overlaps. -+ newobj=lt$counter-$objbase -+ counter=`expr $counter + 1` -+ case " $oldobjs " in -+ *[\ /]"$newobj "*) ;; -+ *) if test ! -f "$gentop/$newobj"; then break; fi ;; -+ esac -+ done -+ $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" -+ $run ln "$obj" "$gentop/$newobj" || -+ $run cp "$obj" "$gentop/$newobj" -+ oldobjs="$oldobjs $gentop/$newobj" -+ ;; -+ *) oldobjs="$oldobjs $obj" ;; -+ esac -+ done -+ fi -+ - eval cmds=\"$old_archive_cmds\" - - if len=`expr "X$cmds" : ".*"` && - test "$len" -le "$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 - $echo "using piecewise archive linking..." -@@ -4969,31 +5601,18 @@ fi\ - 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 -- : -- 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 -- fi -+ - # Is there a better way of finding the last object in the list? - for obj in $save_oldobjs - do - last_oldobj=$obj -- done -+ 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" : ".*"` && -+ if len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len"; then - : - else -@@ -5001,7 +5620,7 @@ fi\ - oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then - RANLIB=$save_RANLIB -- fi -+ fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= -@@ -5012,12 +5631,13 @@ fi\ - if test "X$oldobjs" = "X" ; then - eval cmds=\"\$concat_cmds\" - else -- eval cmds=\"\$concat_cmds~$old_archive_cmds\" -+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" - fi - fi - fi - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do -+ eval cmd=\"$cmd\" - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? -@@ -5049,8 +5669,12 @@ fi\ - 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"` -+ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" -+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` -+ if test "$hardcode_automatic" = yes ; then -+ relink_command= -+ fi -+ - - # Only create the output if not a dry run. - if test -z "$run"; then -@@ -5069,7 +5693,7 @@ fi\ - 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 -+ exit $EXIT_FAILURE - fi - newdependency_libs="$newdependency_libs $libdir/$name" - ;; -@@ -5083,7 +5707,7 @@ fi\ - 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 -+ exit $EXIT_FAILURE - fi - newdlfiles="$newdlfiles $libdir/$name" - done -@@ -5094,11 +5718,30 @@ fi\ - 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 -+ exit $EXIT_FAILURE - fi - newdlprefiles="$newdlprefiles $libdir/$name" - 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 -@@ -5155,7 +5798,7 @@ relink_command=\"$relink_command\"" - $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? - ;; - esac -- exit 0 -+ exit $EXIT_SUCCESS - ;; - - # libtool install mode -@@ -5166,11 +5809,11 @@ relink_command=\"$relink_command\"" - # 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 -+ $echo "X$nonopt" | grep shtool > /dev/null; then - # Aesthetically quote it. - arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` - case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac -@@ -5179,14 +5822,14 @@ relink_command=\"$relink_command\"" - shift - else - install_prog= -- arg="$nonopt" -+ 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 -@@ -5204,28 +5847,31 @@ relink_command=\"$relink_command\"" - do - if test -n "$dest"; then - files="$files $dest" -- dest="$arg" -+ dest=$arg - continue - fi - - case $arg in - -d) isdir=yes ;; -- -f) prev="-f" ;; -- -g) prev="-g" ;; -- -m) prev="-m" ;; -- -o) prev="-o" ;; -+ -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" -+ dest=$arg - continue - fi - ;; -@@ -5234,7 +5880,7 @@ relink_command=\"$relink_command\"" - # Aesthetically quote the argument. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac -@@ -5244,13 +5890,13 @@ relink_command=\"$relink_command\"" - if test -z "$install_prog"; then - $echo "$modename: you must specify an install program" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - if test -n "$prev"; then - $echo "$modename: the \`$prev' option requires an argument" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - if test -z "$files"; then -@@ -5260,7 +5906,7 @@ relink_command=\"$relink_command\"" - $echo "$modename: you must specify a destination" 1>&2 - fi - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Strip any trailing slash from the destination. -@@ -5281,7 +5927,7 @@ relink_command=\"$relink_command\"" - if test "$#" -gt 2; then - $echo "$modename: \`$dest' is not a directory" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - fi - case $destdir in -@@ -5293,7 +5939,7 @@ relink_command=\"$relink_command\"" - *) - $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - done -@@ -5322,7 +5968,7 @@ relink_command=\"$relink_command\"" - else - $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - library_names= -@@ -5364,14 +6010,14 @@ relink_command=\"$relink_command\"" - # 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 -+ exit $EXIT_FAILURE - 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%"` -+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` - else -- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"` -+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` - fi - - $echo "$modename: warning: relinking \`$file'" 1>&2 -@@ -5379,7 +6025,7 @@ relink_command=\"$relink_command\"" - if $run eval "$relink_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - fi - -@@ -5403,23 +6049,36 @@ relink_command=\"$relink_command\"" - - 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 - if test "$linkname" != "$realname"; then -- $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" -- $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" -+ $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" -+ $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" - fi - done - fi - - # Do each command in the postinstall commands. - lib="$destdir/$realname" -- eval cmds=\"$postinstall_cmds\" -+ cmds=$postinstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" -- $run eval "$cmd" || exit $? -+ $run eval "$cmd" || { -+ lt_exit=$? -+ -+ # Restore the uninstalled library and exit -+ if test "$mode" = relink; then -+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' -+ fi -+ -+ exit $lt_exit -+ } - done - IFS="$save_ifs" - fi -@@ -5457,7 +6116,7 @@ relink_command=\"$relink_command\"" - *) - $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - -@@ -5475,7 +6134,7 @@ relink_command=\"$relink_command\"" - $show "$install_prog $staticobj $staticdest" - $run eval "$install_prog \$staticobj \$staticdest" || exit $? - fi -- exit 0 -+ exit $EXIT_SUCCESS - ;; - - *) -@@ -5513,23 +6172,21 @@ relink_command=\"$relink_command\"" - notinst_deplibs= - 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 -+ # Note that it is not necessary on cygwin/mingw to append a dot to -+ # foo even if both foo 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. -+ # - # If there is no directory component, then add one. -- case $file in -- */* | *\\*) . ${wrapperdot} ;; -- *) . ./${wrapperdot} ;; -+ case $wrapper in -+ */* | *\\*) . ${wrapper} ;; -+ *) . ./${wrapper} ;; - esac - - # 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 -+ exit $EXIT_FAILURE - fi - - finalize=yes -@@ -5551,34 +6208,25 @@ relink_command=\"$relink_command\"" - done - - 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 -+ # Note that it is not necessary on cygwin/mingw to append a dot to -+ # foo even if both foo 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. -+ # - # If there is no directory component, then add one. -- case $file in -- */* | *\\*) . ${wrapperdot} ;; -- *) . ./${wrapperdot} ;; -+ case $wrapper in -+ */* | *\\*) . ${wrapper} ;; -+ *) . ./${wrapper} ;; - esac - - 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 -+ tmpdir=`func_mktempdir` - 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'` -+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP` - - $show "$relink_command" - if $run eval "$relink_command"; then : -@@ -5598,7 +6246,7 @@ relink_command=\"$relink_command\"" - fi - - # remove .exe since cygwin /usr/bin/install will append another -- # one anyways -+ # one anyway - case $install_prog,$host in - */usr/bin/install*,*cygwin*) - case $file:$destfile in -@@ -5630,16 +6278,17 @@ relink_command=\"$relink_command\"" - $show "$install_prog $file $oldlib" - $run eval "$install_prog \$file \$oldlib" || exit $? - -- if test -n "$stripme" && test -n "$striplib"; then -+ if test -n "$stripme" && test -n "$old_striplib"; then - $show "$old_striplib $oldlib" - $run eval "$old_striplib $oldlib" || exit $? - fi - - # Do each command in the postinstall commands. -- eval cmds=\"$old_postinstall_cmds\" -+ cmds=$old_postinstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done -@@ -5653,9 +6302,9 @@ relink_command=\"$relink_command\"" - 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' -+ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' - else -- exit 0 -+ exit $EXIT_SUCCESS - fi - ;; - -@@ -5674,10 +6323,11 @@ relink_command=\"$relink_command\"" - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. -- eval cmds=\"$finish_cmds\" -+ cmds=$finish_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || admincmds="$admincmds - $cmd" -@@ -5694,9 +6344,9 @@ relink_command=\"$relink_command\"" - fi - - # Exit here if they wanted silent mode. -- test "$show" = : && exit 0 -+ test "$show" = : && exit $EXIT_SUCCESS - -- $echo "----------------------------------------------------------------------" -+ $echo "X----------------------------------------------------------------------" | $Xsed - $echo "Libraries have been installed in:" - for libdir in $libdirs; do - $echo " $libdir" -@@ -5729,8 +6379,8 @@ relink_command=\"$relink_command\"" - $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 -+ $echo "X----------------------------------------------------------------------" | $Xsed -+ exit $EXIT_SUCCESS - ;; - - # libtool execute mode -@@ -5742,7 +6392,7 @@ relink_command=\"$relink_command\"" - if test -z "$cmd"; then - $echo "$modename: you must specify a COMMAND" 1>&2 - $echo "$help" -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Handle -dlopen flags immediately. -@@ -5750,7 +6400,7 @@ relink_command=\"$relink_command\"" - if test ! -f "$file"; then - $echo "$modename: \`$file' is not a file" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - dir= -@@ -5761,7 +6411,7 @@ relink_command=\"$relink_command\"" - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Read the libtool library. -@@ -5787,8 +6437,10 @@ relink_command=\"$relink_command\"" - 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 -+ if test ! -f "$dir/$dlname"; then -+ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 -+ exit $EXIT_FAILURE -+ fi - fi - ;; - -@@ -5852,12 +6504,12 @@ relink_command=\"$relink_command\"" - fi - - # 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 -+ 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 -+ fi" -+ done - - # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" -@@ -5868,7 +6520,7 @@ relink_command=\"$relink_command\"" - $echo "export $shlibpath_var" - fi - $echo "$cmd$args" -- exit 0 -+ exit $EXIT_SUCCESS - fi - ;; - -@@ -5896,7 +6548,7 @@ relink_command=\"$relink_command\"" - if test -z "$rm"; then - $echo "$modename: you must specify an RM program" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - rmdirs= -@@ -5946,15 +6598,24 @@ relink_command=\"$relink_command\"" - 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\" -+ cmds=$postuninstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" - if test "$?" -ne 0 && test "$rmforce" != yes; then -@@ -5966,10 +6627,11 @@ relink_command=\"$relink_command\"" - - if test -n "$old_library"; then - # Do each command in the old_postuninstall commands. -- eval cmds=\"$old_postuninstall_cmds\" -+ cmds=$old_postuninstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" - if test "$?" -ne 0 && test "$rmforce" != yes; then -@@ -5979,7 +6641,8 @@ relink_command=\"$relink_command\"" - IFS="$save_ifs" - fi - # FIXME: should reinstall the best remaining shared library. -- fi -+ ;; -+ esac - fi - ;; - -@@ -6008,7 +6671,7 @@ relink_command=\"$relink_command\"" - if test "$mode" = clean ; then - noexename=$name - case $file in -- *.exe) -+ *.exe) - file=`$echo $file|${SED} 's,.exe$,,'` - noexename=`$echo $name|${SED} 's,.exe$,,'` - # $file with .exe has already been added to rmfiles, -@@ -6053,20 +6716,20 @@ relink_command=\"$relink_command\"" - "") - $echo "$modename: you must specify a MODE" 1>&2 - $echo "$generic_help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - - if test -z "$exec_cmd"; then - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$generic_help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - fi # test -z "$show_help" - - if test -n "$exec_cmd"; then - eval exec $exec_cmd -- exit 1 -+ exit $EXIT_FAILURE - fi - - # We need to display help for each of the modes. -@@ -6102,7 +6765,7 @@ MODE-ARGS vary depending on the MODE. T - a more detailed description of MODE. - - Report bugs to <bug-libtool@gnu.org>." -- exit 0 -+ exit $EXIT_SUCCESS - ;; - - clean) -@@ -6203,9 +6866,9 @@ The following components of LINK-COMMAND - -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 -+ try to export only the symbols listed in SYMFILE - -export-symbols-regex REGEX -- try to export only the symbols matching 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 -@@ -6214,12 +6877,16 @@ The following components of LINK-COMMAND - -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 -- -static do not do any dynamic linking of libtool libraries -+ -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] -+ specify library version info [each variable defaults to 0] - - All other options (arguments beginning with \`-') are ignored. - -@@ -6255,14 +6922,14 @@ Otherwise, only FILE itself is deleted u - *) - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - - $echo - $echo "Try \`$modename --help' for more information about other modes." - --exit 0 -+exit $? - - # The TAGs below are defined such that we never get into a situation - # in which we disable both kinds of libraries. Given conflicting -@@ -6276,12 +6943,11 @@ exit 0 - # configuration. But we'll never go from static-only to shared-only. - - # ### BEGIN LIBTOOL TAG CONFIG: disable-shared --build_libtool_libs=no --build_old_libs=yes -+disable_libs=shared - # ### 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` -+disable_libs=static - # ### END LIBTOOL TAG CONFIG: disable-static - - # Local Variables: diff --git a/inputmethod/ja-freewnn-lib/patches/patch-makerule.mk.in b/inputmethod/ja-freewnn-lib/patches/patch-makerule.mk.in index 6f3cddd2e35..301a141e5c9 100644 --- a/inputmethod/ja-freewnn-lib/patches/patch-makerule.mk.in +++ b/inputmethod/ja-freewnn-lib/patches/patch-makerule.mk.in @@ -1,169 +1,26 @@ -$NetBSD: patch-makerule.mk.in,v 1.1 2011/09/13 07:23:21 mef Exp $ +$NetBSD: patch-makerule.mk.in,v 1.2 2013/10/15 06:25:38 mef Exp $ -(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31 + lib/wnn -> share/wnn fix for datadir ---- makerule.mk.in.orig 2003-05-11 18:22:57.000000000 +0000 -+++ makerule.mk.in -@@ -10,9 +10,9 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001, 2003 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2003, 2006, 2007, 2010, 2011 - # --# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp> -+# Maintainer: FreeWnn Project - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -31,7 +31,10 @@ - - all:: - -- SHELL = /bin/sh -+ SHELL = @SHELL@ -+# To developers: Please use common syntax / function of Bourne Shell -+# (i.e. don't use extention of specific SHELL (bash, ksh, ...)) -+# on Makefile.in . - - TOP = $(top_builddir) - CURRENT_DIR = `pwd` -@@ -58,13 +61,20 @@ CPP = @CPP@ - CC = @CC@ - CCLINK = $(CC) - -+# Split fuzoku-go preprocessor (for text processing) from CPP. -+FZK_PP = @FZK_PP@ -+ - INSTALLFLAGS = - LD = ld - LINT = lint - LINTLIBFLAG = -C - LINTOPTS = -axz - LN = @LN_S@ -- MAKE = make -+# ¥³¥ó¥Ñ¥¤¥ë»þ¤Ë°ã¤¦make (ex. ¥·¥¹¥Æ¥à¤Îmake¤ÈGNU make)¤ò»È¤¨¤ë¤è¤¦¡¢ -+# ($MAKE¤¬ÄêµÁ¤µ¤ì¤ëmake¤Ê¤é¤Ð) $MAKE¤ÏÄêµÁ¤·¤Ê¤¤¡£ -+# If you like to use specific make, uncomment and modify following line ... -+# MAKE = make -+ @SET_MAKE@ - MV = mv -f - CP = cp - -@@ -72,6 +82,15 @@ CCLINK = $(CC) - RANLIBINSTFLAGS = - - LIBTOOL = @LIBTOOL@ -+# Notice: If you have trouble on building, please use following lines -+# (explicitly use preferred shell by configure / Libtool). -+# SHELL = /bin/sh -+# LIBTOOL = @LIBTOOL_MOD@ -+ -+# LT_* : shortcut for Makefile.in -+ LT_CC = $(LIBTOOL) --mode=compile $(CC) -+ LT_LD = $(LIBTOOL) --mode=link $(CCLINK) -+ LT_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) - - RM = rm -f - TBL = tbl -@@ -88,6 +107,9 @@ CCLINK = $(CC) - INSTINCFLAGS = -m 0444 - INSTMANFLAGS = -m 0444 - INSTDATFLAGS = -m 0444 -+ INSTUUMFLAGS = @INSTUUMFLAGS@ -+ -+ transform = @program_transform_name@ - - CCOPTIONS = @CCOPTIONS@ - ALLDEFINES = $(INCLUDES) $(DEFINES) -@@ -102,17 +124,31 @@ LDOPTIONS = @CDEBUGFLAGS@ $(CCOPTIONS) - # - - WNNOWNER = wnn -+ UUMOWNER = @UUMOWNER@ -+ UUMGROUP = @UUMGROUP@ - - IMTOP = $(TOP) - - prefix = @prefix@ +--- makerule.mk.in.orig 2011-06-01 22:33:11.000000000 +0900 ++++ makerule.mk.in 2011-06-01 22:33:57.000000000 +0900 +@@ -45,8 +45,8 @@ + # for libtool (AM_PROG_LIBTOOL) + # top_builddir = @abs_top_srcdir@ + +- MANDIR = @mandir@/man$(MANSUFFIX) +- LIBMANDIR = @mandir@/man$(LIBMANSUFFIX) ++ MANDIR = @mandir@/ja_JP.EUC/man$(MANSUFFIX) ++ LIBMANDIR = @mandir@/ja_JP.EUC/man$(LIBMANSUFFIX) + + MANSUFFIX = 1 + LIBMANSUFFIX = 3 +@@ -133,7 +133,7 @@ exec_prefix = @exec_prefix@ -- PREFIX = @prefix@ -- WNNWNNDIR = ${PREFIX}/lib/wnn -- WNNBINDIR = ${PREFIX}/bin -+ bindir = @bindir@ -+ sbindir = @sbindir@ -+ WNNWNNDIR = $(exec_prefix)/lib/wnn -+ WNNBINDIR = $(bindir) -+ WNNSBINDIR = @WNNSBINDIR@ + bindir = @bindir@ + sbindir = @sbindir@ +- WNNWNNDIR = $(exec_prefix)/lib/wnn ++ WNNWNNDIR = $(exec_prefix)/share/wnn + WNNBINDIR = $(bindir) + WNNSBINDIR = @WNNSBINDIR@ WNNINCDIR = @includedir@ - WNNLIBDIR = @libdir@ -- WNNTERM_LIB = -ltermcap -+ -+# sub directory for binaries: -+# if --enable-sub-bindir specified: -+@if_enable_sub_bindir@ JWNNSUBBINDIR = /Wnn4 -+@if_enable_sub_bindir@ CWNNSUBBINDIR = /cWnn4 -+@if_enable_sub_bindir@ KWNNSUBBINDIR = /kWnn4 -+# else: -+@if_disable_sub_bindir@ JWNNSUBBINDIR = -+@if_disable_sub_bindir@ CWNNSUBBINDIR = -+@if_disable_sub_bindir@ KWNNSUBBINDIR = -+# end if - - PUBDICPLUSSRC = $(IMTOP)/PubdicPlus - WNNCONSDICSRC = $(IMTOP)/Wnn-consortium/dic -@@ -120,7 +156,8 @@ LDOPTIONS = @CDEBUGFLAGS@ $(CCOPTIONS) - WNNTOP = $(IMTOP)/Wnn - JWNNLANG = ja_JP - JWNNWNNDIR = $(WNNWNNDIR)/$(JWNNLANG) -- JWNNBINDIR = $(WNNBINDIR)/Wnn4 -+ JWNNBINDIR = $(WNNBINDIR)$(JWNNSUBBINDIR) -+ JWNNSBINDIR = $(WNNSBINDIR)$(JWNNSUBBINDIR) - JWNNINCDIR = $(WNNINCDIR)/wnn - JWNNDICDIR = $(JWNNWNNDIR)/dic - JWNNPUBDICDIR = $(JWNNDICDIR)/pubdic -@@ -140,7 +177,7 @@ WNNWNNCONSSRC = $(WNNTOP)/wnncons - WNNWNNCONSDICSRC = $(WNNWNNCONSSRC)/dic - WNNROMKANSRC = $(WNNTOP)/romkan - WNNUUMSRC = $(WNNTOP)/uum -- WNNCNVFILEDIR = $(WNNJDSRC)/./bsd -+ WNNCNVFILEDIR = $(WNNJDSRC)/@CNVFILE_SUBDIR@ - WNNINCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANMSRC) - WNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\" - WNNJLIB = @WNNJLIB@ -@@ -151,7 +188,8 @@ WNNWNNCONSDICSRC = $(WNNWNNCONSSRC)/dic - CWNNLANG = zh_CN - CWNNWNNDIR = $(WNNWNNDIR)/$(CWNNLANG) - CWNNINCDIR = $(WNNINCDIR)/cwnn -- CWNNBINDIR = $(WNNBINDIR)/cWnn4 -+ CWNNBINDIR = $(WNNBINDIR)$(CWNNSUBBINDIR) -+ CWNNSBINDIR = $(WNNSBINDIR)$(CWNNSUBBINDIR) - CWNNDICDIR = $(CWNNWNNDIR)/dic - CWNNSYSDICDIR = $(CWNNDICDIR)/sys - CWNNCDSRC = $(CWNNTOP)/cd -@@ -164,7 +202,6 @@ WNNWNNCONSDICSRC = $(WNNWNNCONSSRC)/dic - CWNNJUTILSRC = $(CWNNTOP)/jutil - CWNNROMKANSRC = $(CWNNTOP)/romkan - CWNNUUMSRC = $(CWNNTOP)/uum -- CWNNCNVFILEDIR = $(CWNNCDSRC)/./bsd - CWNNINCLUDES = -I$(CWNNINCLUDESRC) -I$(CWNNROMKANMSRC) - CWNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\" - CWNNJLIB = @CWNNJLIB@ -@@ -175,7 +212,8 @@ CWNNJLIBVERSION = 0:0 - KWNNLANG = ko_KR - KWNNWNNDIR = $(WNNWNNDIR)/$(KWNNLANG) - KWNNINCDIR = $(WNNINCDIR)/kwnn -- KWNNBINDIR = $(WNNBINDIR)/kWnn4 -+ KWNNBINDIR = $(WNNBINDIR)$(KWNNSUBBINDIR) -+ KWNNSBINDIR = $(WNNSBINDIR)$(KWNNSUBBINDIR) - KWNNDICDIR = $(KWNNWNNDIR)/dic - KWNNSYSDICDIR = $(KWNNDICDIR)/sys - KWNNKDSRC = $(KWNNTOP)/kd -@@ -188,7 +226,6 @@ CWNNJLIBVERSION = 0:0 - KWNNJUTILSRC = $(KWNNTOP)/jutil - KWNNROMKANSRC = $(KWNNTOP)/romkan - KWNNUUMSRC = $(KWNNTOP)/uum -- KWNNCNVFILEDIR = $(KWNNCDSRC)/./bsd - KWNNINCLUDES = -I$(KWNNINCLUDESRC) -I$(KWNNROMKANMSRC) - KWNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\" - KWNNJLIB = @KWNNJLIB@ diff --git a/inputmethod/ja-freewnn-lib/patches/patch-makerule.mk.in-2 b/inputmethod/ja-freewnn-lib/patches/patch-makerule.mk.in-2 deleted file mode 100644 index bc4120288cf..00000000000 --- a/inputmethod/ja-freewnn-lib/patches/patch-makerule.mk.in-2 +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-makerule.mk.in-2,v 1.1 2011/09/13 07:23:21 mef Exp $ - - lib/wnn -> share/wnn fix for datadir - ---- makerule.mk.in.orig 2011-06-01 22:33:11.000000000 +0900 -+++ makerule.mk.in 2011-06-01 22:33:57.000000000 +0900 -@@ -45,8 +45,8 @@ - # for libtool (AM_PROG_LIBTOOL) - # top_builddir = @abs_top_srcdir@ - -- MANDIR = @mandir@/man$(MANSUFFIX) -- LIBMANDIR = @mandir@/man$(LIBMANSUFFIX) -+ MANDIR = @mandir@/ja_JP.EUC/man$(MANSUFFIX) -+ LIBMANDIR = @mandir@/ja_JP.EUC/man$(LIBMANSUFFIX) - - MANSUFFIX = 1 - LIBMANSUFFIX = 3 -@@ -133,7 +133,7 @@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ - sbindir = @sbindir@ -- WNNWNNDIR = $(exec_prefix)/lib/wnn -+ WNNWNNDIR = $(exec_prefix)/share/wnn - WNNBINDIR = $(bindir) - WNNSBINDIR = @WNNSBINDIR@ - WNNINCDIR = @includedir@ |