Re: Fix for MSN and Jabber static builds
Rodney Dawes <[email protected]> Sat, 03 Apr 2004 01:46:31 -0500
| Newsgroups | gmane.network.everybuddy.devel |
|---|---|
| Message-ID | <[email protected]> |
--=-R0kt90ecEUrZEVy38lX0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Doh, stupid typo in the configure.ac. I probably had msn.la already built, and so it just worked for me. :/ Anyway... I give you a more complete patch. This one fixes all the automake errors where we are doing libtool and non-libtool builds of the same sources, for all the plug-ins. It also fixes an issue in the toc Makefile, where it was only being built static if you did --with-static-irc, and not --with-static-toc. The STATIC_IRC conditional was being used instead of the appropriate STATIC_TOC. Hopefully you and Meredydd will be happy with this patch allowing you to do the --static-all thing again. And thanks for fixing the aclocal/acinclude issue. -- dobey --=-R0kt90ecEUrZEVy38lX0 Content-Disposition: attachment; filename=eb-lite-trunk-static.patch Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name=eb-lite-trunk-static.patch; charset=UTF-8 SW5kZXg6IHBsdWdpbnMveWFob28vTWFrZWZpbGUuYW0NCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBwbHVnaW5z L3lhaG9vL01ha2VmaWxlLmFtCShyZXZpc2lvbiAzMzMpDQorKysgcGx1Z2lucy95YWhvby9NYWtl ZmlsZS5hbQkod29ya2luZyBjb3B5KQ0KQEAgLTksMjUgKzksMjQgQEANCiBXSU4zMl9MSUIgPSAt TC4uLy4uL3NyYyAtbGVibGl0ZSAtbGludGwgLWxnbGliLTIuMCAtbHdzMl8zMg0KIGVuZGlmDQog DQorbm9pbnN0X0xUTElCUkFSSUVTID0gbGlieWFob28ubGENCiANCi1pZiBTVEFUSUNfWUFIT08N Ci1ub2luc3RfTElCUkFSSUVTID0gbGlieWFob28uYQ0KLWVsc2UNCitpZiAhU1RBVElDX1lBSE9P DQogcGtnbGliX0xUTElCUkFSSUVTID0geWFob28ubGENCiBlbmRpZg0KIA0KLXlhaG9vX2xhX1NP VVJDRVMgPSBcDQorbGlieWFob29fbGFfU09VUkNFUyA9IFwNCiAJbGlieWFob28yLmMgeWFob29f ZGVidWcuaCBcDQogCWNyeXB0LmMgbWQ1LmMgbWQ1Lmggc2hhLmMgc2hhLmggXA0KLSAgICAgICAg eWFob29faHR0cGxpYi5jIHlhaG9vX2h0dHBsaWIuaCBcDQorICB5YWhvb19odHRwbGliLmMgeWFo b29faHR0cGxpYi5oIFwNCiAJeWFob29fdXRpbC5jIHlhaG9vX3V0aWwuaCBcDQogCXlhaG9vX2xp c3QuYyB5YWhvb19saXN0LmggXA0KIAl5YWhvb19mbi5jIHlhaG9vX2ZuLmggXA0KIAl5YWhvby5j IHlhaG9vMi5oDQogDQorbGlieWFob29fbGFfTElCQUREID0gJChXSU4zMl9MSUIpDQorDQoreWFo b29fbGFfU09VUkNFUyA9DQogeWFob29fbGFfTERGTEFHUyA9IC1hdm9pZC12ZXJzaW9uIC1tb2R1 bGUgJChXSU4zMl9MRCkNCi15YWhvb19sYV9MSUJBREQgPSAkKFdJTjMyX0xJQikNCit5YWhvb19s YV9MSUJBREQgPSBsaWJ5YWhvby5sYQ0KIA0KLWxpYnlhaG9vX2FfU09VUkNFUyA9IGxpYnlhaG9v Mi5jIGNyeXB0LmMgbWQ1LmMgc2hhLmMgXA0KLSAgICAgICAgeWFob29faHR0cGxpYi5jIHlhaG9v X3V0aWwuYyB5YWhvb19saXN0LmMgeWFob29fZm4uYyB5YWhvby5jDQotDQpJbmRleDogcGx1Z2lu cy9qYWJiZXIvTWFrZWZpbGUuYW0NCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBwbHVnaW5zL2phYmJlci9NYWtl ZmlsZS5hbQkocmV2aXNpb24gMzMzKQ0KKysrIHBsdWdpbnMvamFiYmVyL01ha2VmaWxlLmFtCSh3 b3JraW5nIGNvcHkpDQpAQCAtMSwyMCArMSwyMCBAQA0KIElOQ0xVREVTID0gLUkkKHRvcF9zcmNk aXIpL3NyYw0KIA0KLUVYVFJBX0RJU1QgPSANCi0NCiBpZiBNSU5HVzMyDQogV0lOMzJfTEQgPSAt bm8tdW5kZWZpbmVkDQogV0lOMzJfTElCID0gLUwuLi8uLi9zcmMgLWxlYmxpdGUgLWxpbnRsIC1s Z2xpYi0yLjAgLWx3czJfMzINCiBlbmRpZg0KIA0KLWlmIFNUQVRJQ19KQUJCRVINCi1ub2luc3Rf TElCUkFSSUVTID0gbGliamFiYmVyLmENCi1lbHNlDQorbm9pbnN0X0xUTElCUkFSSUVTID0gbGli amFiYmVyLmxhDQorDQoraWYgIVNUQVRJQ19KQUJCRVINCiBwa2dsaWJfTFRMSUJSQVJJRVMgPSBq YWJiZXIubGENCiBlbmRpZg0KIA0KLWphYmJlcl9sYV9TT1VSQ0VTID0gamFiYmVyLmMNCi1qYWJi ZXJfbGFfTERGTEFHUyA9IC1hdm9pZC12ZXJzaW9uIC1tb2R1bGUgJChXSU4zMl9MRCkgLWxleHBh dA0KLWphYmJlcl9sYV9MSUJBREQgPSAkKFdJTjMyX0xJQikNCitsaWJqYWJiZXJfbGFfU09VUkNF UyA9IGphYmJlci5jDQorbGliamFiYmVyX2xhX0xJQkFERCA9ICQoV0lOMzJfTElCKSAtbGV4cGF0 DQogDQotbGliamFiYmVyX2FfU09VUkNFUyA9IGphYmJlci5jDQoramFiYmVyX2xhX1NPVVJDRVMg PQ0KK2phYmJlcl9sYV9MREZMQUdTID0gLWF2b2lkLXZlcnNpb24gLW1vZHVsZSAkKFdJTjMyX0xE KQ0KK2phYmJlcl9sYV9MSUJBREQgPSBsaWJqYWJiZXIubGENCisNCkluZGV4OiBwbHVnaW5zL3Rv Yy9NYWtlZmlsZS5hbQ0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIHBsdWdpbnMvdG9jL01ha2VmaWxlLmFtCShy ZXZpc2lvbiAzMzMpDQorKysgcGx1Z2lucy90b2MvTWFrZWZpbGUuYW0JKHdvcmtpbmcgY29weSkN CkBAIC0xLDIwICsxLDIwIEBADQogSU5DTFVERVMgPSAtSSQodG9wX3NyY2Rpcikvc3JjDQogDQot RVhUUkFfRElTVCA9IA0KLQ0KIGlmIE1JTkdXMzINCiBXSU4zMl9MRCA9IC1uby11bmRlZmluZWQN CiBXSU4zMl9MSUIgPSAtTC4uLy4uL3NyYyAtbGVibGl0ZSAtbGludGwgLWxnbGliLTIuMCAtbHdz Ml8zMg0KIGVuZGlmDQogDQotaWYgU1RBVElDX0lSQw0KLW5vaW5zdF9MSUJSQVJJRVMgPSBsaWJ0 b2MuYQ0KLWVsc2UNCitub2luc3RfTFRMSUJSQVJJRVMgPSBsaWJ0b2MubGENCisNCitpZiAhU1RB VElDX1RPQw0KIHBrZ2xpYl9MVExJQlJBUklFUyA9IHRvYy5sYQ0KIGVuZGlmDQogDQotdG9jX2xh X1NPVVJDRVMgPSB0b2MuYyBsaWJ0b2MuYyBsaWJ0b2MuaA0KK2xpYnRvY19sYV9TT1VSQ0VTID0g dG9jLmMgbGlidG9jLmMgbGlidG9jLmgNCitsaWJ0b2NfbGFfTElCQUREID0gJChXSU4zMl9MSUIp DQorDQordG9jX2xhX1NPVVJDRVMgPQ0KIHRvY19sYV9MREZMQUdTID0gLWF2b2lkLXZlcnNpb24g LW1vZHVsZSAkKFdJTjMyX0xEKQ0KLXRvY19sYV9MSUJBREQgPSAkKFdJTjMyX0xJQikNCit0b2Nf bGFfTElCQUREID0gbGlidG9jLmxhDQogDQotbGlidG9jX2FfU09VUkNFUyA9IHRvYy5jIGxpYnRv Yy5jDQpJbmRleDogcGx1Z2lucy9taXNjL01ha2VmaWxlLmFtDQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gcGx1 Z2lucy9taXNjL01ha2VmaWxlLmFtCShyZXZpc2lvbiAzMzMpDQorKysgcGx1Z2lucy9taXNjL01h a2VmaWxlLmFtCSh3b3JraW5nIGNvcHkpDQpAQCAtNSwxNiArNSwxNiBAQA0KIFdJTjMyX0xJQiA9 IC1MLi4vLi4vc3JjIC1sZWJsaXRlIC1saW50bCAtbGdsaWItMi4wIC1sd3MyXzMyDQogZW5kaWYN CiANCi1FWFRSQV9ESVNUID0gDQorbm9pbnN0X0xUTElCUkFSSUVTID0gbGlibWlzYy5sYQ0KIA0K LWlmIFNUQVRJQ19NSVNDDQotbm9pbnN0X0xJQlJBUklFUyA9IGxpYm1pc2MuYQ0KLWVsc2UNCitp ZiAhU1RBVElDX01JU0MNCiBwa2dsaWJfTFRMSUJSQVJJRVMgPSBtaXNjLmxhDQogZW5kaWYNCiAN Ci1saWJtaXNjX2FfU09VUkNFUyA9IGF1dG90cmFucy5jIHJhaW5ib3cuYw0KK2xpYm1pc2NfbGFf U09VUkNFUyA9IGF1dG90cmFucy5jIHJhaW5ib3cuYw0KK2xpYm1pc2NfbGFfTElCQUREID0gJChX SU4zMl9MSUIpDQogDQotbWlzY19sYV9TT1VSQ0VTID0gYXV0b3RyYW5zLmMgcmFpbmJvdy5jDQor bWlzY19sYV9TT1VSQ0VTID0NCiBtaXNjX2xhX0xERkxBR1MgPSAtYXZvaWQtdmVyc2lvbiAtbW9k dWxlICQoV0lOMzJfTEQpDQotbWlzY19sYV9MSUJBREQgPSAkKFdJTjMyX0xJQikNCittaXNjX2xh X0xJQkFERCA9IGxpYm1pc2MubGENCisNCkluZGV4OiBwbHVnaW5zL2lyYy9NYWtlZmlsZS5hbQ0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQ0KLS0tIHBsdWdpbnMvaXJjL01ha2VmaWxlLmFtCShyZXZpc2lvbiAzMzMpDQor KysgcGx1Z2lucy9pcmMvTWFrZWZpbGUuYW0JKHdvcmtpbmcgY29weSkNCkBAIC02LDE0ICs2LDE2 IEBADQogV0lOMzJfTElCID0gLUwuLi8uLi9zcmMgLWxlYmxpdGUgLWxpbnRsIC1sZ2xpYi0yLjAg LWx3czJfMzINCiBlbmRpZg0KIA0KLWlmIFNUQVRJQ19JUkMNCi1ub2luc3RfTElCUkFSSUVTID0g bGliaXJjLmENCi1lbHNlDQorbm9pbnN0X0xUTElCUkFSSUVTID0gbGliaXJjLmxhDQorDQoraWYg IVNUQVRJQ19JUkMNCiBwa2dsaWJfTFRMSUJSQVJJRVMgPSBpcmMubGENCiBlbmRpZg0KIA0KLWly Y19sYV9TT1VSQ0VTID0gaXJjLmMNCitsaWJpcmNfbGFfU09VUkNFUyA9IGlyYy5jDQorbGliaXJj X2xhX0xJQkFERCA9ICQoV0lOMzJfTElCKQ0KKw0KK2lyY19sYV9TT1VSQ0VTID0NCiBpcmNfbGFf TERGTEFHUyA9IC1tb2R1bGUgLWF2b2lkLXZlcnNpb24gJChXSU4zMl9MRCkNCi1pcmNfbGFfTElC QUREID0gJChXSU4zMl9MSUIpDQoraXJjX2xhX0xJQkFERCA9IGxpYmlyYy5sYQ0KIA0KLWxpYmly Y19hX1NPVVJDRVMgPSBpcmMuYw0KSW5kZXg6IHBsdWdpbnMvbXNuL01ha2VmaWxlLmFtDQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09DQotLS0gcGx1Z2lucy9tc24vTWFrZWZpbGUuYW0JKHJldmlzaW9uIDMzMykNCisrKyBw bHVnaW5zL21zbi9NYWtlZmlsZS5hbQkod29ya2luZyBjb3B5KQ0KQEAgLTgsMTggKzgsMjAgQEAN CiAjIHRoZXJlIGlzIGFuIG9yZGVyaW5nIHByb2JsZW0gd2l0aCBnbnV0bHMgbmVlZGVkIHRoZSBX SU4zMl9MSUINCiBlbmRpZg0KIA0KLWlmIFNUQVRJQ19NU04NCi1ub2luc3RfTElCUkFSSUVTID0g bGlibXNuLmENCi1lbHNlDQorbm9pbnN0X0xUTElCUkFSSUVTID0gbGlibXNuLmxhDQorDQoraWYg IVNUQVRJQ19NU04NCiBwa2dsaWJfTFRMSUJSQVJJRVMgPSBtc24ubGENCiBlbmRpZg0KIA0KLW1z bl9sYV9TT1VSQ0VTID0gXA0KK2xpYm1zbl9sYV9TT1VSQ0VTID0gXA0KIAltc25fY29yZS5DIG1z bl9jb3JlLmggXA0KIAltc25fYml0dHliaXRzLkMgbXNuX2JpdHR5Yml0cy5oIFwNCiAJbXNuLkMg bXNuX2ludGVyZmFjZS5oIFwNCiAJbXNuX3Bhc3Nwb3J0LkMgbXNuX3Bhc3Nwb3J0LmgNCitsaWJt c25fbGFfTElCQUREID0gLWxzdGRjKysgJChMSUJHTlVUTFNfTElCUykgJChXSU4zMl9MSUIpDQor DQorbXNuX2xhX1NPVVJDRVMgPSANCiBtc25fbGFfTERGTEFHUyA9IC1hdm9pZC12ZXJzaW9uIC1t b2R1bGUgJChXSU4zMl9MRCkNCi1tc25fbGFfTElCQUREID0gLWxzdGRjKysgJChMSUJHTlVUTFNf TElCUykgJChXSU4zMl9MSUIpDQorbXNuX2xhX0xJQkFERCA9IGxpYm1zbi5sYQ0KIA0KLWxpYm1z bl9hX1NPVVJDRVMgPSBtc25fY29yZS5DIG1zbl9iaXR0eWJpdHMuQyBtc24uQyBtc25fcGFzc3Bv cnQuQw0KSW5kZXg6IGNvbmZpZ3VyZS5hYw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIGNvbmZpZ3VyZS5hYwko cmV2aXNpb24gMzMzKQ0KKysrIGNvbmZpZ3VyZS5hYwkod29ya2luZyBjb3B5KQ0KQEAgLTEwMSw3 ICsxMDEsNyBAQA0KIEFNX0NPTkRJVElPTkFMKFNUQVRJQ19NU04sIHRlc3QgeCR3aXRoX3N0YXRp Y19tc24gPSB4eWVzKQ0KIGlmIHRlc3QgeCR3aXRoX3N0YXRpY19tc24gPSB4eWVzOyB0aGVuDQog CUFDX0RFRklORShTVEFUSUNfTVNOLCAxLCBbRGVmaW5lIGlmIHlvdSB3YW50IG1zbiBsaW5rZWQg c3RhdGljYWxseV0pDQotCVNUQVRJQ19MSUJTPSIkU1RBVElDX0xJQlMgXCQodG9wX3NyY2Rpcikv cGx1Z2lucy9tc24vbGlibXNuLmEiDQorCVNUQVRJQ19MSUJTPSIkU1RBVElDX0xJQlMgXCQodG9w X2J1aWxkZGlyKS9wbHVnaW5zL21zbi9saWJtc24ubGEiDQogZmkNCiANCiAjDQpAQCAtMTEyLDcg KzExMiw3IEBADQogQU1fQ09ORElUSU9OQUwoU1RBVElDX0lSQywgdGVzdCB4JHdpdGhfc3RhdGlj X2lyYyA9IHh5ZXMpDQogaWYgdGVzdCB4JHdpdGhfc3RhdGljX2lyYyA9IHh5ZXM7IHRoZW4NCiAJ QUNfREVGSU5FKFNUQVRJQ19JUkMsIDEsIFtEZWZpbmUgaWYgeW91IHdhbnQgSVJDIGxpbmtlZCBz dGF0aWNhbGx5XSkNCi0JU1RBVElDX0xJQlM9IiRTVEFUSUNfTElCUyBcJCh0b3Bfc3JjZGlyKS9w bHVnaW5zL2lyYy9saWJpcmMuYSINCisJU1RBVElDX0xJQlM9IiRTVEFUSUNfTElCUyBcJCh0b3Bf YnVpbGRkaXIpL3BsdWdpbnMvaXJjL2xpYmlyYy5sYSINCiBmaQ0KIA0KICMNCkBAIC0xMjMsNyAr MTIzLDcgQEANCiBBTV9DT05ESVRJT05BTChTVEFUSUNfVE9DLCB0ZXN0IHgkd2l0aF9zdGF0aWNf dG9jID0geHllcykNCiBpZiB0ZXN0IHgkd2l0aF9zdGF0aWNfdG9jID0geHllczsgdGhlbg0KIAlB Q19ERUZJTkUoU1RBVElDX1RPQywgMSwgW0RlZmluZSBpZiB5b3Ugd2FudCBUT0MgbGlua2VkIHN0 YXRpY2FsbHldKQ0KLQlTVEFUSUNfTElCUz0iJFNUQVRJQ19MSUJTIFwkKHRvcF9zcmNkaXIpL3Bs dWdpbnMvdG9jL2xpYnRvYy5hIg0KKwlTVEFUSUNfTElCUz0iJFNUQVRJQ19MSUJTIFwkKHRvcF9i dWlsZGRpcikvcGx1Z2lucy90b2MvbGlidG9jLmxhIg0KIGZpDQogDQogIw0KQEAgLTEzNCw3ICsx MzQsNyBAQA0KIEFNX0NPTkRJVElPTkFMKFNUQVRJQ19ZQUhPTywgdGVzdCB4JHdpdGhfc3RhdGlj X3lhaG9vID0geHllcykNCiBpZiB0ZXN0IHgkd2l0aF9zdGF0aWNfeWFob28gPSB4eWVzOyB0aGVu DQogCUFDX0RFRklORShTVEFUSUNfVE9DLCAxLCBbRGVmaW5lIGlmIHlvdSB3YW50IFlhaG9vIGxp bmtlZCBzdGF0aWNhbGx5XSkNCi0JU1RBVElDX0xJQlM9IiRTVEFUSUNfTElCUyBcJCh0b3Bfc3Jj ZGlyKS9wbHVnaW5zL3lhaG9vL2xpYnlhaG9vLmEiDQorCVNUQVRJQ19MSUJTPSIkU1RBVElDX0xJ QlMgXCQodG9wX2J1aWxkZGlyKS9wbHVnaW5zL3lhaG9vL2xpYnlhaG9vLmxhIg0KIGZpDQogDQog Iw0KQEAgLTE0NSw3ICsxNDUsNyBAQA0KIEFNX0NPTkRJVElPTkFMKFNUQVRJQ19KQUJCRVIsIHRl c3QgeCR3aXRoX3N0YXRpY19qYWJiZXIgPSB4eWVzKQ0KIGlmIHRlc3QgeCR3aXRoX3N0YXRpY19q YWJiZXIgPSB4eWVzOyB0aGVuDQogCUFDX0RFRklORShTVEFUSUNfSkFCQkVSLCAxLCBbRGVmaW5l IGlmIHlvdSB3YW50IEphYmJlciBsaW5rZWQgc3RhdGljYWxseV0pDQotCVNUQVRJQ19MSUJTPSIk U1RBVElDX0xJQlMgXCQodG9wX3NyY2RpcikvcGx1Z2lucy9qYWJiZXIvbGliamFiYmVyLmEiDQor CVNUQVRJQ19MSUJTPSIkU1RBVElDX0xJQlMgXCQodG9wX2J1aWxkZGlyKS9wbHVnaW5zL2phYmJl ci9saWJqYWJiZXIubGEiDQogZmkNCiANCiBpZiB0ZXN0ICJ3aXRoX2phYmJlciIgIT0gbm87IHRo ZW4NCkBAIC0xNjAsNyArMTYwLDcgQEANCiBBTV9DT05ESVRJT05BTChTVEFUSUNfTUlTQywgdGVz dCB4JHdpdGhfc3RhdGljX21pc2MgPSB4eWVzKQ0KIGlmIHRlc3QgeCR3aXRoX3N0YXRpY19taXNj ID0geHllczsgdGhlbg0KIAlBQ19ERUZJTkUoU1RBVElDX01JU0MsIDEsIFtEZWZpbmUgaWYgeW91 IHdhbnQgTUlTQyBsaW5rZWQgc3RhdGljYWxseV0pDQotCVNUQVRJQ19MSUJTPSIkU1RBVElDX0xJ QlMgXCQodG9wX3NyY2RpcikvcGx1Z2lucy9taXNjL2xpYm1pc2MuYSINCisJU1RBVElDX0xJQlM9 IiRTVEFUSUNfTElCUyBcJCh0b3BfYnVpbGRkaXIpL3BsdWdpbnMvbWlzYy9saWJtaXNjLmxhIg0K IGZpDQogDQogQUNfU1VCU1QoU1RBVElDX0xJQlMpDQo= --=-R0kt90ecEUrZEVy38lX0 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Everybuddy-Dev mailing list [email protected] http://lists.spine.cx/listinfo/everybuddy-dev --=-R0kt90ecEUrZEVy38lX0--