From kde-core-devel Tue Sep 24 13:00:44 2002 From: Bernhard Rosenkraenzer Date: Tue, 24 Sep 2002 13:00:44 +0000 To: kde-core-devel Subject: [PATCH] Allow Java detection to find gcj -- ok to commit? X-MARC-Message: https://marc.info/?l=kde-core-devel&m=103287249401455 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--279710978-1738837810-1032872444=:2145" This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. Send mail to mime@docserver.cac.washington.edu for more info. --279710978-1738837810-1032872444=:2145 Content-Type: TEXT/PLAIN; charset=US-ASCII The attached patch allows KDE's (admin/acinclude.m4.in) java detection to use gcj -- I've successfully built the Java bindings and their test apps with gcj (and also run them -- they're slow, but work). Ok to commit? LLaP bero -- This message is provided to you under the terms outlined at http://www.bero.org/terms.html --279710978-1738837810-1032872444=:2145 Content-Type: TEXT/PLAIN; charset=US-ASCII; name="kde-3.1.0-gcjjava.patch" Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: gcj detection Content-Disposition: attachment; filename="kde-3.1.0-gcjjava.patch" LS0tIGtkZWJhc2Uud29yay9hZG1pbi9hY2luY2x1ZGUubTQuaW4uZ2NqCTIw MDItMDktMjQgMTM6NTQ6MTkuMDAwMDAwMDAwICswMjAwDQorKysga2RlYmFz ZS53b3JrL2FkbWluL2FjaW5jbHVkZS5tNC5pbgkyMDAyLTA5LTI0IDE0OjM1 OjUyLjAwMDAwMDAwMCArMDIwMA0KQEAgLTQ1NzQsNiArNDU3NCwxNSBAQA0K IAkgIGZpDQogICAgICAgZG9uZQ0KIA0KKyAgICAgIGlmIHRlc3QgLXogIiRq cmVkaXJzIjsgdGhlbg0KKyAgICAgICAgICBkbmwgZ2NqIGRvZXMgbm90IHVz ZSBhIGxpYmp2bS5zbywgc28gdGhpcyBtYXkgc3RpbGwgYmUgdmFsaWQNCisg ICAgICAgICAgSUZTPSc6Jw0KKyAgICAgICAgICBmb3IgZGlyIGluICRQQVRI OyBkbw0KKyAgICAgICAgICAgICAganJlZGlycz0iJGpyZWRpcnMgJGRpciIN CisgICAgICAgICAgZG9uZQ0KKyAgICAgICAgICBJRlM9JGtkZV9zYXZlX0lG Uw0KKyAgICAgIGZpDQorDQogICAgICAgSkFWQUM9DQogICAgICAgSkFWQT0N CiAgICAgICBrZGVfamF2YV9iaW5kaXI9bm8NCkBAIC00NjA1LDExICs0NjE0 LDI5IEBADQogDQogZG5sIEF0IHRoaXMgcG9pbnQga2RlX2phdmFfYmluZGly IGFuZCBrZGVfamF2YV9pbmNsdWRlZGlyIGFyZSBlaXRoZXIgc2V0IG9yICJu byINCiBpZiB0ZXN0ICJ4JGtkZV9qYXZhX2JpbmRpciIgIT0gInhubyI7IHRo ZW4NCi0NCi0gIGRubCBMb29rIGZvciBsaWJqdm0uc28NCi0gIGtkZV9qYXZh X2xpYmp2bWRpcj1gZmluZCAka2RlX2phdmFfYmluZGlyLy4uIC1uYW1lIGxp Ymp2bS5zbyB8IHNlZCAncyxsaWJqdm0uc28sLCd8aGVhZCAtbiAxYA0KLSAg ZG5sIExvb2sgZm9yIGxpYmhwaS5zbyBhbmQgYXZvaWQgZ3JlZW4gdGhyZWFk cw0KLSAga2RlX2phdmFfbGliaHBpZGlyPWBmaW5kICRrZGVfamF2YV9iaW5k aXIvLi4gLW5hbWUgbGliaHBpLnNvIHwgZ3JlcCAtdiBncmVlbiB8IHNlZCAn cyxsaWJocGkuc28sLCcgfCBoZWFkIC1uIDFgDQorICBkbmwgQ2hlY2sgaWYg amF2YSBpcyBhY3R1YWxseSBnY2ogLSBzb21lIG9mIHRoZSBmb2xsb3dpbmcg Y2hlY2tzIGhhdmUgdG8gYmUNCisgIGRubCBkaWZmZXJlbnQgaWYgZ2NqIGlz IGluIHVzZSAoZS5nLiBnY2ogZG9lc24ndCBoYXZlIGEgc2VwYXJhdGUgbGli anZtKQ0KKyAgQUNfTVNHX0NIRUNLSU5HKFtpZiBqYXZhIGlzIGdjal0pDQor ICBBQ19UUllfQ09NUElMRSgNCisgICAgWyNpbmNsdWRlICIka2RlX2phdmFf aW5jbHVkZWRpci9qbmkuaCJdLA0KKyAgICBbI2lmbmRlZiBfX0dDSl9KTklf SF9fDQorICAgICAjZXJyb3IgVGhpcyBpcyBub3QgZ2NqDQorICAgICAjZW5k aWZdLA0KKyAgICBbQUNfTVNHX1JFU1VMVCh5ZXMpDQorICAgICBBQ19ERUZJ TkUoR0NKSkFWQSwgMSwgW0RlZmluZSBpZiB5b3VyIGphdmEgaXMgZ2NqXSkN CisgICAgIGFjX2N2X2djamphdmE9InllcyIgXSwNCisgICAgW0FDX01TR19S RVNVTFQobm8pXSkNCisNCisgIGlmIHRlc3QgeCRhY19jdl9nY2pqYXZhICE9 IHh5ZXM7IHRoZW4NCisgICAgZG5sIExvb2sgZm9yIGxpYmp2bS5zbw0KKyAg ICBrZGVfamF2YV9saWJqdm1kaXI9YGZpbmQgJGtkZV9qYXZhX2JpbmRpci8u LiAtbmFtZSBsaWJqdm0uc28gfCBzZWQgJ3MsbGlianZtLnNvLCwnfGhlYWQg LW4gMWANCisgICAgZG5sIExvb2sgZm9yIGxpYmhwaS5zbyBhbmQgYXZvaWQg Z3JlZW4gdGhyZWFkcw0KKyAgICBrZGVfamF2YV9saWJocGlkaXI9YGZpbmQg JGtkZV9qYXZhX2JpbmRpci8uLiAtbmFtZSBsaWJocGkuc28gfCBncmVwIC12 IGdyZWVuIHwgc2VkICdzLGxpYmhwaS5zbywsJyB8IGhlYWQgLW4gMWANCisg IGVsc2UNCisgICAgZG5sIGdjaiBkb2VzIG5vdCBuZWVkIGxpYmp2bSBvciBs aWJocGk7IGl0IGhhcyBpdHMgb3duIGludGVybmFsIHZhcmlhbnRzIHRoZXJl b2YuDQorICAgIGtkZV9qYXZhX2xpYmp2bWRpcj0iIg0KKyAgICBrZGVfamF2 YV9saWJocGlkaXI9IiINCisgIGZpDQogDQogICBkbmwgTm93IGNoZWNrIGV2 ZXJ5dGhpbmcncyBmaW5lIHVuZGVyIHRoZXJlDQogICBkbmwgdGhlIGluY2x1 ZGUgZGlyIGlzIG91ciBmbGFnIGZvciBoYXZpbmcgdGhlIEpESw0KQEAgLTQ2 MjcsMzAgKzQ2NTQsMzkgQEANCiAgICAgICBBQ19NU0dfRVJST1IoW2puaS5o IG5vdCBmb3VuZCB1bmRlciAka2RlX2phdmFfaW5jbHVkZWRpci4gVXNlIC0t d2l0aC1qYXZhIG9yIC0td2l0aG91dC1qYXZhLl0pDQogICAgIGZpDQogDQot ICAgIGpuaV9pbmNsdWRlcz0iLUkka2RlX2phdmFfaW5jbHVkZWRpciINCi0g ICAgZG5sIFN0cmFuZ2UgdGhpbmcsIGpuaS5oIHJlcXVpcmVzIGpuaV9tZC5o IHdoaWNoIGlzIHVuZGVyIGdlbnVuaXggaGVyZS4uDQotICAgIGRubCBhbmQg dW5kZXIgbGludXggaGVyZS4uDQotICAgIHRlc3QgLWQgIiRrZGVfamF2YV9p bmNsdWRlZGlyL2xpbnV4IiAmJiBqbmlfaW5jbHVkZXM9IiRqbmlfaW5jbHVk ZXMgLUkka2RlX2phdmFfaW5jbHVkZWRpci9saW51eCINCi0gICAgdGVzdCAt ZCAiJGtkZV9qYXZhX2luY2x1ZGVkaXIvc29sYXJpcyIgJiYgam5pX2luY2x1 ZGVzPSIkam5pX2luY2x1ZGVzIC1JJGtkZV9qYXZhX2luY2x1ZGVkaXIvc29s YXJpcyINCi0gICAgdGVzdCAtZCAiJGtkZV9qYXZhX2luY2x1ZGVkaXIvZ2Vu dW5peCIgJiYgam5pX2luY2x1ZGVzPSIkam5pX2luY2x1ZGVzIC1JJGtkZV9q YXZhX2luY2x1ZGVkaXIvZ2VudW5peCINCisgICAgaWYgdGVzdCAiJGtkZV9q YXZhX2luY2x1ZGVkaXIiICE9ICIvdXNyL2luY2x1ZGUiOyB0aGVuDQorICAg ICAgZG5sIGpka2djaiBhbmQgcXVpdGUgcG9zc2libHkgb3RoZXJzIHB1dCBq bmkuaCBzdHJhaWdodCBpbiAvdXNyL2luY2x1ZGUuDQorICAgICAgZG5sIGdj YyAzLnggZG9lcyBub3QgbGlrZSAtSS91c3IvaW5jbHVkZSBhdCBhbGwuLi4N CisgICAgICBqbmlfaW5jbHVkZXM9Ii1JJGtkZV9qYXZhX2luY2x1ZGVkaXIi DQorICAgIGVsc2UNCisgICAgICBqbmlfaW5jbHVkZXM9IiAiDQorICAgIGZp DQogDQorICAgIGlmIHRlc3QgeCRhY19jdl9nY2pqYXZhICE9IHh5ZXM7IHRo ZW4NCisgICAgICBkbmwgU3RyYW5nZSB0aGluZywgam5pLmggcmVxdWlyZXMg am5pX21kLmggd2hpY2ggaXMgdW5kZXIgZ2VudW5peCBoZXJlLi4NCisgICAg ICBkbmwgYW5kIHVuZGVyIGxpbnV4IGhlcmUuLg0KKyAgICAgIHRlc3QgLWQg IiRrZGVfamF2YV9pbmNsdWRlZGlyL2xpbnV4IiAmJiBqbmlfaW5jbHVkZXM9 IiRqbmlfaW5jbHVkZXMgLUkka2RlX2phdmFfaW5jbHVkZWRpci9saW51eCIN CisgICAgICB0ZXN0IC1kICIka2RlX2phdmFfaW5jbHVkZWRpci9zb2xhcmlz IiAmJiBqbmlfaW5jbHVkZXM9IiRqbmlfaW5jbHVkZXMgLUkka2RlX2phdmFf aW5jbHVkZWRpci9zb2xhcmlzIg0KKyAgICAgIHRlc3QgLWQgIiRrZGVfamF2 YV9pbmNsdWRlZGlyL2dlbnVuaXgiICYmIGpuaV9pbmNsdWRlcz0iJGpuaV9p bmNsdWRlcyAtSSRrZGVfamF2YV9pbmNsdWRlZGlyL2dlbnVuaXgiDQorICAg IGZpDQogICBlbHNlDQogICAgIEpBVkFDPQ0KICAgICBqbmlfaW5jbHVkZXM9 DQogICBmaQ0KIA0KLSAgaWYgdGVzdCAhIC1yICIka2RlX2phdmFfbGlianZt ZGlyL2xpYmp2bS5zbyI7IHRoZW4NCi0gICAgIEFDX01TR19FUlJPUihbbGli anZtLnNvIG5vdCBmb3VuZCB1bmRlciAka2RlX2phdmFfbGlianZtZGlyLiBV c2UgLS13aXRob3V0LWphdmEuXSkNCi0gIGZpIA0KKyAgaWYgdGVzdCB4JGFj X2N2X2djamphdmEgIT0geHllczsgdGhlbg0KKyAgICAgaWYgdGVzdCAhIC1y ICIka2RlX2phdmFfbGlianZtZGlyL2xpYmp2bS5zbyI7IHRoZW4NCisgICAg ICAgIEFDX01TR19FUlJPUihbbGlianZtLnNvIG5vdCBmb3VuZCB1bmRlciAk a2RlX2phdmFfbGlianZtZGlyLiBVc2UgLS13aXRob3V0LWphdmEuXSkNCisg ICAgIGZpIA0KKyAgICAgaWYgdGVzdCAhIC1yICIka2RlX2phdmFfbGliaHBp ZGlyL2xpYmhwaS5zbyI7IHRoZW4NCisgICAgICAgQUNfTVNHX0VSUk9SKFts aWJocGkuc28gbm90IGZvdW5kIHVuZGVyICRrZGVfamF2YV9saWJocGlkaXIu IFVzZSAtLXdpdGhvdXQtamF2YS5dKQ0KKyAgICAgZmkNCisgIGZpDQogDQog ICBpZiB0ZXN0ICEgLXggIiRrZGVfamF2YV9iaW5kaXIvamF2YSI7IHRoZW4N CiAgICAgICBBQ19NU0dfRVJST1IoW2phdmEgbm90IGZvdW5kIHVuZGVyICRr ZGVfamF2YV9iaW5kaXIuIGphdmFjIHdhcyBmb3VuZCB0aG91Z2ghIFVzZSAt LXdpdGgtamF2YSBvciAtLXdpdGhvdXQtamF2YS5dKQ0KICAgZmkNCiANCi0g IGlmIHRlc3QgISAtciAiJGtkZV9qYXZhX2xpYmhwaWRpci9saWJocGkuc28i OyB0aGVuDQotICAgIEFDX01TR19FUlJPUihbbGliaHBpLnNvIG5vdCBmb3Vu ZCB1bmRlciAka2RlX2phdmFfbGliaHBpZGlyLiBVc2UgLS13aXRob3V0LWph dmEuXSkNCi0gIGZpDQotDQogICBpZiB0ZXN0IC1uICIkam5pX2luY2x1ZGVz IjsgdGhlbg0KICAgICBkbmwgQ2hlY2sgZm9yIEpOSSB2ZXJzaW9uDQogICAg IEFDX0xBTkdfU0FWRQ0KQEAgLTQ2ODcsNyArNDcyMyw5IEBADQogICAgIEpB VkFIPSRrZGVfamF2YV9iaW5kaXIvamF2YWgNCiAgICAgSkFSPSRrZGVfamF2 YV9iaW5kaXIvamFyDQogICAgIEFDX0RFRklORV9VTlFVT1RFRChQQVRIX0pB VkEsICIka2RlX2phdmFfYmluZGlyL2phdmEiLCBbRGVmaW5lIHdoZXJlIHlv dXIgamF2YSBleGVjdXRhYmxlIGlzXSkNCi0gICAgSlZNTElCUz0iLUwka2Rl X2phdmFfbGlianZtZGlyIC1sanZtIC1MJGtkZV9qYXZhX2xpYmhwaWRpciAt bGhwaSINCisgICAgaWYgdGVzdCB4JGFjX2N2X2djamphdmEgIT0geHllczsg dGhlbg0KKyAgICAgICBKVk1MSUJTPSItTCRrZGVfamF2YV9saWJqdm1kaXIg LWxqdm0gLUwka2RlX2phdmFfbGliaHBpZGlyIC1saHBpIg0KKyAgICBmaQ0K ICAgICBBQ19NU0dfUkVTVUxUKFtqYXZhIEpESyBpbiAka2RlX2phdmFfYmlu ZGlyXSkNCiANCiAgIGVsc2UNCg== --279710978-1738837810-1032872444=:2145--