From 29355da541d02eb327494c98337af337c2acaa67 Mon Sep 17 00:00:00 2001 From: "mvl%exedo.nl" Date: Mon, 10 Dec 2007 13:25:50 +0000 Subject: [PATCH] This commit was generated by cvs2svn to compensate for changes in r240715, which included commits to RCS files with non-trunk default branches. git-svn-id: svn://10.0.0.236/trunk@240716 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/calendar/libical/AUTHORS | 4 - mozilla/calendar/libical/COPYING | 33 - mozilla/calendar/libical/ChangeLog | 21 - mozilla/calendar/libical/INSTALL | 231 - mozilla/calendar/libical/Makefile.am | 9 - mozilla/calendar/libical/README | 17 +- mozilla/calendar/libical/README.win32 | 61 - mozilla/calendar/libical/TEST | 4 - mozilla/calendar/libical/aclocal.m4 | 7493 ----------------- mozilla/calendar/libical/autogen.sh | 61 - mozilla/calendar/libical/bootstrap | 32 - mozilla/calendar/libical/buildpackages | 93 - mozilla/calendar/libical/config.guess | 1447 ---- mozilla/calendar/libical/config.h.in | 115 - mozilla/calendar/libical/config.sub | 1555 ---- mozilla/calendar/libical/configure.in | 188 - mozilla/calendar/libical/configure.in.in | 20 - mozilla/calendar/libical/depcomp | 522 -- .../calendar/libical/design-data/Makefile.in | 271 +- .../libical/design-data/parameters.csv | 11 +- .../libical/design-data/properties.csv | 58 +- .../libical/design-data/restrictions.csv | 4 +- .../libical/design-data/value-types.csv | 4 + mozilla/calendar/libical/install-sh | 322 - mozilla/calendar/libical/ltconfig | 3096 ------- mozilla/calendar/libical/ltmain.sh | 6425 -------------- mozilla/calendar/libical/missing | 353 - mozilla/calendar/libical/mkinstalldirs | 40 - mozilla/calendar/libical/scripts/Makefile.in | 271 +- .../libical/scripts/mkderivedparameters.pl | 6 +- .../libical/scripts/mkderivedproperties.pl | 4 +- .../libical/scripts/mkderivedvalues.pl | 6 +- .../libical/scripts/mkrestrictiontable.pl | 4 +- .../libical/scripts/readvaluesfile.pl | 3 + mozilla/calendar/libical/src/Makefile.am | 20 +- mozilla/calendar/libical/src/libical.dsw | 92 - .../calendar/libical/src/libical/Makefile.am | 33 +- .../calendar/libical/src/libical/icalarray.c | 2 +- .../calendar/libical/src/libical/icalarray.h | 2 +- .../calendar/libical/src/libical/icalattach.c | 2 +- .../libical/src/libical/icalattachimpl.h | 2 +- .../src/libical/icalderivedparameter.c.in | 8 +- .../src/libical/icalderivedparameter.h.in | 2 +- .../src/libical/icalderivedproperty.c.in | 12 +- .../src/libical/icalderivedproperty.h.in | 2 +- .../libical/src/libical/icalderivedvalue.c.in | 11 +- .../libical/src/libical/icalderivedvalue.h.in | 2 +- .../libical/src/libical/icalduration.h | 2 +- .../calendar/libical/src/libical/icalenums.c | 6 +- .../calendar/libical/src/libical/icalenums.h | 1 + .../calendar/libical/src/libical/icalerror.c | 10 +- .../calendar/libical/src/libical/icalerror.h | 6 +- .../libical/src/libical/icallangbind.c | 6 +- .../libical/src/libical/icallangbind.h | 4 +- .../calendar/libical/src/libical/icalmemory.c | 8 +- .../calendar/libical/src/libical/icalmemory.h | 2 +- .../calendar/libical/src/libical/icalmime.c | 16 +- .../calendar/libical/src/libical/icalmime.h | 2 +- .../libical/src/libical/icalparameterimpl.h | 2 +- .../calendar/libical/src/libical/icalparser.h | 2 +- .../calendar/libical/src/libical/icalperiod.c | 2 +- .../calendar/libical/src/libical/icalperiod.h | 2 +- .../libical/src/libical/icalrestriction.c.in | 58 +- .../libical/src/libical/icalrestriction.h | 2 +- .../libical/src/libical/icaltimezone.h | 3 +- .../calendar/libical/src/libical/icaltypes.c | 2 +- .../libical/src/libical/icalvalueimpl.h | 2 +- mozilla/calendar/libical/src/libical/sspm.c | 40 +- mozilla/calendar/libical/src/libical/sspm.h | 4 +- .../libical/src/libicalss/Makefile.am | 24 +- .../libical/src/libicalss/icalcalendar.c | 2 +- .../libical/src/libicalss/icalcalendar.h | 2 +- .../libical/src/libicalss/icalclassify.c | 24 +- .../libical/src/libicalss/icalclassify.h | 2 +- .../libical/src/libicalss/icalcluster.c | 2 +- .../libical/src/libicalss/icalcluster.h | 2 +- .../libical/src/libicalss/icalclusterimpl.h | 2 +- .../libical/src/libicalss/icaldirset.c | 4 +- .../libical/src/libicalss/icaldirset.h | 2 +- .../libical/src/libicalss/icaldirsetimpl.h | 2 +- .../libical/src/libicalss/icalfileset.c | 53 +- .../libical/src/libicalss/icalfileset.h | 5 +- .../libical/src/libicalss/icalfilesetimpl.h | 2 +- .../libical/src/libicalss/icalgauge.c | 2 +- .../libical/src/libicalss/icalgauge.h | 2 +- .../libical/src/libicalss/icalgaugeimpl.h | 2 +- .../libical/src/libicalss/icalmessage.c | 4 +- .../libical/src/libicalss/icalmessage.h | 2 +- .../calendar/libical/src/libicalss/icalset.c | 2 +- .../calendar/libical/src/libicalss/icalset.h | 2 +- .../libical/src/libicalss/icalspanlist.c | 2 +- .../libical/src/libicalss/icalspanlist.h | 2 +- .../libical/src/libicalss/icalsslexer.c | 2127 +++-- .../libical/src/libicalss/icalsslexer.l | 14 +- .../libical/src/libicalss/icalssyacc.c | 6 +- .../libical/src/libicalss/icalssyacc.y | 2 +- mozilla/calendar/libical/src/test/Makefile.am | 13 +- mozilla/calendar/libical/src/test/Makefile.in | 784 +- .../calendar/libical/src/test/copycluster.c | 2 +- .../libical/src/test/icaltestparser.c | 2 +- mozilla/calendar/libical/src/test/process.c | 2 +- .../libical/src/test/regression-classify.c | 2 +- .../libical/src/test/regression-component.c | 18 +- .../libical/src/test/regression-storage.c | 2 +- .../calendar/libical/src/test/regression.c | 568 +- mozilla/calendar/libical/src/test/stow.c | 10 +- mozilla/calendar/libical/src/test/testmime.c | 2 +- mozilla/calendar/libical/src/test/testvcal.c | 2 +- mozilla/calendar/libical/test-data/recur.txt | 13 +- .../libical/zoneinfo/Africa/Abidjan.ics | 14 +- .../libical/zoneinfo/Africa/Accra.ics | 40 +- .../libical/zoneinfo/Africa/Addis_Ababa.ics | 23 +- .../libical/zoneinfo/Africa/Algiers.ics | 89 +- .../libical/zoneinfo/Africa/Asmara.ics | 14 - .../libical/zoneinfo/Africa/Bamako.ics | 28 +- .../libical/zoneinfo/Africa/Bangui.ics | 16 +- .../libical/zoneinfo/Africa/Banjul.ics | 28 +- .../libical/zoneinfo/Africa/Bissau.ics | 21 +- .../libical/zoneinfo/Africa/Blantyre.ics | 16 +- .../libical/zoneinfo/Africa/Brazzaville.ics | 16 +- .../libical/zoneinfo/Africa/Bujumbura.ics | 16 +- .../libical/zoneinfo/Africa/Cairo.ics | 127 +- .../libical/zoneinfo/Africa/Casablanca.ics | 50 +- .../libical/zoneinfo/Africa/Ceuta.ics | 92 +- .../libical/zoneinfo/Africa/Conakry.ics | 28 +- .../libical/zoneinfo/Africa/Dakar.ics | 21 +- .../libical/zoneinfo/Africa/Dar_es_Salaam.ics | 30 +- .../libical/zoneinfo/Africa/Djibouti.ics | 16 +- .../libical/zoneinfo/Africa/Douala.ics | 16 +- .../libical/zoneinfo/Africa/El_Aaiun.ics | 21 +- .../libical/zoneinfo/Africa/Freetown.ics | 80 +- .../libical/zoneinfo/Africa/Gaborone.ics | 30 +- .../libical/zoneinfo/Africa/Harare.ics | 16 +- .../libical/zoneinfo/Africa/Johannesburg.ics | 39 +- .../libical/zoneinfo/Africa/Kampala.ics | 37 +- .../libical/zoneinfo/Africa/Khartoum.ics | 65 +- .../libical/zoneinfo/Africa/Kigali.ics | 16 +- .../libical/zoneinfo/Africa/Kinshasa.ics | 16 +- .../libical/zoneinfo/Africa/Lagos.ics | 16 +- .../libical/zoneinfo/Africa/Libreville.ics | 16 +- .../calendar/libical/zoneinfo/Africa/Lome.ics | 14 +- .../libical/zoneinfo/Africa/Luanda.ics | 23 +- .../libical/zoneinfo/Africa/Lubumbashi.ics | 16 +- .../libical/zoneinfo/Africa/Lusaka.ics | 16 +- .../libical/zoneinfo/Africa/Malabo.ics | 23 +- .../libical/zoneinfo/Africa/Maputo.ics | 16 +- .../libical/zoneinfo/Africa/Maseru.ics | 30 +- .../libical/zoneinfo/Africa/Mbabane.ics | 16 +- .../libical/zoneinfo/Africa/Mogadishu.ics | 30 +- .../libical/zoneinfo/Africa/Monrovia.ics | 28 +- .../libical/zoneinfo/Africa/Nairobi.ics | 37 +- .../libical/zoneinfo/Africa/Ndjamena.ics | 30 +- .../libical/zoneinfo/Africa/Niamey.ics | 30 +- .../libical/zoneinfo/Africa/Nouakchott.ics | 28 +- .../libical/zoneinfo/Africa/Ouagadougou.ics | 14 +- .../libical/zoneinfo/Africa/Porto-Novo.ics | 23 +- .../libical/zoneinfo/Africa/Sao_Tome.ics | 21 +- .../libical/zoneinfo/Africa/Tripoli.ics | 66 +- .../libical/zoneinfo/Africa/Tunis.ics | 55 +- .../libical/zoneinfo/Africa/Windhoek.ics | 61 +- .../libical/zoneinfo/America/Adak.ics | 137 +- .../libical/zoneinfo/America/Anchorage.ics | 137 +- .../libical/zoneinfo/America/Anguilla.ics | 16 +- .../libical/zoneinfo/America/Antigua.ics | 23 +- .../libical/zoneinfo/America/Araguaina.ics | 90 +- .../libical/zoneinfo/America/Aruba.ics | 23 +- .../libical/zoneinfo/America/Asuncion.ics | 103 +- .../libical/zoneinfo/America/Atikokan.ics | 14 - .../libical/zoneinfo/America/Bahia.ics | 14 - .../libical/zoneinfo/America/Barbados.ics | 43 +- .../libical/zoneinfo/America/Belem.ics | 61 +- .../libical/zoneinfo/America/Belize.ics | 94 +- .../libical/zoneinfo/America/Blanc-Sablon.ics | 14 - .../libical/zoneinfo/America/Boa_Vista.ics | 66 +- .../libical/zoneinfo/America/Bogota.ics | 37 +- .../libical/zoneinfo/America/Boise.ics | 111 +- .../zoneinfo/America/Cambridge_Bay.ics | 139 +- .../libical/zoneinfo/America/Campo_Grande.ics | 22 - .../libical/zoneinfo/America/Cancun.ics | 80 +- .../libical/zoneinfo/America/Caracas.ics | 30 +- .../libical/zoneinfo/America/Cayenne.ics | 23 +- .../libical/zoneinfo/America/Cayman.ics | 23 +- .../libical/zoneinfo/America/Chicago.ics | 167 +- .../libical/zoneinfo/America/Chihuahua.ics | 85 +- .../libical/zoneinfo/America/Costa_Rica.ics | 43 +- .../libical/zoneinfo/America/Cuiaba.ics | 90 +- .../libical/zoneinfo/America/Curacao.ics | 23 +- .../libical/zoneinfo/America/Danmarkshavn.ics | 14 - .../libical/zoneinfo/America/Dawson.ics | 94 +- .../libical/zoneinfo/America/Dawson_Creek.ics | 101 +- .../libical/zoneinfo/America/Denver.ics | 93 +- .../libical/zoneinfo/America/Detroit.ics | 91 +- .../libical/zoneinfo/America/Dominica.ics | 16 +- .../libical/zoneinfo/America/Edmonton.ics | 79 +- .../libical/zoneinfo/America/Eirunepe.ics | 65 +- .../libical/zoneinfo/America/El_Salvador.ics | 32 +- .../libical/zoneinfo/America/Fortaleza.ics | 70 +- .../libical/zoneinfo/America/Glace_Bay.ics | 74 +- .../libical/zoneinfo/America/Godthab.ics | 55 +- .../libical/zoneinfo/America/Goose_Bay.ics | 218 +- .../libical/zoneinfo/America/Grand_Turk.ics | 45 +- .../libical/zoneinfo/America/Grenada.ics | 16 +- .../libical/zoneinfo/America/Guadeloupe.ics | 16 +- .../libical/zoneinfo/America/Guatemala.ics | 34 +- .../libical/zoneinfo/America/Guayaquil.ics | 23 +- .../libical/zoneinfo/America/Guyana.ics | 37 +- .../libical/zoneinfo/America/Halifax.ics | 152 +- .../libical/zoneinfo/America/Havana.ics | 123 +- .../libical/zoneinfo/America/Hermosillo.ics | 65 +- .../zoneinfo/America/Indiana/Indianapolis.ics | 105 +- .../libical/zoneinfo/America/Indiana/Knox.ics | 144 +- .../zoneinfo/America/Indiana/Marengo.ics | 113 +- .../zoneinfo/America/Indiana/Petersburg.ics | 22 - .../zoneinfo/America/Indiana/Vevay.ics | 78 +- .../zoneinfo/America/Indiana/Vincennes.ics | 22 - .../zoneinfo/America/Indiana/Winamac.ics | 22 - .../libical/zoneinfo/America/Inuvik.ics | 94 +- .../libical/zoneinfo/America/Iqaluit.ics | 124 +- .../libical/zoneinfo/America/Jamaica.ics | 60 +- .../libical/zoneinfo/America/Juneau.ics | 124 +- .../zoneinfo/America/Kentucky/Louisville.ics | 150 +- .../zoneinfo/America/Kentucky/Monticello.ics | 137 +- .../libical/zoneinfo/America/La_Paz.ics | 30 +- .../libical/zoneinfo/America/Lima.ics | 47 +- .../libical/zoneinfo/America/Los_Angeles.ics | 116 +- .../libical/zoneinfo/America/Maceio.ics | 74 +- .../libical/zoneinfo/America/Managua.ics | 51 +- .../libical/zoneinfo/America/Manaus.ics | 65 +- .../libical/zoneinfo/America/Martinique.ics | 37 +- .../libical/zoneinfo/America/Mazatlan.ics | 74 +- .../libical/zoneinfo/America/Menominee.ics | 95 +- .../libical/zoneinfo/America/Merida.ics | 56 +- .../libical/zoneinfo/America/Mexico_City.ics | 79 +- .../libical/zoneinfo/America/Miquelon.ics | 62 +- .../libical/zoneinfo/America/Moncton.ics | 22 - .../libical/zoneinfo/America/Monterrey.ics | 58 +- .../libical/zoneinfo/America/Montevideo.ics | 130 +- .../libical/zoneinfo/America/Montreal.ics | 136 +- .../libical/zoneinfo/America/Montserrat.ics | 16 +- .../libical/zoneinfo/America/Nassau.ics | 65 +- .../libical/zoneinfo/America/New_York.ics | 161 +- .../libical/zoneinfo/America/Nipigon.ics | 61 +- .../libical/zoneinfo/America/Nome.ics | 137 +- .../libical/zoneinfo/America/Noronha.ics | 65 +- .../libical/zoneinfo/America/Panama.ics | 23 +- .../libical/zoneinfo/America/Pangnirtung.ics | 142 +- .../libical/zoneinfo/America/Paramaribo.ics | 44 +- .../libical/zoneinfo/America/Phoenix.ics | 50 +- .../zoneinfo/America/Port-au-Prince.ics | 61 +- .../zoneinfo/America/Port_of_Spain.ics | 16 +- .../libical/zoneinfo/America/Porto_Velho.ics | 61 +- .../libical/zoneinfo/America/Puerto_Rico.ics | 30 +- .../libical/zoneinfo/America/Rainy_River.ics | 61 +- .../libical/zoneinfo/America/Rankin_Inlet.ics | 120 +- .../libical/zoneinfo/America/Recife.ics | 70 +- .../libical/zoneinfo/America/Regina.ics | 91 +- .../libical/zoneinfo/America/Rio_Branco.ics | 61 +- .../libical/zoneinfo/America/Santiago.ics | 142 +- .../zoneinfo/America/Santo_Domingo.ics | 66 +- .../libical/zoneinfo/America/Sao_Paulo.ics | 97 +- .../libical/zoneinfo/America/Scoresbysund.ics | 64 +- .../libical/zoneinfo/America/Shiprock.ics | 93 +- .../libical/zoneinfo/America/St_Johns.ics | 219 +- .../libical/zoneinfo/America/St_Kitts.ics | 16 +- .../libical/zoneinfo/America/St_Lucia.ics | 23 +- .../libical/zoneinfo/America/St_Thomas.ics | 16 +- .../libical/zoneinfo/America/St_Vincent.ics | 23 +- .../zoneinfo/America/Swift_Current.ics | 66 +- .../libical/zoneinfo/America/Tegucigalpa.ics | 32 +- .../libical/zoneinfo/America/Thule.ics | 26 +- .../libical/zoneinfo/America/Thunder_Bay.ics | 76 +- .../libical/zoneinfo/America/Tijuana.ics | 93 +- .../libical/zoneinfo/America/Toronto.ics | 22 - .../libical/zoneinfo/America/Tortola.ics | 16 +- .../libical/zoneinfo/America/Vancouver.ics | 105 +- .../libical/zoneinfo/America/Whitehorse.ics | 94 +- .../libical/zoneinfo/America/Winnipeg.ics | 126 +- .../libical/zoneinfo/America/Yakutat.ics | 117 +- .../libical/zoneinfo/America/Yellowknife.ics | 71 +- .../libical/zoneinfo/Antarctica/Casey.ics | 16 +- .../libical/zoneinfo/Antarctica/Davis.ics | 24 +- .../zoneinfo/Antarctica/DumontDUrville.ics | 28 +- .../libical/zoneinfo/Antarctica/Mawson.ics | 16 +- .../libical/zoneinfo/Antarctica/McMurdo.ics | 69 +- .../libical/zoneinfo/Antarctica/Palmer.ics | 127 +- .../libical/zoneinfo/Antarctica/Rothera.ics | 14 - .../zoneinfo/Antarctica/South_Pole.ics | 69 +- .../libical/zoneinfo/Antarctica/Syowa.ics | 16 +- .../libical/zoneinfo/Antarctica/Vostok.ics | 16 +- .../libical/zoneinfo/Arctic/Longyearbyen.ics | 82 +- .../calendar/libical/zoneinfo/Asia/Aden.ics | 16 +- .../calendar/libical/zoneinfo/Asia/Almaty.ics | 88 +- .../calendar/libical/zoneinfo/Asia/Amman.ics | 77 +- .../calendar/libical/zoneinfo/Asia/Anadyr.ics | 105 +- .../calendar/libical/zoneinfo/Asia/Aqtau.ics | 114 +- .../calendar/libical/zoneinfo/Asia/Aqtobe.ics | 100 +- .../libical/zoneinfo/Asia/Ashgabat.ics | 81 +- .../libical/zoneinfo/Asia/Baghdad.ics | 63 +- .../libical/zoneinfo/Asia/Bahrain.ics | 23 +- .../calendar/libical/zoneinfo/Asia/Baku.ics | 119 +- .../libical/zoneinfo/Asia/Bangkok.ics | 23 +- .../calendar/libical/zoneinfo/Asia/Beirut.ics | 90 +- .../libical/zoneinfo/Asia/Bishkek.ics | 99 +- .../calendar/libical/zoneinfo/Asia/Brunei.ics | 23 +- .../libical/zoneinfo/Asia/Calcutta.ics | 38 +- .../libical/zoneinfo/Asia/Choibalsan.ics | 22 - .../libical/zoneinfo/Asia/Chongqing.ics | 14 - .../libical/zoneinfo/Asia/Colombo.ics | 58 +- .../libical/zoneinfo/Asia/Damascus.ics | 105 +- .../calendar/libical/zoneinfo/Asia/Dhaka.ics | 49 +- .../calendar/libical/zoneinfo/Asia/Dili.ics | 44 +- .../calendar/libical/zoneinfo/Asia/Dubai.ics | 16 +- .../libical/zoneinfo/Asia/Dushanbe.ics | 67 +- .../calendar/libical/zoneinfo/Asia/Gaza.ics | 129 +- .../calendar/libical/zoneinfo/Asia/Harbin.ics | 62 +- .../libical/zoneinfo/Asia/Hong_Kong.ics | 96 +- .../calendar/libical/zoneinfo/Asia/Hovd.ics | 67 +- .../libical/zoneinfo/Asia/Irkutsk.ics | 88 +- .../libical/zoneinfo/Asia/Istanbul.ics | 154 +- .../libical/zoneinfo/Asia/Jakarta.ics | 65 +- .../libical/zoneinfo/Asia/Jayapura.ics | 30 +- .../libical/zoneinfo/Asia/Jerusalem.ics | 136 +- .../calendar/libical/zoneinfo/Asia/Kabul.ics | 23 +- .../libical/zoneinfo/Asia/Kamchatka.ics | 81 +- .../libical/zoneinfo/Asia/Karachi.ics | 42 +- .../libical/zoneinfo/Asia/Kashgar.ics | 54 +- .../libical/zoneinfo/Asia/Katmandu.ics | 23 +- .../libical/zoneinfo/Asia/Krasnoyarsk.ics | 81 +- .../libical/zoneinfo/Asia/Kuala_Lumpur.ics | 58 +- .../libical/zoneinfo/Asia/Kuching.ics | 68 +- .../calendar/libical/zoneinfo/Asia/Kuwait.ics | 16 +- .../calendar/libical/zoneinfo/Asia/Macau.ics | 14 - .../libical/zoneinfo/Asia/Magadan.ics | 81 +- .../libical/zoneinfo/Asia/Makassar.ics | 14 - .../calendar/libical/zoneinfo/Asia/Manila.ics | 49 +- .../calendar/libical/zoneinfo/Asia/Muscat.ics | 16 +- .../libical/zoneinfo/Asia/Nicosia.ics | 91 +- .../libical/zoneinfo/Asia/Novosibirsk.ics | 95 +- .../calendar/libical/zoneinfo/Asia/Omsk.ics | 81 +- .../calendar/libical/zoneinfo/Asia/Oral.ics | 14 - .../libical/zoneinfo/Asia/Phnom_Penh.ics | 37 +- .../libical/zoneinfo/Asia/Pontianak.ics | 65 +- .../libical/zoneinfo/Asia/Pyongyang.ics | 45 +- .../calendar/libical/zoneinfo/Asia/Qatar.ics | 23 +- .../libical/zoneinfo/Asia/Qyzylorda.ics | 14 - .../libical/zoneinfo/Asia/Rangoon.ics | 35 +- .../calendar/libical/zoneinfo/Asia/Riyadh.ics | 16 +- .../calendar/libical/zoneinfo/Asia/Saigon.ics | 37 +- .../libical/zoneinfo/Asia/Sakhalin.ics | 22 - .../libical/zoneinfo/Asia/Samarkand.ics | 96 +- .../calendar/libical/zoneinfo/Asia/Seoul.ics | 70 +- .../libical/zoneinfo/Asia/Shanghai.ics | 49 +- .../libical/zoneinfo/Asia/Singapore.ics | 65 +- .../calendar/libical/zoneinfo/Asia/Taipei.ics | 68 +- .../libical/zoneinfo/Asia/Tashkent.ics | 84 +- .../libical/zoneinfo/Asia/Tbilisi.ics | 137 +- .../calendar/libical/zoneinfo/Asia/Tehran.ics | 161 +- .../libical/zoneinfo/Asia/Thimphu.ics | 23 +- .../calendar/libical/zoneinfo/Asia/Tokyo.ics | 28 +- .../libical/zoneinfo/Asia/Ulaanbaatar.ics | 67 +- .../calendar/libical/zoneinfo/Asia/Urumqi.ics | 47 +- .../libical/zoneinfo/Asia/Vientiane.ics | 37 +- .../libical/zoneinfo/Asia/Vladivostok.ics | 81 +- .../libical/zoneinfo/Asia/Yakutsk.ics | 81 +- .../libical/zoneinfo/Asia/Yekaterinburg.ics | 99 +- .../libical/zoneinfo/Asia/Yerevan.ics | 103 +- .../libical/zoneinfo/Atlantic/Azores.ics | 216 +- .../libical/zoneinfo/Atlantic/Bermuda.ics | 55 +- .../libical/zoneinfo/Atlantic/Canary.ics | 58 +- .../libical/zoneinfo/Atlantic/Cape_Verde.ics | 35 +- .../libical/zoneinfo/Atlantic/Faroe.ics | 22 - .../libical/zoneinfo/Atlantic/Jan_Mayen.ics | 82 +- .../libical/zoneinfo/Atlantic/Madeira.ics | 194 +- .../libical/zoneinfo/Atlantic/Reykjavik.ics | 102 +- .../zoneinfo/Atlantic/South_Georgia.ics | 16 +- .../libical/zoneinfo/Atlantic/St_Helena.ics | 21 +- .../libical/zoneinfo/Atlantic/Stanley.ics | 117 +- .../libical/zoneinfo/Australia/Adelaide.ics | 97 +- .../libical/zoneinfo/Australia/Brisbane.ics | 49 +- .../zoneinfo/Australia/Broken_Hill.ics | 111 +- .../libical/zoneinfo/Australia/Currie.ics | 22 - .../libical/zoneinfo/Australia/Darwin.ics | 43 +- .../libical/zoneinfo/Australia/Eucla.ics | 14 - .../libical/zoneinfo/Australia/Hobart.ics | 111 +- .../libical/zoneinfo/Australia/Lindeman.ics | 54 +- .../libical/zoneinfo/Australia/Lord_Howe.ics | 91 +- .../libical/zoneinfo/Australia/Melbourne.ics | 104 +- .../libical/zoneinfo/Australia/Perth.ics | 45 +- .../libical/zoneinfo/Australia/Sydney.ics | 105 +- .../libical/zoneinfo/Europe/Amsterdam.ics | 157 +- .../libical/zoneinfo/Europe/Andorra.ics | 46 +- .../libical/zoneinfo/Europe/Athens.ics | 115 +- .../libical/zoneinfo/Europe/Belgrade.ics | 62 +- .../libical/zoneinfo/Europe/Berlin.ics | 96 +- .../libical/zoneinfo/Europe/Bratislava.ics | 89 +- .../libical/zoneinfo/Europe/Brussels.ics | 151 +- .../libical/zoneinfo/Europe/Bucharest.ics | 102 +- .../libical/zoneinfo/Europe/Budapest.ics | 94 +- .../libical/zoneinfo/Europe/Chisinau.ics | 160 +- .../libical/zoneinfo/Europe/Copenhagen.ics | 81 +- .../libical/zoneinfo/Europe/Dublin.ics | 194 +- .../libical/zoneinfo/Europe/Gibraltar.ics | 164 +- .../libical/zoneinfo/Europe/Guernsey.ics | 22 - .../libical/zoneinfo/Europe/Helsinki.ics | 65 +- .../libical/zoneinfo/Europe/Isle_of_Man.ics | 22 - .../libical/zoneinfo/Europe/Istanbul.ics | 154 +- .../libical/zoneinfo/Europe/Jersey.ics | 22 - .../libical/zoneinfo/Europe/Kaliningrad.ics | 131 +- .../calendar/libical/zoneinfo/Europe/Kiev.ics | 136 +- .../libical/zoneinfo/Europe/Lisbon.ics | 223 +- .../libical/zoneinfo/Europe/Ljubljana.ics | 62 +- .../libical/zoneinfo/Europe/London.ics | 201 +- .../libical/zoneinfo/Europe/Luxembourg.ics | 154 +- .../libical/zoneinfo/Europe/Madrid.ics | 129 +- .../libical/zoneinfo/Europe/Malta.ics | 110 +- .../libical/zoneinfo/Europe/Mariehamn.ics | 22 - .../libical/zoneinfo/Europe/Minsk.ics | 128 +- .../libical/zoneinfo/Europe/Monaco.ics | 156 +- .../libical/zoneinfo/Europe/Moscow.ics | 148 +- .../libical/zoneinfo/Europe/Nicosia.ics | 91 +- .../calendar/libical/zoneinfo/Europe/Oslo.ics | 82 +- .../libical/zoneinfo/Europe/Paris.ics | 155 +- .../libical/zoneinfo/Europe/Podgorica.ics | 22 - .../libical/zoneinfo/Europe/Prague.ics | 89 +- .../calendar/libical/zoneinfo/Europe/Riga.ics | 166 +- .../calendar/libical/zoneinfo/Europe/Rome.ics | 118 +- .../libical/zoneinfo/Europe/Samara.ics | 117 +- .../libical/zoneinfo/Europe/San_Marino.ics | 118 +- .../libical/zoneinfo/Europe/Sarajevo.ics | 62 +- .../libical/zoneinfo/Europe/Simferopol.ics | 146 +- .../libical/zoneinfo/Europe/Skopje.ics | 62 +- .../libical/zoneinfo/Europe/Sofia.ics | 109 +- .../libical/zoneinfo/Europe/Stockholm.ics | 67 +- .../libical/zoneinfo/Europe/Tallinn.ics | 148 +- .../libical/zoneinfo/Europe/Tirane.ics | 78 +- .../libical/zoneinfo/Europe/Uzhgorod.ics | 139 +- .../libical/zoneinfo/Europe/Vaduz.ics | 50 +- .../libical/zoneinfo/Europe/Vatican.ics | 118 +- .../libical/zoneinfo/Europe/Vienna.ics | 78 +- .../libical/zoneinfo/Europe/Vilnius.ics | 152 +- .../libical/zoneinfo/Europe/Volgograd.ics | 22 - .../libical/zoneinfo/Europe/Warsaw.ics | 150 +- .../libical/zoneinfo/Europe/Zagreb.ics | 62 +- .../libical/zoneinfo/Europe/Zaporozhye.ics | 131 +- .../libical/zoneinfo/Europe/Zurich.ics | 69 +- .../libical/zoneinfo/Indian/Antananarivo.ics | 30 +- .../libical/zoneinfo/Indian/Chagos.ics | 16 +- .../libical/zoneinfo/Indian/Christmas.ics | 16 +- .../libical/zoneinfo/Indian/Cocos.ics | 9 +- .../libical/zoneinfo/Indian/Comoro.ics | 16 +- .../libical/zoneinfo/Indian/Kerguelen.ics | 16 +- .../calendar/libical/zoneinfo/Indian/Mahe.ics | 16 +- .../libical/zoneinfo/Indian/Maldives.ics | 23 +- .../libical/zoneinfo/Indian/Mauritius.ics | 16 +- .../libical/zoneinfo/Indian/Mayotte.ics | 16 +- .../libical/zoneinfo/Indian/Reunion.ics | 16 +- mozilla/calendar/libical/zoneinfo/Makefile.am | 2 - mozilla/calendar/libical/zoneinfo/Makefile.in | 312 +- .../libical/zoneinfo/Pacific/Apia.ics | 30 +- .../libical/zoneinfo/Pacific/Auckland.ics | 114 +- .../libical/zoneinfo/Pacific/Chatham.ics | 29 +- .../libical/zoneinfo/Pacific/Easter.ics | 130 +- .../libical/zoneinfo/Pacific/Efate.ics | 48 +- .../libical/zoneinfo/Pacific/Enderbury.ics | 30 +- .../libical/zoneinfo/Pacific/Fakaofo.ics | 16 +- .../libical/zoneinfo/Pacific/Fiji.ics | 32 +- .../libical/zoneinfo/Pacific/Funafuti.ics | 16 +- .../libical/zoneinfo/Pacific/Galapagos.ics | 23 +- .../libical/zoneinfo/Pacific/Gambier.ics | 16 +- .../libical/zoneinfo/Pacific/Guadalcanal.ics | 16 +- .../libical/zoneinfo/Pacific/Guam.ics | 28 +- .../libical/zoneinfo/Pacific/Honolulu.ics | 52 +- .../libical/zoneinfo/Pacific/Johnston.ics | 9 +- .../libical/zoneinfo/Pacific/Kiritimati.ics | 30 +- .../libical/zoneinfo/Pacific/Kosrae.ics | 30 +- .../libical/zoneinfo/Pacific/Kwajalein.ics | 30 +- .../libical/zoneinfo/Pacific/Majuro.ics | 23 +- .../libical/zoneinfo/Pacific/Marquesas.ics | 16 +- .../libical/zoneinfo/Pacific/Midway.ics | 28 +- .../libical/zoneinfo/Pacific/Nauru.ics | 37 +- .../libical/zoneinfo/Pacific/Niue.ics | 30 +- .../libical/zoneinfo/Pacific/Norfolk.ics | 23 +- .../libical/zoneinfo/Pacific/Noumea.ics | 34 +- .../libical/zoneinfo/Pacific/Pago_Pago.ics | 42 +- .../libical/zoneinfo/Pacific/Palau.ics | 16 +- .../libical/zoneinfo/Pacific/Pitcairn.ics | 23 +- .../libical/zoneinfo/Pacific/Ponape.ics | 16 +- .../libical/zoneinfo/Pacific/Port_Moresby.ics | 23 +- .../libical/zoneinfo/Pacific/Rarotonga.ics | 60 +- .../libical/zoneinfo/Pacific/Saipan.ics | 35 +- .../libical/zoneinfo/Pacific/Tahiti.ics | 16 +- .../libical/zoneinfo/Pacific/Tarawa.ics | 16 +- .../libical/zoneinfo/Pacific/Tongatapu.ics | 44 +- .../libical/zoneinfo/Pacific/Truk.ics | 16 +- .../libical/zoneinfo/Pacific/Wake.ics | 16 +- .../libical/zoneinfo/Pacific/Wallis.ics | 16 +- mozilla/calendar/libical/zoneinfo/zones.h | 397 - mozilla/calendar/libical/zoneinfo/zones.tab | 70 +- 498 files changed, 25083 insertions(+), 27076 deletions(-) delete mode 100644 mozilla/calendar/libical/COPYING delete mode 100644 mozilla/calendar/libical/INSTALL delete mode 100644 mozilla/calendar/libical/Makefile.am delete mode 100644 mozilla/calendar/libical/README.win32 delete mode 100644 mozilla/calendar/libical/TEST delete mode 100644 mozilla/calendar/libical/aclocal.m4 delete mode 100755 mozilla/calendar/libical/autogen.sh delete mode 100755 mozilla/calendar/libical/bootstrap delete mode 100755 mozilla/calendar/libical/buildpackages delete mode 100755 mozilla/calendar/libical/config.guess delete mode 100644 mozilla/calendar/libical/config.h.in delete mode 100755 mozilla/calendar/libical/config.sub delete mode 100644 mozilla/calendar/libical/configure.in delete mode 100644 mozilla/calendar/libical/configure.in.in delete mode 100644 mozilla/calendar/libical/depcomp delete mode 100755 mozilla/calendar/libical/install-sh delete mode 100755 mozilla/calendar/libical/ltconfig delete mode 100644 mozilla/calendar/libical/ltmain.sh delete mode 100755 mozilla/calendar/libical/missing delete mode 100644 mozilla/calendar/libical/mkinstalldirs delete mode 100644 mozilla/calendar/libical/src/libical.dsw delete mode 100644 mozilla/calendar/libical/zoneinfo/Africa/Asmara.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/America/Atikokan.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/America/Bahia.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/America/Blanc-Sablon.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/America/Campo_Grande.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/America/Danmarkshavn.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/America/Indiana/Petersburg.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/America/Indiana/Vincennes.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/America/Indiana/Winamac.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/America/Moncton.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/America/Toronto.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/Antarctica/Rothera.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/Asia/Choibalsan.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/Asia/Chongqing.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/Asia/Macau.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/Asia/Makassar.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/Asia/Oral.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/Asia/Qyzylorda.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/Asia/Sakhalin.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/Atlantic/Faroe.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/Australia/Currie.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/Australia/Eucla.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/Europe/Guernsey.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/Europe/Isle_of_Man.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/Europe/Jersey.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/Europe/Mariehamn.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/Europe/Podgorica.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/Europe/Volgograd.ics delete mode 100644 mozilla/calendar/libical/zoneinfo/zones.h diff --git a/mozilla/calendar/libical/AUTHORS b/mozilla/calendar/libical/AUTHORS index 3662b9a6667..ce25b7bd751 100644 --- a/mozilla/calendar/libical/AUTHORS +++ b/mozilla/calendar/libical/AUTHORS @@ -1,7 +1,3 @@ -Art Cancro (version 0.27) - -Omar Kilani (version 0.26) - John Gray Andrea Campi diff --git a/mozilla/calendar/libical/COPYING b/mozilla/calendar/libical/COPYING deleted file mode 100644 index 9ed264adf93..00000000000 --- a/mozilla/calendar/libical/COPYING +++ /dev/null @@ -1,33 +0,0 @@ -Libical is distributed under both the LGPL and the MPL. The MPL -notice, reproduced below, covers the use of either of the licenses. - ----------------------------------------------------------------------- - -The contents of this file are subject to the Mozilla Public License -Version 1.1 (the "License"); you may not use this file except in -compliance with the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS -IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -implied. See the License for the specific language governing rights -and limitations under the License. - - The Original Code is libical. - - The Initial Developer of the Original Code is Eric Busboom - - All Rights Reserved. - - Contributor(s): See individual source files. - -Alternatively, the contents of this file may be used under the terms -of the LGPL license, in which case the provisions of LGPL License are -applicable instead of those above. If you wish to allow use of your -version of this file only under the terms of the LGPL License and not -to allow others to use your version of this file under the MPL, -indicate your decision by deleting the provisions above and replace -them with the notice and other provisions required by the LGPL -License. If you do not delete the provisions above, a recipient may -use your version of this file under either the MPL or the LGPL -License." diff --git a/mozilla/calendar/libical/ChangeLog b/mozilla/calendar/libical/ChangeLog index ffb7b31cc38..97d25838f07 100644 --- a/mozilla/calendar/libical/ChangeLog +++ b/mozilla/calendar/libical/ChangeLog @@ -1,24 +1,3 @@ -2004-02-04 JP Rosevear (merged to upstream by Ross Burton and Art Cancro) - * src/libicalvcal/icalvcal.c (icalvcal_traverse_objects): just - return on unknown property - -2004-08-02 Not Zed (merged to upstream by Ross Burton and Art Cancro) - * src/libicalvcal/vcc.y: re-alloc when we reach the buffer length, - not one past it. Fixes an ABW. - -2005-09-15 Tor Lillqvist (merged to upstream by Ross Burton and Art Cancro) - * src/libical/vsnprintf.c: No reason not to include config.h also - on Win32. - -2007-05-18 Matthew Barnes (merged to upstream by Ross Burton and Art Cancro) - * src/libical/icalvalue.c: Fix implicit function declarations. - -2007-03-?? Art Cancro - * Updated tzdata in order to deal with daylight savings time changes in the US. - -200?-??-?? Omar Kilani (merged to upstream by Art Cancro) - * Merge the libical forks from KDE, Evolution, and SourceForge. - 2002-07-09 Andrea Campi * src/libical/icalcomponent.c diff --git a/mozilla/calendar/libical/INSTALL b/mozilla/calendar/libical/INSTALL deleted file mode 100644 index 095b1eb4063..00000000000 --- a/mozilla/calendar/libical/INSTALL +++ /dev/null @@ -1,231 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free -Software Foundation, Inc. - -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - -These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - -You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. - -Installation Names -================== - -By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PREFIX'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PREFIX', the package will -use PREFIX as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - -Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -will cause the specified gcc to be used as the C compiler (unless it is -overridden in the site shell script). - -`configure' Invocation -====================== - -`configure' recognizes the following options to control how it operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/mozilla/calendar/libical/Makefile.am b/mozilla/calendar/libical/Makefile.am deleted file mode 100644 index c375c8debf3..00000000000 --- a/mozilla/calendar/libical/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -EXTRA_DIST = \ - ChangeLog \ - README \ - TEST \ - TODO - -SUBDIRS = design-data doc scripts test-data src zoneinfo - diff --git a/mozilla/calendar/libical/README b/mozilla/calendar/libical/README index cc40c2503ce..19a4740e940 100644 --- a/mozilla/calendar/libical/README +++ b/mozilla/calendar/libical/README @@ -1,10 +1,6 @@ LIBICAL -- An implementation of basic iCAL protocols -Most of the code in here was written by Eric Busboom with help from -dozens of contributors. It is currently (and minimally) maintained -by Art Cancro. - The code and datafiles in this distribution are licensed under the Mozilla Public License. See http://www.mozilla.org/NPL/MPL-1.0.html for a copy of the license. Alternately, you may use libical under the @@ -30,7 +26,7 @@ This code is under active development. If you would like to contribute to the project, you can contact me, Eric Busboom, at eric@softwarestudio.org. The project has a webpage at - http://www.softwarestudio.org/softwarestudio/app.php/libical + http://softwarestudio.org/libical/index.html and a mailing list that you can join by sending the following mail: @@ -43,9 +39,9 @@ and a mailing list that you can join by sending the following mail: Building the library -------------------- -This distribution is developed on CentOS Linux and usually -compiles on Solaris and FreeBSD. There are reports of success of -previous version on MacOS ( with CodeWarrior ) and on UnixWare, but we +This distribution is developed on Red Hat Linux 6.0 and usually +compiles on SunOS 5.6 and FreeBSD 2.27. I have reports of success of +previous version on MacOS ( with CodeWarrior ) and on UnixWare, but I don't know about any other systems. The library is configured with automake. IF YOU ARE BUILDING THE @@ -99,3 +95,8 @@ Using the Library There is rudimentary, unfinished documentation in the /doc directory, and annotated examples in /examples and the test code in src/test. + + + +Eric Busboom +eric@softwarestudio.org diff --git a/mozilla/calendar/libical/README.win32 b/mozilla/calendar/libical/README.win32 deleted file mode 100644 index c47c5d0999a..00000000000 --- a/mozilla/calendar/libical/README.win32 +++ /dev/null @@ -1,61 +0,0 @@ -Building on Win32. - -Building libical on Windows is a different process than building it on the other platforms: Instead of autogenerating makefiles using the autoconf/automake/make tools, Microsoft project files (.dsp) are used. - -Here are the requirements and steps to build libical on the Win32 platform. - -Software Requirements ---------------------- - -The following softwares need to be installed for a standard Windows build: - -- Microsoft Visual C++ 6.0 or higher (only tested on 6.0 as of today). - -- GNU Tools for Microsoft Windows (the cygwin toolkit). - cygwin is a UNIX-like environment for Windows, free from Red Hat. libical uses a few set of cygwin packages, which must be installed. - Go to http://www.cygwin.com and follow the installation instructions. The cygwin installer wizard runs as a Windows program. One page of the wizard presents an outline view of categories and packages. Here is a list of the cygwin packages needed for building libical: - . base --> ash : Unix-like command line interpreter shell. - . base --> grep: GNU grep, egrep and fgrep - . interpreters --> perl: A scripting language used to autogenerate some header files. - -Environment Variables ---------------------- - -Visual C++ needs to be able to launch the cygwin tools. To do so, you can either: -- add the path to the cygwin tools (by default c:\cygwin\bin) to your global or user Path enviroment variable, -- or, in Visual C++ go to Tools --> Options --> Directories --> Show directories for Executable files and add the path to the cygwin tools (by default c:\cygwin\bin). - -Building the library --------------------- -You need to build each subcomponent of libical one by one in the following order: - . src/libical/libical.dsp - . src/libicalss/libicalss.dsp - . src/libicalvcal/libicalvcal.dsp - -Testing your build ------------------- -libical comes with 2 regression test programs: - . src/test/recur.dsp - . src/test/regression.dsp - -Building those and running them (from the command line or from VC++) is probably a good idea to check that your build is OK. The results are pretty much self explanatory. -Of course, running the regression tests becomes mandatory if you're planning on submitting a change. - - -Using the library ------------------ -By default, the library is created as a static library under src/libical/Debug/libical.lib (Debug version). You can also create a Release version which will be put under src/libical/Release/libical.lib. - -The header file ical.h is autogenerated by the build process and should be located under src/libical/ical.h. - -The library is created using the (Debug) Multithreaded DLL run-time library option. Be sure that you have the same setting in your application (Project --> Settings --> C/C++ --> Code Generation) or things will start to break. - The symptoms of this problem are link time errors like: - MSVCRTD.lib(MSVCRTD.dll) : error LNK2005: _malloc already defined in -LIBCMTD.lib(dbgheap.obj) - MSVCRTD.lib(MSVCRTD.dll) : error LNK2005: _free already defined in -LIBCMTD.lib(dbgheap.obj) - MSVCRTD.lib(MSVCRTD.dll) : error LNK2005: _strncmp already defined in -LIBCMTD.lib(strncmp.obj) - -Alternatively, you can alter the libical .dsp files and recompile the library. - diff --git a/mozilla/calendar/libical/TEST b/mozilla/calendar/libical/TEST deleted file mode 100644 index 90c3473b31c..00000000000 --- a/mozilla/calendar/libical/TEST +++ /dev/null @@ -1,4 +0,0 @@ - -Parser Tests ------------- -Use iCAL keywords as first words of unquoted strings \ No newline at end of file diff --git a/mozilla/calendar/libical/aclocal.m4 b/mozilla/calendar/libical/aclocal.m4 deleted file mode 100644 index 9a5471c0339..00000000000 --- a/mozilla/calendar/libical/aclocal.m4 +++ /dev/null @@ -1,7493 +0,0 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - -# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL - - -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -# ----------------------------------------------------------- -# If this macro is not defined by Autoconf, define it here. -m4_ifdef([AC_PROVIDE_IFELSE], - [], - [m4_define([AC_PROVIDE_IFELSE], - [m4_ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) - - -# AC_PROG_LIBTOOL -# --------------- -AC_DEFUN([AC_PROG_LIBTOOL], -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. - AC_PROVIDE_IFELSE([AC_PROG_CXX], - [AC_LIBTOOL_CXX], - [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX - ])]) -dnl And a similar setup for Fortran 77 support - AC_PROVIDE_IFELSE([AC_PROG_F77], - [AC_LIBTOOL_F77], - [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 -])]) - -dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. -dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run -dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. - AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [ifdef([AC_PROG_GCJ], - [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([A][M_PROG_GCJ], - [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([LT_AC_PROG_GCJ], - [define([LT_AC_PROG_GCJ], - defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) -])])# AC_PROG_LIBTOOL - - -# _AC_PROG_LIBTOOL -# ---------------- -AC_DEFUN([_AC_PROG_LIBTOOL], -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl -AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -# Prevent multiple expansion -define([AC_PROG_LIBTOOL], []) -])# _AC_PROG_LIBTOOL - - -# AC_LIBTOOL_SETUP -# ---------------- -AC_DEFUN([AC_LIBTOOL_SETUP], -[AC_PREREQ(2.50)dnl -AC_REQUIRE([AC_ENABLE_SHARED])dnl -AC_REQUIRE([AC_ENABLE_STATIC])dnl -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_LD])dnl -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -AC_REQUIRE([AC_PROG_NM])dnl - -AC_REQUIRE([AC_PROG_LN_S])dnl -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -AC_REQUIRE([AC_OBJEXT])dnl -AC_REQUIRE([AC_EXEEXT])dnl -dnl - -AC_LIBTOOL_SYS_MAX_CMD_LEN -AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -AC_LIBTOOL_OBJDIR - -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -_LT_AC_PROG_ECHO_BACKSLASH - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='sed -e 1s/^X//' -[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] - -# Same as above, but do not quote variable references. -[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -# Constants: -rm="rm -f" - -# Global variables: -default_ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a -ltmain="$ac_aux_dir/ltmain.sh" -ofile="$default_ofile" -with_gnu_ld="$lt_cv_prog_gnu_ld" - -AC_CHECK_TOOL(AR, ar, false) -AC_CHECK_TOOL(RANLIB, ranlib, :) -AC_CHECK_TOOL(STRIP, strip, :) - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -test -z "$AS" && AS=as -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$DLLTOOL" && DLLTOOL=dlltool -test -z "$LD" && LD=ld -test -z "$LN_S" && LN_S="ln -s" -test -z "$MAGIC_CMD" && MAGIC_CMD=file -test -z "$NM" && NM=nm -test -z "$SED" && SED=sed -test -z "$OBJDUMP" && OBJDUMP=objdump -test -z "$RANLIB" && RANLIB=: -test -z "$STRIP" && STRIP=: -test -z "$ac_objext" && ac_objext=o - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi - -_LT_CC_BASENAME([$compiler]) - -# Only perform the check for file, if the check method requires it -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - AC_PATH_MAGIC - fi - ;; -esac - -AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -enable_win32_dll=yes, enable_win32_dll=no) - -AC_ARG_ENABLE([libtool-lock], - [AC_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -AC_ARG_WITH([pic], - [AC_HELP_STRING([--with-pic], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], - [pic_mode=default]) -test -z "$pic_mode" && pic_mode=default - -# Use C for the default configuration in the libtool script -tagname= -AC_LIBTOOL_LANG_C_CONFIG -_LT_AC_TAGCONFIG -])# AC_LIBTOOL_SETUP - - -# _LT_AC_SYS_COMPILER -# ------------------- -AC_DEFUN([_LT_AC_SYS_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC -])# _LT_AC_SYS_COMPILER - - -# _LT_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 conftest* -])# _LT_LINKER_BOILERPLATE - - -# _LT_AC_SYS_LIBPATH_AIX -# ---------------------- -# Links a minimal program and checks the executable -# for the system default hardcoded library path. In most cases, -# this is /usr/lib:/lib, but when the MPI compilers are used -# the location of the communication and MPI libs are included too. -# If we don't find anything, use the default library path according -# to the aix ld manual. -AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -[AC_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 "$lt_aix_libpath_sed"` -fi],[]) -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -])# _LT_AC_SYS_LIBPATH_AIX - - -# _LT_AC_SHELL_INIT(ARG) -# ---------------------- -AC_DEFUN([_LT_AC_SHELL_INIT], -[ifdef([AC_DIVERSION_NOTICE], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) -$1 -AC_DIVERT_POP -])# _LT_AC_SHELL_INIT - - -# _LT_AC_PROG_ECHO_BACKSLASH -# -------------------------- -# Add some code to the start of the generated configure script which -# will find an echo command which doesn't interpret backslashes. -AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], -[_LT_AC_SHELL_INIT([ -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` - ;; -esac - -echo=${ECHO-echo} -if test "X[$]1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X[$]1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then - # Yippee, $echo works! - : -else - # Restart under the correct shell. - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} -fi - -if test "X[$]1" = X--fallback-echo; then - # used as fallback echo - shift - cat </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` && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break - fi - done -fi - -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : -else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$echo" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - echo='print -r' - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} - else - # Try using printf. - echo='printf %s\n' - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - echo="$CONFIG_SHELL [$]0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$CONFIG_SHELL [$]0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "[$]0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} - else - # Oops. We lost completely, so just stick with echo. - echo=echo - fi - fi - fi - fi -fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -ECHO=$echo -if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then - ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -fi - -AC_SUBST(ECHO) -])])# _LT_AC_PROG_ECHO_BACKSLASH - - -# _LT_AC_LOCK -# ----------- -AC_DEFUN([_LT_AC_LOCK], -[AC_ARG_ENABLE([libtool-lock], - [AC_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -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 - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) - AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -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" ;; - *) LD="${LD-ld} -64" ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -[*-*-cygwin* | *-*-mingw* | *-*-pw32*) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - ;; - ]) -esac - -need_locks="$enable_libtool_lock" - -])# _LT_AC_LOCK - - -# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------------------- -# Check whether the given compiler option works -AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], -[AC_REQUIRE([LT_AC_PROG_SED]) -AC_CACHE_CHECK([$1], [$2], - [$2=no - ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&AS_MESSAGE_LOG_FD - 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 other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - fi - $rm conftest* -]) - -if test x"[$]$2" = xyes; then - ifelse([$5], , :, [$5]) -else - ifelse([$6], , :, [$6]) -fi -])# AC_LIBTOOL_COMPILER_OPTION - - -# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ------------------------------------------------------------ -# Check whether the given compiler option works -AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $3" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&AS_MESSAGE_LOG_FD - $echo "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* - LDFLAGS="$save_LDFLAGS" -]) - -if test x"[$]$2" = xyes; then - ifelse([$4], , :, [$4]) -else - ifelse([$5], , :, [$5]) -fi -])# AC_LIBTOOL_LINKER_OPTION - - -# AC_LIBTOOL_SYS_MAX_CMD_LEN -# -------------------------- -AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], -[# find the maximum length of command line arguments -AC_MSG_CHECKING([the maximum length of command line arguments]) -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 - teststring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - 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 -]) -if test -n $lt_cv_sys_max_cmd_len ; then - AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -else - AC_MSG_RESULT(none) -fi -])# AC_LIBTOOL_SYS_MAX_CMD_LEN - - -# _LT_AC_CHECK_DLFCN -# ------------------ -AC_DEFUN([_LT_AC_CHECK_DLFCN], -[AC_CHECK_HEADERS(dlfcn.h)dnl -])# _LT_AC_CHECK_DLFCN - - -# _LT_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 : - [$4] -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - else - puts (dlerror ()); - - exit (status); -}] -EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) $1 ;; - x$lt_dlneed_uscore) $2 ;; - x$lt_dlunknown|x*) $3 ;; - esac - else : - # compilation failed - $3 - fi -fi -rm -fr conftest* -])# _LT_AC_TRY_DLOPEN_SELF - - -# AC_LIBTOOL_DLOPEN_SELF -# ---------------------- -AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ]) - ;; - - *) - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) - ]) - ]) - ]) - ]) - ]) - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - AC_CACHE_CHECK([whether a program can dlopen itself], - lt_cv_dlopen_self, [dnl - _LT_AC_TRY_DLOPEN_SELF( - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) - ]) - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - AC_CACHE_CHECK([whether a statically linked program can dlopen itself], - lt_cv_dlopen_self_static, [dnl - _LT_AC_TRY_DLOPEN_SELF( - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) - ]) - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi -])# AC_LIBTOOL_DLOPEN_SELF - - -# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) -# --------------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler -AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -[AC_REQUIRE([LT_AC_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 - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $echo "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 . 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* -]) -])# AC_LIBTOOL_PROG_CC_C_O - - -# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) -# ----------------------------------------- -# Check to see if we can do hard links to lock some files if needed -AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], -[AC_REQUIRE([_LT_AC_LOCK])dnl - -hard_links="nottested" -if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - AC_MSG_CHECKING([if we can lock with hard links]) - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) - need_locks=warn - fi -else - need_locks=no -fi -])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS - - -# AC_LIBTOOL_OBJDIR -# ----------------- -AC_DEFUN([AC_LIBTOOL_OBJDIR], -[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -[rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null]) -objdir=$lt_cv_objdir -])# AC_LIBTOOL_OBJDIR - - -# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) -# ---------------------------------------------- -# Check hardcoding attributes. -AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], -[AC_MSG_CHECKING([how to hardcode library paths into programs]) -_LT_AC_TAGVAR(hardcode_action, $1)= -if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ - test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then - # Linking always hardcodes the temporary library directory. - _LT_AC_TAGVAR(hardcode_action, $1)=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - _LT_AC_TAGVAR(hardcode_action, $1)=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - _LT_AC_TAGVAR(hardcode_action, $1)=unsupported -fi -AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) - -if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = 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 -])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH - - -# AC_LIBTOOL_SYS_LIB_STRIP -# ------------------------ -AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], -[striplib= -old_striplib= -AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) -fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac -fi -])# AC_LIBTOOL_SYS_LIB_STRIP - - -# AC_LIBTOOL_SYS_DYNAMIC_LINKER -# ----------------------------- -# PORTME Fill in your ld.so characteristics -AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_MSG_CHECKING([dynamic linker characteristics]) -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" -m4_if($1,[],[ -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[[lt_foo]]++; } - if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -}'` - sys_lib_search_path_spec=`echo $lt_search_path_spec` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi]) -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.so - # instead of lib.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 - ;; - -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 - - 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 - ;; - -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`' - m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux - 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* | 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 - ;; - -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_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' - ;; - -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 ;; - *) - 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* | 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 - - # 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, - # 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' - ;; - -netbsdelf*-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 - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux - 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 - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux - 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 - ;; - -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}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi -])# AC_LIBTOOL_SYS_DYNAMIC_LINKER - - -# _LT_AC_TAGCONFIG -# ---------------- -AC_DEFUN([_LT_AC_TAGCONFIG], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_ARG_WITH([tags], - [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], - [include additional configurations @<:@automatic@:>@])], - [tagnames="$withval"]) - -if test -f "$ltmain" && test -n "$tagnames"; then - if test ! -f "${ofile}"; then - AC_MSG_WARN([output file `$ofile' does not exist]) - fi - - if test -z "$LTCC"; then - eval "`$SHELL ${ofile} --config | grep '^LTCC='`" - if test -z "$LTCC"; then - AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) - else - AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) - fi - fi - 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. - available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` - - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for tagname in $tagnames; do - IFS="$lt_save_ifs" - # Check whether tagname contains only valid characters - case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in - "") ;; - *) AC_MSG_ERROR([invalid tag name: $tagname]) - ;; - esac - - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null - then - AC_MSG_ERROR([tag name \"$tagname\" already exists]) - fi - - # Update the list of available tags. - if test -n "$tagname"; then - echo appending configuration tag \"$tagname\" to $ofile - - case $tagname in - CXX) - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_LIBTOOL_LANG_CXX_CONFIG - else - tagname="" - fi - ;; - - F77) - if test -n "$F77" && test "X$F77" != "Xno"; then - AC_LIBTOOL_LANG_F77_CONFIG - else - tagname="" - fi - ;; - - GCJ) - if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - AC_LIBTOOL_LANG_GCJ_CONFIG - else - tagname="" - fi - ;; - - RC) - AC_LIBTOOL_LANG_RC_CONFIG - ;; - - *) - AC_MSG_ERROR([Unsupported tag name: $tagname]) - ;; - esac - - # Append the new tag name to the list of available tags. - if test -n "$tagname" ; then - available_tags="$available_tags $tagname" - fi - fi - done - IFS="$lt_save_ifs" - - # Now substitute the updated list of available tags. - if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then - mv "${ofile}T" "$ofile" - chmod +x "$ofile" - else - rm -f "${ofile}T" - AC_MSG_ERROR([unable to update list of available tagged configurations.]) - fi -fi -])# _LT_AC_TAGCONFIG - - -# AC_LIBTOOL_DLOPEN -# ----------------- -# enable checks for dlopen support -AC_DEFUN([AC_LIBTOOL_DLOPEN], - [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) -])# AC_LIBTOOL_DLOPEN - - -# AC_LIBTOOL_WIN32_DLL -# -------------------- -# declare package support for building win32 DLLs -AC_DEFUN([AC_LIBTOOL_WIN32_DLL], -[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) -])# AC_LIBTOOL_WIN32_DLL - - -# AC_ENABLE_SHARED([DEFAULT]) -# --------------------------- -# implement the --enable-shared flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_SHARED], -[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([shared], - [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], - [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_shared=]AC_ENABLE_SHARED_DEFAULT) -])# AC_ENABLE_SHARED - - -# AC_DISABLE_SHARED -# ----------------- -# set the default shared flag to --disable-shared -AC_DEFUN([AC_DISABLE_SHARED], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_SHARED(no) -])# AC_DISABLE_SHARED - - -# AC_ENABLE_STATIC([DEFAULT]) -# --------------------------- -# implement the --enable-static flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_STATIC], -[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([static], - [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], - [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_static=]AC_ENABLE_STATIC_DEFAULT) -])# AC_ENABLE_STATIC - - -# AC_DISABLE_STATIC -# ----------------- -# set the default static flag to --disable-static -AC_DEFUN([AC_DISABLE_STATIC], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_STATIC(no) -])# AC_DISABLE_STATIC - - -# AC_ENABLE_FAST_INSTALL([DEFAULT]) -# --------------------------------- -# implement the --enable-fast-install flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_FAST_INSTALL], -[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([fast-install], - [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], - [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) -])# AC_ENABLE_FAST_INSTALL - - -# AC_DISABLE_FAST_INSTALL -# ----------------------- -# set the default to --disable-fast-install -AC_DEFUN([AC_DISABLE_FAST_INSTALL], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_FAST_INSTALL(no) -])# AC_DISABLE_FAST_INSTALL - - -# AC_LIBTOOL_PICMODE([MODE]) -# -------------------------- -# implement the --with-pic flag -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -AC_DEFUN([AC_LIBTOOL_PICMODE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -pic_mode=ifelse($#,1,$1,default) -])# AC_LIBTOOL_PICMODE - - -# AC_PROG_EGREP -# ------------- -# This is predefined starting with Autoconf 2.54, so this conditional -# definition can be removed once we require Autoconf 2.54 or later. -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], -[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], - [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi]) - EGREP=$ac_cv_prog_egrep - AC_SUBST([EGREP]) -])]) - - -# AC_PATH_TOOL_PREFIX -# ------------------- -# find a file program which can recognize shared library -AC_DEFUN([AC_PATH_TOOL_PREFIX], -[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in -[[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -dnl $ac_dummy forces splitting on constant user-supplied paths. -dnl POSIX.2 word splitting is done only on the output of word expansions, -dnl not every word. This closes a longstanding sh security hole. - ac_dummy="ifelse([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) -else - AC_MSG_RESULT(no) -fi -])# AC_PATH_TOOL_PREFIX - - -# AC_PATH_MAGIC -# ------------- -# 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 - if test -n "$ac_tool_prefix"; then - AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) - else - MAGIC_CMD=: - fi -fi -])# AC_PATH_MAGIC - - -# AC_PROG_LD -# ---------- -# 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], - [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], - [with_gnu_ld=no]) -AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by $CC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(lt_cv_path_LD, -[if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &1 /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*) - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -interix[[3-9]]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -nto-qnx*) - lt_cv_deplibs_check_method=unknown - ;; - -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; -esac -]) -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown -])# AC_DEPLIBS_CHECK_METHOD - - -# AC_PROG_NM -# ---------- -# 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_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -fi]) -NM="$lt_cv_path_NM" -])# AC_PROG_NM - - -# AC_CHECK_LIBM -# ------------- -# check for math library -AC_DEFUN([AC_CHECK_LIBM], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, cos, LIBM="-lm") - ;; -esac -])# AC_CHECK_LIBM - - -# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) -# ----------------------------------- -# sets LIBLTDL to the link flags for the libltdl convenience library and -# LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-convenience to the configure arguments. Note that -# 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 - no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; - "") enable_ltdl_convenience=yes - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; - esac - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" -])# AC_LIBLTDL_CONVENIENCE - - -# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) -# ----------------------------------- -# sets LIBLTDL to the link flags for the libltdl installable library and -# LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-install to the configure arguments. Note that -# 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 - AC_CHECK_LIB(ltdl, lt_dlinit, - [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], - [if test x"$enable_ltdl_install" = xno; then - AC_MSG_WARN([libltdl not installed, but installation disabled]) - else - enable_ltdl_install=yes - fi - ]) - if test x"$enable_ltdl_install" = x"yes"; then - ac_configure_args="$ac_configure_args --enable-ltdl-install" - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - else - ac_configure_args="$ac_configure_args --enable-ltdl-install=no" - LIBLTDL="-lltdl" - LTDLINCL= - fi - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" -])# AC_LIBLTDL_INSTALLABLE - - -# AC_LIBTOOL_CXX -# -------------- -# enable support for C++ libraries -AC_DEFUN([AC_LIBTOOL_CXX], -[AC_REQUIRE([_LT_AC_LANG_CXX]) -])# AC_LIBTOOL_CXX - - -# _LT_AC_LANG_CXX -# --------------- -AC_DEFUN([_LT_AC_LANG_CXX], -[AC_REQUIRE([AC_PROG_CXX]) -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 -# -------------- -# enable support for Fortran 77 libraries -AC_DEFUN([AC_LIBTOOL_F77], -[AC_REQUIRE([_LT_AC_LANG_F77]) -])# AC_LIBTOOL_F77 - - -# _LT_AC_LANG_F77 -# --------------- -AC_DEFUN([_LT_AC_LANG_F77], -[AC_REQUIRE([AC_PROG_F77]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) -])# _LT_AC_LANG_F77 - - -# AC_LIBTOOL_GCJ -# -------------- -# enable support for GCJ libraries -AC_DEFUN([AC_LIBTOOL_GCJ], -[AC_REQUIRE([_LT_AC_LANG_GCJ]) -])# AC_LIBTOOL_GCJ - - -# _LT_AC_LANG_GCJ -# --------------- -AC_DEFUN([_LT_AC_LANG_GCJ], -[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], - [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], - [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], - [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) -_LT_AC_SHELL_INIT([tagnames=${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=${tagnames+${tagnames},}RC]) -])# AC_LIBTOOL_RC - - -# AC_LIBTOOL_LANG_C_CONFIG -# ------------------------ -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) -AC_DEFUN([_LT_AC_LANG_C_CONFIG], -[lt_save_CC="$CC" -AC_LANG_PUSH(C) - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' - -_LT_AC_SYS_COMPILER - -# 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_DLOPEN_SELF - -# Report which library types will actually be built -AC_MSG_CHECKING([if libtool supports shared libraries]) -AC_MSG_RESULT([$can_build_shared]) - -AC_MSG_CHECKING([whether to build shared libraries]) -test "$can_build_shared" = "no" && enable_shared=no - -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case $host_os in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - -aix4* | aix5*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; -esac -AC_MSG_RESULT([$enable_shared]) - -AC_MSG_CHECKING([whether to build static libraries]) -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -AC_MSG_RESULT([$enable_static]) - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_POP -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_C_CONFIG - - -# AC_LIBTOOL_LANG_CXX_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) -AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], -[AC_LANG_PUSH(C++) -AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([_LT_AC_PROG_CXXCPP]) - -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_AC_TAGVAR(allow_undefined_flag, $1)= -_LT_AC_TAGVAR(always_export_symbols, $1)=no -_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_direct, $1)=no -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -_LT_AC_TAGVAR(hardcode_automatic, $1)=no -_LT_AC_TAGVAR(module_cmds, $1)= -_LT_AC_TAGVAR(module_expsym_cmds, $1)= -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_AC_TAGVAR(no_undefined_flag, $1)= -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Dependencies to place before and after the object being linked: -_LT_AC_TAGVAR(predep_objects, $1)= -_LT_AC_TAGVAR(postdep_objects, $1)= -_LT_AC_TAGVAR(predeps, $1)= -_LT_AC_TAGVAR(postdeps, $1)= -_LT_AC_TAGVAR(compiler_lib_search_path, $1)= - -# Source file extension for C++ test sources. -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;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_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 -lt_save_GCC=$GCC -GCC=$GXX -lt_save_with_gnu_ld=$with_gnu_ld -lt_save_path_LD=$lt_cv_path_LD -if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -else - $as_unset lt_cv_prog_gnu_ld -fi -if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX -else - $as_unset lt_cv_path_LD -fi -test -z "${LDCXX+set}" || LD=$LDCXX -CC=${CXX-"c++"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) - -# We don't want -fno-exception wen compiling C++ code, so set the -# no_builtin_flag separately -if test "$GXX" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -else - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -fi - -if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - AC_PROG_LD - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ - grep 'no-whole-archive' > /dev/null; then - _LT_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 - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - -else - GXX=no - with_gnu_ld=no - wlarc= -fi - -# PORTME: fill in a description of your system's C++ link characteristics -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -_LT_AC_TAGVAR(ld_shlibs, $1)=yes -case $host_os in - aix3*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_AC_TAGVAR(archive_cmds, $1)='' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - if test "$GXX" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${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 '"\${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 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _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 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 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 - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--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 - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - darwin* | rhapsody*) - 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 - _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 - - if test "$GXX" = yes ; then - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | $EGREP '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 -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 $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 - 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 -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 $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - 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++*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - freebsd[[12]]*) - # C++ shared libraries reported to be fairly broken before switch to ELF - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - freebsd-elf*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - ;; - gnu*) - ;; - hpux9*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | 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 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - hpux10*|hpux11*) - 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)=: - - case $host_cpu in - hppa*64*|ia64*) ;; - *) - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - esac - fi - 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_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - 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' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - 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' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - 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*) - # 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 ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_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 - fi - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - esac - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc*) - # Intel C++ - with_gnu_ld=yes - # 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(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' - ;; - pgCC*) - # 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' - - runpath_var=LD_RUN_PATH - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - 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*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - m88k*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - 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*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${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)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _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}${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)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${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 ${output_objdir}/so_locations -o $lib~ - $rm $lib.exp' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - 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}${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)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - psos*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - solaris*) - case $cc_basename in - 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} -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} ${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]].*) ;; - *) - # 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)='-z allextract$convenience -z defaultextract' - ;; - esac - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - 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' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | grep -v '^2\.7' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" - fi - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' - 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 - ;; - 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*) - # NonStop-UX NCC 3.20 - # 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 - ;; - vxworks*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -esac -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -_LT_AC_TAGVAR(GCC, $1)="$GXX" -_LT_AC_TAGVAR(LD, $1)="$LD" - -AC_LIBTOOL_POSTDEP_PREDEP($1) -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_POP -CC=$lt_save_CC -LDCXX=$LD -LD=$lt_save_LD -GCC=$lt_save_GCC -with_gnu_ldcxx=$with_gnu_ld -with_gnu_ld=$lt_save_with_gnu_ld -lt_cv_path_LDCXX=$lt_cv_path_LD -lt_cv_path_LD=$lt_save_path_LD -lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -])# AC_LIBTOOL_LANG_CXX_CONFIG - -# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) -# ------------------------------------ -# Figure out "hidden" library dependencies from verbose -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# objects, libraries and library flags. -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ -dnl we can't use the lt_simple_compile_test_code here, -dnl because it contains code intended for an executable, -dnl not a library. It's possible we should let each -dnl tag define a new lt_????_link_test_code variable, -dnl but it's only used here... -ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&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'. -AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)]) -AC_DEFUN([_LT_AC_LANG_F77_CONFIG], -[AC_REQUIRE([AC_PROG_F77]) -AC_LANG_PUSH(Fortran 77) - -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_AC_TAGVAR(allow_undefined_flag, $1)= -_LT_AC_TAGVAR(always_export_symbols, $1)=no -_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_direct, $1)=no -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -_LT_AC_TAGVAR(hardcode_automatic, $1)=no -_LT_AC_TAGVAR(module_cmds, $1)= -_LT_AC_TAGVAR(module_expsym_cmds, $1)= -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_AC_TAGVAR(no_undefined_flag, $1)= -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for f77 test sources. -ac_ext=f - -# Object file extension for compiled f77 test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="\ - subroutine t - return - end -" - -# Code to be used in simple link tests -lt_simple_link_test_code="\ - program t - end -" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_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 -_LT_CC_BASENAME([$compiler]) - -AC_MSG_CHECKING([if libtool supports shared libraries]) -AC_MSG_RESULT([$can_build_shared]) - -AC_MSG_CHECKING([whether to build shared libraries]) -test "$can_build_shared" = "no" && enable_shared=no - -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case $host_os in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; -aix4* | aix5*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; -esac -AC_MSG_RESULT([$enable_shared]) - -AC_MSG_CHECKING([whether to build static libraries]) -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -AC_MSG_RESULT([$enable_static]) - -_LT_AC_TAGVAR(GCC, $1)="$G77" -_LT_AC_TAGVAR(LD, $1)="$LD" - -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_POP -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_F77_CONFIG - - -# AC_LIBTOOL_LANG_GCJ_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)]) -AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], -[AC_LANG_SAVE - -# Source file extension for Java test sources. -ac_ext=java - -# Object file extension for compiled Java test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" - -# Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_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_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_RESTORE -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_GCJ_CONFIG - - -# AC_LIBTOOL_LANG_RC_CONFIG -# ------------------------- -# Ensure that the configuration vars for the Windows resource compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)]) -AC_DEFUN([_LT_AC_LANG_RC_CONFIG], -[AC_LANG_SAVE - -# Source file extension for RC test sources. -ac_ext=rc - -# Object file extension for compiled RC test sources. -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 }' - -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_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) - -AC_LANG_RESTORE -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_RC_CONFIG - - -# AC_LIBTOOL_CONFIG([TAGNAME]) -# ---------------------------- -# If TAGNAME is not passed, then create an initial libtool script -# with a default configuration from the untagged config vars. Otherwise -# add code to config.status for appending the configuration named by -# TAGNAME from the matching tagged config vars. -AC_DEFUN([AC_LIBTOOL_CONFIG], -[# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC 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 \ - _LT_AC_TAGVAR(compiler, $1) \ - _LT_AC_TAGVAR(CC, $1) \ - _LT_AC_TAGVAR(LD, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ - _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ - _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ - _LT_AC_TAGVAR(old_archive_cmds, $1) \ - _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ - _LT_AC_TAGVAR(predep_objects, $1) \ - _LT_AC_TAGVAR(postdep_objects, $1) \ - _LT_AC_TAGVAR(predeps, $1) \ - _LT_AC_TAGVAR(postdeps, $1) \ - _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ - _LT_AC_TAGVAR(archive_cmds, $1) \ - _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ - _LT_AC_TAGVAR(postinstall_cmds, $1) \ - _LT_AC_TAGVAR(postuninstall_cmds, $1) \ - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ - _LT_AC_TAGVAR(allow_undefined_flag, $1) \ - _LT_AC_TAGVAR(no_undefined_flag, $1) \ - _LT_AC_TAGVAR(export_symbols_cmds, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \ - _LT_AC_TAGVAR(hardcode_automatic, $1) \ - _LT_AC_TAGVAR(module_cmds, $1) \ - _LT_AC_TAGVAR(module_expsym_cmds, $1) \ - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ - _LT_AC_TAGVAR(fix_srcfile_path, $1) \ - _LT_AC_TAGVAR(exclude_expsyms, $1) \ - _LT_AC_TAGVAR(include_expsyms, $1); do - - case $var in - _LT_AC_TAGVAR(old_archive_cmds, $1) | \ - _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ - _LT_AC_TAGVAR(archive_cmds, $1) | \ - _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ - _LT_AC_TAGVAR(module_cmds, $1) | \ - _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ - _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - 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 - -ifelse([$1], [], - [cfgfile="${ofile}T" - trap "$rm \"$cfgfile\"; exit 1" 1 2 15 - $rm -f "$cfgfile" - AC_MSG_NOTICE([creating $ofile])], - [cfgfile="$ofile"]) - - cat <<__EOF__ >> "$cfgfile" -ifelse([$1], [], -[#! $SHELL - -# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -# Free Software Foundation, Inc. -# -# This file is part of GNU Libtool: -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 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. - -# A sed program that does not truncate output. -SED=$lt_SED - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e 1s/^X//" - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -# The names of the tagged configurations supported by this script. -available_tags= - -# ### BEGIN LIBTOOL CONFIG], -[# ### 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=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - -# 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 - -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - -# A language-specific compiler. -CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) - -# Is the compiler the GNU C compiler? -with_gcc=$_LT_AC_TAGVAR(GCC, $1) - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_[]_LT_AC_TAGVAR(LD, $1) - -# 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=$lt_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_AC_TAGVAR(lt_prog_compiler_wl, $1) - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) -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_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) - -# 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_AC_TAGVAR(lt_prog_compiler_static, $1) - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) - -# Commands used to build and install a shared archive. -archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) -archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) -module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $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) - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# This is the shared library runtime path variable. -runpath_var=$runpath_var - -# This is the shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# How to hardcode a shared library path into an executable. -hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) - -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) - -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path - -# Set to yes if exported symbols are required. -always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) - -# The commands to list exported symbols. -export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) - -# Symbols that must always be exported. -include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) - -ifelse([$1],[], -[# ### END LIBTOOL CONFIG], -[# ### END LIBTOOL TAG CONFIG: $tagname]) - -__EOF__ - -ifelse([$1],[], [ - case $host_os in - aix3*) - cat <<\EOF >> "$cfgfile" - -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -EOF - ;; - esac - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) - - mv -f "$cfgfile" "$ofile" || \ - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -]) -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - 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 - - -# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------------------- -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl - -_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - -if test "$GCC" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - - AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, - [-fno-rtti -fno-exceptions], [], - [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -fi -])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI - - -# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -# --------------------------------- -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. -AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -[ -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[[BCDEGRST]]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' - -# Transform an extracted symbol line into a proper C declaration -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) # Its linker distinguishes data from code symbols - if test "$host_cpu" = ia64; then - symcode='[[ABCDEGRST]]' - fi - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - ;; -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*) - symcode='[[BDRT]]' - ;; -sco3.2v5*) - symcode='[[DT]]' - ;; -sysv4.2uw2*) - symcode='[[DT]]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[[ABDT]]' - ;; -sysv4) - symcode='[[DFNSTU]]' - ;; -esac - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[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'" - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if grep ' nm_test_var$' "$nlist" >/dev/null; then - if grep ' nm_test_func$' "$nlist" >/dev/null; then - cat < conftest.$ac_ext -#ifdef __cplusplus -extern "C" { -#endif - -EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' - - cat <> conftest.$ac_ext -#if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * -#else -# define lt_ptr_t char * -# define const -#endif - -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - lt_ptr_t address; -} -lt_preloaded_symbols[[]] = -{ -EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext - cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr_t) 0} -}; - -#ifdef __cplusplus -} -#endif -EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi - rm -f conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done -]) -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - AC_MSG_RESULT(failed) -else - AC_MSG_RESULT(ok) -fi -]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE - - -# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) -# --------------------------------------- -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], -[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= -_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= - -AC_MSG_CHECKING([for $compiler option to produce PIC]) - ifelse([$1],[CXX],[ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - 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 - fi - ;; - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - case $host_os in - aix4* | aix5*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - 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++*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; - aCC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - icpc* | 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' - ;; - pgCC*) - # 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. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _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 - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx*) - # Digital/Compaq C++ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - lcc*) - # Lucid - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - *) - ;; - esac - ;; - 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*) - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -], -[ - if test "$GCC" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - enable_shared=no - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - 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* | 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' - ;; - - hpux9* | hpux10* | hpux11*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC (with -KPIC) is the default. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - newsos6) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - 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' - ;; - 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 - ;; - - osf3* | osf4* | osf5*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - rdos*) - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - solaris*) - _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*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - 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' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - 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' - ;; - - *) - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -]) -AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then - AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], - _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), - [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; - *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; - esac], - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" - ;; -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_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) -]) - - -# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) -# ------------------------------------ -# See if the linker supports building shared libraries. -AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], -[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*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - else - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; - cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - ;; - linux* | k*bsd*-gnu) - _LT_AC_TAGVAR(link_all_deplibs, $1)=no - ;; - *) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac -],[ - runpath_var= - _LT_AC_TAGVAR(allow_undefined_flag, $1)= - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)= - _LT_AC_TAGVAR(archive_expsym_cmds, $1)= - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_minus_L, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown - _LT_AC_TAGVAR(hardcode_automatic, $1)=no - _LT_AC_TAGVAR(module_cmds, $1)= - _LT_AC_TAGVAR(module_expsym_cmds, $1)= - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - _LT_AC_TAGVAR(include_expsyms, $1)= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - extract_expsyms_cmds= - # 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 - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # 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*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. - -EOF - fi - ;; - - amigaos*) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[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}--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 - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_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 - _LT_AC_TAGVAR(link_all_deplibs, $1)=no - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - 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= - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - - if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = 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) - case $host_os in - aix3*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$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*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - else - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_AC_TAGVAR(archive_cmds, $1)='' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - if test "$GCC" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${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 '"\${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 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _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 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 - ;; - - amigaos*) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - # see comment about different semantics on the GNU ld section - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - - bsdi[[45]]*) - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_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' - _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - - darwin* | rhapsody*) - 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 - _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 - 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_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 -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 $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - 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*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - freebsd1*) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - 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 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - hpux9*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - _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*) - _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)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - fi - if test "$with_gnu_ld" = no; then - _LT_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_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _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 - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - newsos6) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - openbsd*) - 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 - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - os2*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${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' - fi - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - 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' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # 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 - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4) - case $host_vendor in - sni) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - ;; - motorola) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4.3*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - fi - ;; - - 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' - - if test "$GCC" = yes; then - _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,$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 - ;; - - 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*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - fi -]) -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -# -# Do we need to explicitly link libc? -# -case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in -x|xyes) - # Assume -lc should be added - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $_LT_AC_TAGVAR(archive_cmds, $1) in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) - $rm conftest* - 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= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) - _LT_AC_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) - then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - else - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) - ;; - esac - fi - ;; -esac -])# AC_LIBTOOL_PROG_LD_SHLIBS - - -# _LT_AC_FILE_LTDLL_C -# ------------------- -# Be careful that the start marker always follows a newline. -AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ -# /* ltdll.c starts here */ -# #define WIN32_LEAN_AND_MEAN -# #include -# #undef WIN32_LEAN_AND_MEAN -# #include -# -# #ifndef __CYGWIN__ -# # ifdef __CYGWIN32__ -# # define __CYGWIN__ __CYGWIN32__ -# # endif -# #endif -# -# #ifdef __cplusplus -# extern "C" { -# #endif -# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); -# #ifdef __cplusplus -# } -# #endif -# -# #ifdef __CYGWIN__ -# #include -# DECLARE_CYGWIN_DLL( DllMain ); -# #endif -# HINSTANCE __hDllInstance_base; -# -# BOOL APIENTRY -# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) -# { -# __hDllInstance_base = hInst; -# return TRUE; -# } -# /* ltdll.c ends here */ -])# _LT_AC_FILE_LTDLL_C - - -# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) -# --------------------------------- -AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) - - -# old names -AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) -AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) -AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) -AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) - -# This is just to silence aclocal about the macro not being used -ifelse([AC_DISABLE_FAST_INSTALL]) - -AC_DEFUN([LT_AC_PROG_GCJ], -[AC_CHECK_TOOL(GCJ, gcj, no) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS) -]) - -AC_DEFUN([LT_AC_PROG_RC], -[AC_CHECK_TOOL(RC, windres, no) -]) - - -# 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 # -# macro and use it instead. # -# LT_AC_PROG_SED -# -------------- -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -AC_DEFUN([LT_AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done -]) -SED=$lt_cv_path_SED -AC_SUBST([SED]) -AC_MSG_RESULT([$SED]) -]) - -# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.6])]) - -# AM_AUX_DIR_EXPAND -*- Autoconf -*- - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 7 - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) - - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) - - -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) - - -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -#serial 3 - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done -])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - -# Do all the work for Automake. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 12 - -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.58])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -]) -]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $1 | $1:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} -AC_SUBST(install_sh)]) - -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 5 - -# AM_PROG_LEX -# ----------- -# Autoconf leaves LEX=: if lex or flex can't be found. Change that to a -# "missing" invocation, for better error output. -AC_DEFUN([AM_PROG_LEX], -[AC_PREREQ(2.50)dnl -AC_REQUIRE([AM_MISSING_HAS_RUN])dnl -AC_REQUIRE([AC_PROG_LEX])dnl -if test "$LEX" = :; then - LEX=${am_missing_run}flex -fi]) - -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering - -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -AC_DEFUN([AM_MAINTAINER_MODE], -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST(MAINT)dnl -] -) - -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 3 - -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) - -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories -# created by `make install' are always world readable, even if the -# installer happens to have an overly restrictive umask (e.g. 077). -# This was a mistake. There are at least two reasons why we must not -# use `-m 0755': -# - it causes special bits like SGID to be ignored, -# - it may be too restrictive (some setups expect 775 directories). -# -# Do not use -m 0755 and let people choose whatever they expect by -# setting umask. -# -# We cannot accept any implementation of `mkdir' that recognizes `-p'. -# Some implementations (such as Solaris 8's) are not thread-safe: if a -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' -# concurrently, both version can detect that a/ is missing, but only -# one can create it and the other will error out. Consequently we -# restrict ourselves to GNU make (using the --version option ensures -# this.) -AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi -AC_SUBST([mkdir_p])]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 3 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -# Check how to create a tarball. -*- Autoconf -*- - -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break - - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir - -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR - diff --git a/mozilla/calendar/libical/autogen.sh b/mozilla/calendar/libical/autogen.sh deleted file mode 100755 index ef41bbe86e6..00000000000 --- a/mozilla/calendar/libical/autogen.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir -PROJECT=libical -TEST_TYPE=-d -FILE=src - -DIE=0 - -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile $PROJECT." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -(automake --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have automake installed to compile $PROJECT." - echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.2d.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 -} - -if test "$DIE" -eq 1; then - exit 1 -fi - -test $TEST_TYPE $FILE || { - echo "You must run this script in the top-level $PROJECT directory" - exit 1 -} - -if test -z "$*"; then - echo "I am going to run ./configure with no arguments - if you wish " - echo "to pass any to it, please specify them on the $0 command line." -fi - -case $CC in -*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;; -esac - -aclocal $ACLOCAL_FLAGS - -# optionally feature autoheader -(autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader - -automake -a $am_opt -autoconf -cd $ORIGDIR - -$srcdir/configure "$@" - -echo -echo "Now type 'make' to compile $PROJECT." diff --git a/mozilla/calendar/libical/bootstrap b/mozilla/calendar/libical/bootstrap deleted file mode 100755 index 247baac8aaf..00000000000 --- a/mozilla/calendar/libical/bootstrap +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# run me after checking Citadel out of CVS. -# -# $Id: bootstrap,v 1.1.1.1 2007-12-10 11:43:37 mvl%exedo.nl Exp $ -# - -# Remove any vestiges of pre-6.05 build environments -rm -f .libs modules *.so *.lo *.la 2>/dev/null - -echo ... running aclocal ... -aclocal - -echo ... running autoconf ... -autoconf - -# If your autoconf version changes, the autom4te.cache stuff will mess you up. -# Get rid of it. -echo ... removing autoheader cache files ... -rm -rf autom4te*.cache - -echo ... running autoheader ... -autoheader - -echo -echo This script has been tested with autoconf 2.53 and -echo automake 1.5. Other versions may work, but we recommend -echo the latest echo compatible versions of these. -echo -echo Also note that autoconf and automake should be configured -echo with the same prefix. -echo diff --git a/mozilla/calendar/libical/buildpackages b/mozilla/calendar/libical/buildpackages deleted file mode 100755 index 527928511cb..00000000000 --- a/mozilla/calendar/libical/buildpackages +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash -# find out the package version from conf -if test -x Makefile; then - make clean -fi - -./bootstrap - -export `grep PACKAGE_VERSION= configure |sed -e "s;';;g" -e "s;PACKAGE;LIBICAL;"` - -PACKAGE_VERSION=`cat packageversion` -DATE=`date '+%a, %d %b %Y %H:%I:00 %z'` -ACTUAL_DIR=`pwd` - -if echo "$ACTUAL_DIR" |grep -q "$LIBICAL_VERSION"; then - echo "directory ($ACTUAL_DIR) naming scheme seems right. nothing done." -else - done=false - if test -L "$ACTUAL_DIR"; then - SYMLINK_=`pwd` - SYMLINK=`ls -l $SYMLINK_|sed "s;.*-> ;;"` - if ls -l $SYMLINK_|grep -q "$LIBICAL_VERSION"; then - done=true - fi - else - SYMLINK=`pwd|sed "s;.*/;;"` - fi - if test "$done" = "false"; then - cd .. - mv -- $SYMLINK "libical-$LIBICAL_VERSION" - ln -sf "libical-$LIBICAL_VERSION" libical - cd "libical-$LIBICAL_VERSION" - else - cd "../libical-$LIBICAL_VERSION" - fi - -fi - - -case $1 in - debian) - if grep -q "($LIBICAL_VERSION" debian/changelog; then - echo rebuilding package. - else - echo "Upstream Version higher than local." - - fi - if test "$2" == "src"; then - cd .. - rm -rf tmp - mkdir tmp - cp -a libical-$LIBICAL_VERSION tmp - cd tmp/libical-$LIBICAL_VERSION - rm -rf `find -name CVS ` svn*tmp config.log config.status - cd .. - tar -czf libical_${LIBICAL_VERSION}.orig.tar.gz libical-${LIBICAL_VERSION}/ --exclude "debian/*" - pwd - cd libical-${LIBICAL_VERSION}; debuild -S -sa -kw.goesgens@outgesourced.org - else - fakeroot dpkg-buildpackage - fi - ;; - csw) - if !test -d ~/pkgs/; then - mkdir ~/pkgs - fi - echo " -PKG=CSWlibical -NAME=libical - all you need to parse ical components. -VERSION=${PACKAGE_VERSION} -CATEGORY=application -VENDOR=http://freeassociation.sourceforge.net/ packaged for CSW by Wilfried Goesgens -HOTLINE=https://uncensored.citadel.org/ Room libical support -EMAIL=libical@outgesourced.org -" >~/pkgs/libical - export LDFLAGS='-L/opt/csw/lib -L /usr/local/lib' - export CFLAGS='-I/opt/csw/include -I/usr/local/include -DDISABLE_CURSES' - ./configure \ - --prefix=/opt/csw/ - - gmake citserver aidepost msgform citmail userlist sendcommand base64 whobbs libical - gmake DESTDIR=$ACTUAL_DIR/cswstage install-new - - - - ;; - sourcedist) - cd ..; tar --exclude CVS --exclude "debian/*" -cvzf libical-$LIBICAL_VERSION.tgz libical-$LIBICAL_VERSION/ - ;; - *) - echo "Not yet implemented. we have: debian " - ;; -esac diff --git a/mozilla/calendar/libical/config.guess b/mozilla/calendar/libical/config.guess deleted file mode 100755 index 7d0185e019e..00000000000 --- a/mozilla/calendar/libical/config.guess +++ /dev/null @@ -1,1447 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. - -timestamp='2004-09-07' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. -# -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; - --version | -v ) - echo "$version" ; exit 0 ;; - --help | --h* | -h ) - echo "$usage"; exit 0 ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -# Note: order is significant - the case branches are not exclusive. - -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in - Debian*) - release='-gnu' - ;; - *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit 0 ;; - amd64:OpenBSD:*:*) - echo x86_64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - cats:OpenBSD:*:*) - echo arm-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - luna88k:OpenBSD:*:*) - echo m88k-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 ;; - sgi:OpenBSD:*:*) - echo mips64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit 0 ;; - macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - 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 ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit 0 ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit 0;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit 0 ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit 0 ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit 0;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit 0 ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit 0 ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; - esac ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - 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 ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit 0 ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit 0 ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit 0 ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && exit 0 - echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit 0 ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit 0 ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit 0 ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit 0 ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit 0 ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit 0 ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit 0 ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit 0 ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit 0 ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit 0 ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit 0 ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit 0 ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; - ????????: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 ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit 0 ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo rs6000-ibm-aix3.2.5 - 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]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit 0 ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit 0 ;; - 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 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit 0 ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit 0 ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit 0 ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit 0 ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - # 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 - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo unknown-hitachi-hiuxwe2 - exit 0 ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit 0 ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit 0 ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit 0 ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit 0 ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit 0 ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit 0 ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit 0 ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit 0 ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit 0 ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit 0 ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit 0 ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit 0 ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - 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 ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - 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 ;; - 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 0 ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; - *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; - i*:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit 0 ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; - 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 ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit 0 ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; - *: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 0 ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; - arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu - exit 0 ;; - crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu - exit 0 ;; - frv:Linux:*:*) - echo frv-unknown-linux-gnu - exit 0 ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 - ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit 0 ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit 0 ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac - exit 0 ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit 0 ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit 0 ;; - 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 - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; - "") - # 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 ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #ifdef __INTEL_COMPILER - 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 - ;; - 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 ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; - 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 ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit 0 ;; - i*86:*:5:[78]*) - 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 ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit 0 ;; - 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 ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit 0 ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit 0 ;; - 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 ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit 0 ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit 0 ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit 0 ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 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 - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit 0 ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit 0 ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit 0 ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit 0 ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit 0 ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit 0 ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit 0 ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit 0 ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit 0 ;; - 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 ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit 0 ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit 0 ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit 0 ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - *86) UNAME_PROCESSOR=i686 ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit 0 ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit 0 ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit 0 ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit 0 ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit 0 ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit 0 ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit 0 ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit 0 ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit 0 ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms && exit 0 ;; - I*) echo ia64-dec-vms && exit 0 ;; - V*) echo vax-dec-vms && exit 0 ;; - esac -esac - -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit 0 ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit 0 ;; - c34*) - echo c34-convex-bsd - exit 0 ;; - c38*) - echo c38-convex-bsd - exit 0 ;; - c4*) - echo c4-convex-bsd - exit 0 ;; - esac -fi - -cat >&2 < in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/mozilla/calendar/libical/config.h.in b/mozilla/calendar/libical/config.h.in deleted file mode 100644 index cc1ea17776b..00000000000 --- a/mozilla/calendar/libical/config.h.in +++ /dev/null @@ -1,115 +0,0 @@ -/* config.h.in. Generated from configure.in by autoheader. */ - -/* Define to 1 if you have the header file. */ -#undef HAVE_ASSERT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the `gmtime_r' function. */ -#undef HAVE_GMTIME_R - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the `iswspace' function. */ -#undef HAVE_ISWSPACE - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define if we have pthread. */ -#undef HAVE_PTHREAD - -/* Define to 1 if you have the header file. */ -#undef HAVE_PTHREAD_H - -/* Define to 1 if you have the `snprintf' function. */ -#undef HAVE_SNPRINTF - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the `strdup' function. */ -#undef HAVE_STRDUP - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_TIME_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_WCTYPE_H - -/* Define to make icalerror_* calls abort instead of internally signalling an - error */ -#undef ICAL_ERRORS_ARE_FATAL - -/* Define if we want _REENTRANT */ -#undef ICAL_REENTRANT - -/* Define to terminate lines with "\n" instead of "\r\n" */ -#undef ICAL_UNIX_NEWLINE - -/* Define to 1 if you DO NOT WANT to see deprecated messages */ -#undef NO_WARN_DEPRECATED - -/* Define to 1 if you DO NO WANT to see the warning messages related to - ICAL_MALFORMEDDATA_ERROR and parsing .ics zoneinfo files */ -#undef NO_WARN_ICAL_MALFORMEDDATA_ERROR_HACK - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define to 1 if your declares `struct tm'. */ -#undef TM_IN_SYS_TIME - -/* Version number of package */ -#undef VERSION - -/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a - `char[]'. */ -#undef YYTEXT_POINTER - -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const - -/* Define to `int' if does not define. */ -#undef mode_t - -/* Define to `unsigned int' if does not define. */ -#undef size_t diff --git a/mozilla/calendar/libical/config.sub b/mozilla/calendar/libical/config.sub deleted file mode 100755 index edb6b663ca2..00000000000 --- a/mozilla/calendar/libical/config.sub +++ /dev/null @@ -1,1555 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. - -timestamp='2004-08-29' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.sub ($timestamp) - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; - --version | -v ) - echo "$version" ; exit 0 ;; - --help | --h* | -h ) - echo "$usage"; exit 0 ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit 0;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | 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/'` - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) - os= - basic_machine=$1 - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | mcore \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64vr | mips64vrel \ - | mips64orion | mips64orionel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | msp430 \ - | ns16k | ns32k \ - | openrisc | 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 \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ - | we32k \ - | x86 | xscale | xstormy16 | xtensa \ - | z8k) - basic_machine=$basic_machine-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ - | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | msp430-* \ - | 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-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ - | ymp-* \ - | z8k-*) - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16c) - basic_machine=cr16c-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - or32 | or32-*) - basic_machine=or32-unknown - os=-coff - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown - ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - mmix) - basic_machine=mmix-knuth - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ - | -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* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto-qnx*) - ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -os400*) - os=-os400 - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -syllable*) - os=-syllable - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -tpf*) - os=-tpf - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -aros*) - os=-aros - ;; - -kaos*) - os=-kaos - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - c4x-* | tic4x-*) - os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-ibm) - os=-aix - ;; - *-knuth) - os=-mmixware - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -os400*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -tpf*) - vendor=ibm - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/mozilla/calendar/libical/configure.in b/mozilla/calendar/libical/configure.in deleted file mode 100644 index 6dd71b19b2b..00000000000 --- a/mozilla/calendar/libical/configure.in +++ /dev/null @@ -1,188 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_PREREQ(2.52) - -AC_INIT([libical], [0.30], [http://freeassociation.sf.net/]) -AM_INIT_AUTOMAKE -AC_CANONICAL_SYSTEM - -AM_CONFIG_HEADER(config.h) - -dnl Initialize maintainer mode -AM_MAINTAINER_MODE - -dnl Checks for programs. -AC_PROG_YACC -AC_PROG_CC -AM_PROG_LEX -AC_PROG_LN_S -AC_PROG_INSTALL - -dnl Initialize libtool -AM_PROG_LIBTOOL - -AC_SUBST(AR) - -dnl *** bdb4 support - -AC_MSG_CHECKING(for Berkeley DB4 support) -AC_ARG_WITH(bdb4, [ --with-bdb4 Add support for Berkeley DB 4.0], -[case $with_bdb4 in - yes) AC_MSG_RESULT(yes) - AC_MSG_RESULT( Adding Berkeley DB support) - WITH_BDB4="yes" - ;; - no) AC_MSG_RESULT(no) - ;; - *) AC_MSG_RESULT(no) - AC_MSG_RESULT(Ignoring unknown argument to --with-bdb4: $with_bdb4) - ;; -esac], -AC_MSG_RESULT(no)) - -if test x$WITH_BDB4 = xyes; then - AC_ARG_WITH(bdb4_dir, [ --with-bdb4-dir=PATH Use PATH as location of BerkeleyDB 4.0], - BDB_DIR=$withval, - BDB_DIR=/usr/local/BerkeleyDB.4.0 - ) - - AC_MSG_CHECKING(for Berkeley DB include files) - if test -f $BDB_DIR/include/db.h; then - BDB_DIR_INCLUDE=$BDB_DIR/include - AC_MSG_RESULT($BDB_DIR_INCLUDE) - else - if test -f $BDB_DIR/include/db4/db.h; then - BDB_DIR_INCLUDE=$BDB_DIR/include/db4 - AC_MSG_RESULT($BDB_DIR_INCLUDE) - else - WITH_BDB4="no" - AC_MSG_RESULT(not found!) - fi - fi - - AC_MSG_CHECKING(for Berkeley DB libraries) - if test -f $BDB_DIR/lib/libdb-4.0.la; then - BDB_DIR_LIB=$BDB_DIR/lib - BDB_LIB=libdb-4.0.la - AC_MSG_RESULT($BDB_DIR_LIB $BDB_LIB) - else - if test -f $BDB_DIR/lib/libdb4.la; then - BDB_DIR_LIB=$BDB_DIR/lib - BDB_LIB=libdb4.la - AC_MSG_RESULT($BDB_DIR_LIB $BDB_LIB) - else - WITH_BDB4="no" - AC_MSG_RESULT(not found!) - fi - fi - - AC_SUBST(BDB_DIR) - AC_SUBST(BDB_DIR_INCLUDE) - AC_SUBST(BDB_DIR_LIB) - AC_SUBST(BDB_LIB) - dnl 4.0 is required... - BDB_VERSION="4.0" - AC_SUBST(BDB_VERSION) -fi -AM_CONDITIONAL(WITH_BDB4, test x$WITH_BDB4 = xyes) - -dnl *** Yacc/Bison support - -AC_MSG_CHECKING(whether to support development) -AC_ARG_WITH(devel, [ --with-devel Add development options], -[case $with_devel in - yes) DEV="yes" - AC_MSG_RESULT(yes) - AC_MSG_RESULT(Setting up for development: -Wall, flex, bison) - AC_MSG_RESULT(** Note that you will need flex 2.5.7 or higher) - ;; - no) AC_MSG_RESULT(no) - ;; - *) AC_MSG_RESULT(no) - AC_MSG_RESULT(Ignoring unknown argument to --with-devel: $with_devel) - ;; -esac], -AC_MSG_RESULT(no)) -AM_CONDITIONAL(DEV, test x$DEV = xyes) - -AC_CHECK_PROGS(AR, ar aal, ar) -AC_CHECK_PROGS(PERL, perl5 perl) - -AC_MSG_CHECKING(whether to define _REENTRANT) -AC_ARG_ENABLE(reentrant, [ --enable-reentrant define _REENTRANT to enable reentrant system calls], -[ case "${enableval}" in - no) - AC_MSG_RESULT(no) - ac_cv_reentrant=no - ;; - *) - AC_MSG_RESULT(yes) - AC_DEFINE(ICAL_REENTRANT, ,[Define if we want _REENTRANT]) [CFLAGS="$CFLAGS -D_REENTRANT"] - ac_cv_reentrant=yes - ;; - esac ], - AC_MSG_RESULT(no) -) - - -dnl ************************************************** -dnl test/regression.c (and maybe others) needs this defined -dnl ************************************************** -AC_DEFINE(ICAL_ERRORS_ARE_FATAL,1,[Define to make icalerror_* calls abort instead of internally signalling an error]) -AC_DEFINE(NO_WARN_DEPRECATED,1,[Define to 1 if you DO NOT WANT to see deprecated messages]) -AC_DEFINE(NO_WARN_ICAL_MALFORMEDDATA_ERROR_HACK,1,[Define to 1 if you DO NO WANT to see the warning messages related to ICAL_MALFORMEDDATA_ERROR and parsing .ics zoneinfo files]) - -AC_DEFINE(ICAL_UNIX_NEWLINE,1,[Define to terminate lines with "\n" instead of "\r\n"]) -dnl AC_DEFINE(ICAL_NO_EMPTY_ARRAY_DECL,1,[Define to 1 if your compile does not like lines like: struct something foo[]]) - -dnl Checks for libraries. -dnl Replace `main' with a function in -lical: -dnl AC_CHECK_LIB(ical, main) - -dnl Check if this system can use pthreads -dnl HACK to support FreeBSD 4.x pthread - -case "${host}" in - *-*-freebsdelf4* ) - AC_MSG_RESULT(checking for pthread_create in -lpthread... -pthread (FreeBSD 4.x style)) - AC_DEFINE(HAVE_PTHREAD, ,[Define if we have pthread.]) - PTHREAD_LIBS=-pthread;; - - *) - AC_CHECK_LIB(pthread,pthread_create,have_pthread=yes) - if test "x$have_pthread" = xyes; then - AC_DEFINE(HAVE_PTHREAD, ,[Define if we have pthread.]) - PTHREAD_LIBS=-lpthread - fi;; -esac - -AM_CONDITIONAL(HAVE_PTHREAD, test "$have_pthread" = "yes") -AC_SUBST(PTHREAD_LIBS) - -dnl Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADERS(assert.h pthread.h stdint.h time.h sys/types.h unistd.h wctype.h) - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_TYPE_SIZE_T -AC_TYPE_MODE_T -AC_STRUCT_TM - -dnl Checks for library functions. -AC_CHECK_FUNCS(gmtime_r iswspace strdup snprintf) - -AC_OUTPUT([ -Makefile -design-data/Makefile -doc/Makefile -examples/Makefile -scripts/Makefile -src/Makefile -src/libical/Makefile -src/libical/icalversion.h -src/libicalss/Makefile -src/test/Makefile -test-data/Makefile -zoneinfo/Makefile -]) - diff --git a/mozilla/calendar/libical/configure.in.in b/mozilla/calendar/libical/configure.in.in deleted file mode 100644 index 79aafbc30e1..00000000000 --- a/mozilla/calendar/libical/configure.in.in +++ /dev/null @@ -1,20 +0,0 @@ -dnl Checks for programs. -AC_PROG_YACC -AM_PROG_LEX - -AC_CHECK_PROGS(PERL, perl5 perl) - -AC_DEFINE(ICAL_SAFESAVES,1, [safe saves]) -AC_DEFINE(ICAL_UNIX_NEWLINE,1, [unix newline]) - -AC_CHECK_HEADERS(time.h sys/types.h assert.h) - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_TYPE_SIZE_T -AC_STRUCT_TM -AM_PROG_LEX - -dnl Checks for library functions. -AC_CHECK_FUNCS(strdup) - diff --git a/mozilla/calendar/libical/depcomp b/mozilla/calendar/libical/depcomp deleted file mode 100644 index 11e2d3bfe1c..00000000000 --- a/mozilla/calendar/libical/depcomp +++ /dev/null @@ -1,522 +0,0 @@ -#! /bin/sh -# depcomp - compile a program generating dependencies as side-effects - -scriptversion=2004-05-31.23 - -# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Alexandre Oliva . - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: depcomp [--help] [--version] PROGRAM [ARGS] - -Run PROGRAMS ARGS to compile a file, generating dependencies -as side-effects. - -Environment variables: - depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. - DEPDIR directory where to store dependencies. - depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. - libtool Whether libtool is used (yes/no). - -Report bugs to . -EOF - exit 0 - ;; - -v | --v*) - echo "depcomp $scriptversion" - exit 0 - ;; -esac - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi - -# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. -depfile=${depfile-`echo "$object" | - sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. - "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory -## that the space means something, we add a space to the output as -## well. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the - # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> $depfile - echo >> $depfile - - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the - # start of each line; $object doesn't have directory information. - # Version 6 uses the directory in both cases. - stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` - tmpdepfile="$stripped.u" - if test "$libtool" = yes; then - "$@" -Wc,-M - else - "$@" -M - fi - stat=$? - - if test -f "$tmpdepfile"; then : - else - stripped=`echo "$stripped" | sed 's,^.*/,,'` - tmpdepfile="$stripped.u" - fi - - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - - if test -f "$tmpdepfile"; then - outname="$stripped.o" - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output - # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... - - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # Dependencies are output in .lo.d with libtool 1.4. - # With libtool 1.5 they are output both in $dir.libs/$base.o.d - # and in $dir.libs/$base.o.d and $dir$base.o.d. We process the - # latter, because the former will be cleaned when $dir.libs is - # erased. - tmpdepfile1="$dir.libs/$base.lo.d" - tmpdepfile2="$dir$base.o.d" - tmpdepfile3="$dir.libs/$base.d" - "$@" -Wc,-MD - else - tmpdepfile1="$dir$base.o.d" - tmpdepfile2="$dir$base.d" - tmpdepfile3="$dir$base.d" - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - - if test -f "$tmpdepfile1"; then - tmpdepfile="$tmpdepfile1" - elif test -f "$tmpdepfile2"; then - tmpdepfile="$tmpdepfile2" - else - tmpdepfile="$tmpdepfile3" - fi - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' - # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. - "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - "$@" || exit $? - # Remove any Libtool call - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - # X makedepend - shift - cleared=no - for arg in "$@"; do - case $cleared in - no) - set ""; shift - cleared=yes ;; - esac - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift ;; - # Strip any option that makedepend may not understand. Remove - # the object too, otherwise makedepend will parse it as a source file. - -*|$object) - ;; - *) - set fnord "$@" "$arg"; shift ;; - esac - done - obj_suffix="`echo $object | sed 's/^.*\././'`" - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - "$@" -E | - sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - "$@" || exit $? - IFS=" " - for arg - do - case "$arg" in - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; - *) - set fnord "$@" "$arg" - shift - shift - ;; - esac - done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/mozilla/calendar/libical/design-data/Makefile.in b/mozilla/calendar/libical/design-data/Makefile.in index beb0cceff59..659836cf249 100644 --- a/mozilla/calendar/libical/design-data/Makefile.in +++ b/mozilla/calendar/libical/design-data/Makefile.in @@ -1,8 +1,7 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ +# Makefile.in generated automatically by automake 1.5 from Makefile.am. -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,49 +12,58 @@ # PARTICULAR PURPOSE. @SET_MAKE@ + +SHELL = @SHELL@ + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) +transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_alias = @build_alias@ build_triplet = @build@ +host_alias = @host_alias@ host_triplet = @host@ +target_alias = @target_alias@ target_triplet = @target@ -subdir = design-data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ +AS = @AS@ AWK = @AWK@ BDB_DIR = @BDB_DIR@ BDB_DIR_INCLUDE = @BDB_DIR_INCLUDE@ @@ -63,118 +71,40 @@ BDB_DIR_LIB = @BDB_DIR_LIB@ BDB_LIB = @BDB_LIB@ BDB_VERSION = @BDB_VERSION@ CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DEV_FALSE = @DEV_FALSE@ -DEV_TRUE = @DEV_TRUE@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -HAVE_PTHREAD_FALSE = @HAVE_PTHREAD_FALSE@ -HAVE_PTHREAD_TRUE = @HAVE_PTHREAD_TRUE@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ +JAR = @JAR@ +JAVA = @JAVA@ +JAVAC = @JAVAC@ +JAVAH = @JAVAH@ +JAVA_PLATFORM = @JAVA_PLATFORM@ LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ PTHREAD_LIBS = @PTHREAD_LIBS@ +PY_CFLAGS = @PY_CFLAGS@ +PY_EXTRA_LIBS = @PY_EXTRA_LIBS@ +PY_LIBS = @PY_LIBS@ +PY_LIB_LOC = @PY_LIB_LOC@ RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ +RRCAP_CFLAGS = @RRCAP_CFLAGS@ +RRCAP_LIBS = @RRCAP_LIBS@ VERSION = @VERSION@ -WITH_BDB4_FALSE = @WITH_BDB4_FALSE@ -WITH_BDB4_TRUE = @WITH_BDB4_TRUE@ YACC = @YACC@ -YFLAGS = @YFLAGS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ -am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ +python_val = @python_val@ + EXTRA_DIST = \ properties.csv \ parameters.csv \ @@ -182,38 +112,15 @@ EXTRA_DIST = \ status.txt \ value-types.csv +subdir = design-data +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +DIST_SOURCES = +DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu design-data/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu design-data/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: -rm -f *.lo @@ -223,35 +130,33 @@ clean-libtool: distclean-libtool: -rm -f libtool +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu design-data/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status uninstall-info-am: tags: TAGS TAGS: -ctags: CTAGS -CTAGS: +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = .. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + @for file in $(DISTFILES); do \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ fi; \ if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -261,7 +166,9 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile + installdirs: + install: install-am install-exec: install-exec-am install-data: install-data-am @@ -273,7 +180,6 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -281,7 +187,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -291,15 +197,13 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - -rm -f Makefile + distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am dvi-am: -html: html-am - info: info-am info-am: @@ -315,32 +219,23 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - uninstall-am: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + dvi-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/mozilla/calendar/libical/design-data/parameters.csv b/mozilla/calendar/libical/design-data/parameters.csv index 4efb3028f05..d0a2ef9df6c 100644 --- a/mozilla/calendar/libical/design-data/parameters.csv +++ b/mozilla/calendar/libical/design-data/parameters.csv @@ -6,7 +6,7 @@ "DELEGATED-TO","const char*", "DIR","const char*", "ENCODING","icalparameter_encoding","8BIT;BASE64" -"FBTYPE","icalparameter_fbtype","FREE;BUSY;BUSY-UNAVAILABLE;BUSY-TENTATIVE" +"FBTYPE","icalparameter_fbtype","FREE;BUSY;BUSYUNAVAILABLE;BUSYTENTATIVE" "FMTTYPE","const char*", "LANGUAGE","const char*", "MEMBER","const char*", @@ -22,3 +22,12 @@ "X","const char*", "X-LIC-ERRORTYPE","icalparameter_xlicerrortype","COMPONENT-PARSE-ERROR;PROPERTY-PARSE-ERROR;PARAMETER-NAME-PARSE-ERROR;PARAMETER-VALUE-PARSE-ERROR;VALUE-PARSE-ERROR;INVALID-ITIP;UNKNOWN-VCAL-PROP-ERROR;MIME-PARSE-ERROR;VCAL-PROP-PARSE-ERROR" "X-LIC-COMPARETYPE","icalparameter_xliccomparetype","EQUAL;NOTEQUAL;LESS;GREATER;LESSEQUAL;GREATEREQUAL;REGEX;ISNULL;ISNOTNULL" +"#CAP Parameters","Draft 8", +"#this parameter should really be called ACTION, but this conflicts with the ACTION property" +"ACTIONPARAM","icalparameter_action","ASK;ABORT" +"ID","const char*", +"ENABLE","icalparameter_enable","TRUE;FALSE" +"LATENCY","const char*", +"LOCAL","icalparameter_local","TRUE;FALSE" +"LOCALIZE","const char*", +"OPTIONS","const char*", diff --git a/mozilla/calendar/libical/design-data/properties.csv b/mozilla/calendar/libical/design-data/properties.csv index 57b837b8f40..11f977ed3d5 100644 --- a/mozilla/calendar/libical/design-data/properties.csv +++ b/mozilla/calendar/libical/design-data/properties.csv @@ -1,22 +1,15 @@ ,, "#Property Name","libical Value type","iCalendar default value" "ACTION","ACTION","ACTION" -"ALLOW-CONFLICT","TEXT","TEXT" "ATTACH","ATTACH","URI" "ATTENDEE","CAL-ADDRESS","CAL-ADDRESS" "CALSCALE","TEXT","TEXT" "CATEGORIES","TEXT","TEXT" -"CALID","TEXT","TEXT" -"CARID","TEXT","TEXT" "CLASS","CLASS","CLASS" "COMMENT","TEXT","TEXT" "COMPLETED","DATE-TIME","DATE-TIME" "CONTACT","TEXT","TEXT" "CREATED","DATE-TIME","DATE-TIME" -"DECREED","TEXT","TEXT" -"DEFAULT-CHARSET","TEXT","TEXT" -"DEFAULT-LOCALE","TEXT","TEXT" -"DEFAULT-TZID","TEXT","TEXT" "DESCRIPTION","TEXT","TEXT" "DTEND","DATE-TIME","DATE-TIME" "DTSTAMP","DATE-TIME","DATE-TIME" @@ -31,14 +24,12 @@ "LOCATION","TEXT","TEXT" "METHOD","METHOD","METHOD" "ORGANIZER","CAL-ADDRESS","CAL-ADDRESS" -"OWNER","TEXT","TEXT" "PERCENT-COMPLETE","INTEGER","INTEGER" "PRIORITY","INTEGER","INTEGER" "PRODID","TEXT","TEXT" "RDATE","DATE-TIME-PERIOD","DATE-TIME" "RECURRENCE-ID","DATE-TIME","DATE-TIME" "RELATED-TO","TEXT","TEXT" -"RELCALID","TEXT","TEXT" "REPEAT","INTEGER","INTEGER" "REQUEST-STATUS","REQUEST-STATUS","REQUEST-STATUS" "RESOURCES","TEXT","TEXT" @@ -57,13 +48,9 @@ "URL","URI","URI" "VERSION","TEXT","TEXT" "X","X","X" -"SCOPE","TEXT","TEXT" "MAXRESULTS","INTEGER","INTEGER" "MAXRESULTSSIZE","INTEGER","INTEGER" -"QUERY","QUERY","QUERY" "QUERYNAME","TEXT","TEXT" -"EXPAND","INTEGER","INTEGER" -"TARGET","CAL-ADDRESS","CAL-ADDRESS" "X-LIC-ERROR","TEXT","TEXT" "X-LIC-CLUSTERCOUNT","STRING","STRING" "X-LIC-MIMECONTENTTYPE","STRING","STRING" @@ -72,7 +59,50 @@ "X-LIC-MIMEOPTINFO","STRING","STRING" "X-LIC-MIMECID","STRING","STRING" "X-LIC-MIMEFILENAME","STRING","STRING" -"CALMASTER","TEXT","TEXT" "X-LIC-CLASS","X-LIC-CLASS","X-LIC-CLASS" "ANY","NO","NO" "NO","NO","NO" +"#CAP Properties",, +,"FIXME","Should be BOOLEAN" +"ALLOW-CONFLICT","TEXT","TEXT" +"CALID","TEXT","TEXT" +"CALMASTER","TEXT","TEXT" +"CARID","TEXT","TEXT" +"CMD","CMD","CMD" +"CSID","URI","URI" +"DECREED","TEXT","TEXT" +"DEFAULT-CHARSET","TEXT","TEXT" +"DEFAULT-LOCALE","TEXT","TEXT" +"DEFAULT-TZID","TEXT","TEXT" +"DEFAULT-VCARS","TEXT","TEXT" +,"FIXME","Should be UPN-FILTER" +"DENY","TEXT","TEXT" +,"FIXME","Should be BOOLEAN" +"EXPAND","INTEGER","INTEGER" +,"FIXME","Should be UPN-FILTER" +"GRANT","TEXT","TEXT" +"MAXDATE","DATE-TIME","DATE-TIME" +"MINDATE","DATE-TIME","DATE-TIME" +"NAME","TEXT","TEXT" +"OWNER","TEXT","TEXT" +"PERMISSION","TEXT","TEXT" +"QUERY","QUERY","QUERY" +"QUERYID","TEXT","TEXT" +"RELCALID","TEXT","TEXT" +"RESTRICTION","QUERY","QUERY" +"SCOPE","TEXT","TEXT" +"TARGET","CAL-ADDRESS","CAL-ADDRESS" +"#CAP Properties","These are only allowed in VREPLY", +"CAP-VERSION","TEXT","TEXT" +"CAR-LEVEL","CAR-LEVEL","CAR-LEVEL" +"COMPONENTS","TEXT","TEXT" +"STORES-EXPANDED","TEXT","TEXT" +"DATE-MAX","DATE-TIME","DATE-TIME" +"DATE-MIN","DATE-TIME","DATE-TIME" +"ITIP-VERSION","TEXT","TEXT" +"MAX-COMPONENT-SIZE","INTEGER","INTEGER" +"MULTIPART","TEXT","TEXT" +"QUERY-LEVEL","QUERY-LEVEL","QUERY-LEVEL" +"RECUR-ACCEPTED","TEXT","TEXT" +"RECUR-EXPAND","TEXT","TEXT" +"RECUR-LIMIT","TEXT","TEXT" diff --git a/mozilla/calendar/libical/design-data/restrictions.csv b/mozilla/calendar/libical/design-data/restrictions.csv index bded8506940..70cadea2e0a 100644 --- a/mozilla/calendar/libical/design-data/restrictions.csv +++ b/mozilla/calendar/libical/design-data/restrictions.csv @@ -382,7 +382,7 @@ REPLY,VFREEBUSY,NONE,VJOURNAL,ZERO REPLY,VFREEBUSY,NONE,VTIMEZONE,ZERO PUBLISH,VTODO,NONE,NONE,ONEPLUS PUBLISH,VTODO,DTSTAMP,NONE,ONE -PUBLISH,VTODO,DTSTART,NONE,ONE +PUBLISH,VTODO,DTSTART,NONE,ZEROORONE PUBLISH,VTODO,ORGANIZER,NONE,ONE PUBLISH,VTODO,PRIORITY,NONE,ONE PUBLISH,VTODO,SEQUENCE,NONE,ZEROORONE @@ -423,7 +423,7 @@ PUBLISH,VTODO,RELCALID,NONE,ZEROORONE REQUEST,VTODO,NONE,NONE,ONEPLUS REQUEST,VTODO,ATTENDEE,NONE,ONEPLUS REQUEST,VTODO,DTSTAMP,NONE,ONE -REQUEST,VTODO,DTSTART,NONE,ONE +REQUEST,VTODO,DTSTART,NONE,ZEROORONE REQUEST,VTODO,ORGANIZER,NONE,ONE REQUEST,VTODO,PRIORITY,NONE,ONE REQUEST,VTODO,SEQUENCE,NONE,ZEROORONE diff --git a/mozilla/calendar/libical/design-data/value-types.csv b/mozilla/calendar/libical/design-data/value-types.csv index feb5c476f00..1e6b88b3c54 100644 --- a/mozilla/calendar/libical/design-data/value-types.csv +++ b/mozilla/calendar/libical/design-data/value-types.csv @@ -29,3 +29,7 @@ "GEO","(a)struct icalgeotype","tuple","unitary", "STRING","(a)const char*","string","unitary", "X","(m)const char*","string","unitary", +"#CAP enumeration types",,,, +"CMD","(a)enum icalproperty_cmd","string","unitary","ABORT;CONTINUE;CREATE;DELETE;GENERATE-UID;GET-CAPABILITY;IDENTIFY;MODIFY;MOVE;REPLY;SEARCH;SET-LOCALE" +"QUERY-LEVEL","(a)enum icalproperty_querylevel","string","unitary","CAL-QL-1;CAL-QL-NONE" +"CAR-LEVEL","(a)enum icalproperty_carlevel","string","unitary","CAR-NONE;CAR-MIN;CAR-FULL-1" diff --git a/mozilla/calendar/libical/install-sh b/mozilla/calendar/libical/install-sh deleted file mode 100755 index dd97db7aa1c..00000000000 --- a/mozilla/calendar/libical/install-sh +++ /dev/null @@ -1,322 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2004-09-10.20 - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -chmodcmd="$chmodprog 0755" -chowncmd= -chgrpcmd= -stripcmd= -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src= -dst= -dir_arg= -dstarg= -no_target_directory= - -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: --c (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG -" - -while test -n "$1"; do - case $1 in - -c) shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - --help) echo "$usage"; exit 0;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t) dstarg=$2 - shift - shift - continue;; - - -T) no_target_directory=true - shift - continue;; - - --version) echo "$0 $scriptversion"; exit 0;; - - *) # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - test -n "$dir_arg$dstarg" && break - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dstarg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" - shift # fnord - fi - shift # arg - dstarg=$arg - done - break;; - esac -done - -if test -z "$1"; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call `install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -for src -do - # Protect names starting with `-'. - case $src in - -*) src=./$src ;; - esac - - if test -n "$dir_arg"; then - dst=$src - src= - - if test -d "$dst"; then - mkdircmd=: - chmodcmd= - else - mkdircmd=$mkdirprog - fi - else - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dstarg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - - dst=$dstarg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst ;; - esac - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 - exit 1 - fi - dst=$dst/`basename "$src"` - fi - fi - - # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - - # Make sure that the destination directory exists. - - # Skip lots of stat calls in the usual case. - if test ! -d "$dstdir"; then - defaultIFS=' - ' - IFS="${IFS-$defaultIFS}" - - oIFS=$IFS - # Some sh's can't handle IFS=/ for some reason. - IFS='%' - set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - IFS=$oIFS - - pathcomp= - - while test $# -ne 0 ; do - pathcomp=$pathcomp$1 - shift - if test ! -d "$pathcomp"; then - $mkdirprog "$pathcomp" - # mkdir can fail with a `File exist' error in case several - # install-sh are creating the directory concurrently. This - # is OK. - test -d "$pathcomp" || exit - fi - pathcomp=$pathcomp/ - done - fi - - if test -n "$dir_arg"; then - $doit $mkdircmd "$dst" \ - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } - - else - dstfile=`basename "$dst"` - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - trap '(exit $?); exit' 1 2 13 15 - - # Copy the file name to the temp name. - $doit $cpprog "$src" "$dsttmp" && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && - - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dstdir/$dstfile"; then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ - || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ - || { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit - } - else - : - fi - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" - } - } - fi || { (exit 1); exit; } -done - -# The final little trick to "correctly" pass the exit status to the exit trap. -{ - (exit 0); exit -} - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/mozilla/calendar/libical/ltconfig b/mozilla/calendar/libical/ltconfig deleted file mode 100755 index bad848d61fc..00000000000 --- a/mozilla/calendar/libical/ltconfig +++ /dev/null @@ -1,3096 +0,0 @@ -#! /bin/sh - -# ltconfig - Create a system-specific libtool. -# Copyright (C) 1996-1999 Free Software Foundation, Inc. -# Originally by Gordon Matzigkeit , 1996 -# -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# A lot of this script is taken from autoconf-2.10. - -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} -echo=echo -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then - # Yippee, $echo works! - : -else - # Restart under the correct shell. - exec "$SHELL" "$0" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat </dev/null`} - case X$UNAME in - *-DOS) PATH_SEPARATOR=';' ;; - *) PATH_SEPARATOR=':' ;; - esac -fi - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi - -if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string="`eval $cmd`") 2>/dev/null && - echo_test_string="`eval $cmd`" && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null; then - break - fi - done -fi - -if test "X`($echo '\t') 2>/dev/null`" != 'X\t' || - test "X`($echo "$echo_test_string") 2>/dev/null`" != X"$echo_test_string"; then - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" - for dir in $PATH /usr/ucb; do - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - test "X`($dir/echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then - echo="$dir/echo" - break - fi - done - IFS="$save_ifs" - - if test "X$echo" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && - test "X`(print -r "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - echo='print -r' - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running ltconfig again with it. - ORIGINAL_CONFIG_SHELL="${CONFIG_SHELL-/bin/sh}" - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"} - else - # Try using printf. - echo='printf "%s\n"' - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - test "X`($echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then - # Cool, printf works - : - elif test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' && - test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then - CONFIG_SHELL="$ORIGINAL_CONFIG_SHELL" - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - echo="$CONFIG_SHELL $0 --fallback-echo" - elif test "X`("$CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' && - test "X`("$CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then - echo="$CONFIG_SHELL $0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null; then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "$0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec "${ORIGINAL_CONFIG_SHELL}" "$0" ${1+"$@"} - else - # Oops. We lost completely, so just stick with echo. - echo=echo - fi - fi - fi - fi -fi - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' -sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# The name of this program. -progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'` - -# Constants: -PROGRAM=ltconfig -PACKAGE=libtool -VERSION=1.3.4-freebsd-ports -TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -rm="rm -f" - -help="Try \`$progname --help' for more information." - -# Global variables: -default_ofile=libtool -can_build_shared=yes -enable_shared=yes -# All known linkers require a `.a' archive for static linking (except M$VC, -# which needs '.lib'). -enable_static=yes -enable_fast_install=yes -install_ltlibs=yes -release_suffix=yes -enable_dlopen=unknown -enable_win32_dll=no -ltmain= -silent= -srcdir= -ac_config_guess= -ac_config_sub= -host= -nonopt= -ofile="$default_ofile" -verify_host=yes -with_gcc=no -with_gnu_ld=no -need_locks=yes -ac_ext=c -objext=o -libext=a -exeext= -cache_file= - -old_AR="$AR" -old_CC="$CC" -old_CFLAGS="$CFLAGS" -old_CPPFLAGS="$CPPFLAGS" -old_LDFLAGS="$LDFLAGS" -old_LD="$LD" -old_LN_S="$LN_S" -old_LIBS="$LIBS" -old_NM="$NM" -old_RANLIB="$RANLIB" -old_DLLTOOL="$DLLTOOL" -old_OBJDUMP="$OBJDUMP" -old_AS="$AS" - -# Parse the command line options. -args= -prev= -for option -do - case "$option" in - -*=*) optarg=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - eval "$prev=\$option" - prev= - continue - fi - - case "$option" in - --help) cat <&2 - echo "$help" 1>&2 - exit 1 - ;; - - *) - if test -z "$ltmain"; then - ltmain="$option" - elif test -z "$host"; then -# This generates an unnecessary warning for sparc-sun-solaris4.1.3_U1 -# if test -n "`echo $option| sed 's/[-a-z0-9.]//g'`"; then -# echo "$progname: warning \`$option' is not a valid host type" 1>&2 -# fi - host="$option" - else - echo "$progname: too many arguments" 1>&2 - echo "$help" 1>&2 - exit 1 - fi ;; - esac -done - -if test -z "$ltmain"; then - echo "$progname: you must specify a LTMAIN file" 1>&2 - echo "$help" 1>&2 - exit 1 -fi - -if test ! -f "$ltmain"; then - echo "$progname: \`$ltmain' does not exist" 1>&2 - echo "$help" 1>&2 - exit 1 -fi - -# Quote any args containing shell metacharacters. -ltconfig_args= -for arg -do - case "$arg" in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) - ltconfig_args="$ltconfig_args '$arg'" ;; - *) ltconfig_args="$ltconfig_args $arg" ;; - esac -done - -# A relevant subset of AC_INIT. - -# File descriptor usage: -# 0 standard input -# 1 file creation -# 2 errors and warnings -# 3 some systems may open it to /dev/tty -# 4 used on the Kubota Titan -# 5 compiler messages saved in config.log -# 6 checking for... messages and results -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 -fi -exec 5>>./config.log - -# NLS nuisances. -# Only set LANG and LC_ALL to C if already set. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). -if test "X${LC_ALL+set}" = Xset; then LC_ALL=C; export LC_ALL; fi -if test "X${LANG+set}" = Xset; then LANG=C; export LANG; fi - -if test -n "$cache_file" && test -r "$cache_file"; then - echo "loading cache $cache_file within ltconfig" - . $cache_file -fi - -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi -else - ac_n= ac_c='\c' ac_t= -fi - -if test -z "$srcdir"; then - # Assume the source directory is the same one as the path to LTMAIN. - srcdir=`$echo "X$ltmain" | $Xsed -e 's%/[^/]*$%%'` - test "$srcdir" = "$ltmain" && srcdir=. -fi - -trap "$rm conftest*; exit 1" 1 2 15 -if test "$verify_host" = yes; then - # Check for config.guess and config.sub. - ac_aux_dir= - for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/config.guess; then - ac_aux_dir=$ac_dir - break - fi - done - if test -z "$ac_aux_dir"; then - echo "$progname: cannot find config.guess in $srcdir $srcdir/.. $srcdir/../.." 1>&2 - echo "$help" 1>&2 - exit 1 - fi - ac_config_guess=$ac_aux_dir/config.guess - ac_config_sub=$ac_aux_dir/config.sub - - # Make sure we can run config.sub. - if $SHELL $ac_config_sub sun4 >/dev/null 2>&1; then : - else - echo "$progname: cannot run $ac_config_sub" 1>&2 - echo "$help" 1>&2 - exit 1 - fi - - echo $ac_n "checking host system type""... $ac_c" 1>&6 - - host_alias=$host - case "$host_alias" in - "") - if host_alias=`$SHELL $ac_config_guess`; then : - else - echo "$progname: cannot guess host type; you must specify one" 1>&2 - echo "$help" 1>&2 - exit 1 - fi ;; - esac - host=`$SHELL $ac_config_sub $host_alias` - echo "$ac_t$host" 1>&6 - - # Make sure the host verified. - test -z "$host" && exit 1 - -elif test -z "$host"; then - echo "$progname: you must specify a host type if you use \`--no-verify'" 1>&2 - echo "$help" 1>&2 - exit 1 -else - host_alias=$host -fi - -# Transform linux* to *-*-linux-gnu*, to support old configure scripts. -case "$host_os" in -linux-gnu*) ;; -linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` -esac - -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - -case "$host_os" in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR cru $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -# Set a sane default for `AR'. -test -z "$AR" && AR=ar - -# Set a sane default for `OBJDUMP'. -test -z "$OBJDUMP" && OBJDUMP=objdump - -# If RANLIB is not set, then run the test. -if test "${RANLIB+set}" != "set"; then - result=no - - echo $ac_n "checking for ranlib... $ac_c" 1>&6 - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" - for dir in $PATH; do - test -z "$dir" && dir=. - if test -f $dir/ranlib || test -f $dir/ranlib$ac_exeext; then - RANLIB="ranlib" - result="ranlib" - break - fi - done - IFS="$save_ifs" - - echo "$ac_t$result" 1>&6 -fi - -if test -n "$RANLIB"; then - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" -fi - -# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin. -test -z "$DLLTOOL" && DLLTOOL=dlltool -test -z "$OBJDUMP" && OBJDUMP=objdump -test -z "$AS" && AS=as - -# Check to see if we are using GCC. -if test "$with_gcc" != yes || test -z "$CC"; then - # If CC is not set, then try to find GCC or a usable CC. - if test -z "$CC"; then - echo $ac_n "checking for gcc... $ac_c" 1>&6 - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" - for dir in $PATH; do - test -z "$dir" && dir=. - if test -f $dir/gcc || test -f $dir/gcc$ac_exeext; then - CC="gcc" - break - fi - done - IFS="$save_ifs" - - if test -n "$CC"; then - echo "$ac_t$CC" 1>&6 - else - echo "$ac_t"no 1>&6 - fi - fi - - # Not "gcc", so try "cc", rejecting "/usr/ucb/cc". - if test -z "$CC"; then - echo $ac_n "checking for cc... $ac_c" 1>&6 - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" - cc_rejected=no - for dir in $PATH; do - test -z "$dir" && dir=. - if test -f $dir/cc || test -f $dir/cc$ac_exeext; then - if test "$dir/cc" = "/usr/ucb/cc"; then - cc_rejected=yes - continue - fi - CC="cc" - break - fi - done - IFS="$save_ifs" - if test $cc_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $CC - shift - if test $# -gt 0; then - # We chose a different compiler from the bogus one. - # However, it has the same name, so the bogon will be chosen - # first if we set CC to just the name; use the full file name. - shift - set dummy "$dir/cc" "$@" - shift - CC="$@" - fi - fi - - if test -n "$CC"; then - echo "$ac_t$CC" 1>&6 - else - echo "$ac_t"no 1>&6 - fi - - if test -z "$CC"; then - echo "$progname: error: no acceptable cc found in \$PATH" 1>&2 - exit 1 - fi - fi - - # Now see if the compiler is really GCC. - with_gcc=no - echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6 - echo "$progname:581: checking whether we are using GNU C" >&5 - - $rm conftest.c - cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - with_gcc=yes - fi - $rm conftest.c - echo "$ac_t$with_gcc" 1>&6 -fi - -# Allow CC to be a program name with arguments. -set dummy $CC -compiler="$2" - -echo $ac_n "checking for object suffix... $ac_c" 1>&6 -$rm conftest* -echo 'int i = 1;' > conftest.c -echo "$progname:603: checking for object suffix" >& 5 -if { (eval echo $progname:604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then - # Append any warnings to the config.log. - cat conftest.err 1>&5 - - for ac_file in conftest.*; do - case $ac_file in - *.c) ;; - *) objext=`echo $ac_file | sed -e s/conftest.//` ;; - esac - done -else - cat conftest.err 1>&5 - echo "$progname: failed program was:" >&5 - cat conftest.c >&5 -fi -$rm conftest* -echo "$ac_t$objext" 1>&6 - -echo $ac_n "checking for executable suffix... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_cv_exeext="no" - $rm conftest* - echo 'main () { return 0; }' > conftest.c - echo "$progname:629: checking for executable suffix" >& 5 - if { (eval echo $progname:630: \"$ac_link\") 1>&5; (eval $ac_link) 2>conftest.err; }; then - # Append any warnings to the config.log. - cat conftest.err 1>&5 - - for ac_file in conftest.*; do - case $ac_file in - *.c | *.err | *.$objext ) ;; - *) ac_cv_exeext=.`echo $ac_file | sed -e s/conftest.//` ;; - esac - done - else - cat conftest.err 1>&5 - echo "$progname: failed program was:" >&5 - cat conftest.c >&5 - fi - $rm conftest* -fi -if test "X$ac_cv_exeext" = Xno; then - exeext="" -else - exeext="$ac_cv_exeext" -fi -echo "$ac_t$ac_cv_exeext" 1>&6 - -echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6 -pic_flag= -special_shlib_compile_flags= -wl= -link_static_flag= -no_builtin_flag= - -if test "$with_gcc" = yes; then - wl='-Wl,' - link_static_flag='-static' - - case "$host_os" in - beos* | irix5* | irix6* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - aix*) - # Below there is a dirty hack to force normal static linking with -ldl - # The problem is because libdl dynamically linked with both libc and - # libC (AIX C++ library), which obviously doesn't included in libraries - # list by gcc. This cause undefined symbols with -static flags. - # This hack allows C programs to be linked with "-static -ldl", but - # we not sure about C++ programs. - link_static_flag="$link_static_flag ${wl}-lC" - ;; - cygwin* | mingw* | os2*) - # We can build DLLs from non-PIC. - ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - pic_flag='-m68020 -resident32 -malways-restore-a4' - ;; - sysv4*MP*) - if test -d /usr/nec; then - pic_flag=-Kconform_pic - fi - ;; - *) - pic_flag='-fPIC' - ;; - esac -else - # PORTME Check for PIC flags for the system compiler. - case "$host_os" in - aix3* | aix4*) - # All AIX code is PIC. - link_static_flag='-bnso -bI:/lib/syscalls.exp' - ;; - - hpux9* | hpux10* | hpux11*) - # Is there a better link_static_flag that works with the bundled CC? - wl='-Wl,' - link_static_flag="${wl}-a ${wl}archive" - pic_flag='+Z' - ;; - - irix5* | irix6*) - wl='-Wl,' - link_static_flag='-non_shared' - # PIC (with -KPIC) is the default. - ;; - - cygwin* | mingw* | os2*) - # We can build DLLs from non-PIC. - ;; - - osf3* | osf4* | osf5*) - # All OSF/1 code is PIC. - wl='-Wl,' - link_static_flag='-non_shared' - ;; - - sco3.2v5*) - pic_flag='-Kpic' - link_static_flag='-dn' - special_shlib_compile_flags='-belf' - ;; - - solaris*) - pic_flag='-KPIC' - link_static_flag='-Bstatic' - wl='-Wl,' - ;; - - sunos4*) - pic_flag='-PIC' - link_static_flag='-Bstatic' - wl='-Qoption ld ' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - pic_flag='-KPIC' - link_static_flag='-Bstatic' - wl='-Wl,' - ;; - - uts4*) - pic_flag='-pic' - link_static_flag='-Bstatic' - ;; - sysv4*MP*) - if test -d /usr/nec ;then - pic_flag='-Kconform_pic' - link_static_flag='-Bstatic' - fi - ;; - *) - can_build_shared=no - ;; - esac -fi - -if test -n "$pic_flag"; then - echo "$ac_t$pic_flag" 1>&6 - - # Check to make sure the pic_flag actually works. - echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6 - $rm conftest* - echo "int some_variable = 0;" > conftest.c - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $pic_flag -DPIC" - echo "$progname:776: checking if $compiler PIC flag $pic_flag works" >&5 - if { (eval echo $progname:777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then - # Append any warnings to the config.log. - cat conftest.err 1>&5 - - case "$host_os" in - hpux9* | hpux10* | hpux11*) - # On HP-UX, both CC and GCC only warn that PIC is supported... then they - # create non-PIC objects. So, if there were any warnings, we assume that - # PIC is not supported. - if test -s conftest.err; then - echo "$ac_t"no 1>&6 - can_build_shared=no - pic_flag= - else - echo "$ac_t"yes 1>&6 - pic_flag=" $pic_flag" - fi - ;; - *) - echo "$ac_t"yes 1>&6 - pic_flag=" $pic_flag" - ;; - esac - else - # Append any errors to the config.log. - cat conftest.err 1>&5 - can_build_shared=no - pic_flag= - echo "$ac_t"no 1>&6 - fi - CFLAGS="$save_CFLAGS" - $rm conftest* -else - echo "$ac_t"none 1>&6 -fi - -# Check to see if options -o and -c are simultaneously supported by compiler -echo $ac_n "checking if $compiler supports -c -o file.o... $ac_c" 1>&6 -$rm -r conftest 2>/dev/null -mkdir conftest -cd conftest -$rm conftest* -echo "int some_variable = 0;" > conftest.c -mkdir out -# 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 . -save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -o out/conftest2.o" -echo "$progname:829: checking if $compiler supports -c -o file.o" >&5 -if { (eval echo $progname:830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; 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 "$ac_t"no 1>&6 - compiler_c_o=no - else - echo "$ac_t"yes 1>&6 - compiler_c_o=yes - fi -else - # Append any errors to the config.log. - cat out/conftest.err 1>&5 - compiler_c_o=no - echo "$ac_t"no 1>&6 -fi -CFLAGS="$save_CFLAGS" -chmod u+w . -$rm conftest* out/* -rmdir out -cd .. -rmdir conftest -$rm -r conftest 2>/dev/null - -if test x"$compiler_c_o" = x"yes"; then - # Check to see if we can write to a .lo - echo $ac_n "checking if $compiler supports -c -o file.lo... $ac_c" 1>&6 - $rm conftest* - echo "int some_variable = 0;" > conftest.c - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -c -o conftest.lo" - echo "$progname:862: checking if $compiler supports -c -o file.lo" >&5 -if { (eval echo $progname:863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; 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 - echo "$ac_t"no 1>&6 - compiler_o_lo=no - else - echo "$ac_t"yes 1>&6 - compiler_o_lo=yes - fi - else - # Append any errors to the config.log. - cat conftest.err 1>&5 - compiler_o_lo=no - echo "$ac_t"no 1>&6 - fi - CFLAGS="$save_CFLAGS" - $rm conftest* -else - compiler_o_lo=no -fi - -# Check to see if we can do hard links to lock some files if needed -hard_links="nottested" -if test "$compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - echo $ac_n "checking if we can lock with hard links... $ac_c" 1>&6 - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$ac_t$hard_links" 1>&6 - $rm conftest* - if test "$hard_links" = no; then - echo "*** WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2 - need_locks=warn - fi -else - need_locks=no -fi - -if test "$with_gcc" = yes; then - # Check to see if options -fno-rtti -fno-exceptions are supported by compiler - echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions ... $ac_c" 1>&6 - $rm conftest* - echo "int some_variable = 0;" > conftest.c - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c" - echo "$progname:914: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 - if { (eval echo $progname:915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; 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 - echo "$ac_t"no 1>&6 - compiler_rtti_exceptions=no - else - echo "$ac_t"yes 1>&6 - compiler_rtti_exceptions=yes - fi - else - # Append any errors to the config.log. - cat conftest.err 1>&5 - compiler_rtti_exceptions=no - echo "$ac_t"no 1>&6 - fi - CFLAGS="$save_CFLAGS" - $rm conftest* - - if test "$compiler_rtti_exceptions" = "yes"; then - no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions' - else - no_builtin_flag=' -fno-builtin' - fi - -fi - -# Check for any special shared library compilation flags. -if test -n "$special_shlib_compile_flags"; then - echo "$progname: warning: \`$CC' requires \`$special_shlib_compile_flags' to build shared libraries" 1>&2 - if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$special_shlib_compile_flags[ ]" >/dev/null; then : - else - echo "$progname: add \`$special_shlib_compile_flags' to the CC or CFLAGS env variable and reconfigure" 1>&2 - can_build_shared=no - fi -fi - -echo $ac_n "checking if $compiler static flag $link_static_flag works... $ac_c" 1>&6 -$rm conftest* -echo 'main(){return(0);}' > conftest.c -save_LDFLAGS="$LDFLAGS" -LDFLAGS="$LDFLAGS $link_static_flag" -echo "$progname:958: checking if $compiler static flag $link_static_flag works" >&5 -if { (eval echo $progname:959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - echo "$ac_t$link_static_flag" 1>&6 -else - echo "$ac_t"none 1>&6 - link_static_flag= -fi -LDFLAGS="$save_LDFLAGS" -$rm conftest* - -if test -z "$LN_S"; then - # Check to see if we can use ln -s, or we need hard links. - echo $ac_n "checking whether ln -s works... $ac_c" 1>&6 - $rm conftest.dat - if ln -s X conftest.dat 2>/dev/null; then - $rm conftest.dat - LN_S="ln -sf" - else - LN_S=ln - fi - if test "$LN_S" = "ln -sf"; then - echo "$ac_t"yes 1>&6 - else - echo "$ac_t"no 1>&6 - fi -fi - -# Make sure LD is an absolute path. -if test -z "$LD"; then - ac_prog=ld - if test "$with_gcc" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6 - echo "$progname:991: checking for ld used by GCC" >&5 - ac_prog=`($CC -print-prog-name=ld) 2>&5` - case "$ac_prog" in - # Accept absolute paths. - [\\/]* | [A-Za-z]:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we are not using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac - elif test "$with_gnu_ld" = yes; then - echo $ac_n "checking for GNU ld... $ac_c" 1>&6 - echo "$progname:1015: checking for GNU ld" >&5 - else - echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 - echo "$progname:1018: checking for non-GNU ld" >&5 - fi - - if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - if "$LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then - test "$with_gnu_ld" != no && break - else - test "$with_gnu_ld" != yes && break - fi - fi - done - IFS="$ac_save_ifs" - fi - - if test -n "$LD"; then - echo "$ac_t$LD" 1>&6 - else - echo "$ac_t"no 1>&6 - fi - - if test -z "$LD"; then - echo "$progname: error: no acceptable ld found in \$PATH" 1>&2 - exit 1 - fi -fi - -# Check to see if it really is or is not GNU ld. -echo $ac_n "checking if the linker ($LD) is GNU ld... $ac_c" 1>&6 -# I'd rather use --version here, but apparently some GNU ld's only accept -v. -if $LD -v 2>&1 &5; then - with_gnu_ld=yes -else - with_gnu_ld=no -fi -echo "$ac_t$with_gnu_ld" 1>&6 - -# See if the linker supports building shared libraries. -echo $ac_n "checking whether the linker ($LD) supports shared libraries... $ac_c" 1>&6 - -allow_undefined_flag= -no_undefined_flag= -need_lib_prefix=unknown -need_version=unknown -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -archive_cmds= -archive_expsym_cmds= -old_archive_from_new_cmds= -export_dynamic_flag_spec= -whole_archive_flag_spec= -thread_safe_flag_spec= -hardcode_libdir_flag_spec= -hardcode_libdir_separator= -hardcode_direct=no -hardcode_minus_L=no -hardcode_shlibpath_var=unsupported -runpath_var= -always_export_symbols=no -export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols' -# include_expsyms should be a list of space-separated symbols to be *always* -# included in the symbol list -include_expsyms= -# exclude_expsyms can be an egrep regular expression of symbols to exclude -# it will be wrapped by ` (' and `)$', so one must not match beginning or -# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -# as well as any symbol that contains `d'. -exclude_expsyms="_GLOBAL_OFFSET_TABLE_" -# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -# platforms (ab)use it in PIC code, but their linkers get confused if -# the symbol is explicitly referenced. Since portable code cannot -# rely on this symbol name, it's probably fine to never include it in -# preloaded symbol tables. - -case "$host_os" in -cygwin* | mingw*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$with_gcc" != yes; then - with_gnu_ld=no - fi - ;; - -esac - -ld_shlibs=yes -if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # See if GNU ld supports shared libraries. - case "$host_os" in - aix3* | aix4*) - # On AIX, the GNU linker is very broken - ld_shlibs=no - cat <&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. - -EOF - ;; - - amigaos*) - archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can use - # them. - ld_shlibs=no - ;; - - beos*) - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs=no - fi - ;; - - cygwin* | mingw*) - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - allow_undefined_flag=unsupported - always_export_symbols=yes - - # Extract the symbol export list from an `--export-all' def file, - # then regenerate the def file from the symbol export list, so that - # the compiled dll only exports the symbol export list. - export_symbols_cmds='test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~ - test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~ - $DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def $objdir/$soname-ltdll.$objext $libobjs $convenience~ - sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]* ; *//" < $objdir/$soname-def > $export_symbols' - - archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~ - _lt_hint=1; - for symbol in `cat $export_symbols`; do - echo " \$symbol @ \$_lt_hint ; " >> $objdir/$soname-def; - _lt_hint=`expr 1 + \$_lt_hint`; - done~ - test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~ - test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~ - $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~ - $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~ - $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~ - $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~ - $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts' - - old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a' - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' - # can we support soname and/or expsyms with a.out? -oliva - fi - ;; - - solaris* | sysv5*) - if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - cat <&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -EOF - elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - - sunos4*) - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linkopts' - wlarc= - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - *) - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - - if test "$ld_shlibs" = yes; then - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' - case $host_os in - cygwin* | mingw*) - # dlltool doesn't understand --whole-archive et. al. - whole_archive_flag_spec= - ;; - *) - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi - ;; - esac - fi -else - # PORTME fill in a description of your system's linker (not GNU ld) - case "$host_os" in - aix3*) - allow_undefined_flag=unsupported - always_export_symbols=yes - archive_expsym_cmds='$LD -o $objdir/$soname $libobjs $deplibs $linkopts -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$with_gcc" = yes && test -z "$link_static_flag"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - - aix4*) - hardcode_libdir_flag_spec='${wl}-b ${wl}nolibpath ${wl}-b ${wl}libpath:$libdir:/usr/lib:/lib' - hardcode_libdir_separator=':' - if test "$with_gcc" = yes; then - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - hardcode_direct=yes - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - shared_flag='-shared' - else - shared_flag='${wl}-bM:SRE' - hardcode_direct=yes - fi - allow_undefined_flag=' ${wl}-berok' - archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}' - archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}' - case "$host_os" in aix4.[01]|aix4.[01].*) - # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on - always_export_symbols=yes ;; - esac - ;; - - amigaos*) - archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # see comment about different semantics on the GNU ld section - ld_shlibs=no - ;; - - cygwin* | mingw*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $linkopts `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' - fix_srcfile_path='`cygpath -w $srcfile`' - ;; - - freebsd1*) - ld_shlibs=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - hpux9* | hpux10* | hpux11*) - case "$host_os" in - hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; - *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linkopts' ;; - esac - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - hardcode_minus_L=yes # Not in the search PATH, but as the default - # location of the library. - export_dynamic_flag_spec='${wl}-E' - ;; - - irix5* | irix6*) - if test "$with_gcc" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - else - archive_cmds='$LD -shared $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' # a.out - else - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linkopts' # ELF - fi - hardcode_libdir_flag_spec='${wl}-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - openbsd*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported - archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $linkopts $objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def' - ;; - - osf3*) - if test "$with_gcc" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - - osf4* | osf5*) # As osf3* with the addition of the -msym flag - if test "$with_gcc" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - - sco3.2v5*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ;; - - solaris*) - 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 $linkopts' - 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 $linkopts~$rm $lib.exp' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_shlibpath_var=no - case "$host_os" in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; - esac - ;; - - sunos4*) - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - sysv4) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - - sysv4.3*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='-Bexport' - ;; - - 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 $linkopts' - 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 $linkopts~$rm $lib.exp' - hardcode_libdir_flag_spec= - hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' - ;; - - uts4*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - dgux*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs=yes - fi - ;; - - sysv4.2uw2*) - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linkopts' - hardcode_direct=yes - hardcode_minus_L=no - hardcode_shlibpath_var=no - hardcode_runpath_var=yes - runpath_var=LD_RUN_PATH - ;; - - unixware7*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; - - *) - ld_shlibs=no - ;; - esac -fi -echo "$ac_t$ld_shlibs" 1>&6 -test "$ld_shlibs" = no && can_build_shared=no - -if test -z "$NM"; then - echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6 - case "$NM" in - [\\/]* | [A-Za-z]:[\\/]*) ;; # Let the user override the test with a path. - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" - for ac_dir in $PATH /usr/ucb /usr/ccs/bin /bin; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/nm || test -f $ac_dir/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 - if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - NM="$ac_dir/nm -B" - break - elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - NM="$ac_dir/nm -p" - break - else - NM=${NM="$ac_dir/nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - fi - fi - done - IFS="$ac_save_ifs" - test -z "$NM" && NM=nm - ;; - esac - echo "$ac_t$NM" 1>&6 -fi - -# Check for command to grab the raw symbol name followed by C symbol from nm. -echo $ac_n "checking command to parse $NM output... $ac_c" 1>&6 - -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[BCDEGRST]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([_A-Za-z][_A-Za-z0-9]*\)' - -# 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 -global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" - -# Define system-specific variables. -case "$host_os" in -aix*) - symcode='[BCDT]' - ;; -cygwin* | mingw*) - symcode='[ABCDGISTW]' - ;; -hpux*) # Its linker distinguishes data from code symbols - global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'" - ;; -irix*) - symcode='[BCDEGRST]' - ;; -solaris*) - symcode='[BDT]' - ;; -sysv4) - symcode='[DFNSTU]' - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then - symcode='[ABCDGISTW]' -fi - -# Try without a prefix undercore, then with it. -for ac_symprfx in "" "_"; do - - # Write the raw and C identifiers. - global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode\)[ ][ ]*\($ac_symprfx\)$sympat$/$symxfrm/p'" - - # Check to see that the pipe works correctly. - pipe_works=no - $rm conftest* - cat > conftest.c <&5 - if { (eval echo $progname:1636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then - # Now try to grab the symbols. - nlist=conftest.nm - if { echo "$progname:1639: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then - - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if egrep ' nm_test_var$' "$nlist" >/dev/null; then - if egrep ' nm_test_func$' "$nlist" >/dev/null; then - cat < conftest.c -#ifdef __cplusplus -extern "C" { -#endif - -EOF - # Now generate the symbol file. - eval "$global_symbol_to_cdecl"' < "$nlist" >> conftest.c' - - cat <> conftest.c -#if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * -#else -# define lt_ptr_t char * -# define const -#endif - -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - lt_ptr_t address; -} -lt_preloaded_symbols[] = -{ -EOF - sed 's/^. \(.*\) \(.*\)$/ {"\2", (lt_ptr_t) \&\2},/' < "$nlist" >> conftest.c - cat <<\EOF >> conftest.c - {0, (lt_ptr_t) 0} -}; - -#ifdef __cplusplus -} -#endif -EOF - # Now try linking the two files. - mv conftest.$objext conftstm.$objext - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="conftstm.$objext" - CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo $progname:1691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - pipe_works=yes - else - echo "$progname: failed program was:" >&5 - cat conftest.c >&5 - fi - LIBS="$save_LIBS" - else - echo "cannot find nm_test_func in $nlist" >&5 - fi - else - echo "cannot find nm_test_var in $nlist" >&5 - fi - else - echo "cannot run $global_symbol_pipe" >&5 - fi - else - echo "$progname: failed program was:" >&5 - cat conftest.c >&5 - fi - $rm conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - global_symbol_pipe= - fi -done -if test "$pipe_works" = yes; then - echo "${ac_t}ok" 1>&6 -else - echo "${ac_t}failed" 1>&6 -fi - -if test -z "$global_symbol_pipe"; then - global_symbol_to_cdecl= -fi - -# Check hardcoding attributes. -echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6 -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var"; 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 "$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 "$ac_t$hardcode_action" 1>&6 - - -reload_flag= -reload_cmds='$LD$reload_flag -o $output$reload_objs' -echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6 -# PORTME Some linkers may need a different reload flag. -reload_flag='-r' -echo "$ac_t$reload_flag" 1>&6 -test -n "$reload_flag" && reload_flag=" $reload_flag" - -# PORTME Fill in your ld.so characteristics -library_names_spec= -libname_spec='lib$name' -soname_spec= -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" -sys_lib_search_path_spec="/lib /usr/lib" -file_magic_cmd= -file_magic_test_file= -deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [regex]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given egrep regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. -echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6 -case "$host_os" in -aix3*) - version_type=linux - library_names_spec='${libname}${release}.so$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}.so$major' - ;; - -aix4*) - version_type=linux - # AIX 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. - # We preserve .a as extension for shared libraries though AIX4.2 - # and later linker supports .so - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.a' - shlibpath_var=LIBPATH - deplibs_check_method=pass_all - ;; - -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}.so' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - deplibs_check_method=pass_all - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - -bsdi4*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - file_magic_cmd=/usr/bin/file - file_magic_test_file=/shlib/libc.so - 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" - export_dynamic_flag_spec=-rdynamic - # 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*) - version_type=windows - need_version=no - need_lib_prefix=no - if test "$with_gcc" = yes; then - library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.a' - else - library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib' - fi - dynamic_linker='Win32 ld.exe' - deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - file_magic_cmd='${OBJDUMP} -f' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - -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*) - deplibs_check_method='file_magic (ELF [0-9][0-9]*-bit [LM]SB shared object|current ar archive)' - ;; - freebsd-*) - deplibs_check_method='file_magic FreeBSD.* shared library' - ;; - esac - file_magic_cmd=/usr/bin/file - file_magic_test_file=`echo /usr/lib/libc.so.*` - if test "$release_suffix" = all; then - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so' - else - library_names_spec='${libname}${release}.so$versuffix ${libname}.so' - fi - need_version=no - need_lib_prefix=no - finish_cmds='/usr/bin/env OBJFORMAT="'"$objformat"'" /sbin/ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - case "$host_os" in - freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - ;; - *) # from 3.2 on - shlibpath_overrides_runpath=no - ;; - esac - ;; - -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so' - soname_spec='${libname}${release}.so$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - dynamic_linker="$host_os dld.sl" - version_type=sunos - need_lib_prefix=no - need_version=no - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl' - soname_spec='${libname}${release}.sl$major' - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -irix5* | irix6*) - version_type=irix - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}.so.$major' - library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so' - case "$host_os" in - irix5*) - libsuff= shlibsuff= - # this will be overridden with pass_all, but let us keep it just in case - deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" - ;; - *) - case "$LD" in # libtool.m4 will add one of these switches to LD - *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 ") 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}" - file_magic_cmd=/usr/bin/file - file_magic_test_file=`echo /lib${libsuff}/libc.so*` - deplibs_check_method='pass_all' - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux-gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' - file_magic_cmd=/usr/bin/file - file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - - if test -f /lib/ld.so.1; then - dynamic_linker='GNU ld.so' - else - # Only the GNU ld.so supports shared libraries on MkLinux. - case "$host_cpu" in - powerpc*) dynamic_linker=no ;; - *) dynamic_linker='Linux ld.so' ;; - esac - fi - ;; - -netbsd*) - version_type=sunos - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' - soname_spec='${libname}${release}.so$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - ;; - -openbsd*) - version_type=sunos - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - need_version=no - fi - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - ;; - -os2*) - libname_spec='$name' - need_lib_prefix=no - library_names_spec='$libname.dll $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_version=no - soname_spec='${libname}${release}.so' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' - shlibpath_var=LD_LIBRARY_PATH - # this will be overridden with pass_all, but let us keep it just in case - deplibs_check_method='file_magic COFF format alpha shared library' - file_magic_cmd=/usr/bin/file - file_magic_test_file=/shlib/libc.so - deplibs_check_method='pass_all' - 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}.so$major' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - shlibpath_var=LD_LIBRARY_PATH - ;; - -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - deplibs_check_method="file_magic ELF [0-9][0-9]-bit [LM]SB dynamic lib" - file_magic_cmd=/usr/bin/file - file_magic_test_file=/lib/libc.so - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$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}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - shlibpath_var=LD_LIBRARY_PATH - case "$host_vendor" in - ncr) - deplibs_check_method='pass_all' - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - 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]' - file_magic_cmd=/usr/bin/file - file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - esac - ;; - -uts4*) - version_type=linux - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so' - soname_spec='$libname.so.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -*) - dynamic_linker=no - ;; -esac -echo "$ac_t$dynamic_linker" 1>&6 -test "$dynamic_linker" = no && can_build_shared=no - -# Report the final consequences. -echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6 - -# Only try to build win32 dlls if AC_LIBTOOL_WIN32_DLL was used in -# configure.in, otherwise build static only libraries. -case "$host_os" in -cygwin* | mingw* | os2*) - if test x$can_build_shared = xyes; then - test x$enable_win32_dll = xno && can_build_shared=no - echo "checking if package supports dlls... $can_build_shared" 1>&6 - fi -;; -esac - -if test -n "$file_magic_test_file" && test -n "$file_magic_cmd"; then - case "$deplibs_check_method" in - "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - egrep "$file_magic_regex" > /dev/null; then - : - else - cat <&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -EOF - fi ;; - esac -fi - -echo $ac_n "checking whether to build shared libraries... $ac_c" 1>&6 -test "$can_build_shared" = "no" && enable_shared=no - -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case "$host_os" in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - -aix4*) - test "$enable_shared" = yes && enable_static=no - ;; -esac - -echo "$ac_t$enable_shared" 1>&6 - -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes - -echo "checking whether to build static libraries... $enable_static" 1>&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 - -echo $ac_n "checking for objdir... $ac_c" 1>&6 -rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - objdir=_libs -fi -rmdir .libs 2>/dev/null -echo "$ac_t$objdir" 1>&6 - -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else -if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then - lt_cv_dlopen=no lt_cv_dlopen_libs= -echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "$progname:2212: checking for dlopen in -ldl" >&5 -ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ldl $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "$progname:2252: checking for dlopen" >&5 -if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen(); - -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 -dlopen(); -#endif - -; return 0; } -EOF -if { (eval echo $progname:2282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_dlopen=yes" -else - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_dlopen=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then - echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="dlopen" -else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 -echo "$progname:2299: checking for dld_link in -ldld" >&5 -ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ldld $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" -else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "$progname:2339: checking for shl_load" >&5 -if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load(); - -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 -shl_load(); -#endif - -; return 0; } -EOF -if { (eval echo $progname:2369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_shl_load=yes" -else - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_shl_load=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then - echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="shl_load" -else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "$progname:2387: checking for shl_load in -ldld" >&5 -ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ldld $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -else - echo "$ac_t""no" 1>&6 -fi - - -fi - - -fi - - -fi - - -fi - -fi - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - fi - - case "$lt_cv_dlopen" in - dlopen) -for ac_hdr in dlfcn.h; do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "$progname:2452: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -int fnord = 0; -EOF -ac_try="$ac_compile >/dev/null 2>conftest.out" -{ (eval echo $progname:2462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi -done - - if test "x$ac_cv_header_dlfcn_h" = xyes; then - CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - fi - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - LIBS="$lt_cv_dlopen_libs $LIBS" - - echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 -echo "$progname:2490: checking whether a program can dlopen itself" >&5 -if test "${lt_cv_dlopen_self+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - lt_cv_dlopen_self=cross - else - cat > conftest.c < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LTDL_GLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LTDL_GLOBAL DL_GLOBAL -# else -# define LTDL_GLOBAL 0 -# endif -#endif - -/* We may have to define LTDL_LAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LTDL_LAZY_OR_NOW -# ifdef RTLD_LAZY -# define LTDL_LAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LTDL_LAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LTDL_LAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LTDL_LAZY_OR_NOW DL_NOW -# else -# define LTDL_LAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -fnord() { int i=42;} -main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW); - if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord"); - if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } - -EOF -if { (eval echo $progname:2544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null -then - lt_cv_dlopen_self=yes -else - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - lt_cv_dlopen_self=no -fi -rm -fr conftest* -fi - -fi - -echo "$ac_t""$lt_cv_dlopen_self" 1>&6 - - if test "$lt_cv_dlopen_self" = yes; then - LDFLAGS="$LDFLAGS $link_static_flag" - echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 -echo "$progname:2563: checking whether a statically linked program can dlopen itself" >&5 -if test "${lt_cv_dlopen_self_static+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - lt_cv_dlopen_self_static=cross - else - cat > conftest.c < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LTDL_GLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LTDL_GLOBAL DL_GLOBAL -# else -# define LTDL_GLOBAL 0 -# endif -#endif - -/* We may have to define LTDL_LAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LTDL_LAZY_OR_NOW -# ifdef RTLD_LAZY -# define LTDL_LAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LTDL_LAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LTDL_LAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LTDL_LAZY_OR_NOW DL_NOW -# else -# define LTDL_LAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -fnord() { int i=42;} -main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW); - if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord"); - if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } - -EOF -if { (eval echo $progname:2617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null -then - lt_cv_dlopen_self_static=yes -else - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - lt_cv_dlopen_self_static=no -fi -rm -fr conftest* -fi - -fi - -echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6 -fi - ;; - 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 - -# Copy echo and quote the copy, instead of the original, because it is -# used later. -ltecho="$echo" -if test "X$ltecho" = "X$CONFIG_SHELL $0 --fallback-echo"; then - ltecho="$CONFIG_SHELL \$0 --fallback-echo" -fi -LTSHELL="$SHELL" - -LTCONFIG_VERSION="$VERSION" - -# Only quote variables if we're using ltmain.sh. -case "$ltmain" in -*.sh) - # Now quote all the things that may contain metacharacters. - for var in ltecho old_CC old_CFLAGS old_CPPFLAGS \ - old_LD old_LDFLAGS old_LIBS \ - old_NM old_RANLIB old_LN_S old_DLLTOOL old_OBJDUMP old_AS \ - AR CC LD LN_S NM LTSHELL LTCONFIG_VERSION \ - reload_flag reload_cmds wl \ - pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ - thread_safe_flag_spec whole_archive_flag_spec libname_spec \ - library_names_spec soname_spec \ - RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ - old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds postuninstall_cmds \ - file_magic_cmd export_symbols_cmds deplibs_check_method allow_undefined_flag no_undefined_flag \ - finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \ - hardcode_libdir_flag_spec hardcode_libdir_separator \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do - - case "$var" in - reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - export_symbols_cmds | archive_cmds | archive_expsym_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case "$ltecho" in - *'\$0 --fallback-echo"') - ltecho=`$echo "X$ltecho" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac - - trap "$rm \"$ofile\"; exit 1" 1 2 15 - echo "creating $ofile" - $rm "$ofile" - cat < "$ofile" -#! $SHELL - -# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh. -# -# Copyright (C) 1996-1999 Free Software Foundation, Inc. -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="sed -e s/^X//" - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi - -### BEGIN LIBTOOL CONFIG -EOF - cfgfile="$ofile" - ;; - -*) - # Double-quote the variables that need it (for aesthetics). - for var in old_CC old_CFLAGS old_CPPFLAGS \ - old_LD old_LDFLAGS old_LIBS \ - old_NM old_RANLIB old_LN_S old_DLLTOOL old_OBJDUMP old_AS; do - eval "$var=\\\"\$var\\\"" - done - - # Just create a config file. - cfgfile="$ofile.cfg" - trap "$rm \"$cfgfile\"; exit 1" 1 2 15 - echo "creating $cfgfile" - $rm "$cfgfile" - cat < "$cfgfile" -# `$echo "$cfgfile" | sed 's%^.*/%%'` - Libtool configuration file. -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -EOF - ;; -esac - -cat <> "$cfgfile" -# Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# -# CC=$old_CC CFLAGS=$old_CFLAGS CPPFLAGS=$old_CPPFLAGS \\ -# LD=$old_LD LDFLAGS=$old_LDFLAGS LIBS=$old_LIBS \\ -# NM=$old_NM RANLIB=$old_RANLIB LN_S=$old_LN_S \\ -# DLLTOOL=$old_DLLTOOL OBJDUMP=$old_OBJDUMP AS=$old_AS \\ -# $0$ltconfig_args -# -# Compiler and other test output produced by $progname, useful for -# debugging $progname, is in ./config.log if it exists. - -# The version of $progname that generated this script. -LTCONFIG_VERSION=$LTCONFIG_VERSION - -# Shell to use when invoking shell scripts. -SHELL=$LTSHELL - -# Whether to waste disk space. -install_ltlibs=$install_ltlibs - -# What to do with -release. -# yes - only for shared archive -# no - ingnore -# all - for all archives -release_suffix=$release_suffix - -# 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 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=$ltecho - -# The archiver. -AR=$AR - -# The default C compiler. -CC=$CC - -# The linker used to build libraries. -LD=$LD - -# Whether we need hard or soft links. -LN_S=$LN_S - -# A BSD-compatible nm program. -NM=$NM - -# 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=$reload_flag -reload_cmds=$reload_cmds - -# How to pass a linker flag through the compiler. -wl=$wl - -# Object file suffix (normally "o"). -objext="$objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$pic_flag - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$compiler_c_o - -# Can we write directly to a .lo ? -compiler_o_lo=$compiler_o_lo - -# Must we lock files when doing compilation ? -need_locks=$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=$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=$link_static_flag - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$no_builtin_flag - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$export_dynamic_flag_spec - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$whole_archive_flag_spec - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$thread_safe_flag_spec - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$RANLIB -old_archive_cmds=$old_archive_cmds -old_postinstall_cmds=$old_postinstall_cmds -old_postuninstall_cmds=$old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$old_archive_from_new_cmds - -# Commands used to build and install a shared archive. -archive_cmds=$archive_cmds -archive_expsym_cmds=$archive_expsym_cmds -postinstall_cmds=$postinstall_cmds -postuninstall_cmds=$postuninstall_cmds - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$allow_undefined_flag - -# Flag that forces no undefined symbols. -no_undefined_flag=$no_undefined_flag - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$finish_cmds - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$finish_eval - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$global_symbol_to_cdecl - -# This is the shared library runtime path variable. -runpath_var=$runpath_var - -# This is the shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$hardcode_libdir_flag_spec - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$hardcode_libdir_separator - -# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var - -# Compile-time system search path for libraries -sys_lib_search_path_spec=$sys_lib_search_path_spec - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path" - -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols - -# The commands to list exported symbols. -export_symbols_cmds=$export_symbols_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$exclude_expsyms - -# Symbols that must always be exported. -include_expsyms=$include_expsyms - -EOF - -case "$ltmain" in -*.sh) - echo '### END LIBTOOL CONFIG' >> "$ofile" - echo >> "$ofile" - case "$host_os" in - aix3*) - cat <<\EOF >> "$ofile" - -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -EOF - ;; - esac - - # Append the ltmain.sh script. - sed '$q' "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1) - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - - chmod +x "$ofile" - ;; - -*) - # Compile the libtool program. - echo "FIXME: would compile $ltmain" - ;; -esac - -test -n "$cache_file" || exit 0 - -# AC_CACHE_SAVE -trap '' 1 2 15 -cat > confcache <<\EOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. -# -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. -# -EOF -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else - if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - -exit 0 - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: diff --git a/mozilla/calendar/libical/ltmain.sh b/mozilla/calendar/libical/ltmain.sh deleted file mode 100644 index 23f82e3b79c..00000000000 --- a/mozilla/calendar/libical/ltmain.sh +++ /dev/null @@ -1,6425 +0,0 @@ -# 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, 2004 -# Free Software Foundation, Inc. -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -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" - -# RH: define SED for historic ltconfig's generated by Libtool 1.3 -[ -z "$SED" ] && SED=sed - -# 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.6 -TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42)" - - -# Check that we have a working $echo. -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then - # Yippee, $echo works! - : -else - # Restart under the correct shell, and then maybe $echo will work. - exec $SHELL "$progpath" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat <&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE -fi - -# Global variables. -mode=$default_mode -nonopt= -prev= -prevopt= -run= -show="$echo" -show_help= -execute_dlfiles= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" - -##################################### -# Shell function definitions: -# This seems to be the best place for them - -# func_win32_libid arg -# return the library type of file 'arg' -# -# Need a lot of goo to handle *both* DLLs and import libs -# Has to be a shell function in order to 'eat' the argument -# that is supplied when $file_magic_command is called. -func_win32_libid () { - win32_libid_type="unknown" - win32_fileres=`file -L $1 2>/dev/null` - case $win32_fileres in - *ar\ archive\ import\ library*) # definitely import - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ - $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then - win32_nmres=`eval $NM -f posix -A $1 | \ - sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` - if test "X$win32_nmres" = "Ximport" ; then - win32_libid_type="x86 archive import" - else - win32_libid_type="x86 archive static" - fi - fi - ;; - *DLL*) - win32_libid_type="x86 DLL" - ;; - *executable*) # but shell scripts are "executable" too... - case $win32_fileres in - *MS\ Windows\ PE\ Intel*) - win32_libid_type="x86 DLL" - ;; - esac - ;; - esac - $echo $win32_libid_type -} - - -# func_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 -} -# End of Shell function definitions -##################################### - -# Darwin sucks -eval std_shrext=\"$shrext_cmds\" - -# Parse our command line options once, thoroughly. -while test "$#" -gt 0 -do - arg="$1" - shift - - case $arg in - -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - execute_dlfiles) - execute_dlfiles="$execute_dlfiles $arg" - ;; - tag) - tagname="$arg" - 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 $EXIT_FAILURE - ;; - esac - - case $tagname in - CC) - # Don't test for the "default" C tag, as we know, it's there, but - # not specially marked. - ;; - *) - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$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' < $progpath`" - else - $echo "$progname: ignoring unknown tag $tagname" 1>&2 - fi - ;; - esac - ;; - *) - eval "$prev=\$arg" - ;; - esac - - prev= - prevopt= - continue - fi - - # Have we seen a non-optional argument yet? - case $arg in - --help) - show_help=yes - ;; - - --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 $EXIT_SUCCESS - ;; - - --config) - ${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" < "$progpath" - done - exit $EXIT_SUCCESS - ;; - - --debug) - $echo "$progname: enabling shell trace mode" - set -x - preserve_args="$preserve_args $arg" - ;; - - --dry-run | -n) - run=: - ;; - - --features) - $echo "host: $host" - if test "$build_libtool_libs" = yes; then - $echo "enable shared libraries" - else - $echo "disable shared libraries" - fi - if test "$build_old_libs" = yes; then - $echo "enable static libraries" - else - $echo "disable static libraries" - fi - exit $EXIT_SUCCESS - ;; - - --finish) mode="finish" ;; - - --mode) prevopt="--mode" prev=mode ;; - --mode=*) mode="$optarg" ;; - - --preserve-dup-deps) duplicate_deps="yes" ;; - - --quiet | --silent) - show=: - preserve_args="$preserve_args $arg" - ;; - - --tag) prevopt="--tag" prev=tag ;; - --tag=*) - set tag "$optarg" ${1+"$@"} - shift - prev=tag - preserve_args="$preserve_args --tag" - ;; - - -dlopen) - prevopt="-dlopen" - prev=execute_dlfiles - ;; - - -*) - $echo "$modename: unrecognized option \`$arg'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - - *) - nonopt="$arg" - break - ;; - esac -done - -if test -n "$prevopt"; then - $echo "$modename: option \`$prevopt' requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE -fi - -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= - -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 - case $nonopt in - *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) - mode=link - for arg - do - case $arg in - -c) - mode=compile - break - ;; - esac - done - ;; - *db | *dbx | *strace | *truss) - mode=execute - ;; - *install*|cp|mv) - mode=install - ;; - *rm) - mode=uninstall - ;; - *) - # If we have no mode, but dlfiles were specified, then do execute mode. - test -n "$execute_dlfiles" && mode=execute - - # Just use the default operation mode. - if test -z "$mode"; then - if test -n "$nonopt"; then - $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 - else - $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 - fi - fi - ;; - esac - fi - - # Only execute mode is allowed to have -dlopen flags. - if test -n "$execute_dlfiles" && test "$mode" != execute; then - $echo "$modename: unrecognized option \`-dlopen'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$modename --help --mode=$mode' for more information." - - # These modes are in order of execution frequency so that they run quickly. - case $mode in - # libtool compile mode - compile) - modename="$modename: compile" - # Get the compilation command and the source file. - base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" - suppress_opt=yes - suppress_output= - arg_mode=normal - libobj= - later= - - for arg - do - case "$arg_mode" in - arg ) - # do not "continue". Instead, add this to base_compile - lastarg="$arg" - arg_mode=normal - ;; - - target ) - libobj="$arg" - arg_mode=normal - continue - ;; - - normal ) - # Accept any command-line options. - case $arg in - -o) - if test -n "$libobj" ; then - $echo "$modename: you cannot specify \`-o' more than once" 1>&2 - exit $EXIT_FAILURE - fi - arg_mode=target - continue - ;; - - -static | -prefer-pic | -prefer-non-pic) - later="$later $arg" - continue - ;; - - -no-suppress) - suppress_opt=no - continue - ;; - - -Xcompiler) - arg_mode=arg # the next one goes into the "base_compile" arg list - continue # The current "srcfile" will either be retained or - ;; # replaced later. I would guess that would be a bug. - - -Wc,*) - args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` - lastarg= - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" - - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - lastarg="$lastarg $arg" - done - IFS="$save_ifs" - lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` - - # Add the arguments to base_compile. - base_compile="$base_compile $lastarg" - continue - ;; - - * ) - # Accept the current argument as the source file. - # The previous "srcfile" becomes the current argument. - # - lastarg="$srcfile" - srcfile="$arg" - ;; - esac # case $arg - ;; - esac # case $arg_mode - - # Aesthetically quote the previous argument. - lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` - - case $lastarg in - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - lastarg="\"$lastarg\"" - ;; - esac - - base_compile="$base_compile $lastarg" - done # for arg - - case $arg_mode in - arg) - $echo "$modename: you must specify an argument for -Xcompile" - exit $EXIT_FAILURE - ;; - target) - $echo "$modename: you must specify a target with \`-o'" 1>&2 - exit $EXIT_FAILURE - ;; - *) - # Get the name of the library object. - [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` - ;; - esac - - # Recognize several different file suffixes. - # If the user specifies -o file.o, it is replaced with file.lo - xform='[cCFSifmso]' - case $libobj in - *.ada) xform=ada ;; - *.adb) xform=adb ;; - *.ads) xform=ads ;; - *.asm) xform=asm ;; - *.c++) xform=c++ ;; - *.cc) xform=cc ;; - *.ii) xform=ii ;; - *.class) xform=class ;; - *.cpp) xform=cpp ;; - *.cxx) xform=cxx ;; - *.f90) xform=f90 ;; - *.for) xform=for ;; - *.java) xform=java ;; - esac - - libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` - - case $libobj in - *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; - *) - $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - 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 - done - - objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$obj"; then - xdir= - else - xdir=$xdir/ - fi - lobj=${xdir}$objdir/$objname - - if test -z "$base_compile"; then - $echo "$modename: you must specify a compilation command" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Delete any leftover library objects. - if test "$build_old_libs" = yes; then - removelist="$obj $lobj $libobj ${libobj}T" - else - removelist="$lobj $libobj ${libobj}T" - fi - - $run $rm $removelist - 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 - cygwin* | mingw* | pw32* | os2*) - pic_mode=default - ;; - esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then - # non-PIC code in shared libraries is not supported - pic_mode=default - fi - - # Calculate the filename of the output object if compiler does - # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" - removelist="$removelist $output_obj $lockfile" - trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 - else - output_obj= - need_locks=no - lockfile= - fi - - # Lock this critical section if it is needed - # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then - until $run ln "$progpath" "$lockfile" 2>/dev/null; do - $show "Waiting for $lockfile to be removed" - sleep 2 - done - elif test "$need_locks" = warn; then - if test -f "$lockfile"; then - $echo "\ -*** ERROR, $lockfile exists and contains: -`cat $lockfile 2>/dev/null` - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $run $rm $removelist - exit $EXIT_FAILURE - fi - $echo $srcfile > "$lockfile" - fi - - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi - - $run $rm "$libobj" "${libobj}T" - - # Create a libtool object file (analogous to a ".la" file), - # but don't create it if we're doing a dry run. - test -z "$run" && cat > ${libobj}T </dev/null`" != "X$srcfile"; then - $echo "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $run $rm $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed, then go on to compile the next one - if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then - $show "$mv $output_obj $lobj" - if $run $mv $output_obj $lobj; then : - else - error=$? - $run $rm $removelist - exit $error - fi - fi - - # Append the name of the PIC object to the libtool object file. - test -z "$run" && cat >> ${libobj}T <> ${libobj}T </dev/null`" != "X$srcfile"; then - $echo "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $run $rm $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed - if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then - $show "$mv $output_obj $obj" - if $run $mv $output_obj $obj; then : - else - error=$? - $run $rm $removelist - exit $error - fi - fi - - # Append the name of the non-PIC object the libtool object file. - # Only append if the libtool object file exists. - test -z "$run" && cat >> ${libobj}T <> ${libobj}T <&2 - fi - if test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - else - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - fi - build_libtool_libs=no - build_old_libs=yes - prefer_static_libs=yes - break - ;; - esac - done - - # See if our shared archives depend on static archives. - test -n "$old_archive_from_new_cmds" && build_old_libs=yes - - # Go through the arguments, transforming them on the way. - while test "$#" -gt 0; do - arg="$1" - shift - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test - ;; - *) qarg=$arg ;; - esac - libtool_args="$libtool_args $qarg" - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - output) - compile_command="$compile_command @OUTPUT@" - finalize_command="$finalize_command @OUTPUT@" - ;; - esac - - case $prev in - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. - compile_command="$compile_command @SYMFILE@" - finalize_command="$finalize_command @SYMFILE@" - preload=yes - fi - case $arg in - *.la | *.lo) ;; # We handle these cases below. - force) - if test "$dlself" = no; then - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - self) - if test "$prev" = dlprefiles; then - dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then - dlself=yes - else - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - *) - if test "$prev" = dlfiles; then - dlfiles="$dlfiles $arg" - else - dlprefiles="$dlprefiles $arg" - fi - prev= - continue - ;; - esac - ;; - expsyms) - export_symbols="$arg" - if test ! -f "$arg"; then - $echo "$modename: symbol file \`$arg' does not exist" - exit $EXIT_FAILURE - fi - prev= - continue - ;; - expsyms_regex) - export_symbols_regex="$arg" - prev= - continue - ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; - precious_regex) - precious_files_regex="$arg" - prev= - continue - ;; - release) - release="-$arg" - prev= - continue - ;; - objectlist) - if test -f "$arg"; then - save_arg=$arg - moreargs= - for fil in `cat $save_arg` - do -# moreargs="$moreargs $fil" - arg=$fil - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - pic_object= - non_pic_object= - - # Read the .lo file - # If there is no directory component, then add one. - case $arg in - */* | *\\*) . $arg ;; - *) . ./$arg ;; - esac - - if test -z "$pic_object" || \ - test -z "$non_pic_object" || - test "$pic_object" = none && \ - test "$non_pic_object" = none; then - $echo "$modename: cannot find name of object for \`$arg'" 1>&2 - exit $EXIT_FAILURE - fi - - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" - prev= - fi - - # A PIC object. - libobjs="$libobjs $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - non_pic_objects="$non_pic_objects $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - fi - else - # Only an error if not doing a dry-run. - if test -z "$run"; then - $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 - exit $EXIT_FAILURE - else - # Dry-run case. - - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi - - pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` - non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` - libobjs="$libobjs $pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - fi - done - else - $echo "$modename: link input file \`$save_arg' does not exist" - exit $EXIT_FAILURE - fi - arg=$save_arg - prev= - continue - ;; - rpath | xrpath) - # We need an absolute path. - case $arg in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit $EXIT_FAILURE - ;; - esac - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; - *) rpath="$rpath $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; - *) xrpath="$xrpath $arg" ;; - esac - fi - prev= - continue - ;; - xcompiler) - compiler_flags="$compiler_flags $qarg" - prev= - compile_command="$compile_command $qarg" - finalize_command="$finalize_command $qarg" - continue - ;; - xlinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $wl$qarg" - prev= - compile_command="$compile_command $wl$qarg" - finalize_command="$finalize_command $wl$qarg" - continue - ;; - xcclinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $qarg" - prev= - compile_command="$compile_command $qarg" - finalize_command="$finalize_command $qarg" - continue - ;; - shrext) - shrext_cmds="$arg" - prev= - continue - ;; - *) - eval "$prev=\"\$arg\"" - prev= - continue - ;; - esac - fi # test -n "$prev" - - prevarg="$arg" - - case $arg in - -all-static) - if test -n "$link_static_flag"; then - compile_command="$compile_command $link_static_flag" - finalize_command="$finalize_command $link_static_flag" - fi - continue - ;; - - -allow-undefined) - # FIXME: remove this flag sometime in the future. - $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 - continue - ;; - - -avoid-version) - avoid_version=yes - continue - ;; - - -dlopen) - prev=dlfiles - continue - ;; - - -dlpreopen) - prev=dlprefiles - continue - ;; - - -export-dynamic) - export_dynamic=yes - continue - ;; - - -export-symbols | -export-symbols-regex) - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - $echo "$modename: more than one -exported-symbols argument is not allowed" - exit $EXIT_FAILURE - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms - else - prev=expsyms_regex - fi - continue - ;; - - -inst-prefix-dir) - prev=inst_prefix - continue - ;; - - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* - # so, if we see these flags be careful not to treat them like -L - -L[A-Z][A-Z]*:*) - case $with_gcc/$host in - no/*-*-irix* | /*-*-irix*) - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - ;; - esac - continue - ;; - - -L*) - dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit $EXIT_FAILURE - fi - dir="$absdir" - ;; - esac - case "$deplibs " in - *" -L$dir "*) ;; - *) - deplibs="$deplibs -L$dir" - lib_search_path="$lib_search_path $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - case :$dllsearchpath: in - *":$dir:"*) ;; - *) dllsearchpath="$dllsearchpath:$dir";; - esac - ;; - esac - continue - ;; - - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in - *-*-cygwin* | *-*-pw32* | *-*-beos*) - # These systems don't actually have a C or math library (as such) - continue - ;; - *-*-mingw* | *-*-os2*) - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; - *-*-openbsd* | *-*-freebsd*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework - deplibs="$deplibs -framework System" - continue - esac - elif test "X$arg" = "X-lc_r"; then - case $host in - *-*-openbsd* | *-*-freebsd*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; - esac - fi - deplibs="$deplibs $arg" - continue - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) - deplibs="$deplibs $arg" - 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*) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" - fi - continue - ;; - - -shrext) - prev=shrext - continue - ;; - - -no-fast-install) - fast_install=no - continue - ;; - - -no-install) - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - # The PATH hackery in wrapper scripts is required on Windows - # in order for the loader to find any dlls it needs. - $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 - $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 - fast_install=no - ;; - *) no_install=yes ;; - esac - continue - ;; - - -no-undefined) - allow_undefined=no - continue - ;; - - -objectlist) - prev=objectlist - continue - ;; - - -o) prev=output ;; - - -precious-files-regex) - prev=precious_regex - continue - ;; - - -release) - prev=release - continue - ;; - - -rpath) - prev=rpath - continue - ;; - - -R) - prev=xrpath - continue - ;; - - -R*) - dir=`$echo "X$arg" | $Xsed -e 's/^-R//'` - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit $EXIT_FAILURE - ;; - esac - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - continue - ;; - - -static) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that - # didn't have a PIC flag, but the assumption that the effects - # would be equivalent was wrong. It would break on at least - # Digital Unix and AIX. - continue - ;; - - -thread-safe) - thread_safe=yes - continue - ;; - - -version-info) - prev=vinfo - continue - ;; - -version-number) - prev=vinfo - vinfo_number=yes - continue - ;; - - -Wc,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - case $flag in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - flag="\"$flag\"" - ;; - esac - arg="$arg $wl$flag" - compiler_flags="$compiler_flags $flag" - done - IFS="$save_ifs" - arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; - - -Wl,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - case $flag in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - flag="\"$flag\"" - ;; - esac - arg="$arg $wl$flag" - compiler_flags="$compiler_flags $wl$flag" - linker_flags="$linker_flags $flag" - done - IFS="$save_ifs" - arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; - - -Xcompiler) - prev=xcompiler - continue - ;; - - -Xlinker) - prev=xlinker - continue - ;; - - -XCClinker) - prev=xcclinker - continue - ;; - - # Some other compiler flag. - -* | +*) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - ;; - - *.$objext) - # A standard object. - objs="$objs $arg" - ;; - - *.lo) - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - pic_object= - non_pic_object= - - # Read the .lo file - # If there is no directory component, then add one. - case $arg in - */* | *\\*) . $arg ;; - *) . ./$arg ;; - esac - - if test -z "$pic_object" || \ - test -z "$non_pic_object" || - test "$pic_object" = none && \ - test "$non_pic_object" = none; then - $echo "$modename: cannot find name of object for \`$arg'" 1>&2 - exit $EXIT_FAILURE - fi - - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" - prev= - fi - - # A PIC object. - libobjs="$libobjs $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - non_pic_objects="$non_pic_objects $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - fi - else - # Only an error if not doing a dry-run. - if test -z "$run"; then - $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 - exit $EXIT_FAILURE - else - # Dry-run case. - - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi - - pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` - non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` - libobjs="$libobjs $pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - fi - ;; - - *.$libext) - # An archive. - deplibs="$deplibs $arg" - old_deplibs="$old_deplibs $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. - dlfiles="$dlfiles $arg" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. - dlprefiles="$dlprefiles $arg" - prev= - else - deplibs="$deplibs $arg" - fi - continue - ;; - - # Some other compiler argument. - *) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - ;; - esac # arg - - # Now actually substitute the argument into the commands. - if test -n "$arg"; then - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - fi - done # argument parsing loop - - if test -n "$prev"; then - $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - fi - - oldlibs= - # calculate the name of the file, without its directory - outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` - libobjs_save="$libobjs" - - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` - else - shlib_search_path= - fi - eval sys_lib_search_path=\"$sys_lib_search_path_spec\" - eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - - output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'` - if test "X$output_objdir" = "X$output"; then - output_objdir="$objdir" - else - output_objdir="$output_objdir/$objdir" - fi - # Create the object directory. - if test ! -d "$output_objdir"; then - $show "$mkdir $output_objdir" - $run $mkdir $output_objdir - status=$? - if test "$status" -ne 0 && test ! -d "$output_objdir"; then - exit $status - fi - fi - - # Determine the type of output - case $output in - "") - $echo "$modename: you must specify an output file" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; - *.la) linkmode=lib ;; - *) linkmode=prog ;; # Anything else should be a program. - esac - - case $host in - *cygwin* | *mingw* | *pw32*) - # don't eliminate duplications in $postdeps and $predeps - duplicate_compiler_generated_deps=yes - ;; - *) - duplicate_compiler_generated_deps=$duplicate_deps - ;; - esac - specialdeplibs= - - libs= - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do - if test "X$duplicate_deps" = "Xyes" ; then - case "$libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - libs="$libs $deplib" - done - - if test "$linkmode" = lib; then - libs="$predeps $libs $compiler_lib_search_path $postdeps" - - # Compute libraries that are listed more than once in $predeps - # $postdeps and mark them as special (i.e., whose duplicates are - # not to be eliminated). - pre_post_deps= - if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; - esac - pre_post_deps="$pre_post_deps $pre_post_dep" - done - fi - pre_post_deps= - fi - - deplibs= - newdependency_libs= - newlib_search_path= - need_relink=no # whether we're linking any uninstalled libtool libraries - notinst_deplibs= # not-installed libtool libraries - notinst_path= # paths that contain not-installed libtool libraries - case $linkmode in - lib) - passes="conv link" - for file in $dlfiles $dlprefiles; do - case $file in - *.la) ;; - *) - $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 - exit $EXIT_FAILURE - ;; - esac - done - ;; - prog) - compile_deplibs= - finalize_deplibs= - alldeplibs=no - newdlfiles= - newdlprefiles= - passes="conv scan dlopen dlpreopen link" - ;; - *) passes="conv" - ;; - esac - for pass in $passes; do - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" - deplibs= - fi - if test "$linkmode" = prog; then - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; - esac - fi - if test "$pass" = dlopen; then - # Collect dlpreopened libraries - save_deplibs="$deplibs" - deplibs= - fi - for deplib in $libs; do - lib= - found=no - case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - 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 - for search_ext in .la $std_shrext .so .a; do - # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" - if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes - else - found=no - fi - break 2 - fi - done - done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library - # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, - # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $deplib "*) - if (${SED} -e '2q' $lib | - grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - library_names= - old_library= - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - for l in $old_library $library_names; do - ll="$l" - done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` - test "X$ladir" = "X$lib" && ladir="." - lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - fi - fi - ;; - *) ;; - esac - fi - fi - ;; # -l - -L*) - case $linkmode in - lib) - deplibs="$deplib $deplibs" - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - prog) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - if test "$pass" = scan; then - deplibs="$deplib $deplibs" - 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 - ;; - esac # linkmode - continue - ;; # -L - -R*) - if test "$pass" = link; then - dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; - *.la) lib="$deplib" ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - case $linkmode in - lib) - if test "$deplibs_check_method" != pass_all; then - $echo - $echo "*** Warning: Trying to link with static lib archive $deplib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have" - $echo "*** because the file extensions .$libext of this argument makes me believe" - $echo "*** that it is just a static archive that I should not used here." - else - $echo - $echo "*** Warning: Linking the shared library $output against the" - $echo "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" - fi - continue - ;; - prog) - if test "$pass" != link; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - continue - ;; - esac # linkmode - ;; # *.$libext - *.lo | *.$objext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. - newdlprefiles="$newdlprefiles $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - newdlfiles="$newdlfiles $deplib" - fi - fi - continue - ;; - %DEPLIBS%) - alldeplibs=yes - continue - ;; - esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - $echo "$modename: cannot find the library \`$lib'" 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 $EXIT_FAILURE - fi - - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` - test "X$ladir" = "X$lib" && ladir="." - - dlname= - dlopen= - dlpreopen= - libdir= - library_names= - old_library= - # If the library was installed with an old release of libtool, - # it will not redefine variables installed, or shouldnotlink - installed=yes - shouldnotlink=no - - # Read the .la file - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && dlfiles="$dlfiles $dlopen" - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" - fi - - if test "$pass" = conv; then - # Only check for convenience libraries - deplibs="$lib $deplibs" - if test -z "$libdir"; then - if test -z "$old_library"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - # It is a libtool convenience library, so add in its objects. - convenience="$convenience $ladir/$objdir/$old_library" - old_convenience="$old_convenience $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - $echo "$modename: \`$lib' is not a convenience library" 1>&2 - exit $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 - linklib="$l" - done - if test -z "$linklib"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - 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 $EXIT_FAILURE - fi - if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then - # If there is no dlname, no dlopen support or we're linking - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. - dlprefiles="$dlprefiles $lib $dependency_libs" - else - newdlfiles="$newdlfiles $lib" - fi - continue - fi # $pass = dlopen - - # We need an absolute path. - case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; - *) - abs_ladir=`cd "$ladir" && pwd` - if test -z "$abs_ladir"; then - $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2 - $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 - abs_ladir="$ladir" - fi - ;; - esac - laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - $echo "$modename: warning: library \`$lib' was moved." 1>&2 - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else - dir="$libdir" - absdir="$libdir" - fi - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" - fi # $installed = yes - name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - - # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - newdlprefiles="$newdlprefiles $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - newdlprefiles="$newdlprefiles $dir/$dlname" - else - newdlprefiles="$newdlprefiles $dir/$linklib" - fi - fi # $pass = dlpreopen - - if test -z "$libdir"; then - # Link the convenience library - if test "$linkmode" = lib; then - deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$dir/$old_library $compile_deplibs" - finalize_deplibs="$dir/$old_library $finalize_deplibs" - else - deplibs="$lib $deplibs" # used for prog,scan pass - fi - continue - fi - - - if test "$linkmode" = prog && test "$pass" != link; then - newlib_search_path="$newlib_search_path $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes - fi - - tmp_libs= - for deplib in $dependency_libs; do - case $deplib in - -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test - esac - # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then - deplibs="$deplib $deplibs" - else - # Need to hardcode shared library paths - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done # for deplib - continue - fi # $linkmode = prog... - - if test "$linkmode,$pass" = "prog,link"; then - if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then - # We need to hardcode the library path - if test -n "$shlibpath_var"; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath " in - *" $dir "*) ;; - *" $absdir "*) ;; - *) temp_rpath="$temp_rpath $dir" ;; - esac - fi - - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" - esac - ;; - esac - fi # $linkmode,$pass = prog,link... - - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && - test -n "$library_names"; }; }; then - # We only need to search for static libraries - continue - fi - fi - - link_static=no # Whether the deplib will be linked statically - if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then - if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes - fi - # This is a shared library - - # Warn about portability, can't link against -module's on - # some systems (darwin) - if test "$shouldnotlink" = yes && test "$pass" = link ; then - $echo - if test "$linkmode" = prog; then - $echo "*** Warning: Linking the executable $output against the loadable module" - else - $echo "*** Warning: Linking the shared library $output against the loadable module" - fi - $echo "*** $linklib is not portable!" - fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" - esac - ;; - esac - fi - - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names - realname="$2" - shift; shift - libname=`eval \\$echo \"$libname_spec\"` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" - elif test -n "$soname_spec"; then - # bleh windows - case $host in - *cygwin* | mingw*) - major=`expr $current - $age` - versuffix="-$major" - ;; - esac - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - - # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" - soname=`$echo $soroot | ${SED} -e 's/^.*\///'` - newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" - - # If the library has no export list, then create one now - if test -f "$output_objdir/$soname-def"; then : - else - $show "extracting exported symbol list from \`$soname'" - save_ifs="$IFS"; IFS='~' - cmds=$extract_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - - # Create $newlib - if test -f "$output_objdir/$newlib"; then :; else - $show "generating import library for \`$soname'" - save_ifs="$IFS"; IFS='~' - cmds=$old_archive_from_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - # make sure the library variables are pointing to the new library - dir=$output_objdir - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - - if test "$linkmode" = prog || test "$mode" != relink; then - add_shlibpath= - add_dir= - add= - lib_linked=yes - case $hardcode_action in - immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" - case $host in - *-*-sco3.2v5* ) add_dir="-L$dir" ;; - *-*-darwin* ) - # if the lib is a module then we can not link against - # it, someone is ignoring the new warnings I added - if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then - $echo "** Warning, lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then - $echo - $echo "** And there doesn't seem to be a static archive available" - $echo "** The link will probably fail, sorry" - else - add="$dir/$old_library" - fi - fi - esac - elif test "$hardcode_minus_L" = no; then - case $host in - *-*-sunos*) add_shlibpath="$dir" ;; - esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - relink) - if test "$hardcode_direct" = yes; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case "$libdir" in - [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - *) lib_linked=no ;; - esac - - if test "$lib_linked" != yes; then - $echo "$modename: configuration error: unsupported hardcode properties" - exit $EXIT_FAILURE - fi - - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then - test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" - test -n "$add" && compile_deplibs="$add $compile_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && \ - test "$hardcode_minus_L" != yes && \ - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - fi - fi - fi - - if test "$linkmode" = prog || test "$mode" = relink; then - add_shlibpath= - add_dir= - add= - # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then - if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" - else - add="$libdir/$linklib" - fi - else - # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case "$libdir" in - [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - fi - - if test "$linkmode" = prog; then - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" - test -n "$add" && finalize_deplibs="$add $finalize_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - fi - fi - elif test "$linkmode" = prog; then - # Here we assume that one of hardcode_direct or hardcode_minus_L - # is not unsupported. This is valid on all known static and - # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" - compile_deplibs="$dir/$linklib $compile_deplibs" - finalize_deplibs="$dir/$linklib $finalize_deplibs" - else - compile_deplibs="-l$name -L$dir $compile_deplibs" - finalize_deplibs="-l$name -L$dir $finalize_deplibs" - fi - elif test "$build_libtool_libs" = yes; then - # Not a shared library - if test "$deplibs_check_method" != pass_all; then - # We're trying link a shared library against a static one - # but the system doesn't support it. - - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. - $echo - $echo "*** Warning: This system can not link to static lib archive $lib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then - $echo "*** But as you try to build a module library, libtool will still create " - $echo "*** a static module, that should work as long as the dlopening application" - $echo "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then - $echo - $echo "*** However, this would only work if libtool was able to extract symbol" - $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - $echo "*** not find such a program. So, this module is probably useless." - $echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - else - convenience="$convenience $dir/$old_library" - old_convenience="$old_convenience $dir/$old_library" - deplibs="$dir/$old_library $deplibs" - link_static=yes - fi - fi # link shared/static library? - - if test "$linkmode" = lib; then - if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= - for libdir in $dependency_libs; do - case $libdir in - -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'` - case " $xrpath " in - *" $temp_xrpath "*) ;; - *) xrpath="$xrpath $temp_xrpath";; - esac;; - *) temp_deplibs="$temp_deplibs $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - - newlib_search_path="$newlib_search_path $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done - - if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - case $deplib in - -L*) path="$deplib" ;; - *.la) - dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$deplib" && dir="." - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 - absdir="$dir" - fi - ;; - esac - if grep "^installed=no" $deplib > /dev/null; then - path="$absdir/$objdir" - else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - if test "$absdir" != "$libdir"; then - $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 - fi - path="$absdir" - fi - depdepl= - case $host in - *-*-darwin*) - # we do not want to link against static libs, - # but need to link against shared - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp - done - if test -f "$path/$depdepl" ; then - depdepl="$path/$depdepl" - fi - # 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 - ;; - -l*) - case $host in - *-*-darwin*) - # Again, we only want to link against shared libraries - eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` - for tmp in $newlib_search_path ; do - if test -f "$tmp/lib$tmp_libs.dylib" ; then - eval depdepl="$tmp/lib$tmp_libs.dylib" - break - fi - done - path="" - ;; - *) continue ;; - esac - ;; - *) continue ;; - esac - case " $deplibs " in - *" $depdepl "*) ;; - *) deplibs="$depdepl $deplibs" ;; - esac - case " $deplibs " in - *" $path "*) ;; - *) deplibs="$deplibs $path" ;; - esac - done - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then - # Link the dlpreopened libraries before other libraries - for deplib in $save_deplibs; do - deplibs="$deplib $deplibs" - done - fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then - # Make sure lib_search_path contains only unique directories. - lib_search_path= - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; - *) lib_search_path="$lib_search_path $dir" ;; - esac - done - newlib_search_path= - fi - - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else - vars="compile_deplibs finalize_deplibs" - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order - eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so - # that some nasty dependency loop isn't accidentally - # broken: - #new_libs="$deplib $new_libs" - # Pragmatically, this seems to cause very few problems in - # practice: - case $deplib in - -L*) new_libs="$deplib $new_libs" ;; - -R*) ;; - *) - # And here is the reason: when a library appears more - # than once as an explicit dependence of a library, or - # is implicitly linked in more than once by the - # compiler, it is considered special, and multiple - # occurrences thereof are not removed. Compare this - # with having the same library being listed as a - # dependency of multiple other libraries: in this case, - # we know (pedantically, we assume) the library does not - # need to be listed more than once, so we keep only the - # last copy. This is not always right, but it is rare - # enough that we require users that really mean to play - # such unportable linking tricks to link the library - # using -Wl,-lname, so that libtool does not consider it - # for duplicate removal. - case " $specialdeplibs " in - *" $deplib "*) new_libs="$deplib $new_libs" ;; - *) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$deplib $new_libs" ;; - esac - ;; - esac - ;; - esac - done - tmp_libs= - for deplib in $new_libs; do - case $deplib in - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; - *) tmp_libs="$tmp_libs $deplib" ;; - esac - ;; - *) tmp_libs="$tmp_libs $deplib" ;; - esac - done - eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs - # (they stay in deplibs) - tmp_libs= - for i in $dependency_libs ; do - case " $predeps $postdeps $compiler_lib_search_path " in - *" $i "*) - i="" - ;; - esac - if test -n "$i" ; then - tmp_libs="$tmp_libs $i" - fi - done - dependency_libs=$tmp_libs - done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" - dlprefiles="$newdlprefiles" - fi - - case $linkmode in - oldlib) - if test -n "$deplibs"; then - $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 - fi - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 - fi - - if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2 - fi - - if test -n "$xrpath"; then - $echo "$modename: warning: \`-R' is ignored for archives" 1>&2 - fi - - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for archives" 1>&2 - fi - - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2 - fi - - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" - objs="$objs$old_deplibs" - ;; - - lib) - # Make sure we only generate libraries of the form `libNAME.la'. - case $outputname in - lib*) - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - eval shared_ext=\"$shrext_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 $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_cmds\" - eval libname=\"$libname_spec\" - else - libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` - fi - ;; - esac - - 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 $EXIT_FAILURE - else - $echo - $echo "*** Warning: Linking the shared library $output against the non-libtool" - $echo "*** objects $objs is not portable!" - libobjs="$libobjs $objs" - fi - fi - - if test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2 - fi - - set dummy $rpath - if test "$#" -gt 2; then - $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 - fi - install_libdir="$2" - - oldlibs= - if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then - # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so - # convenience libraries should have the same extension an - # archive normally would. - oldlibs="$output_objdir/$libname.$libext $oldlibs" - build_libtool_libs=convenience - build_old_libs=yes - fi - - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2 - fi - else - - # Parse the version information argument. - save_ifs="$IFS"; IFS=':' - set dummy $vinfo 0 0 0 - IFS="$save_ifs" - - if test -n "$8"; then - $echo "$modename: too many parameters to \`-version-info'" 1>&2 - $echo "$help" 1>&2 - 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" - number_minor="$3" - number_revision="$4" - # - # There are really only two kinds -- those that - # use the current revision as the major version - # and those that subtract age and use age as - # a minor version. But, then there is irix - # which has an extra 1 added just for fun - # - case $version_type in - darwin|linux|osf|windows) - current=`expr $number_major + $number_minor` - age="$number_minor" - revision="$number_revision" - ;; - freebsd-aout|freebsd-elf|sunos) - current="$number_major" - revision="$number_minor" - age="0" - ;; - irix|nonstopux) - current=`expr $number_major + $number_minor - 1` - age="$number_minor" - revision="$number_minor" - ;; - esac - ;; - no) - current="$2" - revision="$3" - age="$4" - ;; - esac - - # Check that each of the things are valid numbers. - case $current in - [0-9]*) ;; - *) - $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - case $revision in - [0-9]*) ;; - *) - $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - case $age in - [0-9]*) ;; - *) - $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - 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 $EXIT_FAILURE - fi - - # Calculate the version variables. - major= - versuffix= - verstring= - case $version_type in - none) ;; - - darwin) - # Like Linux, but with the current version available in - # verstring for coding it into the library header - major=.`expr $current - $age` - versuffix="$major.$age.$revision" - # Darwin ld doesn't like 0 for these options... - minor_current=`expr $current + 1` - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" - ;; - - freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; - ;; - - freebsd-elf) - major=".$current" - versuffix=".$current"; - ;; - - irix | nonstopux) - major=`expr $current - $age + 1` - - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; - *) verstring_prefix=sgi ;; - esac - verstring="$verstring_prefix$major.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$revision - while test "$loop" -ne 0; do - iface=`expr $revision - $loop` - loop=`expr $loop - 1` - verstring="$verstring_prefix$major.$iface:$verstring" - done - - # Before this point, $major must not contain `.'. - major=.$major - versuffix="$major.$revision" - ;; - - linux) - major=.`expr $current - $age` - versuffix="$major.$age.$revision" - ;; - - osf) - major=.`expr $current - $age` - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$age - while test "$loop" -ne 0; do - iface=`expr $current - $loop` - loop=`expr $loop - 1` - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - verstring="$verstring:${current}.0" - ;; - - sunos) - major=".$current" - versuffix=".$current.$revision" - ;; - - windows) - # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. - major=`expr $current - $age` - versuffix="-$major" - ;; - - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE - ;; - esac - - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= - case $version_type in - darwin) - # we can't check for "0.0" in archive_cmds due to quoting - # problems, so we reset it completely - verstring= - ;; - *) - verstring="0.0" - ;; - esac - if test "$need_version" = no; then - versuffix= - else - versuffix=".0.0" - fi - fi - - # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then - major= - versuffix= - verstring="" - fi - - # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 - build_libtool_libs=no - build_old_libs=yes - fi - else - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" - fi - fi - - if test "$mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= - tempremovelist=`$echo "$output_objdir/*"` - for p in $tempremovelist; do - case $p in - *.$objext) - ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then - if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 - then - continue - fi - fi - removelist="$removelist $p" - ;; - *) ;; - esac - done - if test -n "$removelist"; then - $show "${rm}r $removelist" - $run ${rm}r $removelist - fi - fi - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - oldlibs="$oldlibs $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. - oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` - 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 - - if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do - temp_xrpath="$temp_xrpath -R$libdir" - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then - dependency_libs="$temp_xrpath $dependency_libs" - fi - fi - - # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" - dlfiles= - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; - *) dlfiles="$dlfiles $lib" ;; - esac - done - - # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" - dlprefiles= - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; - *) dlprefiles="$dlprefiles $lib" ;; - esac - done - - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework - deplibs="$deplibs -framework System" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; - *-*-openbsd* | *-*-freebsd*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then - deplibs="$deplibs -lc" - fi - ;; - esac - fi - - # Transform deplibs into only deplibs that can be linked in shared. - name_save=$name - libname_save=$libname - release_save=$release - versuffix_save=$versuffix - major_save=$major - # I'm not sure if I'm treating the release correctly. I think - # release should show up in the -l (ie -lgmp5) so we don't want to - # add it in twice. Is that correct? - release="" - versuffix="" - major="" - newdeplibs= - droppeddeps=no - case $deplibs_check_method in - pass_all) - # Don't check for shared/static. Everything works. - # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behavior. - newdeplibs=$deplibs - ;; - test_compile) - # This code stresses the "libraries are programs" paradigm to its - # limits. Maybe even breaks it. We compile a program, linking it - # against the deplibs as a proxy for the library. Then we can check - # whether they linked in statically or dynamically with ldd. - $rm conftest.c - cat > conftest.c </dev/null` - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null \ - | grep " -> " >/dev/null; then - continue - fi - # The statement above tries to avoid entering an - # endless loop below, in case of cyclic links. - # We might still enter an endless loop, since a link - # loop can be closed while we follow links, - # but so what? - potlib="$potent_lib" - while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ - | ${SED} 10q \ - | $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - $echo - $echo "*** Warning: linker path does not have real file for library $a_deplib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have" - $echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $echo "*** with $libname but no candidates were found. (...for file magic test)" - else - $echo "*** with $libname and none of the candidates passed a file format test" - $echo "*** using a file magic. Last file checked: $potlib" - fi - fi - else - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" - fi - done # Gone through all deplibs. - ;; - match_pattern*) - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - for a_deplib in $deplibs; do - name="`expr $a_deplib : '-l\(.*\)'`" - # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then - libname=`eval \\$echo \"$libname_spec\"` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test - if eval $echo \"$potent_lib\" 2>/dev/null \ - | ${SED} 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - $echo - $echo "*** Warning: linker path does not have real file for library $a_deplib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have" - $echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $echo "*** with $libname but no candidates were found. (...for regex pattern test)" - else - $echo "*** with $libname and none of the candidates passed a file format test" - $echo "*** using a regex pattern. Last file checked: $potlib" - fi - fi - else - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" - fi - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" - tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ - -e 's/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do - # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"` - done - fi - if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \ - | grep . >/dev/null; then - $echo - if test "X$deplibs_check_method" = "Xnone"; then - $echo "*** Warning: inter-library dependencies are not supported in this platform." - else - $echo "*** Warning: inter-library dependencies are not known to be supported." - fi - $echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes - fi - ;; - esac - versuffix=$versuffix_save - major=$major_save - release=$release_save - libname=$libname_save - name=$name_save - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` - ;; - esac - - if test "$droppeddeps" = yes; then - if test "$module" = yes; then - $echo - $echo "*** Warning: libtool could not satisfy all declared inter-library" - $echo "*** dependencies of module $libname. Therefore, libtool will create" - $echo "*** a static module, that should work as long as the dlopening" - $echo "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then - $echo - $echo "*** However, this would only work if libtool was able to extract symbol" - $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - $echo "*** not find such a program. So, this module is probably useless." - $echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - else - $echo "*** The inter-library dependencies that have been dropped here will be" - $echo "*** automatically added whenever a program is linked with this library" - $echo "*** or is declared to -dlopen it." - - if test "$allow_undefined" = no; then - $echo - $echo "*** Since this library must not contain undefined symbols," - $echo "*** because either the platform does not support them or" - $echo "*** it was explicitly requested with -no-undefined," - $echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - fi - fi - # Done checking deplibs! - deplibs=$newdeplibs - fi - - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= - dlname= - - # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" - test "$mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - dep_rpath="$dep_rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi - - shlibpath="$finalize_shlibpath" - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi - - # Get the real and link names of the library. - eval shared_ext=\"$shrext_cmds\" - eval library_names=\"$library_names_spec\" - set dummy $library_names - realname="$2" - shift; shift - - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - if test -z "$dlname"; then - dlname=$soname - fi - - lib="$output_objdir/$realname" - for link - do - linknames="$linknames $link" - done - - # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $run $rm $export_symbols - 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" - $run eval "$cmd" || exit $? - skipped_export=false - else - # The command line is too long to execute in one step. - $show "using reloadable object file for export list..." - skipped_export=: - fi - done - IFS="$save_ifs" - if test -n "$export_symbols_regex"; then - $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" - $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - $show "$mv \"${export_symbols}T\" \"$export_symbols\"" - $run eval '$mv "${export_symbols}T" "$export_symbols"' - fi - fi - fi - - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' - fi - - tmp_deplibs= - for test_deplib in $deplibs; do - case " $convenience " in - *" $test_deplib "*) ;; - *) - tmp_deplibs="$tmp_deplibs $test_deplib" - ;; - esac - done - deplibs="$tmp_deplibs" - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - else - gentop="$output_objdir/${outputname}x" - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "$mkdir $gentop" - $run $mkdir "$gentop" - status=$? - if test "$status" -ne 0 && test ! -d "$gentop"; then - exit $status - fi - generated="$generated $gentop" - - 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 - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - linker_flags="$linker_flags $flag" - fi - - # Make a backup of the uninstalled library when relinking - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? - fi - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else - eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else - eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi - - if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : - else - # The command line is too long to link in one step, link piecewise. - $echo "creating reloadable object files..." - - # Save the value of $output and $libobjs because we want to - # use them later. If we have whole_archive_flag_spec, we - # want to use save_libobjs as it was before - # whole_archive_flag_spec was expanded, because we can't - # assume the linker understands whole_archive_flag_spec. - # This may have to be revisited, in case too many - # convenience libraries get linked in and end up exceeding - # the spec. - if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - fi - save_output=$output - - # Clear the reloadable object creation command queue and - # initialize k to one. - test_cmds= - concat_cmds= - objlist= - delfiles= - last_robj= - k=1 - output=$output_objdir/$save_output-${k}.$objext - # Loop over the list of objects to be linked. - for obj in $save_libobjs - do - eval test_cmds=\"$reload_cmds $objlist $last_robj\" - if test "X$objlist" = X || - { len=`expr "X$test_cmds" : ".*"` && - test "$len" -le "$max_cmd_len"; }; then - objlist="$objlist $obj" - else - # The command $test_cmds is almost too long, add a - # command to the queue. - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. - eval concat_cmds=\"$reload_cmds $objlist $last_robj\" - else - # All subsequent reloadable object files will link in - # the last one created. - eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" - fi - last_robj=$output_objdir/$save_output-${k}.$objext - k=`expr $k + 1` - output=$output_objdir/$save_output-${k}.$objext - objlist=$obj - len=1 - fi - done - # Handle the remaining objects by creating one last - # reloadable object file. All subsequent reloadable object - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" - - if ${skipped_export-false}; then - $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $run $rm $export_symbols - libobjs=$output - # Append the command to create the export file. - eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" - fi - - # Set up a command to remove the reloadale object files - # after they are used. - i=0 - while test "$i" -lt "$k" - do - i=`expr $i + 1` - delfiles="$delfiles $output_objdir/$save_output-${i}.$objext" - done - - $echo "creating a temporary reloadable object file: $output" - - # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' - for cmd in $concat_cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - - libobjs=$output - # Restore the value of output. - output=$save_output - - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - fi - # Expand the library linking commands again to reset the - # value of $libobjs for piecewise linking. - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - cmds=$module_expsym_cmds - else - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - cmds=$archive_expsym_cmds - else - cmds=$archive_cmds - fi - fi - - # Append the command to remove the reloadable object files - # to the just-reset $cmds. - eval cmds=\"\$cmds~\$rm $delfiles\" - fi - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? - exit $EXIT_SUCCESS - fi - - # Create links to the real library. - for linkname in $linknames; do - if test "$realname" != "$linkname"; then - $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)" - $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $? - fi - done - - # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" - fi - fi - ;; - - obj) - if test -n "$deplibs"; then - $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 - fi - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 - fi - - if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2 - fi - - if test -n "$xrpath"; then - $echo "$modename: warning: \`-R' is ignored for objects" 1>&2 - fi - - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for objects" 1>&2 - fi - - case $output in - *.lo) - if test -n "$objs$old_deplibs"; then - $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 - exit $EXIT_FAILURE - fi - libobj="$output" - obj=`$echo "X$output" | $Xsed -e "$lo2o"` - ;; - *) - libobj= - obj="$output" - ;; - esac - - # Delete the old objects. - $run $rm $obj $libobj - - # Objects from convenience libraries. This assumes - # single-version convenience libraries. Whenever we create - # different ones for PIC/non-PIC, this we'll have to duplicate - # the extraction. - reload_conv_objs= - gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec - wl= - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" - else - gentop="$output_objdir/${obj}x" - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "$mkdir $gentop" - $run $mkdir "$gentop" - status=$? - if test "$status" -ne 0 && test ! -d "$gentop"; then - exit $status - 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 - fi - fi - - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - - output="$obj" - 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 - IFS="$save_ifs" - - # Exit if we aren't doing a library object file. - if test -z "$libobj"; then - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi - - exit $EXIT_SUCCESS - fi - - if test "$build_libtool_libs" != yes; then - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi - - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" - # $run eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi - - if test -n "$pic_flag" || test "$pic_mode" != default; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs $reload_conv_objs" - output="$libobj" - 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 - IFS="$save_ifs" - fi - - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi - - exit $EXIT_SUCCESS - ;; - - prog) - case $host in - *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; - esac - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for programs" 1>&2 - fi - - if test "$preload" = yes; then - if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown && - test "$dlopen_self_static" = unknown; then - $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support." - fi - fi - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` - finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` - ;; - esac - - case $host in - *darwin*) - # Don't allow lazy linking, it breaks C++ global constructors - if test "$tagname" = CXX ; then - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$finalize_command ${wl}-bind_at_load" - fi - ;; - esac - - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. - for libdir in $rpath $xrpath; do - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; - esac - done - fi - - # Now hardcode the library paths - rpath= - hardcode_libdirs= - for libdir in $compile_rpath $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - case :$dllsearchpath: in - *":$libdir:"*) ;; - *) dllsearchpath="$dllsearchpath:$libdir";; - esac - ;; - esac - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - - rpath= - hardcode_libdirs= - for libdir in $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - fi - - dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - if test -n "$NM" && test -n "$global_symbol_pipe"; then - dlsyms="${outputname}S.c" - else - $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2 - fi - fi - - if test -n "$dlsyms"; then - case $dlsyms in - "") ;; - *.c) - # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${outputname}.nm" - - $show "$rm $nlist ${nlist}S ${nlist}T" - $run $rm "$nlist" "${nlist}S" "${nlist}T" - - # Parse the name list into a source file. - $show "creating $output_objdir/$dlsyms" - - test -z "$run" && $echo > "$output_objdir/$dlsyms" "\ -/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */ -/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */ - -#ifdef __cplusplus -extern \"C\" { -#endif - -/* Prevent the only kind of declaration conflicts we can make. */ -#define lt_preloaded_symbols some_other_symbol - -/* External symbol declarations for the compiler. */\ -" - - if test "$dlself" = yes; then - $show "generating symbol list for \`$output'" - - test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist" - - # Add our own program objects to the symbol list. - progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - for arg in $progfiles; do - $show "extracting global C symbols from \`$arg'" - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then - $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - if test -n "$export_symbols_regex"; then - $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - export_symbols="$output_objdir/$output.exp" - $run $rm $export_symbols - $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - else - $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' - $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' - $run eval 'mv "$nlist"T "$nlist"' - fi - fi - - for arg in $dlprefiles; do - $show "extracting global C symbols from \`$arg'" - name=`$echo "$arg" | ${SED} -e 's%^.*/%%'` - $run eval '$echo ": $name " >> "$nlist"' - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done - - if test -z "$run"; then - # Make sure we have at least an empty file. - test -f "$nlist" || : > "$nlist" - - if test -n "$exclude_expsyms"; then - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T - $mv "$nlist"T "$nlist" - fi - - # Try sorting and uniquifying the output. - if grep -v "^: " < "$nlist" | - if sort -k 3 /dev/null 2>&1; then - sort -k 3 - else - sort +2 - fi | - uniq > "$nlist"S; then - : - else - grep -v "^: " < "$nlist" > "$nlist"S - fi - - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"' - else - $echo '/* NONE */' >> "$output_objdir/$dlsyms" - fi - - $echo >> "$output_objdir/$dlsyms" "\ - -#undef lt_preloaded_symbols - -#if defined (__STDC__) && __STDC__ -# define lt_ptr void * -#else -# define lt_ptr char * -# define const -#endif - -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - lt_ptr address; -} -lt_preloaded_symbols[] = -{\ -" - - eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" - - $echo >> "$output_objdir/$dlsyms" "\ - {0, (lt_ptr) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif\ -" - fi - - pic_flag_for_symtable= - case $host in - # compiling the symbol table file with pic_flag works around - # a FreeBSD bug that causes programs to crash when -lm is - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";; - esac;; - *-*-hpux*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag";; - esac - esac - - # Now compile the dynamic symbol file. - $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" - $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? - - # Clean up the generated files. - $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" - $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" - - # Transform the symbol file into the correct name. - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - ;; - *) - $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 - exit $EXIT_FAILURE - ;; - esac - else - # We keep going just in case the user didn't refer to - # lt_preloaded_symbols. The linker will fail if global_symbol_pipe - # really was required. - - # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` - fi - - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. - $show "$link_command" - $run eval "$link_command" - status=$? - - # Delete the generated files. - if test -n "$dlsyms"; then - $show "$rm $output_objdir/${outputname}S.${objext}" - $run $rm "$output_objdir/${outputname}S.${objext}" - fi - - exit $status - fi - - if test -n "$shlibpath_var"; then - # We should set the shlibpath_var - rpath= - for dir in $temp_rpath; do - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) - # Absolute path. - rpath="$rpath$dir:" - ;; - *) - # Relative path: add a thisdir entry. - rpath="$rpath\$thisdir/$dir:" - ;; - esac - done - temp_rpath="$rpath" - fi - - if test -n "$compile_shlibpath$finalize_shlibpath"; then - compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" - fi - if test -n "$finalize_shlibpath"; then - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" - fi - - compile_var= - finalize_var= - if test -n "$runpath_var"; then - if test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - if test -n "$finalize_perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do - rpath="$rpath$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - fi - - if test "$no_install" = yes; then - # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" - # Replace the output file specification. - link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. - $run $rm $output - # Link the executable and exit - $show "$link_command" - $run eval "$link_command" || exit $? - exit $EXIT_SUCCESS - fi - - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2 - $echo "$modename: \`$output' will be relinked during installation" 1>&2 - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi - - # Replace the output file specification. - link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - - # Delete the old output files. - $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname - - $show "$link_command" - $run eval "$link_command" || exit $? - - # Now create the wrapper script. - $show "creating $output" - - # Quote the relink command for shipping. - if test -n "$relink_command"; then - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` - relink_command="$var=\"$var_value\"; export $var; $relink_command" - fi - done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` - fi - - # Quote $echo for shipping. - if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then - case $progpath in - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; - *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; - esac - qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` - else - qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` - fi - - # Only actually do things if our run command is non-null. - if test -z "$run"; then - # win32 will think the script is a binary if it has - # a .exe suffix, so we strip it off here. - case $output in - *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;; - esac - # test for cygwin because mv fails w/o .exe extensions - case $host in - *cygwin*) - exeext=.exe - outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;; - *) exeext= ;; - esac - case $host in - *cygwin* | *mingw* ) - cwrappersource=`$echo ${objdir}/lt-${output}.c` - cwrapper=`$echo ${output}.exe` - $rm $cwrappersource $cwrapper - trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 - - cat > $cwrappersource <> $cwrappersource<<"EOF" -#include -#include -#include -#include -#include -#include - -#if defined(PATH_MAX) -# define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) -# define LT_PATHMAX MAXPATHLEN -#else -# define LT_PATHMAX 1024 -#endif - -#ifndef DIR_SEPARATOR -#define DIR_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 -#endif - -#ifndef DIR_SEPARATOR_2 -# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -#else /* DIR_SEPARATOR_2 */ -# define IS_DIR_SEPARATOR(ch) \ - (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -#endif /* DIR_SEPARATOR_2 */ - -#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -#define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ -} while (0) - -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); -char * strendzap(char *str, const char *pat); -void lt_fatal (const char *message, ...); - -int -main (int argc, char *argv[]) -{ - char **newargz; - int i; - - program_name = (char *) xstrdup ((char *) basename (argv[0])); - newargz = XMALLOC(char *, argc+2); -EOF - - cat >> $cwrappersource <> $cwrappersource <<"EOF" - newargz[1] = fnqualify(argv[0]); - /* we know the script has the same name, without the .exe */ - /* so make sure newargz[1] doesn't end in .exe */ - strendzap(newargz[1],".exe"); - for (i = 1; i < argc; i++) - newargz[i+1] = xstrdup(argv[i]); - newargz[argc+1] = NULL; -EOF - - cat >> $cwrappersource <> $cwrappersource <<"EOF" -} - -void * -xmalloc (size_t num) -{ - void * p = (void *) malloc (num); - if (!p) - lt_fatal ("Memory exhausted"); - - return p; -} - -char * -xstrdup (const char *string) -{ - return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL -; -} - -char * -basename (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] == ':') - name += 2; -#endif - - for (base = name; *name; name++) - if (IS_DIR_SEPARATOR (*name)) - base = name + 1; - return (char *) base; -} - -char * -fnqualify(const char *path) -{ - size_t size; - char *p; - char tmp[LT_PATHMAX + 1]; - - assert(path != NULL); - - /* Is it qualified already? */ -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha (path[0]) && path[1] == ':') - return xstrdup (path); -#endif - if (IS_DIR_SEPARATOR (path[0])) - return xstrdup (path); - - /* prepend the current directory */ - /* doesn't handle '~' */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); - size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */ - p = XMALLOC(char, size); - sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path); - return p; -} - -char * -strendzap(char *str, const char *pat) -{ - size_t len, patlen; - - assert(str != NULL); - assert(pat != NULL); - - len = strlen(str); - patlen = strlen(pat); - - if (patlen <= len) - { - str += len - patlen; - if (strcmp(str, pat) == 0) - *str = '\0'; - } - return str; -} - -static void -lt_error_core (int exit_status, const char * mode, - const char * message, va_list ap) -{ - fprintf (stderr, "%s: %s: ", program_name, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - - if (exit_status >= 0) - exit (exit_status); -} - -void -lt_fatal (const char *message, ...) -{ - va_list ap; - va_start (ap, message); - lt_error_core (EXIT_FAILURE, "FATAL", message, ap); - va_end (ap); -} -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 $EXIT_FAILURE" 1 2 15 - - $echo > $output "\ -#! $SHELL - -# $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -# -# The $output program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='${SED} -e 1s/^X//' -sed_quote_subst='$sed_quote_subst' - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi - -relink_command=\"$relink_command\" - -# This environment variable determines our operation mode. -if test \"\$libtool_install_magic\" = \"$magic\"; then - # install mode needs the following variable: - notinst_deplibs='$notinst_deplibs' -else - # When we are sourced in execute mode, \$file and \$echo are already set. - if test \"\$libtool_execute_magic\" != \"$magic\"; then - echo=\"$qecho\" - file=\"\$0\" - # Make sure echo works. - if test \"X\$1\" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then - # Yippee, \$echo works! - : - else - # Restart under the correct shell, and then maybe \$echo will work. - exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} - fi - fi\ -" - $echo >> $output "\ - - # Find the directory that this script lives in. - thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` - - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then - case \"\$destdir\" in - [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; - *) thisdir=\"\$thisdir/\$destdir\" ;; - esac - fi - - file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` - done - - # Try to get the absolute directory name. - absdir=\`cd \"\$thisdir\" && pwd\` - test -n \"\$absdir\" && thisdir=\"\$absdir\" -" - - if test "$fast_install" = yes; then - $echo >> $output "\ - program=lt-'$outputname'$exeext - progdir=\"\$thisdir/$objdir\" - - if test ! -f \"\$progdir/\$program\" || \\ - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ - test \"X\$file\" != \"X\$progdir/\$program\"; }; then - - file=\"\$\$-\$program\" - - if test ! -d \"\$progdir\"; then - $mkdir \"\$progdir\" - else - $rm \"\$progdir/\$file\" - fi" - - $echo >> $output "\ - - # relink executable if necessary - if test -n \"\$relink_command\"; then - if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $echo \"\$relink_command_output\" >&2 - $rm \"\$progdir/\$file\" - exit $EXIT_FAILURE - fi - fi - - $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || - { $rm \"\$progdir/\$program\"; - $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; } - $rm \"\$progdir/\$file\" - fi" - else - $echo >> $output "\ - program='$outputname' - progdir=\"\$thisdir/$objdir\" -" - fi - - $echo >> $output "\ - - if test -f \"\$progdir/\$program\"; then" - - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $echo >> $output "\ - # Add our own library path to $shlibpath_var - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" - - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` - - export $shlibpath_var -" - fi - - # fixup the dll searchpath if we need to. - if test -n "$dllsearchpath"; then - $echo >> $output "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - - $echo >> $output "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2*) - $echo >> $output "\ - exec \$progdir\\\\\$program \${1+\"\$@\"} -" - ;; - - *) - $echo >> $output "\ - exec \$progdir/\$program \${1+\"\$@\"} -" - ;; - esac - $echo >> $output "\ - \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" - exit $EXIT_FAILURE - fi - else - # The program doesn't exist. - \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 - \$echo \"This script is just a wrapper for \$program.\" 1>&2 - $echo \"See the $PACKAGE documentation for more information.\" 1>&2 - exit $EXIT_FAILURE - fi -fi\ -" - chmod +x $output - fi - exit $EXIT_SUCCESS - ;; - esac - - # See if we need to build an old-fashioned archive. - for oldlib in $oldlibs; do - - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" - build_libtool_libs=no - else - oldobjs="$old_deplibs $non_pic_objects" - fi - addlibs="$old_convenience" - fi - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "$mkdir $gentop" - $run $mkdir "$gentop" - status=$? - if test "$status" -ne 0 && test ! -d "$gentop"; then - exit $status - 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 - fi - - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then - cmds=$old_archive_from_new_cmds - else - 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..." - save_RANLIB=$RANLIB - RANLIB=: - objlist= - concat_cmds= - save_oldobjs=$oldobjs - # GNU ar 2.10+ was changed to match POSIX; thus no paths are - # encoded into archives. This makes 'ar r' malfunction in - # this piecewise linking case whenever conflicting object - # names appear in distinct ar calls; check, warn and compensate. - if (for obj in $save_oldobjs - do - $echo "X$obj" | $Xsed -e 's%^.*/%%' - done | sort | sort -uc >/dev/null 2>&1); then - : - 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 - for obj in $save_oldobjs - do - oldobjs="$objlist $obj" - objlist="$objlist $obj" - eval test_cmds=\"$old_archive_cmds\" - if len=`expr "X$test_cmds" : ".*"` && - test "$len" -le "$max_cmd_len"; then - : - else - # the above command should be used before it gets too long - oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= - fi - done - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then - eval cmds=\"\$concat_cmds\" - else - 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 $? - done - IFS="$save_ifs" - done - - if test -n "$generated"; then - $show "${rm}r$generated" - $run ${rm}r$generated - fi - - # Now create the libtool archive. - case $output in - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" - $show "creating $output" - - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` - relink_command="$var=\"$var_value\"; export $var; $relink_command" - fi - done - # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then - relink_command= - fi - - - # Only create the output if not a dry run. - if test -z "$run"; then - for installed in no yes; do - if test "$installed" = yes; then - if test -z "$install_libdir"; then - break - fi - output="$output_objdir/$outputname"i - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do - case $deplib in - *.la) - name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdependency_libs="$newdependency_libs $libdir/$name" - ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" - newdlfiles= - for lib in $dlfiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdlfiles="$newdlfiles $libdir/$name" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $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 - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; - esac - $echo > $output "\ -# $outputname - a libtool library file -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='$tdlname' - -# Names of this library. -library_names='$library_names' - -# The name of the static archive. -old_library='$old_library' - -# Libraries that this one depends upon. -dependency_libs='$dependency_libs' - -# Version information for $libname. -current=$current -age=$age -revision=$revision - -# Is this an already installed library? -installed=$installed - -# Should we warn about portability when linking against -modules? -shouldnotlink=$module - -# Files to dlopen/dlpreopen -dlopen='$dlfiles' -dlpreopen='$dlprefiles' - -# Directory that this library needs to be installed in: -libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then - $echo >> $output "\ -relink_command=\"$relink_command\"" - fi - done - fi - - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. - $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" - $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? - ;; - esac - exit $EXIT_SUCCESS - ;; - - # libtool install mode - install) - modename="$modename: install" - - # There may be an optional sh(1) argument at the beginning of - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || - # Allow the use of GNU shtool's install command. - $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then - # Aesthetically quote it. - arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) - arg="\"$arg\"" - ;; - esac - install_prog="$arg " - arg="$1" - shift - else - install_prog= - arg="$nonopt" - fi - - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog$arg" - - # We need to accept at least all the BSD install flags. - dest= - files= - opts= - prev= - install_type= - isdir=no - stripme= - for arg - do - if test -n "$dest"; then - files="$files $dest" - dest="$arg" - continue - fi - - case $arg in - -d) isdir=yes ;; - -f) prev="-f" ;; - -g) prev="-g" ;; - -m) prev="-m" ;; - -o) prev="-o" ;; - -s) - stripme=" -s" - continue - ;; - -*) ;; - - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - prev= - else - dest="$arg" - continue - fi - ;; - esac - - # Aesthetically quote the argument. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog $arg" - done - - if test -z "$install_prog"; then - $echo "$modename: you must specify an install program" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - if test -n "$prev"; then - $echo "$modename: the \`$prev' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - if test -z "$files"; then - if test -z "$dest"; then - $echo "$modename: no file or destination specified" 1>&2 - else - $echo "$modename: you must specify a destination" 1>&2 - fi - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Strip any trailing slash from the destination. - dest=`$echo "X$dest" | $Xsed -e 's%/$%%'` - - # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" - destname= - else - destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'` - test "X$destdir" = "X$dest" && destdir=. - destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'` - - # Not a directory, so check to see that there is only one file specified. - set dummy $files - if test "$#" -gt 2; then - $echo "$modename: \`$dest' is not a directory" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - fi - case $destdir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - for file in $files; do - case $file in - *.lo) ;; - *) - $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - esac - done - ;; - esac - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - staticlibs= - future_libdirs= - current_libdirs= - for file in $files; do - - # Do each installation. - case $file in - *.$libext) - # Do the static libraries later. - staticlibs="$staticlibs $file" - ;; - - *.la) - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - library_names= - old_library= - relink_command= - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Add the libdir to current_libdirs if it is the destination. - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; - esac - fi - - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/ - test "X$dir" = "X$file/" && dir= - dir="$dir$objdir" - - if test -n "$relink_command"; then - # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that - # are installed to the same prefix. - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. - if test "$inst_prefix_dir" = "$destdir"; then - $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 - exit $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%"` - else - relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"` - fi - - $echo "$modename: warning: relinking \`$file'" 1>&2 - $show "$relink_command" - if $run eval "$relink_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - exit $EXIT_FAILURE - fi - fi - - # See the names of the shared library. - set dummy $library_names - if test -n "$2"; then - realname="$2" - shift - shift - - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T - - # Install the shared library and build the symlinks. - $show "$install_prog $dir/$srcname $destdir/$realname" - $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $? - if test -n "$stripme" && test -n "$striplib"; then - $show "$striplib $destdir/$realname" - $run eval "$striplib $destdir/$realname" || exit $? - fi - - if test "$#" -gt 0; then - # Delete the old symlinks, and create new ones. - for linkname - do - if test "$linkname" != "$realname"; then - $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" - $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" - fi - done - fi - - # Do each command in the postinstall commands. - lib="$destdir/$realname" - cmds=$postinstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - - # Install the pseudo-library for information purposes. - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" - ;; - - *.lo) - # Install (i.e. copy) a libtool object. - - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - destfile="$destdir/$destfile" - fi - - # Deduce the name of the destination old-style object file. - case $destfile in - *.lo) - staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"` - ;; - *.$objext) - staticdest="$destfile" - destfile= - ;; - *) - $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - # Install the libtool object if requested. - if test -n "$destfile"; then - $show "$install_prog $file $destfile" - $run eval "$install_prog $file $destfile" || exit $? - fi - - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. - staticobj=`$echo "X$file" | $Xsed -e "$lo2o"` - - $show "$install_prog $staticobj $staticdest" - $run eval "$install_prog \$staticobj \$staticdest" || exit $? - fi - exit $EXIT_SUCCESS - ;; - - *) - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - destfile="$destdir/$destfile" - fi - - # If the file is missing, and there is a .exe on the end, strip it - # because it is most likely a libtool script we actually want to - # install - stripped_ext="" - case $file in - *.exe) - if test ! -f "$file"; then - file=`$echo $file|${SED} 's,.exe$,,'` - stripped_ext=".exe" - fi - ;; - esac - - # Do a test to see if this is really a libtool program. - case $host in - *cygwin*|*mingw*) - wrapper=`$echo $file | ${SED} -e 's,.exe$,,'` - ;; - *) - wrapper=$file - ;; - esac - if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then - notinst_deplibs= - relink_command= - - # To insure that "foo" is sourced, and not "foo.exe", - # finese the cygwin/MSYS system by explicitly sourcing "foo." - # which disallows the automatic-append-.exe behavior. - case $build in - *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; - *) wrapperdot=${wrapper} ;; - esac - # If there is no directory component, then add one. - case $file in - */* | *\\*) . ${wrapperdot} ;; - *) . ./${wrapperdot} ;; - esac - - # Check the variables that should have been set. - if test -z "$notinst_deplibs"; then - $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 - exit $EXIT_FAILURE - fi - - finalize=yes - for lib in $notinst_deplibs; do - # Check to see that each library is installed. - libdir= - if test -f "$lib"; then - # If there is no directory component, then add one. - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - fi - libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test - if test -n "$libdir" && test ! -f "$libfile"; then - $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 - finalize=no - fi - done - - relink_command= - # To insure that "foo" is sourced, and not "foo.exe", - # finese the cygwin/MSYS system by explicitly sourcing "foo." - # which disallows the automatic-append-.exe behavior. - case $build in - *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; - *) wrapperdot=${wrapper} ;; - esac - # If there is no directory component, then add one. - case $file in - */* | *\\*) . ${wrapperdot} ;; - *) . ./${wrapperdot} ;; - esac - - 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-$$" - save_umask=`umask` - umask 0077 - if $mkdir "$tmpdir"; then - umask $save_umask - else - umask $save_umask - $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 - continue - fi - file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` - outputname="$tmpdir/$file" - # Replace the output file specification. - relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` - - $show "$relink_command" - if $run eval "$relink_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - ${rm}r "$tmpdir" - continue - fi - file="$outputname" - else - $echo "$modename: warning: cannot relink \`$file'" 1>&2 - fi - else - # Install the binary that we compiled earlier. - file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` - fi - fi - - # remove .exe since cygwin /usr/bin/install will append another - # one anyways - case $install_prog,$host in - */usr/bin/install*,*cygwin*) - case $file:$destfile in - *.exe:*.exe) - # this is ok - ;; - *.exe:*) - destfile=$destfile.exe - ;; - *:*.exe) - destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'` - ;; - esac - ;; - esac - $show "$install_prog$stripme $file $destfile" - $run eval "$install_prog\$stripme \$file \$destfile" || exit $? - test -n "$outputname" && ${rm}r "$tmpdir" - ;; - esac - done - - for file in $staticlibs; do - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - - # Set up the ranlib parameters. - oldlib="$destdir/$name" - - $show "$install_prog $file $oldlib" - $run eval "$install_prog \$file \$oldlib" || exit $? - - 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. - 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 - IFS="$save_ifs" - done - - if test -n "$future_libdirs"; then - $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2 - fi - - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - test -n "$run" && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' - else - exit $EXIT_SUCCESS - fi - ;; - - # libtool finish mode - finish) - modename="$modename: finish" - libdirs="$nonopt" - admincmds= - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done - - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. - 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" - done - IFS="$save_ifs" - fi - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" - $run eval "$cmds" || admincmds="$admincmds - $cmds" - fi - done - fi - - # Exit here if they wanted silent mode. - test "$show" = : && exit $EXIT_SUCCESS - - $echo "----------------------------------------------------------------------" - $echo "Libraries have been installed in:" - for libdir in $libdirs; do - $echo " $libdir" - done - $echo - $echo "If you ever happen to want to link against installed libraries" - $echo "in a given directory, LIBDIR, you must either use libtool, and" - $echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - $echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - $echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - $echo " during execution" - fi - if test -n "$runpath_var"; then - $echo " - add LIBDIR to the \`$runpath_var' environment variable" - $echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - $echo " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $echo " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - $echo - $echo "See any operating system documentation about shared libraries for" - $echo "more information, such as the ld(1) and ld.so(8) manual pages." - $echo "----------------------------------------------------------------------" - exit $EXIT_SUCCESS - ;; - - # libtool execute mode - execute) - modename="$modename: execute" - - # The first argument is the command name. - cmd="$nonopt" - if test -z "$cmd"; then - $echo "$modename: you must specify a COMMAND" 1>&2 - $echo "$help" - exit $EXIT_FAILURE - fi - - # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do - if test ! -f "$file"; then - $echo "$modename: \`$file' is not a file" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - dir= - case $file in - *.la) - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Read the libtool library. - dlname= - library_names= - - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Skip this library if it cannot be dlopened. - if test -z "$dlname"; then - # Warn if it was a shared library. - test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'" - continue - fi - - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. - - if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" - else - $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 - exit $EXIT_FAILURE - fi - ;; - - *.lo) - # Just add the directory containing the .lo file. - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. - ;; - - *) - $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2 - continue - ;; - esac - - # Get the absolute pathname. - absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" - - # Now add the directory to shlibpath_var. - if eval "test -z \"\$$shlibpath_var\""; then - eval "$shlibpath_var=\"\$dir\"" - else - eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done - - # This variable tells wrapper scripts just to set shlibpath_var - # rather than running their programs. - libtool_execute_magic="$magic" - - # Check if any of the arguments is a wrapper script. - args= - for file - do - case $file in - -*) ;; - *) - # Do a test to see if this is really a libtool program. - if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Transform arg to wrapped name. - file="$progdir/$program" - fi - ;; - esac - # Quote arguments (to preserve shell metacharacters). - file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"` - args="$args \"$file\"" - done - - if test -z "$run"; then - if test -n "$shlibpath_var"; then - # Export the shlibpath_var. - eval "export $shlibpath_var" - 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 - - # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" - $echo "export $shlibpath_var" - fi - $echo "$cmd$args" - exit $EXIT_SUCCESS - fi - ;; - - # libtool clean and uninstall mode - clean | uninstall) - modename="$modename: $mode" - rm="$nonopt" - files= - rmforce= - exit_status=0 - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - for arg - do - case $arg in - -f) rm="$rm $arg"; rmforce=yes ;; - -*) rm="$rm $arg" ;; - *) files="$files $arg" ;; - esac - done - - if test -z "$rm"; then - $echo "$modename: you must specify an RM program" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - rmdirs= - - origobjdir="$objdir" - for file in $files; do - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - if test "X$dir" = "X$file"; then - dir=. - objdir="$origobjdir" - else - objdir="$dir/$origobjdir" - fi - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - test "$mode" = uninstall && objdir="$dir" - - # Remember objdir for removal later, being careful to avoid duplicates - if test "$mode" = clean; then - case " $rmdirs " in - *" $objdir "*) ;; - *) rmdirs="$rmdirs $objdir" ;; - esac - fi - - # Don't error if the file doesn't exist and rm -f was used. - if (test -L "$file") >/dev/null 2>&1 \ - || (test -h "$file") >/dev/null 2>&1 \ - || test -f "$file"; then - : - elif test -d "$file"; then - exit_status=1 - continue - elif test "$rmforce" = yes; then - continue - fi - - rmfiles="$file" - - case $name in - *.la) - # Possibly a libtool archive, so verify it. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - . $dir/$name - - # Delete the libtool libraries and symlinks. - for n in $library_names; do - rmfiles="$rmfiles $objdir/$n" - done - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" - test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" - - if test "$mode" = uninstall; then - if test -n "$library_names"; then - # Do each command in the postuninstall commands. - 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 - exit_status=1 - fi - done - IFS="$save_ifs" - fi - - if test -n "$old_library"; then - # Do each command in the old_postuninstall commands. - 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 - exit_status=1 - fi - done - IFS="$save_ifs" - fi - # FIXME: should reinstall the best remaining shared library. - fi - fi - ;; - - *.lo) - # Possibly a libtool object, so verify it. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - - # Read the .lo file - . $dir/$name - - # Add PIC object to the list of files to remove. - if test -n "$pic_object" \ - && test "$pic_object" != none; then - rmfiles="$rmfiles $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" \ - && test "$non_pic_object" != none; then - rmfiles="$rmfiles $dir/$non_pic_object" - fi - fi - ;; - - *) - if test "$mode" = clean ; then - noexename=$name - case $file in - *.exe) - file=`$echo $file|${SED} 's,.exe$,,'` - noexename=`$echo $name|${SED} 's,.exe$,,'` - # $file with .exe has already been added to rmfiles, - # add $file without .exe - rmfiles="$rmfiles $file" - ;; - esac - # Do a test to see if this is a libtool program. - if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - relink_command= - . $dir/$noexename - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then - rmfiles="$rmfiles $objdir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then - rmfiles="$rmfiles $objdir/lt-${noexename}.c" - fi - fi - fi - ;; - esac - $show "$rm $rmfiles" - $run $rm $rmfiles || exit_status=1 - done - objdir="$origobjdir" - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do - if test -d "$dir"; then - $show "rmdir $dir" - $run rmdir $dir >/dev/null 2>&1 - fi - done - - exit $exit_status - ;; - - "") - $echo "$modename: you must specify a MODE" 1>&2 - $echo "$generic_help" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - if test -z "$exec_cmd"; then - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$generic_help" 1>&2 - exit $EXIT_FAILURE - fi -fi # test -z "$show_help" - -if test -n "$exec_cmd"; then - eval exec $exec_cmd - exit $EXIT_FAILURE -fi - -# We need to display help for each of the modes. -case $mode in -"") $echo \ -"Usage: $modename [OPTION]... [MODE-ARG]... - -Provide generalized library-building support services. - - --config show all configuration variables - --debug enable verbose shell tracing --n, --dry-run display commands without modifying any files - --features display basic configuration information and exit - --finish same as \`--mode=finish' - --help display this help message and exit - --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] - --quiet same as \`--silent' - --silent don't print informational messages - --tag=TAG use configuration variables from tag TAG - --version print version information - -MODE must be one of the following: - - clean remove files from the build directory - compile compile a source file into a libtool object - execute automatically set library path, then run a program - finish complete the installation of libtool libraries - install install libraries or executables - link create a library or an executable - uninstall remove libraries from an installed directory - -MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for -a more detailed description of MODE. - -Report bugs to ." - exit $EXIT_SUCCESS - ;; - -clean) - $echo \ -"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE... - -Remove files from the build directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, object or program, all the files associated -with it are deleted. Otherwise, only FILE itself is deleted using RM." - ;; - -compile) - $echo \ -"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - -Compile a source file into a libtool library object. - -This mode accepts the following additional options: - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -prefer-pic try to building PIC objects only - -prefer-non-pic try to building non-PIC objects only - -static always build a \`.o' file suitable for static linking - -COMPILE-COMMAND is a command to be used in creating a \`standard' object file -from the given SOURCEFILE. - -The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." - ;; - -execute) - $echo \ -"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]... - -Automatically set library path, then run a program. - -This mode accepts the following additional options: - - -dlopen FILE add the directory containing FILE to the library path - -This mode sets the library path environment variable according to \`-dlopen' -flags. - -If any of the ARGS are libtool executable wrappers, then they are translated -into their corresponding uninstalled binary, and any of their required library -directories are added to the library path. - -Then, COMMAND is executed, with ARGS as arguments." - ;; - -finish) - $echo \ -"Usage: $modename [OPTION]... --mode=finish [LIBDIR]... - -Complete the installation of libtool libraries. - -Each LIBDIR is a directory that contains libtool libraries. - -The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." - ;; - -install) - $echo \ -"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND... - -Install executables or libraries. - -INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. - -The rest of the components are interpreted as arguments to that command (only -BSD-compatible install options are recognized)." - ;; - -link) - $echo \ -"Usage: $modename [OPTION]... --mode=link LINK-COMMAND... - -Link object files or libraries together to form another library, or to -create an executable program. - -LINK-COMMAND is a command using the C compiler that you would use to create -a program from several object files. - -The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -avoid-version do not add a version suffix if possible - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) - -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE - -export-symbols-regex REGEX - try to export only the symbols matching REGEX - -LLIBDIR search LIBDIR for required installed libraries - -lNAME OUTPUT-FILE requires the installed library libNAME - -module build a library that can dlopened - -no-fast-install disable the fast-install mode - -no-install link a not-installable executable - -no-undefined declare that a library does not refer to external symbols - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects - -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 - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -All other options (arguments beginning with \`-') are ignored. - -Every other argument is treated as a filename. Files ending in \`.la' are -treated as uninstalled libtool libraries, other files are standard or library -object files. - -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is -required, except when creating a convenience library. - -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. - -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file -is created, otherwise an executable program is created." - ;; - -uninstall) - $echo \ -"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - -Remove libraries from an installation directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, all the files associated with it are deleted. -Otherwise, only FILE itself is deleted using RM." - ;; - -*) - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; -esac - -$echo -$echo "Try \`$modename --help' for more information about other modes." - -exit $EXIT_SUCCESS - -# The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting -# choices, we go for a static library, that is the most portable, -# since we can't tell whether shared libraries were disabled because -# the user asked for that or because the platform doesn't support -# them. This is particularly important on AIX, because we don't -# support having both static and shared libraries enabled at the same -# time on that platform, so we default to a shared-only configuration. -# If a disable-shared tag is given, we'll fallback to a static-only -# configuration. But we'll never go from static-only to shared-only. - -# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -build_libtool_libs=no -build_old_libs=yes -# ### END LIBTOOL TAG CONFIG: disable-shared - -# ### BEGIN LIBTOOL TAG CONFIG: disable-static -build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac` -# ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: diff --git a/mozilla/calendar/libical/missing b/mozilla/calendar/libical/missing deleted file mode 100755 index 64b5f901dd5..00000000000 --- a/mozilla/calendar/libical/missing +++ /dev/null @@ -1,353 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. - -scriptversion=2004-09-07.08 - -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 -# Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - -case "$1" in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] - -Send bug reports to ." - exit 0 - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit 0 - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - -esac - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). -case "$1" in - lex|yacc) - # Not GNU programs, they don't have --version. - ;; - - tar) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case "$f" in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison|yacc) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then - eval LASTARG="\${$#}" - case "$LASTARG" in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if [ ! -f y.tab.h ]; then - echo >y.tab.h - fi - if [ ! -f y.tab.c ]; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex|flex) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if [ $# -ne 1 ]; then - eval LASTARG="\${$#}" - case "$LASTARG" in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if [ ! -f lex.yy.c ]; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit 1 - fi - ;; - - makeinfo) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` - fi - touch $file - ;; - - tar) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case "$firstarg" in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case "$firstarg" in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/mozilla/calendar/libical/mkinstalldirs b/mozilla/calendar/libical/mkinstalldirs deleted file mode 100644 index d1f54eec696..00000000000 --- a/mozilla/calendar/libical/mkinstalldirs +++ /dev/null @@ -1,40 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman -# Created: 1993-05-16 -# Public domain - -# $Id: mkinstalldirs,v 1.1.1.1 2007-12-10 11:43:44 mvl%exedo.nl Exp $ - -errstatus=0 - -for file -do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift - - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case "$pathcomp" in - -* ) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - fi - fi - - pathcomp="$pathcomp/" - done -done - -exit $errstatus - -# mkinstalldirs ends here diff --git a/mozilla/calendar/libical/scripts/Makefile.in b/mozilla/calendar/libical/scripts/Makefile.in index f8036464c3d..6123a27545d 100644 --- a/mozilla/calendar/libical/scripts/Makefile.in +++ b/mozilla/calendar/libical/scripts/Makefile.in @@ -1,8 +1,7 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ +# Makefile.in generated automatically by automake 1.5 from Makefile.am. -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,49 +12,58 @@ # PARTICULAR PURPOSE. @SET_MAKE@ + +SHELL = @SHELL@ + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) +transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_alias = @build_alias@ build_triplet = @build@ +host_alias = @host_alias@ host_triplet = @host@ +target_alias = @target_alias@ target_triplet = @target@ -subdir = scripts -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ +AS = @AS@ AWK = @AWK@ BDB_DIR = @BDB_DIR@ BDB_DIR_INCLUDE = @BDB_DIR_INCLUDE@ @@ -63,118 +71,40 @@ BDB_DIR_LIB = @BDB_DIR_LIB@ BDB_LIB = @BDB_LIB@ BDB_VERSION = @BDB_VERSION@ CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DEV_FALSE = @DEV_FALSE@ -DEV_TRUE = @DEV_TRUE@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -HAVE_PTHREAD_FALSE = @HAVE_PTHREAD_FALSE@ -HAVE_PTHREAD_TRUE = @HAVE_PTHREAD_TRUE@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ +JAR = @JAR@ +JAVA = @JAVA@ +JAVAC = @JAVAC@ +JAVAH = @JAVAH@ +JAVA_PLATFORM = @JAVA_PLATFORM@ LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ PTHREAD_LIBS = @PTHREAD_LIBS@ +PY_CFLAGS = @PY_CFLAGS@ +PY_EXTRA_LIBS = @PY_EXTRA_LIBS@ +PY_LIBS = @PY_LIBS@ +PY_LIB_LOC = @PY_LIB_LOC@ RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ +RRCAP_CFLAGS = @RRCAP_CFLAGS@ +RRCAP_LIBS = @RRCAP_LIBS@ VERSION = @VERSION@ -WITH_BDB4_FALSE = @WITH_BDB4_FALSE@ -WITH_BDB4_TRUE = @WITH_BDB4_TRUE@ YACC = @YACC@ -YFLAGS = @YFLAGS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ -am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ +python_val = @python_val@ + EXTRA_DIST = \ mkderivedcomponents.pl \ mkderivedparameters.pl \ @@ -185,38 +115,15 @@ mkrestrictionrecords.pl \ mkrestrictiontable.pl \ readvaluesfile.pl +subdir = scripts +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +DIST_SOURCES = +DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scripts/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu scripts/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: -rm -f *.lo @@ -226,35 +133,33 @@ clean-libtool: distclean-libtool: -rm -f libtool +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu scripts/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status uninstall-info-am: tags: TAGS TAGS: -ctags: CTAGS -CTAGS: +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = .. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + @for file in $(DISTFILES); do \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ fi; \ if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -264,7 +169,9 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile + installdirs: + install: install-am install-exec: install-exec-am install-data: install-data-am @@ -276,7 +183,6 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -284,7 +190,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -294,15 +200,13 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - -rm -f Makefile + distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am dvi-am: -html: html-am - info: info-am info-am: @@ -318,32 +222,23 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - uninstall-am: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + dvi-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/mozilla/calendar/libical/scripts/mkderivedparameters.pl b/mozilla/calendar/libical/scripts/mkderivedparameters.pl index f32edbe7442..5439509aa86 100755 --- a/mozilla/calendar/libical/scripts/mkderivedparameters.pl +++ b/mozilla/calendar/libical/scripts/mkderivedparameters.pl @@ -118,7 +118,7 @@ if ($opt_c){ } $count+=2; - print "static const struct icalparameter_value_kind_map value_kind_map[$count] = {\n"; + print "static struct icalparameter_value_kind_map value_kind_map[$count] = {\n"; print $out; print " {ICAL_VALUE_X,ICAL_X_VALUE},\n"; print " {ICAL_VALUE_NONE,ICAL_NO_VALUE}\n};\n\n"; @@ -141,7 +141,7 @@ if ($opt_c){ } $count+=1; - print "static const struct icalparameter_kind_map parameter_map[$count] = { \n"; + print "static struct icalparameter_kind_map parameter_map[$count] = { \n"; print $out; print " { ICAL_NO_PARAMETER, \"\"}\n};\n\n"; @@ -171,7 +171,7 @@ if ($opt_c){ } $count+=3; - print "static const struct icalparameter_map icalparameter_map[] = {\n"; + print "static struct icalparameter_map icalparameter_map[] = {\n"; print "{ICAL_ANY_PARAMETER,0,\"\"},\n"; print $out; print " {ICAL_NO_PARAMETER,0,\"\"}};\n\n"; diff --git a/mozilla/calendar/libical/scripts/mkderivedproperties.pl b/mozilla/calendar/libical/scripts/mkderivedproperties.pl index b853732c9a1..59ec4b6430d 100755 --- a/mozilla/calendar/libical/scripts/mkderivedproperties.pl +++ b/mozilla/calendar/libical/scripts/mkderivedproperties.pl @@ -65,7 +65,7 @@ if($opt_c){ my $count = scalar(@props); - print "static const struct icalproperty_map property_map[$count] = {\n"; + print "static struct icalproperty_map property_map[$count] = {\n"; foreach $prop (@props) { @@ -124,7 +124,7 @@ if($opt_c){ } $count++; - print "static const struct icalproperty_enum_map enum_map[$count] = {\n"; + print "static struct icalproperty_enum_map enum_map[$count] = {\n"; print $out; print " {ICAL_NO_PROPERTY,0,\"\"}\n};\n\n"; diff --git a/mozilla/calendar/libical/scripts/mkderivedvalues.pl b/mozilla/calendar/libical/scripts/mkderivedvalues.pl index 003158671a1..08c17051678 100755 --- a/mozilla/calendar/libical/scripts/mkderivedvalues.pl +++ b/mozilla/calendar/libical/scripts/mkderivedvalues.pl @@ -130,7 +130,7 @@ if($opt_c){ # print out the value to string map my $count = scalar(keys %h) + 1; - print "static const struct icalvalue_kind_map value_map[$count]={\n"; + print "static struct icalvalue_kind_map value_map[$count]={\n"; foreach $value (keys %h) { @@ -206,8 +206,8 @@ void icalvalue_set_${lc}(icalvalue* value, $type v) {\ impl->data.v_$union_data = $assign \n\ icalvalue_reset_kind(impl);\n}\n"; - print "$type\ icalvalue_get_${lc}(const icalvalue* value)\ {\n"; - if ($type =~ m/(\*|int|float)$/) { + print "$type icalvalue_get_${lc}(const icalvalue* value) {\n"; + if( $type =~ /^(int|const char\s?[*])$/) { print " icalerror_check_arg_rz( (value!=0),\"value\");\n"; } else { print " icalerror_check_arg( (value!=0),\"value\");\n"; diff --git a/mozilla/calendar/libical/scripts/mkrestrictiontable.pl b/mozilla/calendar/libical/scripts/mkrestrictiontable.pl index 1c70b0cc62e..e02c55b2f94 100755 --- a/mozilla/calendar/libical/scripts/mkrestrictiontable.pl +++ b/mozilla/calendar/libical/scripts/mkrestrictiontable.pl @@ -31,7 +31,7 @@ if ($opt_i) { } # First build the property restriction table -print "static const icalrestriction_property_record icalrestriction_property_records[] = {\n"; +print "icalrestriction_property_record icalrestriction_property_records[] = {\n"; while() { @@ -62,7 +62,7 @@ print " {ICAL_METHOD_NONE,ICAL_NO_COMPONENT,ICAL_NO_PROPERTY,ICAL_RESTRICTION print "};\n"; -print "static const icalrestriction_component_record icalrestriction_component_records[] = {\n"; +print "icalrestriction_component_record icalrestriction_component_records[] = {\n"; # Go back through the entire file and build the component restriction table diff --git a/mozilla/calendar/libical/scripts/readvaluesfile.pl b/mozilla/calendar/libical/scripts/readvaluesfile.pl index d5e2d36fd8e..cb40db84ff3 100644 --- a/mozilla/calendar/libical/scripts/readvaluesfile.pl +++ b/mozilla/calendar/libical/scripts/readvaluesfile.pl @@ -13,6 +13,7 @@ sub read_values_file { s/#.*$//g; s/\"//g; + s/\r//g; next if ! $_; @@ -69,6 +70,7 @@ sub read_properties_file { s/#.*$//g; s/\"//g; + s/\r//g; next if ! $_; @@ -100,6 +102,7 @@ sub read_parameters_file { s/#.*$//g; s/\"//g; + s/\r//g; next if ! $_; diff --git a/mozilla/calendar/libical/src/Makefile.am b/mozilla/calendar/libical/src/Makefile.am index ef64080346e..5e5cd331dbc 100644 --- a/mozilla/calendar/libical/src/Makefile.am +++ b/mozilla/calendar/libical/src/Makefile.am @@ -1 +1,19 @@ -SUBDIRS = libical libicalss +if WITH_PYTHON +PYTHON_DIR = python +else +PYTHON_DIR = +endif + +if WITH_JAVA +JAVA_DIR = java +else +JAVA_DIR = +endif + +if WITH_CAP +LIBICALCAP_DIR = libicalcap +else +LIBICALCAP_DIR = +endif + +SUBDIRS = libical libicalss $(LIBICALCAP_DIR) libicalvcal $(PYTHON_DIR) $(JAVA_DIR) test diff --git a/mozilla/calendar/libical/src/libical.dsw b/mozilla/calendar/libical/src/libical.dsw deleted file mode 100644 index 607417eaeaa..00000000000 --- a/mozilla/calendar/libical/src/libical.dsw +++ /dev/null @@ -1,92 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "libical"=.\libical\libical.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libicalss"=.\libicalss\libicalss.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libicalvcal"=.\libicalvcal\libicalvcal.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "recur"=.\test\recur.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libical - End Project Dependency - Begin Project Dependency - Project_Dep_Name libicalvcal - End Project Dependency -}}} - -############################################################################### - -Project: "regression"=.\test\regression.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libical - End Project Dependency - Begin Project Dependency - Project_Dep_Name libicalvcal - End Project Dependency - Begin Project Dependency - Project_Dep_Name libicalss - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/mozilla/calendar/libical/src/libical/Makefile.am b/mozilla/calendar/libical/src/libical/Makefile.am index fe1bcec3226..bd81698d310 100644 --- a/mozilla/calendar/libical/src/libical/Makefile.am +++ b/mozilla/calendar/libical/src/libical/Makefile.am @@ -2,7 +2,7 @@ # FILE: Makefile.am # CREATOR: eric # -# $Id: Makefile.am,v 1.38 2007/12/01 12:17:44 dothebart Exp $ +# $Id: Makefile.am,v 1.35 2002/11/05 14:59:21 acampi Exp $ # # # (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org @@ -26,8 +26,13 @@ DESIGNDATA = $(top_srcdir)/design-data ICALSCRIPTS = $(top_srcdir)/scripts +if WITH_CXX +cxx_lib=libical_cxx.la +cxx_headers=vcomponent.h icalparameter_cxx.h icalproperty_cxx.h icalvalue_cxx.h icptrholder.h +else cxx_lib= cxx_headers= +endif lib_LTLIBRARIES = libical.la $(cxx_lib) @@ -35,7 +40,7 @@ noinst_LTLIBRARIES = libical-static.la libical_static_la_SOURCES = $(libical_la_SOURCES) libical_static_la_LDFLAGS = --all-static -AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" +CPPFLAGS = -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" # CFLAGS = -g @@ -47,7 +52,7 @@ INCLUDES = \ -I$(top_builddir)/src \ -I$(srcdir) -libical_la_LDFLAGS = -version-info 30:0:30 +libical_la_LDFLAGS = -version-info 0:0:0 libical_la_SOURCES = \ @@ -100,13 +105,28 @@ libical_la_SOURCES = \ caldate.c \ astime.h +if WITH_CXX +libical_cxx_la_SOURCES = \ + $(libical_la_SOURCES) \ + vcomponent.h \ + vcomponent.cpp \ + icalproperty_cxx.h \ + icalproperty_cxx.cpp \ + icalparameter_cxx.h \ + icalparameter_cxx.cpp \ + icalvalue_cxx.h \ + icalvalue_cxx.cpp \ + icptrholder.h +endif + libicalincludedir = $(includedir) -libicalinclude_HEADERS = ical.h icalmemory.h icalerror.h +libicalinclude_HEADERS = ical.h icalmemory.h icalerror.h $(cxx_headers) # ORDERING OF HEADERS IS SIGNIFICANT. Don't change this ordering. It # is required to make the combined header ical.h properly COMBINEDHEADERS = \ + $(top_builddir)/config.h \ $(top_builddir)/src/libical/icalversion.h \ $(top_srcdir)/src/libical/icaltime.h \ $(top_srcdir)/src/libical/icalduration.h \ @@ -133,11 +153,6 @@ COMBINEDHEADERS = \ $(top_srcdir)/src/libical/icalmime.h \ $(top_srcdir)/src/libical/icallangbind.h -# exporting the configure stuff is probably no good idea. -# others use standard defines not in our namespace too. -# $(top_builddir)/config.h \ - - BUILT_COMBINEDHEADERS = \ icalderivedparameter.h \ icalderivedproperty.h \ diff --git a/mozilla/calendar/libical/src/libical/icalarray.c b/mozilla/calendar/libical/src/libical/icalarray.c index 4ad8ffeb6bc..c3f03de1d54 100644 --- a/mozilla/calendar/libical/src/libical/icalarray.c +++ b/mozilla/calendar/libical/src/libical/icalarray.c @@ -3,7 +3,7 @@ FILE: icalarray.c CREATOR: Damon Chaplin 07 March 2001 - $Id: icalarray.c,v 1.6 2007/04/30 13:57:47 artcancro Exp $ + $Id: icalarray.c,v 1.5 2002/06/28 09:30:15 acampi Exp $ $Locker: $ (C) COPYRIGHT 2001, Ximian, Inc. diff --git a/mozilla/calendar/libical/src/libical/icalarray.h b/mozilla/calendar/libical/src/libical/icalarray.h index be53c0da455..4389dca4976 100644 --- a/mozilla/calendar/libical/src/libical/icalarray.h +++ b/mozilla/calendar/libical/src/libical/icalarray.h @@ -4,7 +4,7 @@ CREATOR: Damon Chaplin 07 March 2001 - $Id: icalarray.h,v 1.4 2007/04/30 13:57:47 artcancro Exp $ + $Id: icalarray.h,v 1.3 2002/10/09 19:50:46 acampi Exp $ $Locker: $ (C) COPYRIGHT 2001, Ximian, Inc. diff --git a/mozilla/calendar/libical/src/libical/icalattach.c b/mozilla/calendar/libical/src/libical/icalattach.c index 1637df21c02..6ef426a3d70 100644 --- a/mozilla/calendar/libical/src/libical/icalattach.c +++ b/mozilla/calendar/libical/src/libical/icalattach.c @@ -3,7 +3,7 @@ FILE: icalattach.c CREATOR: acampi 28 May 02 - $Id: icalattach.c,v 1.3 2007/04/30 13:57:47 artcancro Exp $ + $Id: icalattach.c,v 1.2 2002/10/09 19:54:59 acampi Exp $ $Locker: $ diff --git a/mozilla/calendar/libical/src/libical/icalattachimpl.h b/mozilla/calendar/libical/src/libical/icalattachimpl.h index 254c5d45407..b31d97098d1 100644 --- a/mozilla/calendar/libical/src/libical/icalattachimpl.h +++ b/mozilla/calendar/libical/src/libical/icalattachimpl.h @@ -3,7 +3,7 @@ FILE: icalattachimpl.h CREATOR: acampi 28 May 02 - $Id: icalattachimpl.h,v 1.2 2007/04/30 13:57:47 artcancro Exp $ + $Id: icalattachimpl.h,v 1.1 2002/05/28 14:08:00 acampi Exp $ (C) COPYRIGHT 2000, Andrea Campi diff --git a/mozilla/calendar/libical/src/libical/icalderivedparameter.c.in b/mozilla/calendar/libical/src/libical/icalderivedparameter.c.in index da277966da4..4eda7fcdb81 100644 --- a/mozilla/calendar/libical/src/libical/icalderivedparameter.c.in +++ b/mozilla/calendar/libical/src/libical/icalderivedparameter.c.in @@ -3,7 +3,7 @@ FILE: icalderivedparameters.{c,h} CREATOR: eric 09 May 1999 - $Id: icalderivedparameter.c.in,v 1.8 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalderivedparameter.c.in,v 1.7 2004/05/10 22:05:23 acampi Exp $ $Locker: $ @@ -99,7 +99,7 @@ icalparameter_kind icalparameter_string_to_kind(const char* string) for (i=0; parameter_map[i].kind != ICAL_NO_PARAMETER; i++) { - if (strcasecmp(parameter_map[i].name, string) == 0) { + if (strcmp(parameter_map[i].name, string) == 0) { return parameter_map[i].kind; } } @@ -150,7 +150,7 @@ int icalparameter_string_to_enum(const char* str) icalerror_check_arg_rz(str != 0,"str"); for (i=0; icalparameter_map[i].kind != ICAL_NO_PARAMETER; i++){ - if(strcasecmp(str,icalparameter_map[i].str) == 0) { + if(strcmp(str,icalparameter_map[i].str) == 0) { return icalparameter_map[i].enumeration; } } @@ -174,7 +174,7 @@ icalparameter* icalparameter_new_from_value_string(icalparameter_kind kind,const for (i=0; icalparameter_map[i].kind != ICAL_NO_PARAMETER; i++){ if(kind == icalparameter_map[i].kind) { found_kind = 1; - if(strcasecmp(val,icalparameter_map[i].str) == 0) { + if(strcmp(val,icalparameter_map[i].str) == 0) { param->data = (int)icalparameter_map[i].enumeration; return param; diff --git a/mozilla/calendar/libical/src/libical/icalderivedparameter.h.in b/mozilla/calendar/libical/src/libical/icalderivedparameter.h.in index 85bb4ee1c78..299a22cfa44 100644 --- a/mozilla/calendar/libical/src/libical/icalderivedparameter.h.in +++ b/mozilla/calendar/libical/src/libical/icalderivedparameter.h.in @@ -4,7 +4,7 @@ CREATOR: eric 20 March 1999 - $Id: icalderivedparameter.h.in,v 1.4 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalderivedparameter.h.in,v 1.3 2002/05/27 20:55:36 ebusboom Exp $ $Locker: $ diff --git a/mozilla/calendar/libical/src/libical/icalderivedproperty.c.in b/mozilla/calendar/libical/src/libical/icalderivedproperty.c.in index 3a8eff0f610..fe8fbb51721 100644 --- a/mozilla/calendar/libical/src/libical/icalderivedproperty.c.in +++ b/mozilla/calendar/libical/src/libical/icalderivedproperty.c.in @@ -4,7 +4,7 @@ FILE: icalderivedproperty.c CREATOR: eric 15 Feb 2001 - $Id: icalderivedproperty.c.in,v 1.14 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalderivedproperty.c.in,v 1.13 2002/10/10 00:05:37 acampi Exp $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org @@ -107,7 +107,7 @@ icalproperty_kind icalproperty_string_to_kind(const char* string) for (i=0; property_map[i].kind != ICAL_NO_PROPERTY; i++) { - if (strcasecmp(property_map[i].name, string) == 0) { + if (strcmp(property_map[i].name, string) == 0) { return property_map[i].kind; } } @@ -180,7 +180,7 @@ int icalproperty_kind_and_string_to_enum(const int kind, const char* str) return 0; for (; i != ICALPROPERTY_LAST_ENUM; i++) { - if ( strcasecmp(enum_map[i-ICALPROPERTY_FIRST_ENUM].str, str) == 0) { + if ( strcmp(enum_map[i-ICALPROPERTY_FIRST_ENUM].str, str) == 0) { return enum_map[i-ICALPROPERTY_FIRST_ENUM].prop_enum; } } @@ -200,7 +200,7 @@ int icalproperty_string_to_enum(const char* str) } for (i=ICALPROPERTY_FIRST_ENUM; i != ICALPROPERTY_LAST_ENUM; i++) { - if ( strcasecmp(enum_map[i-ICALPROPERTY_FIRST_ENUM].str, str) == 0) { + if ( strcmp(enum_map[i-ICALPROPERTY_FIRST_ENUM].str, str) == 0) { return enum_map[i-ICALPROPERTY_FIRST_ENUM].prop_enum; } } @@ -245,7 +245,7 @@ icalproperty_method icalproperty_string_to_method(const char* str) for (i=ICAL_METHOD_X-ICALPROPERTY_FIRST_ENUM; i != ICAL_METHOD_NONE-ICALPROPERTY_FIRST_ENUM; i++) { - if ( strcasecmp(enum_map[i].str, str) == 0) { + if ( strcmp(enum_map[i].str, str) == 0) { return (icalproperty_method)enum_map[i].prop_enum; } } @@ -275,7 +275,7 @@ icalproperty_status icalenum_string_to_status(const char* str) for (i=ICAL_STATUS_X-ICALPROPERTY_FIRST_ENUM; i != ICAL_STATUS_NONE-ICALPROPERTY_FIRST_ENUM; i++) { - if ( strcasecmp(enum_map[i].str, str) == 0) { + if ( strcmp(enum_map[i].str, str) == 0) { return (icalproperty_status)enum_map[i].prop_enum; } } diff --git a/mozilla/calendar/libical/src/libical/icalderivedproperty.h.in b/mozilla/calendar/libical/src/libical/icalderivedproperty.h.in index 772b452905a..3ee73b96c35 100644 --- a/mozilla/calendar/libical/src/libical/icalderivedproperty.h.in +++ b/mozilla/calendar/libical/src/libical/icalderivedproperty.h.in @@ -3,7 +3,7 @@ FILE: icalderivedproperties.{c,h} CREATOR: eric 09 May 1999 - $Id: icalderivedproperty.h.in,v 1.7 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalderivedproperty.h.in,v 1.6 2002/05/27 20:55:36 ebusboom Exp $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org ======================================================================*/ diff --git a/mozilla/calendar/libical/src/libical/icalderivedvalue.c.in b/mozilla/calendar/libical/src/libical/icalderivedvalue.c.in index 8a8de6bd232..c1debf40824 100644 --- a/mozilla/calendar/libical/src/libical/icalderivedvalue.c.in +++ b/mozilla/calendar/libical/src/libical/icalderivedvalue.c.in @@ -3,7 +3,7 @@ FILE: icalvalue.c CREATOR: eric 02 May 1999 - $Id: icalderivedvalue.c.in,v 1.15 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalderivedvalue.c.in,v 1.13 2005/01/24 11:48:01 acampi Exp $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org @@ -39,13 +39,8 @@ #include "icalvalueimpl.h" #include /* for malloc */ -#include /* for snprintf */ #include /* For memset, others */ -#include /* For offsetof() macro */ #include -#include /* for mktime */ -#include /* for atoi and atof */ -#include /* for SHRT_MAX */ struct icalvalue_impl* icalvalue_new_impl(icalvalue_kind kind); @@ -88,7 +83,7 @@ icalvalue_kind icalvalue_string_to_kind(const char* str) int i; for (i=0; value_map[i].kind != ICAL_NO_VALUE; i++) { - if (strcasecmp(value_map[i].name,str) == 0) { + if (strcmp(value_map[i].name,str) == 0) { return value_map[i].kind; } } @@ -262,7 +257,7 @@ icalvalue_get_datetimeperiod(const icalvalue* impl) icalerror_check_arg( (impl!=0),"value"); icalerror_check_value_type(value, ICAL_DATETIMEPERIOD_VALUE); - if( impl->kind == ICAL_DATETIME_VALUE || impl->kind == ICAL_DATE_VALUE ){ + if(impl->kind == ICAL_DATETIME_VALUE){ dtp.period = icalperiodtype_null_period(); dtp.time = impl->data.v_time; } else if(impl->kind == ICAL_PERIOD_VALUE) { diff --git a/mozilla/calendar/libical/src/libical/icalderivedvalue.h.in b/mozilla/calendar/libical/src/libical/icalderivedvalue.h.in index 70210f42260..eef000f3e67 100644 --- a/mozilla/calendar/libical/src/libical/icalderivedvalue.h.in +++ b/mozilla/calendar/libical/src/libical/icalderivedvalue.h.in @@ -4,7 +4,7 @@ CREATOR: eric 20 March 1999 - $Id: icalderivedvalue.h.in,v 1.10 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalderivedvalue.h.in,v 1.9 2002/06/04 14:07:09 acampi Exp $ $Locker: $ diff --git a/mozilla/calendar/libical/src/libical/icalduration.h b/mozilla/calendar/libical/src/libical/icalduration.h index 8cecda8990f..59bd75c39ae 100644 --- a/mozilla/calendar/libical/src/libical/icalduration.h +++ b/mozilla/calendar/libical/src/libical/icalduration.h @@ -4,7 +4,7 @@ CREATOR: eric 26 Jan 2001 - $Id: icalduration.h,v 1.4 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalduration.h,v 1.3 2002/09/26 22:04:56 lindner Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libical/icalenums.c b/mozilla/calendar/libical/src/libical/icalenums.c index a50fd50ee2f..d3e4fc8426e 100644 --- a/mozilla/calendar/libical/src/libical/icalenums.c +++ b/mozilla/calendar/libical/src/libical/icalenums.c @@ -3,7 +3,7 @@ FILE: icalenum.c CREATOR: eric 29 April 1999 - $Id: icalenums.c,v 1.15 2007/05/25 02:57:04 artcancro Exp $ + $Id: icalenums.c,v 1.13 2002/06/11 12:22:25 acampi Exp $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org @@ -38,7 +38,7 @@ /*** @brief Allowed request status values */ -static const struct { +static struct { enum icalrequeststatus kind; int major; int minor; @@ -112,7 +112,7 @@ char* icalenum_reqstat_code(icalrequeststatus stat) if ( request_status_map[i].kind == stat) { major = request_status_map[i].major; minor = request_status_map[i].minor; - snprintf(tmpbuf, sizeof(tmpbuf), "%i.%i", major, minor); + sprintf(tmpbuf, "%i.%i", major, minor); return icalmemory_tmp_copy(tmpbuf); } } diff --git a/mozilla/calendar/libical/src/libical/icalenums.h b/mozilla/calendar/libical/src/libical/icalenums.h index b00907f4d05..dde5e5afb61 100644 --- a/mozilla/calendar/libical/src/libical/icalenums.h +++ b/mozilla/calendar/libical/src/libical/icalenums.h @@ -56,6 +56,7 @@ typedef enum icalcomponent_kind { ICAL_X_COMPONENT, ICAL_VSCHEDULE_COMPONENT, ICAL_VQUERY_COMPONENT, + ICAL_VREPLY_COMPONENT, ICAL_VCAR_COMPONENT, ICAL_VCOMMAND_COMPONENT, ICAL_XLICINVALID_COMPONENT, diff --git a/mozilla/calendar/libical/src/libical/icalerror.c b/mozilla/calendar/libical/src/libical/icalerror.c index 24642f309b0..e80a3eb63df 100644 --- a/mozilla/calendar/libical/src/libical/icalerror.c +++ b/mozilla/calendar/libical/src/libical/icalerror.c @@ -3,7 +3,7 @@ FILE: icalerror.c CREATOR: eric 16 May 1999 - $Id: icalerror.c,v 1.20 2007/05/31 21:26:14 artcancro Exp $ + $Id: icalerror.c,v 1.17 2002/10/09 20:48:08 acampi Exp $ $Locker: $ @@ -108,7 +108,7 @@ void icalerror_clear_errno() { icalerrno = ICAL_NO_ERROR; } -#if ICAL_ERRORS_ARE_FATAL +#ifdef ICAL_ERRORS_ARE_FATAL int icalerror_errors_are_fatal = 1; #else int icalerror_errors_are_fatal = 0; @@ -141,7 +141,7 @@ struct icalerror_string_map { char name[160]; }; -static const struct icalerror_string_map string_map[] = +static struct icalerror_string_map string_map[] = { {"BADARG",ICAL_BADARG_ERROR,"BADARG: Bad argument to function"}, { "NEWFAILED",ICAL_NEWFAILED_ERROR,"NEWFAILED: Failed to create a new object via a *_new() routine"}, @@ -187,7 +187,7 @@ icalerrorstate icalerror_supress(const char* error){ return es; } -const char* icalerror_perror() +char* icalerror_perror() { return icalerror_strerror(icalerrno); } @@ -233,7 +233,7 @@ icalerrorstate icalerror_get_error_state( icalerrorenum error) -const char* icalerror_strerror(icalerrorenum e) { +char* icalerror_strerror(icalerrorenum e) { int i; diff --git a/mozilla/calendar/libical/src/libical/icalerror.h b/mozilla/calendar/libical/src/libical/icalerror.h index cc443484a9a..18ecc3b66a4 100644 --- a/mozilla/calendar/libical/src/libical/icalerror.h +++ b/mozilla/calendar/libical/src/libical/icalerror.h @@ -3,7 +3,7 @@ FILE: icalerror.h CREATOR: eric 09 May 1999 - $Id: icalerror.h,v 1.16 2007/05/25 02:57:04 artcancro Exp $ + $Id: icalerror.h,v 1.14 2002/07/21 14:58:17 lindner Exp $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org @@ -90,8 +90,8 @@ typedef enum icalerrorstate { ICAL_ERROR_UNKNOWN /* Asked state for an unknown error type */ } icalerrorstate ; -const char* icalerror_strerror(icalerrorenum e); -const char* icalerror_perror(); +char* icalerror_strerror(icalerrorenum e); +char* icalerror_perror(); void icalerror_set_error_state( icalerrorenum error, icalerrorstate); icalerrorstate icalerror_get_error_state( icalerrorenum error); diff --git a/mozilla/calendar/libical/src/libical/icallangbind.c b/mozilla/calendar/libical/src/libical/icallangbind.c index 4290dfa4593..edfb1bae69d 100644 --- a/mozilla/calendar/libical/src/libical/icallangbind.c +++ b/mozilla/calendar/libical/src/libical/icallangbind.c @@ -5,7 +5,7 @@ DESCRIPTION: - $Id: icallangbind.c,v 1.23 2007/04/30 13:57:48 artcancro Exp $ + $Id: icallangbind.c,v 1.22 2002/10/24 13:44:30 acampi Exp $ $Locker: $ (C) COPYRIGHT 1999 Eric Busboom @@ -40,8 +40,8 @@ void icallangbind_free_array(int* array){ free(array); } -int icallangbind_access_array(int* array, int indx) { - return array[indx]; +int icallangbind_access_array(int* array, int index) { + return array[index]; } /** Iterators to fetch parameters given property */ diff --git a/mozilla/calendar/libical/src/libical/icallangbind.h b/mozilla/calendar/libical/src/libical/icallangbind.h index 816cde65361..408117e93fc 100644 --- a/mozilla/calendar/libical/src/libical/icallangbind.h +++ b/mozilla/calendar/libical/src/libical/icallangbind.h @@ -5,7 +5,7 @@ DESCRIPTION: - $Id: icallangbind.h,v 1.7 2007/04/30 13:57:48 artcancro Exp $ + $Id: icallangbind.h,v 1.6 2002/10/24 13:44:30 acampi Exp $ $Locker: $ (C) COPYRIGHT 1999 Eric Busboom @@ -23,7 +23,7 @@ int* icallangbind_new_array(int size); void icallangbind_free_array(int* array); -int icallangbind_access_array(int* array, int indx); +int icallangbind_access_array(int* array, int index); icalproperty* icallangbind_get_property(icalcomponent *c, int n, const char* prop); const char* icallangbind_get_property_val(icalproperty* p); const char* icallangbind_get_parameter(icalproperty *p, const char* parameter); diff --git a/mozilla/calendar/libical/src/libical/icalmemory.c b/mozilla/calendar/libical/src/libical/icalmemory.c index 592901f30bc..6088ed825e1 100644 --- a/mozilla/calendar/libical/src/libical/icalmemory.c +++ b/mozilla/calendar/libical/src/libical/icalmemory.c @@ -3,7 +3,7 @@ FILE: icalmemory.c CREATOR: eric 30 June 1999 - $Id: icalmemory.c,v 1.11 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalmemory.c,v 1.10 2002/08/09 14:28:56 lindner Exp $ $Locker: $ The contents of this file are subject to the Mozilla Public License @@ -215,12 +215,6 @@ void icalmemory_free_ring() br = get_buffer_ring(); icalmemory_free_ring_byval(br); -#ifdef HAVE_PTHREAD - pthread_setspecific(ring_key, 0); -#else - global_buffer_ring = 0; -#endif - } diff --git a/mozilla/calendar/libical/src/libical/icalmemory.h b/mozilla/calendar/libical/src/libical/icalmemory.h index 72002820e1e..7954983d665 100644 --- a/mozilla/calendar/libical/src/libical/icalmemory.h +++ b/mozilla/calendar/libical/src/libical/icalmemory.h @@ -4,7 +4,7 @@ CREATOR: eric 30 June 1999 - $Id: icalmemory.h,v 1.5 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalmemory.h,v 1.4 2002/06/11 12:15:11 acampi Exp $ $Locker: $ This program is free software; you can redistribute it and/or modify diff --git a/mozilla/calendar/libical/src/libical/icalmime.c b/mozilla/calendar/libical/src/libical/icalmime.c index 66aebe6a264..b3da67ae3ec 100644 --- a/mozilla/calendar/libical/src/libical/icalmime.c +++ b/mozilla/calendar/libical/src/libical/icalmime.c @@ -4,7 +4,7 @@ CREATOR: eric 26 July 2000 - $Id: icalmime.c,v 1.11 2007/05/31 21:26:14 artcancro Exp $ + $Id: icalmime.c,v 1.8 2005/01/24 12:49:11 acampi Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org @@ -97,14 +97,12 @@ void* icalmime_textcalendar_end_part(void* part) void* icalmime_text_end_part(void* part) { - char *buf; struct text_part* impl = ( struct text_part*) part; icalmemory_add_tmp_buffer(impl->buf); - buf = impl->buf; free(impl); - return buf; + return impl->buf; } void icalmime_text_free_part(void *part) @@ -140,7 +138,7 @@ void icalmime_attachment_free_part(void *part) -static const struct sspm_action_map icalmime_local_action_map[] = +struct sspm_action_map icalmime_local_action_map[] = { {SSPM_TEXT_MAJOR_TYPE,SSPM_CALENDAR_MINOR_TYPE,icalmime_text_new_part,icalmime_text_add_line,icalmime_textcalendar_end_part,icalmime_text_free_part}, {SSPM_TEXT_MAJOR_TYPE,SSPM_ANY_MINOR_TYPE,icalmime_text_new_part,icalmime_text_add_line,icalmime_text_end_part,icalmime_text_free_part}, @@ -211,9 +209,13 @@ icalcomponent* icalmime_parse(char* (*get_string)(char *s, size_t size, } if(parts[i].header.error!=SSPM_NO_ERROR){ - const char *str="Unknown error"; + char *str = "Unknown error"; char temp[256]; + if(parts[i].header.error==SSPM_MALFORMED_HEADER_ERROR){ + str = "Malformed header, possibly due to input not in MIME format"; + } + if(parts[i].header.error==SSPM_UNEXPECTED_BOUNDARY_ERROR){ str = "Got an unexpected boundary, possibly due to a MIME header for a MULTIPART part that is missing the Content-Type line"; } @@ -233,7 +235,7 @@ line between the header and the previous boundary\?"; } if(parts[i].header.error_text != 0){ - snprintf(temp,256, + snprintf(temp,sizeof(temp), "%s: %s",str,parts[i].header.error_text); } else { strcpy(temp,str); diff --git a/mozilla/calendar/libical/src/libical/icalmime.h b/mozilla/calendar/libical/src/libical/icalmime.h index aa440af85eb..b5005ce1a20 100644 --- a/mozilla/calendar/libical/src/libical/icalmime.h +++ b/mozilla/calendar/libical/src/libical/icalmime.h @@ -4,7 +4,7 @@ CREATOR: eric 26 July 2000 - $Id: icalmime.h,v 1.2 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalmime.h,v 1.1.1.1 2001/01/02 07:33:02 ebusboom Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libical/icalparameterimpl.h b/mozilla/calendar/libical/src/libical/icalparameterimpl.h index ecb30558bcf..a1bdda6e8ca 100644 --- a/mozilla/calendar/libical/src/libical/icalparameterimpl.h +++ b/mozilla/calendar/libical/src/libical/icalparameterimpl.h @@ -3,7 +3,7 @@ FILE: icalparameterimpl.h CREATOR: eric 09 May 1999 - $Id: icalparameterimpl.h,v 1.3 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalparameterimpl.h,v 1.2 2001/03/26 19:17:28 ebusboom Exp $ $Locker: $ diff --git a/mozilla/calendar/libical/src/libical/icalparser.h b/mozilla/calendar/libical/src/libical/icalparser.h index 0010d0f0f15..ee5fee74851 100644 --- a/mozilla/calendar/libical/src/libical/icalparser.h +++ b/mozilla/calendar/libical/src/libical/icalparser.h @@ -3,7 +3,7 @@ FILE: icalparser.h CREATOR: eric 20 April 1999 - $Id: icalparser.h,v 1.8 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalparser.h,v 1.7 2002/06/28 08:55:23 acampi Exp $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libical/icalperiod.c b/mozilla/calendar/libical/src/libical/icalperiod.c index 72d6223f453..ecf014348a1 100644 --- a/mozilla/calendar/libical/src/libical/icalperiod.c +++ b/mozilla/calendar/libical/src/libical/icalperiod.c @@ -3,7 +3,7 @@ FILE: icalperiod.c CREATOR: eric 02 June 2000 - $Id: icalperiod.c,v 1.12 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalperiod.c,v 1.11 2002/10/30 21:22:03 acampi Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libical/icalperiod.h b/mozilla/calendar/libical/src/libical/icalperiod.h index f3abad3bd37..fc1e3382e42 100644 --- a/mozilla/calendar/libical/src/libical/icalperiod.h +++ b/mozilla/calendar/libical/src/libical/icalperiod.h @@ -4,7 +4,7 @@ CREATOR: eric 26 Jan 2001 - $Id: icalperiod.h,v 1.5 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalperiod.h,v 1.4 2002/06/28 11:11:24 acampi Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libical/icalrestriction.c.in b/mozilla/calendar/libical/src/libical/icalrestriction.c.in index 092fb14c749..05cdc9d4139 100644 --- a/mozilla/calendar/libical/src/libical/icalrestriction.c.in +++ b/mozilla/calendar/libical/src/libical/icalrestriction.c.in @@ -30,7 +30,7 @@ in machine generated code below */ struct icalrestriction_property_record; -typedef char* (*restriction_func)(const struct icalrestriction_property_record* rec,icalcomponent* comp,icalproperty* prop); +typedef char* (*restriction_func)(struct icalrestriction_property_record* rec,icalcomponent* comp,icalproperty* prop); typedef struct icalrestriction_property_record { @@ -50,24 +50,24 @@ typedef struct icalrestriction_component_record { restriction_func function; } icalrestriction_component_record; -static const icalrestriction_property_record* +icalrestriction_property_record* icalrestriction_get_property_restriction(icalproperty_method method, icalcomponent_kind component, icalproperty_kind property); -static const icalrestriction_component_record* +icalrestriction_component_record* icalrestriction_get_component_restriction(icalproperty_method method, icalcomponent_kind component, icalcomponent_kind subcomponent); -static const icalrestriction_component_record icalrestriction_component_records[]; -static const icalrestriction_property_record icalrestriction_property_records[]; +icalrestriction_component_record icalrestriction_component_records[]; +icalrestriction_property_record icalrestriction_property_records[]; icalrestriction_property_record null_prop_record = {ICAL_METHOD_NONE,ICAL_NO_COMPONENT,ICAL_NO_PROPERTY,ICAL_RESTRICTION_UNKNOWN,0}; icalrestriction_component_record null_comp_record = {ICAL_METHOD_NONE,ICAL_NO_COMPONENT,ICAL_NO_COMPONENT,ICAL_RESTRICTION_UNKNOWN,0}; -/** Each row gives the result of comparing a restriction against a count. - The columns in each row represent 0,1,2+. '-1' indicates +/** The each row gives the result of comparing a restriction against a + count. The columns in each row represent 0,1,2+. '-1' indicates 'invalid, 'don't care' or 'needs more analysis' So, for ICAL_RESTRICTION_ONE, if there is 1 of a property with that restriction, it passes, but if there are 0 or 2+, it fails. */ @@ -84,7 +84,7 @@ char compare_map[ICAL_RESTRICTION_UNKNOWN+1][3] = { { 1, 1, 1} /*ICAL_RESTRICTION_UNKNOWN*/ }; -const char restr_string_map[ICAL_RESTRICTION_UNKNOWN+1][60] = { +char restr_string_map[ICAL_RESTRICTION_UNKNOWN+1][60] = { "unknown number",/*ICAL_RESTRICTION_NONE*/ "0",/*ICAL_RESTRICTION_ZERO*/ "1",/*ICAL_RESTRICTION_ONE*/ @@ -116,7 +116,7 @@ icalrestriction_compare(icalrestriction_kind restr, int count){ /* Special case routines */ char* icalrestriction_may_be_draft_final_canceled( - const icalrestriction_property_record *rec, + icalrestriction_property_record *rec, icalcomponent* comp, icalproperty* prop) { @@ -135,7 +135,7 @@ char* icalrestriction_may_be_draft_final_canceled( } char* icalrestriction_may_be_comp_need_process( - const icalrestriction_property_record *rec, + icalrestriction_property_record *rec, icalcomponent* comp, icalproperty* prop) { @@ -151,7 +151,7 @@ char* icalrestriction_may_be_comp_need_process( return 0; } -char* icalrestriction_may_be_tent_conf(const icalrestriction_property_record *rec, +char* icalrestriction_may_be_tent_conf(icalrestriction_property_record *rec, icalcomponent* comp, icalproperty* prop){ icalproperty_status stat = icalproperty_get_status(prop); @@ -166,7 +166,7 @@ char* icalrestriction_may_be_tent_conf(const icalrestriction_property_record *re return 0; } char* icalrestriction_may_be_tent_conf_cancel( - const icalrestriction_property_record *rec, + icalrestriction_property_record *rec, icalcomponent* comp, icalproperty* prop) { @@ -184,7 +184,7 @@ char* icalrestriction_may_be_tent_conf_cancel( } char* icalrestriction_must_be_cancel_if_present( - const icalrestriction_property_record *rec, + icalrestriction_property_record *rec, icalcomponent* comp, icalproperty* prop) { @@ -202,7 +202,7 @@ char* icalrestriction_must_be_cancel_if_present( } char* icalrestriction_must_be_canceled_no_attendee( - const icalrestriction_property_record *rec, + icalrestriction_property_record *rec, icalcomponent* comp, icalproperty* prop) { @@ -212,55 +212,55 @@ char* icalrestriction_must_be_canceled_no_attendee( return 0; } -char* icalrestriction_must_be_recurring(const icalrestriction_property_record *rec, +char* icalrestriction_must_be_recurring(icalrestriction_property_record *rec, icalcomponent* comp, icalproperty* prop){ /* Hack */ return 0; } -char* icalrestriction_must_have_duration(const icalrestriction_property_record *rec, +char* icalrestriction_must_have_duration(icalrestriction_property_record *rec, icalcomponent* comp, icalproperty* prop){ if( !icalcomponent_get_first_property(comp,ICAL_DURATION_PROPERTY)){ - return "Failed iTIP restrictions for DURATION property. This component must have a DURATION property"; + return "Failed iTIP restrictions. This component must have a DURATION property"; } return 0; } -char* icalrestriction_must_have_repeat(const icalrestriction_property_record *rec, +char* icalrestriction_must_have_repeat(icalrestriction_property_record *rec, icalcomponent* comp, icalproperty* prop){ if( !icalcomponent_get_first_property(comp,ICAL_REPEAT_PROPERTY)){ - return "Failed iTIP restrictions for REPEAT property. This component must have a REPEAT property"; + return "Failed iTIP restrictions. This component must have a REPEAT property"; } return 0; } -char* icalrestriction_must_if_tz_ref(const icalrestriction_property_record *rec, +char* icalrestriction_must_if_tz_ref(icalrestriction_property_record *rec, icalcomponent* comp, icalproperty* prop){ /* Hack */ return 0; } -char* icalrestriction_no_dtend(const icalrestriction_property_record *rec, +char* icalrestriction_no_dtend(icalrestriction_property_record *rec, icalcomponent* comp, icalproperty* prop){ - if( !icalcomponent_get_first_property(comp,ICAL_DTEND_PROPERTY)){ + if( icalcomponent_get_first_property(comp,ICAL_DTEND_PROPERTY)){ - return "Failed iTIP restrictions for DTEND property. The component must not have both DURATION and DTEND"; + return "Failed iTIP restrictions. The component must not have both DURATION and DTEND"; } return 0; } -char* icalrestriction_no_duration(const icalrestriction_property_record *rec, +char* icalrestriction_no_duration(icalrestriction_property_record *rec, icalcomponent* comp, icalproperty* prop){ @@ -268,7 +268,7 @@ char* icalrestriction_no_duration(const icalrestriction_property_record *rec, return 0; } char* icalrestriction_must_be_email( - const icalrestriction_property_record *rec, + icalrestriction_property_record *rec, icalcomponent* comp, icalproperty* prop) { @@ -289,8 +289,8 @@ int icalrestriction_check_component(icalproperty_method method, icalproperty_kind kind; icalcomponent_kind comp_kind; icalrestriction_kind restr; - const icalrestriction_property_record *prop_record; - const char* funcr = 0; + icalrestriction_property_record *prop_record; + char* funcr = 0; icalproperty *prop; int count; @@ -419,7 +419,7 @@ int icalrestriction_check(icalcomponent* outer_comp) } -static const icalrestriction_property_record* +icalrestriction_property_record* icalrestriction_get_property_restriction(icalproperty_method method, icalcomponent_kind component, icalproperty_kind property) @@ -441,7 +441,7 @@ icalrestriction_get_property_restriction(icalproperty_method method, } -static const icalrestriction_component_record* +icalrestriction_component_record* icalrestriction_get_component_restriction(icalproperty_method method, icalcomponent_kind component, icalcomponent_kind subcomponent) diff --git a/mozilla/calendar/libical/src/libical/icalrestriction.h b/mozilla/calendar/libical/src/libical/icalrestriction.h index c821e082c88..8016d4b0908 100644 --- a/mozilla/calendar/libical/src/libical/icalrestriction.h +++ b/mozilla/calendar/libical/src/libical/icalrestriction.h @@ -3,7 +3,7 @@ FILE: icalrestriction.h CREATOR: eric 24 April 1999 - $Id: icalrestriction.h,v 1.2 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalrestriction.h,v 1.1.1.1 2001/01/02 07:33:02 ebusboom Exp $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libical/icaltimezone.h b/mozilla/calendar/libical/src/libical/icaltimezone.h index c17b9dc7d1c..d89004b2f89 100644 --- a/mozilla/calendar/libical/src/libical/icaltimezone.h +++ b/mozilla/calendar/libical/src/libical/icaltimezone.h @@ -4,7 +4,7 @@ CREATOR: Damon Chaplin 15 March 2001 - $Id: icaltimezone.h,v 1.12 2007/12/01 11:14:00 dothebart Exp $ + $Id: icaltimezone.h,v 1.10 2002/11/03 23:51:55 acampi Exp $ $Locker: $ (C) COPYRIGHT 2001, Damon Chaplin @@ -153,7 +153,6 @@ void set_zone_directory(char *path); /** Free memory dedicated to the zonefile directory */ void free_zone_directory(void); -void icaltimezone_release_zone_tab(void); /* * @par Debugging Output. diff --git a/mozilla/calendar/libical/src/libical/icaltypes.c b/mozilla/calendar/libical/src/libical/icaltypes.c index dc165cfa155..779c3fce1ba 100644 --- a/mozilla/calendar/libical/src/libical/icaltypes.c +++ b/mozilla/calendar/libical/src/libical/icaltypes.c @@ -3,7 +3,7 @@ FILE: icaltypes.c CREATOR: eric 16 May 1999 - $Id: icaltypes.c,v 1.16 2007/04/30 13:57:48 artcancro Exp $ + $Id: icaltypes.c,v 1.15 2002/10/30 23:59:57 acampi Exp $ $Locker: $ diff --git a/mozilla/calendar/libical/src/libical/icalvalueimpl.h b/mozilla/calendar/libical/src/libical/icalvalueimpl.h index 94ad29e077a..3f7f77648ef 100644 --- a/mozilla/calendar/libical/src/libical/icalvalueimpl.h +++ b/mozilla/calendar/libical/src/libical/icalvalueimpl.h @@ -3,7 +3,7 @@ FILE: icalvalue.c CREATOR: eric 02 May 1999 - $Id: icalvalueimpl.h,v 1.6 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalvalueimpl.h,v 1.5 2002/05/28 14:08:00 acampi Exp $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libical/sspm.c b/mozilla/calendar/libical/src/libical/sspm.c index aae2a559b21..77ad7052569 100644 --- a/mozilla/calendar/libical/src/libical/sspm.c +++ b/mozilla/calendar/libical/src/libical/sspm.c @@ -3,7 +3,7 @@ FILE: sspm.c Parse Mime CREATOR: eric 25 June 2000 - $Id: sspm.c,v 1.11 2007/08/21 02:45:54 artcancro Exp $ + $Id: sspm.c,v 1.9 2005/01/24 13:15:19 acampi Exp $ $Locker: $ The contents of this file are subject to the Mozilla Public License @@ -69,7 +69,7 @@ struct mime_impl{ size_t max_parts; int part_no; int level; - const struct sspm_action_map *actions; + struct sspm_action_map *actions; char* (*get_string)(char *s, size_t size, void* data); void* get_string_data; char temp[TMP_BUF_SIZE]; @@ -424,17 +424,19 @@ static struct sspm_action_map get_action(struct mime_impl *impl, char* sspm_lowercase(char* str) { char* p = 0; - char* new = sspm_strdup(str); + char* ret; if(str ==0){ return 0; } - for(p = new; *p!=0; p++){ + ret = sspm_strdup(str); + + for(p = ret; *p!=0; p++){ *p = tolower(*p); } - return new; + return ret; } enum sspm_major_type sspm_find_major_content_type(char* type) @@ -531,7 +533,7 @@ void sspm_build_header(struct sspm_header *header, char* line) val = sspm_strdup(sspm_value(line)); prop = sspm_strdup(sspm_property_name(line)); - if(strcasecmp(prop,"Content-Type") == 0){ + if(strcmp(prop,"Content-Type") == 0){ /* Create a new mime_header, fill in content-type and possibly boundary */ @@ -558,19 +560,19 @@ void sspm_build_header(struct sspm_header *header, char* line) header->boundary = sspm_strdup(boundary); } - } else if(strcasecmp(prop,"Content-Transfer-Encoding")==0){ + } else if(strcmp(prop,"Content-Transfer-Encoding")==0){ char* encoding = sspm_value(line); char* lencoding = sspm_lowercase(encoding); - if(strcasecmp(lencoding,"base64")==0){ + if(strcmp(lencoding,"base64")==0){ header->encoding = SSPM_BASE64_ENCODING; - } else if(strcasecmp(lencoding,"quoted-printable")==0){ + } else if(strcmp(lencoding,"quoted-printable")==0){ header->encoding = SSPM_QUOTED_PRINTABLE_ENCODING; - } else if(strcasecmp(lencoding,"binary")==0){ + } else if(strcmp(lencoding,"binary")==0){ header->encoding = SSPM_BINARY_ENCODING; - } else if(strcasecmp(lencoding,"7bit")==0){ + } else if(strcmp(lencoding,"7bit")==0){ header->encoding = SSPM_7BIT_ENCODING; - } else if(strcasecmp(lencoding,"8bit")==0){ + } else if(strcmp(lencoding,"8bit")==0){ header->encoding = SSPM_8BIT_ENCODING; } else { header->encoding = SSPM_UNKNOWN_ENCODING; @@ -581,7 +583,7 @@ void sspm_build_header(struct sspm_header *header, char* line) header->def = 0; - } else if(strcasecmp(prop,"Content-Id")==0){ + } else if(strcmp(prop,"Content-Id")==0){ char* cid = sspm_value(line); header->content_id = sspm_strdup(cid); header->def = 0; @@ -953,9 +955,9 @@ void sspm_read_header(struct mime_impl *impl,struct sspm_header *header) assert(strlen(buf) < BUF_SIZE); - strncpy(header_lines[current_line],buf,BUF_SIZE); + strncpy(header_lines[current_line],buf,BUF_SIZE-1); header_lines[current_line][BUF_SIZE-1] = '\0'; - + break; } @@ -989,8 +991,8 @@ void sspm_read_header(struct mime_impl *impl,struct sspm_header *header) assert( strlen(buf_start) + strlen(last_line) < BUF_SIZE); - strncat(last_line,buf_start, BUF_SIZE-strlen(last_line)-1); - + strncat(last_line,buf_start,BUF_SIZE-strlen(last_line)-1); + break; } @@ -1015,7 +1017,7 @@ void sspm_read_header(struct mime_impl *impl,struct sspm_header *header) /* Root routine for parsing mime entries*/ int sspm_parse_mime(struct sspm_part *parts, size_t max_parts, - const struct sspm_action_map *actions, + struct sspm_action_map *actions, char* (*get_string)(char *s, size_t size, void* data), void *get_string_data, struct sspm_header *first_header @@ -1169,7 +1171,7 @@ char *decode_base64(char *dest, char *src, size_t *size) { - int cc; + int cc = 0; char buf[4] = {0,0,0,0}; int p = 0; int valid_data = 0; diff --git a/mozilla/calendar/libical/src/libical/sspm.h b/mozilla/calendar/libical/src/libical/sspm.h index 989454867f0..481f9fb3b2e 100644 --- a/mozilla/calendar/libical/src/libical/sspm.h +++ b/mozilla/calendar/libical/src/libical/sspm.h @@ -3,7 +3,7 @@ FILE: sspm.h Mime Parser CREATOR: eric 25 June 2000 - $Id: sspm.h,v 1.4 2007/08/21 02:45:54 artcancro Exp $ + $Id: sspm.h,v 1.2 2001/01/23 07:03:17 ebusboom Exp $ $Locker: $ The contents of this file are subject to the Mozilla Public License @@ -121,7 +121,7 @@ char* sspm_encoding_string(enum sspm_encoding type); int sspm_parse_mime(struct sspm_part *parts, size_t max_parts, - const struct sspm_action_map *actions, + struct sspm_action_map *actions, char* (*get_string)(char *s, size_t size, void* data), void *get_string_data, struct sspm_header *first_header diff --git a/mozilla/calendar/libical/src/libicalss/Makefile.am b/mozilla/calendar/libical/src/libicalss/Makefile.am index d197bf9ae66..664de599cfd 100644 --- a/mozilla/calendar/libical/src/libicalss/Makefile.am +++ b/mozilla/calendar/libical/src/libicalss/Makefile.am @@ -2,7 +2,7 @@ # FILE: Makefile.am # CREATOR: eric # -# $Id: Makefile.am,v 1.22 2007/04/30 13:57:48 artcancro Exp $ +# $Id: Makefile.am,v 1.21 2002/11/05 14:59:22 acampi Exp $ # # # (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org @@ -46,8 +46,13 @@ BDB_SOURCEFILES= BDB_HEADERFILES= endif +if WITH_CXX +cxx_lib=libicalss_cxx.la +cxx_headers=icalspanlist_cxx.h +else cxx_lib= cxx_headers= +endif lib_LTLIBRARIES = libicalss.la $(cxx_lib) @@ -58,7 +63,7 @@ INCLUDES = \ -I$(top_builddir)/libical \ $(BDB_INCLUDE) -libicalss_la_LDFLAGS = -version-info 27:6:27 +libicalss_la_LDFLAGS = -version-info 0:0:0 libicalss_la_LIBADD = $(BDB_LIBFILES) if DEV @@ -124,7 +129,20 @@ icalss.h: $(COMBINEDHEADERS) echo '};' >> icalss.h echo '#endif' >> icalss.h -libicalssinclude_HEADERS = icalss.h icalcalendar.h icalclassify.h icalcluster.h icaldirset.h icaldirsetimpl.h icalfileset.h icalfilesetimpl.h icalgauge.h icalgaugeimpl.h icalmessage.h icalset.h icalspanlist.h icalssyacc.h $(libicalssinclude_BDBHEADERS) + +if WITH_CXX +libicalss_cxx_la_SOURCES = \ + $(libicalss_la_SOURCES) \ + icalspanlist_cxx.h \ + icalspanlist_cxx.cpp + +# c++ needs ical.h auto-generated. +icalspanlist_cxx.lo: icalss.h + +endif + + +libicalssinclude_HEADERS = icalss.h icalcalendar.h icalclassify.h icalcluster.h icaldirset.h icaldirsetimpl.h icalfileset.h icalfilesetimpl.h icalgauge.h icalgaugeimpl.h icalmessage.h icalset.h icalspanlist.h icalssyacc.h $(libicalssinclude_BDBHEADERS) $(cxx_headers) CONFIG_CLEAN_FILES = y.output diff --git a/mozilla/calendar/libical/src/libicalss/icalcalendar.c b/mozilla/calendar/libical/src/libicalss/icalcalendar.c index e25c6f502b7..c0fe47fedb1 100644 --- a/mozilla/calendar/libical/src/libicalss/icalcalendar.c +++ b/mozilla/calendar/libical/src/libicalss/icalcalendar.c @@ -2,7 +2,7 @@ FILE: icalcalendar.c CREATOR: eric 23 December 1999 - $Id: icalcalendar.c,v 1.7 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalcalendar.c,v 1.6 2002/08/07 17:09:06 acampi Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libicalss/icalcalendar.h b/mozilla/calendar/libical/src/libicalss/icalcalendar.h index 3ab71666d01..256d11aa32f 100644 --- a/mozilla/calendar/libical/src/libicalss/icalcalendar.h +++ b/mozilla/calendar/libical/src/libicalss/icalcalendar.h @@ -4,7 +4,7 @@ CREATOR: eric 23 December 1999 - $Id: icalcalendar.h,v 1.3 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalcalendar.h,v 1.2 2002/06/27 02:30:58 acampi Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libicalss/icalclassify.c b/mozilla/calendar/libical/src/libicalss/icalclassify.c index 34446965ccc..ef06ffd57c7 100644 --- a/mozilla/calendar/libical/src/libicalss/icalclassify.c +++ b/mozilla/calendar/libical/src/libicalss/icalclassify.c @@ -3,7 +3,7 @@ FILE: icalclassify.c CREATOR: ebusboom 23 aug 2000 - $Id: icalclassify.c,v 1.17 2007/05/25 02:57:04 artcancro Exp $ + $Id: icalclassify.c,v 1.14 2003/11/17 22:51:53 gray-john Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org @@ -53,18 +53,19 @@ struct icalclassify_parts { char* icalclassify_lowercase(const char* str) { char* p = 0; - char *xnew; + char* ret; if(str ==0){ return 0; } - xnew = icalmemory_strdup(str); - for(p = xnew; *p!=0; p++){ + ret = icalmemory_strdup(str); + + for(p = ret; *p!=0; p++){ *p = tolower(*p); } - return xnew; + return ret; } /* Return a set of components that intersect in time with comp. For @@ -147,11 +148,9 @@ icalproperty* icalclassify_find_attendee(icalcomponent *c, p != 0; p = icalcomponent_get_next_property(inner,ICAL_ATTENDEE_PROPERTY)) { - char* this_upn; char* this_attendee = icalclassify_lowercase(icalproperty_get_attendee(p)); - if ( !this_attendee ) continue; - this_upn = strchr(this_attendee,':'); + char* this_upn = strchr(this_attendee,':'); if(this_upn == 0){ continue; @@ -249,16 +248,15 @@ void icalssutil_get_parts(icalcomponent* c, p = icalcomponent_get_first_property(inner,ICAL_ATTENDEE_PROPERTY); if(p!=0){ - char *attendee = 0; + param = icalproperty_get_first_parameter(p,ICAL_PARTSTAT_PARAMETER); if(param != 0){ parts->reply_partstat = icalparameter_get_partstat(param); } - attendee = icalproperty_get_attendee(p); - if ( attendee ) - parts->reply_attendee = strdup( attendee ); + + parts->reply_attendee = strdup(icalproperty_get_attendee(p)); } } @@ -646,7 +644,7 @@ int icalclassify_delinecounter( icalclassify_post } -static const struct icalclassify_map { +struct icalclassify_map { icalproperty_method method; int (*fn)(struct icalclassify_parts *comp,struct icalclassify_parts *match, const char* user); icalproperty_xlicclass class; diff --git a/mozilla/calendar/libical/src/libicalss/icalclassify.h b/mozilla/calendar/libical/src/libicalss/icalclassify.h index 799ed464e64..81df27dc80b 100644 --- a/mozilla/calendar/libical/src/libicalss/icalclassify.h +++ b/mozilla/calendar/libical/src/libicalss/icalclassify.h @@ -4,7 +4,7 @@ CREATOR: eric 21 Aug 2000 - $Id: icalclassify.h,v 1.5 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalclassify.h,v 1.4 2001/04/12 18:33:36 ebusboom Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libicalss/icalcluster.c b/mozilla/calendar/libical/src/libicalss/icalcluster.c index 9727a661beb..0cc89054a86 100644 --- a/mozilla/calendar/libical/src/libicalss/icalcluster.c +++ b/mozilla/calendar/libical/src/libicalss/icalcluster.c @@ -3,7 +3,7 @@ FILE: icalcluster.c CREATOR: acampi 13 March 2002 - $Id: icalcluster.c,v 1.4 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalcluster.c,v 1.3 2002/06/28 10:15:39 acampi Exp $ $Locker: $ (C) COPYRIGHT 2002, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libicalss/icalcluster.h b/mozilla/calendar/libical/src/libicalss/icalcluster.h index e3fdacd0b4d..c8a6fef2be5 100644 --- a/mozilla/calendar/libical/src/libicalss/icalcluster.h +++ b/mozilla/calendar/libical/src/libicalss/icalcluster.h @@ -4,7 +4,7 @@ CREATOR: eric 23 December 1999 - $Id: icalcluster.h,v 1.3 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalcluster.h,v 1.2 2002/06/27 02:30:58 acampi Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libicalss/icalclusterimpl.h b/mozilla/calendar/libical/src/libicalss/icalclusterimpl.h index 2e4214b9495..08592a726e6 100644 --- a/mozilla/calendar/libical/src/libicalss/icalclusterimpl.h +++ b/mozilla/calendar/libical/src/libicalss/icalclusterimpl.h @@ -3,7 +3,7 @@ FILE: icalfilesetimpl.h CREATOR: eric 23 December 1999 - $Id: icalclusterimpl.h,v 1.2 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalclusterimpl.h,v 1.1 2002/05/29 12:38:31 acampi Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libicalss/icaldirset.c b/mozilla/calendar/libical/src/libicalss/icaldirset.c index dcbac659ccd..2f321788e5d 100644 --- a/mozilla/calendar/libical/src/libicalss/icaldirset.c +++ b/mozilla/calendar/libical/src/libicalss/icaldirset.c @@ -3,7 +3,7 @@ FILE: icaldirset.c CREATOR: eric 28 November 1999 - $Id: icaldirset.c,v 1.23 2007/04/30 13:57:48 artcancro Exp $ + $Id: icaldirset.c,v 1.22 2005/01/24 14:00:39 acampi Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org @@ -34,7 +34,7 @@ icaldirset groups components in to clusters based on their DTSTAMP time -- all components that start in the same month are grouped - together in a single file. All files in a sotre are kept in a single + together in a single file. All files in a store are kept in a single directory. The primary interfaces are icaldirset__get_first_component and diff --git a/mozilla/calendar/libical/src/libicalss/icaldirset.h b/mozilla/calendar/libical/src/libicalss/icaldirset.h index 6796d595c1c..39de8a27462 100644 --- a/mozilla/calendar/libical/src/libicalss/icaldirset.h +++ b/mozilla/calendar/libical/src/libicalss/icaldirset.h @@ -4,7 +4,7 @@ CREATOR: eric 28 November 1999 - $Id: icaldirset.h,v 1.7 2007/04/30 13:57:48 artcancro Exp $ + $Id: icaldirset.h,v 1.6 2002/06/27 02:30:58 acampi Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libicalss/icaldirsetimpl.h b/mozilla/calendar/libical/src/libicalss/icaldirsetimpl.h index 4c4574ca258..f1c380ac8cf 100644 --- a/mozilla/calendar/libical/src/libicalss/icaldirsetimpl.h +++ b/mozilla/calendar/libical/src/libicalss/icaldirsetimpl.h @@ -3,7 +3,7 @@ FILE: icaldirsetimpl.h CREATOR: eric 21 Aug 2000 - $Id: icaldirsetimpl.h,v 1.5 2007/04/30 13:57:48 artcancro Exp $ + $Id: icaldirsetimpl.h,v 1.4 2002/06/27 02:30:58 acampi Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libicalss/icalfileset.c b/mozilla/calendar/libical/src/libicalss/icalfileset.c index 22d6e9bc6e6..cc0f607ce53 100644 --- a/mozilla/calendar/libical/src/libicalss/icalfileset.c +++ b/mozilla/calendar/libical/src/libicalss/icalfileset.c @@ -3,7 +3,7 @@ FILE: icalfileset.c CREATOR: eric 23 December 1999 - $Id: icalfileset.c,v 1.34 2007/05/31 21:26:15 artcancro Exp $ + $Id: icalfileset.c,v 1.32 2004/09/22 07:26:18 acampi Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org @@ -59,7 +59,7 @@ extern int errno; /** Default options used when NULL is passed to icalset_new() **/ -icalfileset_options icalfileset_options_default = {O_RDWR|O_CREAT, 0644, 0, 0}; +icalfileset_options icalfileset_options_default = {O_RDWR|O_CREAT, 0644, 0}; int icalfileset_lock(icalfileset *set); int icalfileset_unlock(icalfileset *set); @@ -117,7 +117,7 @@ icalset* icalfileset_init(icalset *set, const char* path, void* options_in) #ifndef WIN32 fset->fd = open(fset->path, flags, mode); #else - fset->fd = open(fset->path, flags, mode); + fset->fd = open(fset->path, flags | O_BINARY, mode); /* fset->fd = sopen(fset->path,flags, _SH_DENYWR, _S_IREAD | _S_IWRITE); */ #endif @@ -180,13 +180,13 @@ icalcluster* icalfileset_produce_icalcluster(const char *path) { char* icalfileset_read_from_file(char *s, size_t size, void *d) { char* p = s; - icalfileset *set = d; + int fd = (int)d; /* Simulate fgets -- read single characters and stop at '\n' */ for(p=s; pfd,p,1) != 1 || *p=='\n'){ + if(read(fd,p,1) != 1 || *p=='\n'){ p++; break; } @@ -209,7 +209,7 @@ icalerrorenum icalfileset_read_file(icalfileset* set,mode_t mode) parser = icalparser_new(); - icalparser_set_gen_data(parser, set); + icalparser_set_gen_data(parser,(void*)set->fd); set->cluster = icalparser_parse(parser,icalfileset_read_from_file); icalparser_free(parser); @@ -333,34 +333,10 @@ int icalfileset_unlock(icalfileset *set) return (fcntl(set->fd, F_UNLCK, &lock)); #else - return 0; + return 0; #endif } -static char * shell_quote(const char *s) -{ - char *result; - char *p; - p = result = malloc(strlen(s)*5+1); - while(*s) - { - if (*s == '\'') - { - *p++ = '\''; - *p++ = '"'; - *p++ = *s++; - *p++ = '"'; - *p++ = '\''; - } - else - { - *p++ = *s++; - } - } - *p = '\0'; - return result; -} - icalerrorenum icalfileset_commit(icalset* set) { char tmp[ICAL_PATH_MAX]; @@ -378,21 +354,6 @@ icalerrorenum icalfileset_commit(icalset* set) return ICAL_NO_ERROR; } - if (fset->options.safe_saves == 1) { -#ifndef WIN32 - char *quoted_file = shell_quote(fset->path); - snprintf(tmp,ICAL_PATH_MAX,"cp '%s' '%s.bak'",fset->path, fset->path); - free(quoted_file); -#else - snprintf(tmp,ICAL_PATH_MAX,"copy %s %s.bak", fset->path, fset->path); -#endif - - if(system(tmp) < 0){ - icalerror_set_errno(ICAL_FILE_ERROR); - return ICAL_FILE_ERROR; - } - } - if(lseek(fset->fd, 0, SEEK_SET) < 0){ icalerror_set_errno(ICAL_FILE_ERROR); return ICAL_FILE_ERROR; diff --git a/mozilla/calendar/libical/src/libicalss/icalfileset.h b/mozilla/calendar/libical/src/libicalss/icalfileset.h index ad7f944524a..1deca47c49a 100644 --- a/mozilla/calendar/libical/src/libicalss/icalfileset.h +++ b/mozilla/calendar/libical/src/libicalss/icalfileset.h @@ -4,7 +4,7 @@ CREATOR: eric 23 December 1999 - $Id: icalfileset.h,v 1.14 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalfileset.h,v 1.13 2002/12/05 13:45:20 acampi Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org @@ -41,8 +41,6 @@ #define mode_t int #endif -extern int icalfileset_safe_saves; - typedef struct icalfileset_impl icalfileset; icalset* icalfileset_new(const char* path); @@ -122,7 +120,6 @@ icalcomponent* icalfileset_get_component(icalset* cluster); typedef struct icalfileset_options { int flags; /**< flags for open() O_RDONLY, etc */ mode_t mode; /**< file mode */ - int safe_saves; /**< to lock or not */ icalcluster *cluster; /**< use this cluster to initialize data */ } icalfileset_options; diff --git a/mozilla/calendar/libical/src/libicalss/icalfilesetimpl.h b/mozilla/calendar/libical/src/libicalss/icalfilesetimpl.h index 5ff9662fe35..9fac8ad3728 100644 --- a/mozilla/calendar/libical/src/libicalss/icalfilesetimpl.h +++ b/mozilla/calendar/libical/src/libicalss/icalfilesetimpl.h @@ -3,7 +3,7 @@ FILE: icalfilesetimpl.h CREATOR: eric 23 December 1999 - $Id: icalfilesetimpl.h,v 1.6 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalfilesetimpl.h,v 1.5 2002/06/27 02:30:58 acampi Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libicalss/icalgauge.c b/mozilla/calendar/libical/src/libicalss/icalgauge.c index e0309a50422..2bced9981f5 100644 --- a/mozilla/calendar/libical/src/libicalss/icalgauge.c +++ b/mozilla/calendar/libical/src/libicalss/icalgauge.c @@ -4,7 +4,7 @@ CREATOR: eric 23 December 1999 - $Id: icalgauge.c,v 1.14 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalgauge.c,v 1.13 2002/09/26 22:26:06 lindner Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libicalss/icalgauge.h b/mozilla/calendar/libical/src/libicalss/icalgauge.h index 5c51b23c306..a698360d0cf 100644 --- a/mozilla/calendar/libical/src/libicalss/icalgauge.h +++ b/mozilla/calendar/libical/src/libicalss/icalgauge.h @@ -4,7 +4,7 @@ CREATOR: eric 23 December 1999 - $Id: icalgauge.h,v 1.5 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalgauge.h,v 1.4 2002/06/27 02:30:59 acampi Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libicalss/icalgaugeimpl.h b/mozilla/calendar/libical/src/libicalss/icalgaugeimpl.h index b9b6f04c1a7..40dcf9b7ae6 100644 --- a/mozilla/calendar/libical/src/libicalss/icalgaugeimpl.h +++ b/mozilla/calendar/libical/src/libicalss/icalgaugeimpl.h @@ -4,7 +4,7 @@ CREATOR: eric 09 Aug 2000 - $Id: icalgaugeimpl.h,v 1.7 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalgaugeimpl.h,v 1.6 2002/07/21 17:18:15 lindner Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libicalss/icalmessage.c b/mozilla/calendar/libical/src/libicalss/icalmessage.c index 76e253353f1..83c149a5683 100644 --- a/mozilla/calendar/libical/src/libicalss/icalmessage.c +++ b/mozilla/calendar/libical/src/libicalss/icalmessage.c @@ -3,7 +3,7 @@ FILE: icalmessage.c CREATOR: ebusboom 07 Nov 2000 - $Id: icalmessage.c,v 1.8 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalmessage.c,v 1.7 2005/01/24 14:02:20 acampi Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org @@ -115,7 +115,7 @@ icalcomponent *icalmessage_new_reply_base(icalcomponent* c, const char* msg) { icalproperty *attendee; - char tmp[45]; + char tmp[1024]; icalcomponent *reply = icalcomponent_vanew( ICAL_VCALENDAR_COMPONENT, diff --git a/mozilla/calendar/libical/src/libicalss/icalmessage.h b/mozilla/calendar/libical/src/libicalss/icalmessage.h index e36816e1c8e..d13db05fd12 100644 --- a/mozilla/calendar/libical/src/libicalss/icalmessage.h +++ b/mozilla/calendar/libical/src/libicalss/icalmessage.h @@ -4,7 +4,7 @@ CREATOR: eric 07 Nov 2000 - $Id: icalmessage.h,v 1.2 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalmessage.h,v 1.1.1.1 2001/01/02 07:33:05 ebusboom Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libicalss/icalset.c b/mozilla/calendar/libical/src/libicalss/icalset.c index 3dcebba1950..8f7acd621e4 100644 --- a/mozilla/calendar/libical/src/libicalss/icalset.c +++ b/mozilla/calendar/libical/src/libicalss/icalset.c @@ -12,7 +12,7 @@ icalheapset Store components on the heap icalmysqlset Store components in a mysql database. - $Id: icalset.c,v 1.17 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalset.c,v 1.16 2002/07/21 17:00:26 lindner Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libicalss/icalset.h b/mozilla/calendar/libical/src/libicalss/icalset.h index c0019206f02..47c5aa57326 100644 --- a/mozilla/calendar/libical/src/libicalss/icalset.h +++ b/mozilla/calendar/libical/src/libicalss/icalset.h @@ -14,7 +14,7 @@ **/ /* - $Id: icalset.h,v 1.14 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalset.h,v 1.13 2002/09/26 22:25:12 lindner Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libicalss/icalspanlist.c b/mozilla/calendar/libical/src/libicalss/icalspanlist.c index 46f27f033d2..cc9bdd7389d 100644 --- a/mozilla/calendar/libical/src/libicalss/icalspanlist.c +++ b/mozilla/calendar/libical/src/libicalss/icalspanlist.c @@ -3,7 +3,7 @@ FILE: icalspanlist.c CREATOR: ebusboom 23 aug 2000 - $Id: icalspanlist.c,v 1.14 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalspanlist.c,v 1.13 2002/10/30 23:41:47 acampi Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libicalss/icalspanlist.h b/mozilla/calendar/libical/src/libicalss/icalspanlist.h index 55b0e27ac02..1d0c4b84872 100644 --- a/mozilla/calendar/libical/src/libicalss/icalspanlist.h +++ b/mozilla/calendar/libical/src/libicalss/icalspanlist.h @@ -4,7 +4,7 @@ CREATOR: eric 21 Aug 2000 - $Id: icalspanlist.h,v 1.7 2007/04/30 13:57:48 artcancro Exp $ + $Id: icalspanlist.h,v 1.6 2002/06/28 10:15:39 acampi Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/libicalss/icalsslexer.c b/mozilla/calendar/libical/src/libicalss/icalsslexer.c index dd566bdcb12..e009d06f347 100644 --- a/mozilla/calendar/libical/src/libicalss/icalsslexer.c +++ b/mozilla/calendar/libical/src/libicalss/icalsslexer.c @@ -1,93 +1,70 @@ +#define YY_REENTRANT 1 +#define YY_TEXT_IS_ARRAY +#define YY_REENTRANT_BISON_PURE 1 +#ifndef YY_REENTRANT +#define yytext sstext +#define yyleng ssleng +#define yyin ssin +#define yyout ssout +#endif +#define yy_create_buffer ss_create_buffer +#define yy_delete_buffer ss_delete_buffer +#define yy_scan_buffer ss_scan_buffer +#define yy_scan_string ss_scan_string +#define yy_scan_bytes ss_scan_bytes +#define yy_flex_debug ss_flex_debug +#define yy_init_buffer ss_init_buffer +#define yy_flush_buffer ss_flush_buffer +#define yy_load_buffer_state ss_load_buffer_state +#define yy_switch_to_buffer ss_switch_to_buffer +#define yylex sslex +#define yyrestart ssrestart +#define yylex_init sslex_init +#define yylex_destroy sslex_destroy +#define yyget_extra ssget_extra +#define yyset_extra ssset_extra +#define yyget_in ssget_in +#define yyset_in ssset_in +#define yyget_out ssget_out +#define yyset_out ssset_out +#define yyget_leng ssget_leng +#define yyget_text ssget_text +#define yyget_lineno ssget_lineno +#define yyset_lineno ssset_lineno +#ifdef YY_REENTRANT_BISON_PURE +#define yyget_lval ssget_lval +#define yyset_lval ssset_lval +#ifdef YYLTYPE +#define yyget_lloc ssget_lloc +#define yyset_lloc ssset_lloc +#endif +#endif +#define yywrap sswrap -#line 3 "icalsslexer.c" - -#define YY_INT_ALIGNED short int - +/* -*-C-*- */ /* A lexical scanner generated by flex */ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 33 -#if YY_FLEX_SUBMINOR_VERSION > 0 -#define FLEX_BETA -#endif - -/* First, we deal with platform-specific or compiler-specific issues. */ +/* %- */ /* begin standard C headers. */ #include -#include #include #include - /* end standard C headers. */ - -/* flex integer type definitions */ - -#ifndef FLEXINT_H -#define FLEXINT_H - -/* C99 systems have . Non-C99 systems may or may not. */ - -#if __STDC_VERSION__ >= 199901L - -/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. - */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS 1 -#endif - -#include -typedef int8_t flex_int8_t; -typedef uint8_t flex_uint8_t; -typedef int16_t flex_int16_t; -typedef uint16_t flex_uint16_t; -typedef int32_t flex_int32_t; -typedef uint32_t flex_uint32_t; -#else -typedef signed char flex_int8_t; -typedef short int flex_int16_t; -typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; -typedef unsigned short int flex_uint16_t; -typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ - -/* Limits of integral types. */ -#ifndef INT8_MIN -#define INT8_MIN (-128) -#endif -#ifndef INT16_MIN -#define INT16_MIN (-32767-1) -#endif -#ifndef INT32_MIN -#define INT32_MIN (-2147483647-1) -#endif -#ifndef INT8_MAX -#define INT8_MAX (127) -#endif -#ifndef INT16_MAX -#define INT16_MAX (32767) -#endif -#ifndef INT32_MAX -#define INT32_MAX (2147483647) -#endif -#ifndef UINT8_MAX -#define UINT8_MAX (255U) -#endif -#ifndef UINT16_MAX -#define UINT16_MAX (65535U) -#endif -#ifndef UINT32_MAX -#define UINT32_MAX (4294967295U) -#endif - -#endif /* ! FLEXINT_H */ +/* %+ */ +/* %* */ #ifdef __cplusplus +/* %+ */ +/* %* */ + +/* Use prototypes in function declarations. */ +#define YY_USE_PROTOS + /* The "const" storage-class-modifier is valid. */ #define YY_USE_CONST @@ -95,6 +72,7 @@ typedef unsigned int flex_uint32_t; #if __STDC__ +#define YY_USE_PROTOS #define YY_USE_CONST #endif /* __STDC__ */ @@ -106,6 +84,13 @@ typedef unsigned int flex_uint32_t; #define yyconst #endif + +#ifdef YY_USE_PROTOS +#define YY_PROTO(proto) proto +#else +#define YY_PROTO(proto) () +#endif + /* Returned upon end-of-file. */ #define YY_NULL 0 @@ -116,66 +101,127 @@ typedef unsigned int flex_uint32_t; */ #define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) + +#ifdef YY_REENTRANT + +/* An opaque pointer. */ +#ifndef YY_TYPEDEF_YY_SCANNER_T +#define YY_TYPEDEF_YY_SCANNER_T +typedef void* yyscan_t; +#endif + +/* For use wherever a Global is accessed or assigned. */ +#define YY_G(var) (((struct yy_globals_t*)yy_globals)->var) + +/* For use in function prototypes to append the additional argument. */ +#ifdef YY_USE_PROTOS +#define YY_LAST_ARG , yyscan_t yy_globals +#define YY_ONLY_ARG yyscan_t yy_globals +#else +#define YY_LAST_ARG , yy_globals +#define YY_ONLY_ARG yy_globals +#define YY_DECL_LAST_ARG yyscan_t yy_globals; +#endif + +/* For use in function calls to pass the additional argument. */ +#define YY_CALL_LAST_ARG , yy_globals +#define YY_CALL_ONLY_ARG yy_globals + +/* For convenience, these vars (plus the bison vars far below) + are macros in the reentrant scanner. */ +#define yyin YY_G(yyin_r) +#define yyout YY_G(yyout_r) +#define yyextra YY_G(yyextra_r) +#define yyleng YY_G(yyleng_r) +#define yytext YY_G(yytext_r) +#define yylineno YY_G(yylineno_r) + +int yylex_init YY_PROTO((yyscan_t* scanner)); +int yylex_destroy YY_PROTO((yyscan_t scanner)); + +#else /* not YY_REENTRANT */ + + /* Define these macros to be no-ops. */ +#define YY_G(var) (var) +#define YY_LAST_ARG +#define YY_ONLY_ARG void +#define YY_CALL_LAST_ARG +#define YY_CALL_ONLY_ARG +#define YY_DECL_LAST_ARG +#endif + /* Enter a start condition. This macro really ought to take a parameter, * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ -#define BEGIN (yy_start) = 1 + 2 * +#define BEGIN YY_G(yy_start) = 1 + 2 * /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ -#define YY_START (((yy_start) - 1) / 2) +#define YY_START ((YY_G(yy_start) - 1) / 2) #define YYSTATE YY_START /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE ssrestart(ssin ) +#define YY_NEW_FILE yyrestart( yyin YY_CALL_LAST_ARG ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ -#ifndef YY_BUF_SIZE #define YY_BUF_SIZE 16384 -#endif -/* The state buf must be large enough to hold one state per character in the main buffer. - */ -#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) #ifndef YY_TYPEDEF_YY_BUFFER_STATE #define YY_TYPEDEF_YY_BUFFER_STATE typedef struct yy_buffer_state *YY_BUFFER_STATE; #endif -extern int ssleng; +#ifndef YY_REENTRANT +extern size_t yyleng; +#endif -extern FILE *ssin, *ssout; +/* %- */ +#ifndef YY_REENTRANT +extern FILE *yyin, *yyout; +#endif +/* %* */ #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - #define YY_LESS_LINENO(n) - -/* Return all but the first "n" matched characters back to the input stream. */ +/* The funky do-while in the following #define is used to turn the definition + * int a single C statement (which needs a semi-colon terminator). This + * avoids problems with code like: + * + * if ( condition_holds ) + * yyless( 5 ); + * else + * do_something_else(); + * + * Prior to using the do-while the compiler would get upset at the + * "else" because it interpreted the "if" statement as being all + * done when it reached the ';' after the yyless() call. + */ + +/* Return all but the first 'n' matched characters back to the input stream. */ + #define yyless(n) \ do \ { \ - /* Undo effects of setting up sstext. */ \ - int yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - *yy_cp = (yy_hold_char); \ + /* Undo effects of setting up yytext. */ \ + *yy_cp = YY_G(yy_hold_char); \ YY_RESTORE_YY_MORE_OFFSET \ - (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ - YY_DO_BEFORE_ACTION; /* set up sstext again */ \ + YY_G(yy_c_buf_p) = yy_cp = yy_bp + n - YY_MORE_ADJ; \ + YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) -#define unput(c) yyunput( c, (yytext_ptr) ) +#define unput(c) yyunput( c, YY_G(yytext_ptr) YY_CALL_LAST_ARG ) /* The following is because we cannot portably get our hands on size_t * (without autoconf's help, which isn't available because we want @@ -191,7 +237,10 @@ typedef unsigned int yy_size_t; #define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state { +/* %- */ FILE *yy_input_file; +/* %+ */ +/* %* */ char *yy_ch_buf; /* input buffer */ char *yy_buf_pos; /* current position in input buffer */ @@ -225,16 +274,12 @@ struct yy_buffer_state */ int yy_at_bol; - int yy_bs_lineno; /**< The line count. */ - int yy_bs_column; /**< The column count. */ - /* Whether to try to fill the input buffer when we reach the * end of it. */ int yy_fill_buffer; int yy_buffer_status; - #define YY_BUFFER_NEW 0 #define YY_BUFFER_NORMAL 1 /* When an EOF's been seen but there's still some text to process @@ -244,137 +289,150 @@ struct yy_buffer_state * possible backing-up. * * When we actually see the EOF, we change the status to "new" - * (via ssrestart()), so that the user can continue scanning by - * just pointing ssin at a new input file. + * (via yyrestart()), so that the user can continue scanning by + * just pointing yyin at a new input file. */ #define YY_BUFFER_EOF_PENDING 2 - }; #endif /* !YY_STRUCT_YY_BUFFER_STATE */ -/* Stack of input buffers. */ -static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ -static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ -static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ +/* %- Standard (non-C++) definition */ +/* %c */ +#ifndef ssIN_HEADER +#ifndef YY_REENTRANT +static YY_BUFFER_STATE yy_current_buffer = 0; +#endif +/* %e */ +#endif /* !ssIN_HEADER */ +/* %* */ /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general * "scanner state". - * - * Returns the top of the stack, or NULL. */ -#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ - ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ - : NULL) +#define YY_CURRENT_BUFFER yy_current_buffer -/* Same as previous macro, but useful when we know that the buffer stack is not - * NULL or when we need an lvalue. For internal use only. - */ -#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] -/* yy_hold_char holds the character lost when sstext is formed. */ +/* %- Standard (non-C++) definition */ + +#ifndef YY_REENTRANT +/* %c */ +#ifndef ssIN_HEADER +/* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; + static int yy_n_chars; /* number of characters read into yy_ch_buf */ -int ssleng; + + +size_t yyleng; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; -static int yy_init = 0; /* whether we need to initialize */ +static int yy_init = 1; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ -/* Flag which is used to allow sswrap()'s to do buffer switches - * instead of setting up a fresh ssin. A bit of a hack ... +/* Flag which is used to allow yywrap()'s to do buffer switches + * instead of setting up a fresh yyin. A bit of a hack ... */ static int yy_did_buffer_switch_on_eof; +/* %e */ +#endif /* !ssIN_HEADER */ +#endif /* end !YY_REENTRANT */ -void ssrestart (FILE *input_file ); -void ss_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE ss_create_buffer (FILE *file,int size ); -void ss_delete_buffer (YY_BUFFER_STATE b ); -void ss_flush_buffer (YY_BUFFER_STATE b ); -void sspush_buffer_state (YY_BUFFER_STATE new_buffer ); -void sspop_buffer_state (void ); +void yyrestart YY_PROTO(( FILE *input_file YY_LAST_ARG )); -static void ssensure_buffer_stack (void ); -static void ss_load_buffer_state (void ); -static void ss_init_buffer (YY_BUFFER_STATE b,FILE *file ); -#define YY_FLUSH_BUFFER ss_flush_buffer(YY_CURRENT_BUFFER ) +void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer YY_LAST_ARG )); +void yy_load_buffer_state YY_PROTO(( YY_ONLY_ARG )); +YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size YY_LAST_ARG )); +void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b YY_LAST_ARG )); +void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file YY_LAST_ARG )); +void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b YY_LAST_ARG )); -YY_BUFFER_STATE ss_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE ss_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE ss_scan_bytes (yyconst char *bytes,int len ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_G(yy_current_buffer) YY_CALL_LAST_ARG) -void *ssalloc (yy_size_t ); -void *ssrealloc (void *,yy_size_t ); -void ssfree (void * ); +YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size YY_LAST_ARG )); +YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str YY_LAST_ARG )); +YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len YY_LAST_ARG )); -#define yy_new_buffer ss_create_buffer +/* %* */ + +/* %c */ +#ifndef ssIN_HEADER +static void *yy_flex_alloc YY_PROTO(( yy_size_t YY_LAST_ARG )); +static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t YY_LAST_ARG )); +static void yy_flex_free YY_PROTO(( void * YY_LAST_ARG )); +/* %e */ +#endif /* !ssIN_HEADER */ + +#define yy_new_buffer yy_create_buffer #define yy_set_interactive(is_interactive) \ { \ - if ( ! YY_CURRENT_BUFFER ){ \ - ssensure_buffer_stack (); \ - YY_CURRENT_BUFFER_LVALUE = \ - ss_create_buffer(ssin,YY_BUF_SIZE ); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ + if ( ! YY_G(yy_current_buffer) ) \ + YY_G(yy_current_buffer) = \ + yy_create_buffer( yyin, YY_BUF_SIZE YY_CALL_LAST_ARG); \ + YY_G(yy_current_buffer)->yy_is_interactive = is_interactive; \ } #define yy_set_bol(at_bol) \ { \ - if ( ! YY_CURRENT_BUFFER ){\ - ssensure_buffer_stack (); \ - YY_CURRENT_BUFFER_LVALUE = \ - ss_create_buffer(ssin,YY_BUF_SIZE ); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ + if ( ! YY_G(yy_current_buffer) ) \ + YY_G(yy_current_buffer) = \ + yy_create_buffer( yyin, YY_BUF_SIZE YY_CALL_LAST_ARG); \ + YY_G(yy_current_buffer)->yy_at_bol = at_bol; \ } -#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) +#define YY_AT_BOL() (YY_G(yy_current_buffer)->yy_at_bol) +/* %% [1.0] yytext/yyin/yyout/yy_state_type/yylineno etc. def's & init go here */ /* Begin user sect3 */ - +#ifndef ssIN_HEADER typedef unsigned char YY_CHAR; - -FILE *ssin = (FILE *) 0, *ssout = (FILE *) 0; - +#endif /* !ssIN_HEADER */ +#ifndef ssIN_HEADER +#ifndef YY_REENTRANT +FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; +#endif +#endif /* !ssIN_HEADER */ +#ifndef ssIN_HEADER typedef int yy_state_type; +#endif /* !ssIN_HEADER */ -extern int sslineno; - -int sslineno = 1; - -extern char sstext[]; - -static yy_state_type yy_get_previous_state (void ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); -static int yy_get_next_buffer (void ); -static void yy_fatal_error (yyconst char msg[] ); +/* %- Standard (non-C++) definition */ +/* %c */ +#ifndef ssIN_HEADER +static yy_state_type yy_get_previous_state YY_PROTO(( YY_ONLY_ARG )); +static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state YY_LAST_ARG)); +static int yy_get_next_buffer YY_PROTO(( YY_ONLY_ARG )); +static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); +/* %e */ +#endif /* !ssIN_HEADER */ +/* %* */ /* Done after the current pattern has been matched and before the - * corresponding action - sets up sstext. + * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ - (yytext_ptr) = yy_bp; \ - ssleng = (size_t) (yy_cp - yy_bp); \ - (yy_hold_char) = *yy_cp; \ + YY_G(yytext_ptr) = yy_bp; \ +/* %% [2.0] code to fiddle yytext and yyleng for yymore() goes here \ */\ + yyleng = (size_t) (yy_cp - yy_bp); \ + YY_G(yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ - if ( ssleng >= YYLMAX ) \ +/* %% [3.0] code to copy yytext_ptr to yytext[] goes here, if %array \ */\ + if ( yyleng >= YYLMAX ) \ YY_FATAL_ERROR( "token too large, exceeds YYLMAX" ); \ - yy_flex_strncpy( sstext, (yytext_ptr), ssleng + 1 ); \ - (yy_c_buf_p) = yy_cp; + yy_flex_strncpy( yytext, YY_G(yytext_ptr), yyleng + 1 YY_CALL_LAST_ARG); \ + YY_G(yy_c_buf_p) = yy_cp; +/* %* */ + +/* %c */ +#ifndef ssIN_HEADER +/* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */ #define YY_NUM_RULES 23 #define YY_END_OF_BUFFER 24 -/* This struct is not used in this scanner, - but its presence is necessary. */ -struct yy_trans_info - { - flex_int32_t yy_verify; - flex_int32_t yy_nxt; - }; -static yyconst flex_int16_t yy_accept[56] = +static yyconst short int yy_accept[56] = { 0, 0, 0, 0, 0, 0, 0, 24, 22, 18, 18, 22, 17, 21, 4, 19, 8, 5, 9, 21, 21, @@ -384,7 +442,7 @@ static yyconst flex_int16_t yy_accept[56] = 21, 21, 3, 1, 0 } ; -static yyconst flex_int32_t yy_ec[256] = +static yyconst int yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, @@ -416,14 +474,14 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[30] = +static yyconst int yy_meta[30] = { 0, 1, 1, 1, 2, 1, 1, 3, 1, 2, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 } ; -static yyconst flex_int16_t yy_base[58] = +static yyconst short int yy_base[58] = { 0, 0, 0, 0, 0, 0, 0, 68, 69, 28, 31, 55, 0, 0, 69, 69, 54, 53, 52, 40, 37, @@ -433,7 +491,7 @@ static yyconst flex_int16_t yy_base[58] = 28, 17, 0, 0, 69, 39, 40 } ; -static yyconst flex_int16_t yy_def[58] = +static yyconst short int yy_def[58] = { 0, 55, 1, 1, 1, 1, 1, 55, 55, 55, 55, 55, 56, 57, 55, 55, 55, 55, 55, 57, 57, @@ -443,7 +501,7 @@ static yyconst flex_int16_t yy_def[58] = 57, 57, 57, 57, 0, 55, 55 } ; -static yyconst flex_int16_t yy_nxt[99] = +static yyconst short int yy_nxt[99] = { 0, 8, 9, 10, 9, 11, 12, 13, 14, 8, 15, 16, 17, 18, 19, 13, 13, 13, 20, 13, 21, @@ -458,7 +516,7 @@ static yyconst flex_int16_t yy_nxt[99] = } ; -static yyconst flex_int16_t yy_chk[99] = +static yyconst short int yy_chk[99] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -473,12 +531,6 @@ static yyconst flex_int16_t yy_chk[99] = } ; -static yy_state_type yy_last_accepting_state; -static char *yy_last_accepting_cpos; - -extern int ss_flex_debug; -int ss_flex_debug = 0; - /* The intent behind this definition is that it'll catch * any uses of REJECT which flex missed. */ @@ -490,9 +542,12 @@ int ss_flex_debug = 0; #define YYLMAX 8192 #endif -char sstext[YYLMAX]; +#ifndef YY_REENTRANT +char yytext[YYLMAX]; char *yytext_ptr; +#endif #line 1 "icalsslexer.l" +#define INITIAL 0 #line 2 "icalsslexer.l" /* -*- Mode: C -*- ====================================================================== @@ -501,7 +556,7 @@ char *yytext_ptr; DESCRIPTION: - $Id: icalsslexer.c,v 1.13 2007/08/21 02:45:54 artcancro Exp $ + $Id: icalsslexer.c,v 1.10 2002/07/21 17:18:15 lindner Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org @@ -534,28 +589,153 @@ char *yytext_ptr; #undef SS_FATAL_ERROR #define SS_FATAL_ERROR(msg) sserror(msg) -/* See http://lists.ximian.com/archives/public/evolution-hackers/2003-September/001304.html - if you run into problems with this option. */ - -#line 541 "icalsslexer.c" - -#define INITIAL 0 #define sql 1 #define string_value 2 -#ifndef YY_NO_UNISTD_H +#line 596 "lex.ss.c" +/* %e */ +#endif /* !ssIN_HEADER */ + /* Special case for "unistd.h", since it is non-ANSI. We include it way * down here because we want the user's section 1 to have been scanned first. * The user has a chance to override it with an option. */ +#ifndef YY_NO_UNISTD_H +/* %- */ #include -#endif +/* %+ */ +/* %* */ +#endif /* !YY_NO_UNISTD_H */ + #ifndef YY_EXTRA_TYPE #define YY_EXTRA_TYPE void * #endif -static int yy_init_globals (void ); +/* %- Reentrant structure and macros (non-C++). */ +#ifdef YY_REENTRANT + +/* %c */ +#ifndef ssIN_HEADER +struct yy_globals_t + { + + /* User-defined. Not touched by flex. */ + YY_EXTRA_TYPE yyextra_r; + + /* The rest are the same as the globals declared in the non-reentrant scanner. */ + FILE *yyin_r, *yyout_r; + YY_BUFFER_STATE yy_current_buffer; + char yy_hold_char; + int yy_n_chars; + int yyleng_r; + char *yy_c_buf_p; + int yy_init; + int yy_start; + int yy_did_buffer_switch_on_eof; + int yy_start_stack_ptr; + int yy_start_stack_depth; + int *yy_start_stack; + yy_state_type yy_last_accepting_state; + char* yy_last_accepting_cpos; + + int yylineno_r; + +#ifdef YY_TEXT_IS_ARRAY + char yytext_r[YYLMAX]; + char *yytext_ptr; + int yy_more_offset; + int yy_prev_more_offset; +#else + char *yytext_r; + int yy_more_flag; + int yy_more_len; +#endif + +#ifdef YY_REENTRANT_BISON_PURE + YYSTYPE * yylval_r; +#ifdef YYLTYPE + YYLTYPE * yylloc_r; +#endif +#endif + + }; +/* %e */ +#endif /* !ssIN_HEADER */ + +/* %c */ +#ifndef ssIN_HEADER +static int yy_init_globals YY_PROTO(( yyscan_t )); +/* %e */ +#endif /* !ssIN_HEADER */ + +/* This must go here because YYSTYPE and YYLSTYPE are included + * from bison output in section 1.*/ +#ifdef YY_REENTRANT_BISON_PURE +# define yylval YY_G(yylval_r) +# ifdef YYLTYPE +# define yylloc YY_G(yylloc_r) +# endif +#endif /* YY_REENTRANT_BISON_PURE */ + +#endif /* end if YY_REENTRANT */ + +/* Accessor methods to globals. + These are made visible to non-reentrant scanners for convenience. */ +#ifndef YY_NO_GET_EXTRA +YY_EXTRA_TYPE yyget_extra YY_PROTO(( YY_ONLY_ARG )); +#endif + +#ifndef YY_NO_SET_EXTRA +void yyset_extra YY_PROTO(( YY_EXTRA_TYPE user_defined YY_LAST_ARG )); +#endif + +#ifndef YY_NO_GET_IN +FILE *yyget_in YY_PROTO(( YY_ONLY_ARG )); +#endif + +#ifndef YY_NO_SET_IN +void yyset_in YY_PROTO(( FILE * in_str YY_LAST_ARG )); +#endif + +#ifndef YY_NO_GET_OUT +FILE *yyget_out YY_PROTO(( YY_ONLY_ARG )); +#endif + +#ifndef YY_NO_SET_OUT +void yyset_out YY_PROTO(( FILE * out_str YY_LAST_ARG )); +#endif + +#ifndef YY_NO_GET_LENG +int yyget_leng YY_PROTO(( YY_ONLY_ARG )); +#endif + +#ifndef YY_NO_GET_TEXT +char *yyget_text YY_PROTO(( YY_ONLY_ARG )); +#endif + +#ifndef YY_NO_GET_LINENO +int yyget_lineno YY_PROTO(( YY_ONLY_ARG )); +#endif + +#ifndef YY_NO_SET_LINENO +void yyset_lineno YY_PROTO(( int line_number YY_LAST_ARG )); +#endif + +#ifdef YY_REENTRANT_BISON_PURE +#ifndef YY_NO_GET_LVAL +YYSTYPE * yyget_lval YY_PROTO(( YY_ONLY_ARG )); +#endif +void yyset_lval YY_PROTO(( YYSTYPE * yylvalp YY_LAST_ARG )); +#ifdef YYLTYPE +#ifndef YY_NO_GET_LLOC + YYLTYPE *yyget_lloc YY_PROTO(( YY_ONLY_ARG )); +#endif +#ifndef YY_NO_SET_LLOC + void yyset_lloc YY_PROTO(( YYLTYPE * yyllocp YY_LAST_ARG )); +#endif +#endif /* YYLTYPE */ +#endif /* YY_REENTRANT_BISON_PURE */ /* Macros after this point can all be overridden by user definitions in * section 1. @@ -563,30 +743,68 @@ static int yy_init_globals (void ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int sswrap (void ); +extern "C" int yywrap YY_PROTO(( YY_ONLY_ARG )); #else -extern int sswrap (void ); +extern int yywrap YY_PROTO(( YY_ONLY_ARG )); #endif #endif - static void yyunput (int c,char *buf_ptr ); - +/* %- */ +/* %c */ +#ifndef ssIN_HEADER +#ifndef YY_NO_UNPUT +static void yyunput YY_PROTO(( int c, char *buf_ptr YY_LAST_ARG)); +#endif +/* %e */ +#endif /* !ssIN_HEADER */ +/* %* */ + #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); +static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int YY_LAST_ARG)); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); +static int yy_flex_strlen YY_PROTO(( yyconst char * YY_LAST_ARG)); #endif #ifndef YY_NO_INPUT - +/* %- Standard (non-C++) definition */ +/* %c */ +#ifndef ssIN_HEADER #ifdef __cplusplus -static int yyinput (void ); +static int yyinput YY_PROTO(( YY_ONLY_ARG )); #else -static int input (void ); +static int input YY_PROTO(( YY_ONLY_ARG )); +#endif +/* %e */ +#endif /* !ssIN_HEADER */ +/* %* */ #endif +#if YY_STACK_USED +#ifndef YY_REENTRANT +/* %c */ +#ifndef ssIN_HEADER +static int yy_start_stack_ptr = 0; +static int yy_start_stack_depth = 0; +static int *yy_start_stack = 0; +/* %e */ +#endif /* !ssIN_HEADER */ +#endif +#ifndef YY_NO_PUSH_STATE +static void yy_push_state YY_PROTO(( int new_state YY_LAST_ARG)); +#endif +#ifndef YY_NO_POP_STATE +static void yy_pop_state YY_PROTO(( YY_ONLY_ARG )); +#endif +#ifndef YY_NO_TOP_STATE +static int yy_top_state YY_PROTO(( YY_ONLY_ARG )); +#endif + +#else +#define YY_NO_PUSH_STATE 1 +#define YY_NO_POP_STATE 1 +#define YY_NO_TOP_STATE 1 #endif /* Amount of stuff to slurp up with each read. */ @@ -595,11 +813,15 @@ static int input (void ); #endif /* Copy whatever the last rule matched to the standard output. */ + #ifndef ECHO +/* %- Standard (non-C++) definition */ /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO (void) fwrite( sstext, ssleng, 1, ssout ) +#define ECHO (void) fwrite( yytext, yyleng, 1, yyout ) +/* %+ C++ definition */ +/* %* */ #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -607,23 +829,24 @@ static int input (void ); */ #ifndef YY_INPUT #define YY_INPUT(buf,result,max_size) \ - if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ +/* %% [5.0] fread()/read() definition of YY_INPUT goes here unless we're doing C++ \ */\ + if ( YY_G(yy_current_buffer)->yy_is_interactive ) \ { \ int c = '*'; \ size_t n; \ for ( n = 0; n < max_size && \ - (c = getc( ssin )) != EOF && c != '\n'; ++n ) \ + (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ if ( c == '\n' ) \ buf[n++] = (char) c; \ - if ( c == EOF && ferror( ssin ) ) \ + if ( c == EOF && ferror( yyin ) ) \ YY_FATAL_ERROR( "input in flex scanner failed" ); \ result = n; \ } \ else \ { \ errno=0; \ - while ( (result = fread(buf, 1, max_size, ssin))==0 && ferror(ssin)) \ + while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ { \ if( errno != EINTR) \ { \ @@ -631,11 +854,11 @@ static int input (void ); break; \ } \ errno=0; \ - clearerr(ssin); \ + clearerr(yyin); \ } \ - }\ -\ - + } +/* %+ C++ definition \ */\ +/* %* */ #endif /* No semi-colon after return; correct usage is to write "yyterminate();" - @@ -653,23 +876,54 @@ static int input (void ); /* Report a fatal error. */ #ifndef YY_FATAL_ERROR +/* %- */ #define YY_FATAL_ERROR(msg) yy_fatal_error( msg ) +/* %+ */ +/* %* */ #endif -/* end tables serialization structures and prototypes */ - /* Default declaration of generated scanner - a define so the user can * easily add parameters. */ #ifndef YY_DECL -#define YY_DECL_IS_OURS 1 +/* %- Standard (non-C++) definition */ -extern int sslex (YYSTYPE * yylval_param ); +/* If the bison pure parser is used, then bison will provide + one or two additional arguments. */ -#define YY_DECL int sslex (YYSTYPE * yylval_param ) -#endif /* !YY_DECL */ +#ifdef YY_REENTRANT_BISON_PURE +# ifdef YYLTYPE +# ifdef YY_USE_PROTOS +# define YY_LEX_ARGS (YYSTYPE * yylvalp, YYLTYPE * yyllocp YY_LAST_ARG) +# else +# define YY_LEX_ARGS (yylvalp, yyllocp YY_LAST_ARG) \ + YYSTYPE * yylvalp; YYLTYPE * yyllocp; YY_DECL_LAST_ARG +# endif +# else +# ifdef YY_USE_PROTOS +# define YY_LEX_ARGS (YYSTYPE * yylvalp YY_LAST_ARG) +# else +# define YY_LEX_ARGS (yylvalp YY_LAST_ARG) \ + YYSTYPE * yylvalp; YY_DECL_LAST_ARG +# endif +# endif +#else +# ifdef YY_USE_PROTOS +# define YY_LEX_ARGS (YY_ONLY_ARG) +# else +# define YY_LEX_ARGS (YY_ONLY_ARG) YY_DECL_LAST_ARG +# endif +#endif -/* Code executed at the beginning of each rule, after sstext and ssleng + +extern int yylex YY_PROTO( YY_LEX_ARGS ); + +#define YY_DECL int yylex YY_LEX_ARGS +/* %+ C++ definition */ +/* %* */ +#endif + +/* Code executed at the beginning of each rule, after yytext and yyleng * have been set up. */ #ifndef YY_USER_ACTION @@ -681,77 +935,88 @@ extern int sslex (YYSTYPE * yylval_param ); #define YY_BREAK break; #endif +/* %% [6.0] YY_RULE_SETUP definition goes here */ #define YY_RULE_SETUP \ YY_USER_ACTION -/** The main scanner function which does all the work. - */ +/* %c */ +#ifndef ssIN_HEADER YY_DECL -{ + { register yy_state_type yy_current_state; register char *yy_cp, *yy_bp; register int yy_act; - - YYSTYPE * yylval; - -#line 68 "icalsslexer.l" + +/* %% [7.0] user's declarations go here */ +#line 66 "icalsslexer.l" -#line 705 "icalsslexer.c" +#line 959 "lex.ss.c" - yylval = yylval_param; +#ifdef YY_REENTRANT_BISON_PURE + yylval = yylvalp; +#ifdef YYLTYPE + yylloc = yyllocp; +#endif +#endif - if ( !(yy_init) ) + if ( YY_G(yy_init) ) { - (yy_init) = 1; + YY_G(yy_init) = 0; #ifdef YY_USER_INIT YY_USER_INIT; #endif - if ( ! (yy_start) ) - (yy_start) = 1; /* first start state */ + if ( ! YY_G(yy_start) ) + YY_G(yy_start) = 1; /* first start state */ - if ( ! ssin ) - ssin = stdin; + if ( ! yyin ) +/* %- */ + yyin = stdin; +/* %+ */ +/* %* */ - if ( ! ssout ) - ssout = stdout; + if ( ! yyout ) +/* %- */ + yyout = stdout; +/* %+ */ +/* %* */ - if ( ! YY_CURRENT_BUFFER ) { - ssensure_buffer_stack (); - YY_CURRENT_BUFFER_LVALUE = - ss_create_buffer(ssin,YY_BUF_SIZE ); - } + if ( ! YY_G(yy_current_buffer) ) + YY_G(yy_current_buffer) = + yy_create_buffer( yyin, YY_BUF_SIZE YY_CALL_LAST_ARG); - ss_load_buffer_state( ); + yy_load_buffer_state( YY_CALL_ONLY_ARG ); } while ( 1 ) /* loops until end-of-file is reached */ { - yy_cp = (yy_c_buf_p); +/* %% [8.0] yymore()-related code goes here */ + yy_cp = YY_G(yy_c_buf_p); - /* Support of sstext. */ - *yy_cp = (yy_hold_char); + /* Support of yytext. */ + *yy_cp = YY_G(yy_hold_char); /* yy_bp points to the position in yy_ch_buf of the start of * the current run. */ yy_bp = yy_cp; - yy_current_state = (yy_start); +/* %% [9.0] code to set up and find next match goes here */ + yy_current_state = YY_G(yy_start); yy_match: do { register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; if ( yy_accept[yy_current_state] ) { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; + YY_G(yy_last_accepting_state) = yy_current_state; + YY_G(yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -765,132 +1030,136 @@ yy_match: while ( yy_base[yy_current_state] != 69 ); yy_find_action: +/* %% [10.0] code to find the action number goes here */ yy_act = yy_accept[yy_current_state]; if ( yy_act == 0 ) { /* have to back up */ - yy_cp = (yy_last_accepting_cpos); - yy_current_state = (yy_last_accepting_state); + yy_cp = YY_G(yy_last_accepting_cpos); + yy_current_state = YY_G(yy_last_accepting_state); yy_act = yy_accept[yy_current_state]; } YY_DO_BEFORE_ACTION; +/* %% [11.0] code for yylineno update goes here */ + do_action: /* This label is used only to access EOF actions. */ +/* %% [12.0] debug code goes here */ + switch ( yy_act ) { /* beginning of action switch */ +/* %% [13.0] actions go here */ case 0: /* must back up */ /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = (yy_hold_char); - yy_cp = (yy_last_accepting_cpos); - yy_current_state = (yy_last_accepting_state); + *yy_cp = YY_G(yy_hold_char); + yy_cp = YY_G(yy_last_accepting_cpos); + yy_current_state = YY_G(yy_last_accepting_state); goto yy_find_action; case 1: YY_RULE_SETUP -#line 74 "icalsslexer.l" +#line 72 "icalsslexer.l" { return SELECT; } YY_BREAK case 2: YY_RULE_SETUP -#line 75 "icalsslexer.l" +#line 73 "icalsslexer.l" { return FROM; } YY_BREAK case 3: YY_RULE_SETUP -#line 76 "icalsslexer.l" +#line 74 "icalsslexer.l" { return WHERE; } YY_BREAK case 4: YY_RULE_SETUP -#line 77 "icalsslexer.l" +#line 75 "icalsslexer.l" { return COMMA; } YY_BREAK case 5: YY_RULE_SETUP -#line 78 "icalsslexer.l" +#line 76 "icalsslexer.l" { return EQUALS; } YY_BREAK case 6: YY_RULE_SETUP -#line 79 "icalsslexer.l" +#line 77 "icalsslexer.l" { return EQUALS; } YY_BREAK case 7: YY_RULE_SETUP -#line 80 "icalsslexer.l" +#line 78 "icalsslexer.l" { return NOTEQUALS; } YY_BREAK case 8: YY_RULE_SETUP -#line 81 "icalsslexer.l" +#line 79 "icalsslexer.l" { return LESS; } YY_BREAK case 9: YY_RULE_SETUP -#line 82 "icalsslexer.l" +#line 80 "icalsslexer.l" { return GREATER; } YY_BREAK case 10: YY_RULE_SETUP -#line 83 "icalsslexer.l" +#line 81 "icalsslexer.l" { return LESSEQUALS; } YY_BREAK case 11: YY_RULE_SETUP -#line 84 "icalsslexer.l" +#line 82 "icalsslexer.l" { return GREATEREQUALS; } YY_BREAK case 12: YY_RULE_SETUP -#line 85 "icalsslexer.l" +#line 83 "icalsslexer.l" { return AND; } YY_BREAK case 13: YY_RULE_SETUP -#line 86 "icalsslexer.l" +#line 84 "icalsslexer.l" { return OR; } YY_BREAK case 14: YY_RULE_SETUP -#line 87 "icalsslexer.l" +#line 85 "icalsslexer.l" { return IS; } YY_BREAK case 15: YY_RULE_SETUP -#line 88 "icalsslexer.l" +#line 86 "icalsslexer.l" { return NOT; } YY_BREAK case 16: YY_RULE_SETUP -#line 89 "icalsslexer.l" +#line 87 "icalsslexer.l" { return SQLNULL; } YY_BREAK case 17: YY_RULE_SETUP -#line 90 "icalsslexer.l" +#line 88 "icalsslexer.l" { return QUOTE; } YY_BREAK case 18: -/* rule 18 can match eol */ YY_RULE_SETUP -#line 91 "icalsslexer.l" +#line 89 "icalsslexer.l" ; YY_BREAK case 19: YY_RULE_SETUP -#line 92 "icalsslexer.l" +#line 90 "icalsslexer.l" { return EOL; } YY_BREAK case 20: YY_RULE_SETUP -#line 94 "icalsslexer.l" +#line 92 "icalsslexer.l" { - /* int c = input(yy_globals); removed this variable, does it work? */ - int c = input(); + int c = input(yy_globals); unput(c); if(c!='\''){ - yylval_param->v_string= icalmemory_tmp_copy(sstext); + yylvalp->v_string= icalmemory_tmp_copy(yytext); return STRING; } else { /*ssmore();*/ @@ -899,23 +1168,23 @@ YY_RULE_SETUP YY_BREAK case 21: YY_RULE_SETUP -#line 106 "icalsslexer.l" +#line 103 "icalsslexer.l" { - yylval->v_string= icalmemory_tmp_copy(sstext); + yylval->v_string= icalmemory_tmp_copy(yytext); return STRING; } YY_BREAK case 22: YY_RULE_SETUP -#line 112 "icalsslexer.l" -{ return sstext[0]; } +#line 109 "icalsslexer.l" +{ return yytext[0]; } YY_BREAK case 23: YY_RULE_SETUP -#line 114 "icalsslexer.l" +#line 111 "icalsslexer.l" ECHO; YY_BREAK -#line 919 "icalsslexer.c" +#line 1188 "lex.ss.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(sql): case YY_STATE_EOF(string_value): @@ -924,26 +1193,26 @@ case YY_STATE_EOF(string_value): case YY_END_OF_BUFFER: { /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1; + int yy_amount_of_matched_text = (int) (yy_cp - YY_G(yytext_ptr)) - 1; /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = (yy_hold_char); + *yy_cp = YY_G(yy_hold_char); YY_RESTORE_YY_MORE_OFFSET - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) + if ( YY_G(yy_current_buffer)->yy_buffer_status == YY_BUFFER_NEW ) { /* We're scanning a new file or input source. It's * possible that this happened because the user - * just pointed ssin at a new source and called - * sslex(). If so, then we have to assure - * consistency between YY_CURRENT_BUFFER and our + * just pointed yyin at a new source and called + * yylex(). If so, then we have to assure + * consistency between yy_current_buffer and our * globals. Here is the right place to do so, because * this is the first action (other than possibly a * back-up) that will match for the new input source. */ - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - YY_CURRENT_BUFFER_LVALUE->yy_input_file = ssin; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; + YY_G(yy_n_chars) = YY_G(yy_current_buffer)->yy_n_chars; + YY_G(yy_current_buffer)->yy_input_file = yyin; + YY_G(yy_current_buffer)->yy_buffer_status = YY_BUFFER_NORMAL; } /* Note that here we test for yy_c_buf_p "<=" to the position @@ -953,13 +1222,13 @@ case YY_STATE_EOF(string_value): * end-of-buffer state). Contrast this with the test * in input(). */ - if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) + if ( YY_G(yy_c_buf_p) <= &YY_G(yy_current_buffer)->yy_ch_buf[YY_G(yy_n_chars)] ) { /* This was really a NUL. */ yy_state_type yy_next_state; - (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; + YY_G(yy_c_buf_p) = YY_G(yytext_ptr) + yy_amount_of_matched_text; - yy_current_state = yy_get_previous_state( ); + yy_current_state = yy_get_previous_state( YY_CALL_ONLY_ARG ); /* Okay, we're now positioned to make the NUL * transition. We couldn't have @@ -970,43 +1239,44 @@ case YY_STATE_EOF(string_value): * will run more slowly). */ - yy_next_state = yy_try_NUL_trans( yy_current_state ); + yy_next_state = yy_try_NUL_trans( yy_current_state YY_CALL_LAST_ARG); - yy_bp = (yytext_ptr) + YY_MORE_ADJ; + yy_bp = YY_G(yytext_ptr) + YY_MORE_ADJ; if ( yy_next_state ) { /* Consume the NUL. */ - yy_cp = ++(yy_c_buf_p); + yy_cp = ++YY_G(yy_c_buf_p); yy_current_state = yy_next_state; goto yy_match; } else { - yy_cp = (yy_c_buf_p); +/* %% [14.0] code to do back-up for compressed tables and set up yy_cp goes here */ + yy_cp = YY_G(yy_c_buf_p); goto yy_find_action; } } - else switch ( yy_get_next_buffer( ) ) + else switch ( yy_get_next_buffer( YY_CALL_ONLY_ARG ) ) { case EOB_ACT_END_OF_FILE: { - (yy_did_buffer_switch_on_eof) = 0; + YY_G(yy_did_buffer_switch_on_eof) = 0; - if ( sswrap( ) ) + if ( yywrap( YY_CALL_ONLY_ARG ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up - * sstext, we can now set up + * yytext, we can now set up * yy_c_buf_p so that if some total * hoser (like flex itself) wants to * call the scanner after we return the * YY_NULL, it'll still work - another * YY_NULL will get returned. */ - (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ; + YY_G(yy_c_buf_p) = YY_G(yytext_ptr) + YY_MORE_ADJ; yy_act = YY_STATE_EOF(YY_START); goto do_action; @@ -1014,30 +1284,30 @@ case YY_STATE_EOF(string_value): else { - if ( ! (yy_did_buffer_switch_on_eof) ) + if ( ! YY_G(yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; } break; } case EOB_ACT_CONTINUE_SCAN: - (yy_c_buf_p) = - (yytext_ptr) + yy_amount_of_matched_text; + YY_G(yy_c_buf_p) = + YY_G(yytext_ptr) + yy_amount_of_matched_text; - yy_current_state = yy_get_previous_state( ); + yy_current_state = yy_get_previous_state( YY_CALL_ONLY_ARG ); - yy_cp = (yy_c_buf_p); - yy_bp = (yytext_ptr) + YY_MORE_ADJ; + yy_cp = YY_G(yy_c_buf_p); + yy_bp = YY_G(yytext_ptr) + YY_MORE_ADJ; goto yy_match; case EOB_ACT_LAST_MATCH: - (yy_c_buf_p) = - &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]; + YY_G(yy_c_buf_p) = + &YY_G(yy_current_buffer)->yy_ch_buf[YY_G(yy_n_chars)]; - yy_current_state = yy_get_previous_state( ); + yy_current_state = yy_get_previous_state( YY_CALL_ONLY_ARG ); - yy_cp = (yy_c_buf_p); - yy_bp = (yytext_ptr) + YY_MORE_ADJ; + yy_cp = YY_G(yy_c_buf_p); + yy_bp = YY_G(yytext_ptr) + YY_MORE_ADJ; goto yy_find_action; } break; @@ -1048,7 +1318,15 @@ case YY_STATE_EOF(string_value): "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ -} /* end of sslex */ + } /* end of yylex */ +/* %e */ +#endif /* !ssIN_HEADER */ +/* %+ */ +/* %c */ +#ifndef ssIN_HEADER +/* %e */ +#endif /* !ssIN_HEADER */ +/* %* */ /* yy_get_next_buffer - try to read in a new buffer * @@ -1057,20 +1335,31 @@ case YY_STATE_EOF(string_value): * EOB_ACT_CONTINUE_SCAN - continue scanning from current position * EOB_ACT_END_OF_FILE - end of file */ -static int yy_get_next_buffer (void) -{ - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = (yytext_ptr); + +/* %- */ +/* %c */ +#ifndef ssIN_HEADER +#ifdef YY_USE_PROTOS +static int yy_get_next_buffer(YY_ONLY_ARG) +#else +static int yy_get_next_buffer(YY_ONLY_ARG) +YY_DECL_LAST_ARG +#endif +/* %+ */ +/* %* */ + { + register char *dest = YY_G(yy_current_buffer)->yy_ch_buf; + register char *source = YY_G(yytext_ptr); register int number_to_move, i; int ret_val; - if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) + if ( YY_G(yy_c_buf_p) > &YY_G(yy_current_buffer)->yy_ch_buf[YY_G(yy_n_chars) + 1] ) YY_FATAL_ERROR( "fatal flex scanner internal error--end of buffer missed" ); - if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) + if ( YY_G(yy_current_buffer)->yy_fill_buffer == 0 ) { /* Don't try to fill the buffer, so this is an EOF. */ - if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 ) + if ( YY_G(yy_c_buf_p) - YY_G(yytext_ptr) - YY_MORE_ADJ == 1 ) { /* We matched a single character, the EOB, so * treat this as a final EOF. @@ -1090,30 +1379,34 @@ static int yy_get_next_buffer (void) /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; + number_to_move = (int) (YY_G(yy_c_buf_p) - YY_G(yytext_ptr)) - 1; for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) + if ( YY_G(yy_current_buffer)->yy_buffer_status == YY_BUFFER_EOF_PENDING ) /* don't do the read, it's not guaranteed to return an EOF, * just force an EOF */ - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0; + YY_G(yy_current_buffer)->yy_n_chars = YY_G(yy_n_chars) = 0; else { - int num_to_read = - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; + size_t num_to_read = + YY_G(yy_current_buffer)->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ +#ifdef YY_USES_REJECT + YY_FATAL_ERROR( +"input buffer overflow, can't enlarge buffer because scanner uses REJECT" ); +#else /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER; + YY_BUFFER_STATE b = YY_G(yy_current_buffer); int yy_c_buf_p_offset = - (int) ((yy_c_buf_p) - b->yy_ch_buf); + (int) (YY_G(yy_c_buf_p) - b->yy_ch_buf); if ( b->yy_is_our_buffer ) { @@ -1126,7 +1419,8 @@ static int yy_get_next_buffer (void) b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - ssrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); + yy_flex_realloc( (void *) b->yy_ch_buf, + b->yy_buf_size + 2 YY_CALL_LAST_ARG ); } else /* Can't grow it, we don't own it. */ @@ -1136,35 +1430,35 @@ static int yy_get_next_buffer (void) YY_FATAL_ERROR( "fatal error - scanner input buffer overflow" ); - (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; + YY_G(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; - num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - + num_to_read = YY_G(yy_current_buffer)->yy_buf_size - number_to_move - 1; - +#endif } if ( num_to_read > YY_READ_BUF_SIZE ) num_to_read = YY_READ_BUF_SIZE; /* Read in more data. */ - YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - (yy_n_chars), num_to_read ); + YY_INPUT( (&YY_G(yy_current_buffer)->yy_ch_buf[number_to_move]), + YY_G(yy_n_chars), num_to_read ); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + YY_G(yy_current_buffer)->yy_n_chars = YY_G(yy_n_chars); } - if ( (yy_n_chars) == 0 ) + if ( YY_G(yy_n_chars) == 0 ) { if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - ssrestart(ssin ); + yyrestart( yyin YY_CALL_LAST_ARG); } else { ret_val = EOB_ACT_LAST_MATCH; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = + YY_G(yy_current_buffer)->yy_buffer_status = YY_BUFFER_EOF_PENDING; } } @@ -1172,31 +1466,45 @@ static int yy_get_next_buffer (void) else ret_val = EOB_ACT_CONTINUE_SCAN; - (yy_n_chars) += number_to_move; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; + YY_G(yy_n_chars) += number_to_move; + YY_G(yy_current_buffer)->yy_ch_buf[YY_G(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; + YY_G(yy_current_buffer)->yy_ch_buf[YY_G(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; - (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; + YY_G(yytext_ptr) = &YY_G(yy_current_buffer)->yy_ch_buf[0]; return ret_val; -} + } +/* %e */ +#endif /* !ssIN_HEADER */ /* yy_get_previous_state - get the state just before the EOB char was reached */ - static yy_state_type yy_get_previous_state (void) -{ +/* %- */ +/* %c */ +#ifndef ssIN_HEADER +#ifdef YY_USE_PROTOS +static yy_state_type yy_get_previous_state(YY_ONLY_ARG) +#else +static yy_state_type yy_get_previous_state(YY_ONLY_ARG) +YY_DECL_LAST_ARG +#endif +/* %+ */ +/* %* */ + { register yy_state_type yy_current_state; register char *yy_cp; - - yy_current_state = (yy_start); - for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) +/* %% [15.0] code to get the start state into yy_current_state goes here */ + yy_current_state = YY_G(yy_start); + + for ( yy_cp = YY_G(yytext_ptr) + YY_MORE_ADJ; yy_cp < YY_G(yy_c_buf_p); ++yy_cp ) { +/* %% [16.0] code to find the next state goes here */ register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; + YY_G(yy_last_accepting_state) = yy_current_state; + YY_G(yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -1208,23 +1516,35 @@ static int yy_get_next_buffer (void) } return yy_current_state; -} + } + /* yy_try_NUL_trans - try to make a transition on the NUL character * * synopsis * next_state = yy_try_NUL_trans( current_state ); */ - static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) -{ + +/* %- */ +#ifdef YY_USE_PROTOS +static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state YY_LAST_ARG ) +#else +static yy_state_type yy_try_NUL_trans( yy_current_state YY_LAST_ARG ) +yy_state_type yy_current_state; +YY_DECL_LAST_ARG +#endif +/* %+ */ +/* %* */ + { register int yy_is_jam; - register char *yy_cp = (yy_c_buf_p); +/* %% [17.0] code to find the next state, and perhaps do backing up, goes here */ + register char *yy_cp = YY_G(yy_c_buf_p); register YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; + YY_G(yy_last_accepting_state) = yy_current_state; + YY_G(yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -1236,73 +1556,96 @@ static int yy_get_next_buffer (void) yy_is_jam = (yy_current_state == 55); return yy_is_jam ? 0 : yy_current_state; -} + } - static void yyunput (int c, register char * yy_bp ) -{ - register char *yy_cp; - - yy_cp = (yy_c_buf_p); - /* undo effects of setting up sstext */ - *yy_cp = (yy_hold_char); +/* %- */ +#ifndef YY_NO_UNPUT +#ifdef YY_USE_PROTOS +static void yyunput( int c, register char *yy_bp YY_LAST_ARG ) +#else +static void yyunput( c, yy_bp YY_LAST_ARG) +int c; +register char *yy_bp; +YY_DECL_LAST_ARG +#endif +/* %+ */ +/* %* */ + { + register char *yy_cp = YY_G(yy_c_buf_p); - if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) + /* undo effects of setting up yytext */ + *yy_cp = YY_G(yy_hold_char); + + if ( yy_cp < YY_G(yy_current_buffer)->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register int number_to_move = (yy_n_chars) + 2; - register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ - YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; + register int number_to_move = YY_G(yy_n_chars) + 2; + register char *dest = &YY_G(yy_current_buffer)->yy_ch_buf[ + YY_G(yy_current_buffer)->yy_buf_size + 2]; register char *source = - &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; + &YY_G(yy_current_buffer)->yy_ch_buf[number_to_move]; - while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) + while ( source > YY_G(yy_current_buffer)->yy_ch_buf ) *--dest = *--source; yy_cp += (int) (dest - source); yy_bp += (int) (dest - source); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size; + YY_G(yy_current_buffer)->yy_n_chars = + YY_G(yy_n_chars) = YY_G(yy_current_buffer)->yy_buf_size; - if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) + if ( yy_cp < YY_G(yy_current_buffer)->yy_ch_buf + 2 ) YY_FATAL_ERROR( "flex scanner push-back overflow" ); } *--yy_cp = (char) c; - (yytext_ptr) = yy_bp; - (yy_hold_char) = *yy_cp; - (yy_c_buf_p) = yy_cp; -} +/* %% [18.0] update yylineno here */ + YY_G(yytext_ptr) = yy_bp; + YY_G(yy_hold_char) = *yy_cp; + YY_G(yy_c_buf_p) = yy_cp; + } +/* %- */ +#endif /* ifndef YY_NO_UNPUT */ +/* %* */ + + +/* %- */ #ifndef YY_NO_INPUT #ifdef __cplusplus - static int yyinput (void) +static int yyinput(YY_ONLY_ARG) #else - static int input (void) +#ifdef YY_USE_PROTOS +static int input(YY_ONLY_ARG) +#else +static int input(YY_ONLY_ARG) + YY_DECL_LAST_ARG #endif - -{ +#endif +/* %+ */ +/* %* */ + { int c; - - *(yy_c_buf_p) = (yy_hold_char); - if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) + *YY_G(yy_c_buf_p) = YY_G(yy_hold_char); + + if ( *YY_G(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) { /* yy_c_buf_p now points to the character we want to return. * If this occurs *before* the EOB characters, then it's a * valid NUL; if not, then we've hit the end of the buffer. */ - if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) + if ( YY_G(yy_c_buf_p) < &YY_G(yy_current_buffer)->yy_ch_buf[YY_G(yy_n_chars)] ) /* This was really a NUL. */ - *(yy_c_buf_p) = '\0'; + *YY_G(yy_c_buf_p) = '\0'; else { /* need more input */ - int offset = (yy_c_buf_p) - (yytext_ptr); - ++(yy_c_buf_p); + int offset = YY_G(yy_c_buf_p) - YY_G(yytext_ptr); + ++YY_G(yy_c_buf_p); - switch ( yy_get_next_buffer( ) ) + switch ( yy_get_next_buffer( YY_CALL_ONLY_ARG ) ) { case EOB_ACT_LAST_MATCH: /* This happens because yy_g_n_b() @@ -1316,188 +1659,233 @@ static int yy_get_next_buffer (void) */ /* Reset buffer status. */ - ssrestart(ssin ); + yyrestart( yyin YY_CALL_LAST_ARG); - /*FALLTHROUGH*/ + /* fall through */ case EOB_ACT_END_OF_FILE: { - if ( sswrap( ) ) + if ( yywrap( YY_CALL_ONLY_ARG ) ) return EOF; - if ( ! (yy_did_buffer_switch_on_eof) ) + if ( ! YY_G(yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; #ifdef __cplusplus - return yyinput(); + return yyinput(YY_CALL_ONLY_ARG); #else - return input(); + return input(YY_CALL_ONLY_ARG); #endif } case EOB_ACT_CONTINUE_SCAN: - (yy_c_buf_p) = (yytext_ptr) + offset; + YY_G(yy_c_buf_p) = YY_G(yytext_ptr) + offset; break; } } } - c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ - *(yy_c_buf_p) = '\0'; /* preserve sstext */ - (yy_hold_char) = *++(yy_c_buf_p); + c = *(unsigned char *) YY_G(yy_c_buf_p); /* cast for 8-bit char's */ + *YY_G(yy_c_buf_p) = '\0'; /* preserve yytext */ + YY_G(yy_hold_char) = *++YY_G(yy_c_buf_p); + +/* %% [19.0] update BOL and yylineno */ return c; -} + } +/* %- */ #endif /* ifndef YY_NO_INPUT */ +/* %* */ -/** Immediately switch to a different input stream. - * @param input_file A readable stream. - * - * @note This function does not reset the start condition to @c INITIAL . - */ - void ssrestart (FILE * input_file ) -{ - - if ( ! YY_CURRENT_BUFFER ){ - ssensure_buffer_stack (); - YY_CURRENT_BUFFER_LVALUE = - ss_create_buffer(ssin,YY_BUF_SIZE ); +/* %- */ +#ifdef YY_USE_PROTOS +void yyrestart( FILE *input_file YY_LAST_ARG) +#else +void yyrestart( input_file YY_LAST_ARG) +FILE *input_file; +YY_DECL_LAST_ARG +#endif +/* %+ */ +/* %* */ + { + if ( ! YY_G(yy_current_buffer) ) + YY_G(yy_current_buffer) = + yy_create_buffer( yyin, YY_BUF_SIZE YY_CALL_LAST_ARG); + + yy_init_buffer( YY_G(yy_current_buffer), input_file YY_CALL_LAST_ARG); + yy_load_buffer_state( YY_CALL_ONLY_ARG ); } - ss_init_buffer(YY_CURRENT_BUFFER,input_file ); - ss_load_buffer_state( ); -} -/** Switch to a different input buffer. - * @param new_buffer The new input buffer. - * - */ - void ss_switch_to_buffer (YY_BUFFER_STATE new_buffer ) -{ - - /* TODO. We should be able to replace this entire function body - * with - * sspop_buffer_state(); - * sspush_buffer_state(new_buffer); - */ - ssensure_buffer_stack (); - if ( YY_CURRENT_BUFFER == new_buffer ) +/* %- */ +#ifdef YY_USE_PROTOS +void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer YY_LAST_ARG ) +#else +void yy_switch_to_buffer( new_buffer YY_LAST_ARG ) +YY_BUFFER_STATE new_buffer; +YY_DECL_LAST_ARG +#endif +/* %+ */ +/* %* */ + { + if ( YY_G(yy_current_buffer) == new_buffer ) return; - if ( YY_CURRENT_BUFFER ) + if ( YY_G(yy_current_buffer) ) { /* Flush out information for old buffer. */ - *(yy_c_buf_p) = (yy_hold_char); - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + *YY_G(yy_c_buf_p) = YY_G(yy_hold_char); + YY_G(yy_current_buffer)->yy_buf_pos = YY_G(yy_c_buf_p); + YY_G(yy_current_buffer)->yy_n_chars = YY_G(yy_n_chars); } - YY_CURRENT_BUFFER_LVALUE = new_buffer; - ss_load_buffer_state( ); + YY_G(yy_current_buffer) = new_buffer; + yy_load_buffer_state( YY_CALL_ONLY_ARG ); /* We don't actually know whether we did this switch during - * EOF (sswrap()) processing, but the only time this flag - * is looked at is after sswrap() is called, so it's safe + * EOF (yywrap()) processing, but the only time this flag + * is looked at is after yywrap() is called, so it's safe * to go ahead and always set it. */ - (yy_did_buffer_switch_on_eof) = 1; -} + YY_G(yy_did_buffer_switch_on_eof) = 1; + } -static void ss_load_buffer_state (void) -{ - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; - ssin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; - (yy_hold_char) = *(yy_c_buf_p); -} -/** Allocate and initialize an input buffer state. - * @param file A readable stream. - * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. - * - * @return the allocated buffer state. - */ - YY_BUFFER_STATE ss_create_buffer (FILE * file, int size ) -{ +/* %- */ +#ifdef YY_USE_PROTOS +void yy_load_buffer_state( YY_ONLY_ARG ) +#else +void yy_load_buffer_state(YY_ONLY_ARG ) +YY_DECL_LAST_ARG +#endif +/* %+ */ +/* %* */ + { + YY_G(yy_n_chars) = YY_G(yy_current_buffer)->yy_n_chars; + YY_G(yytext_ptr) = YY_G(yy_c_buf_p) = YY_G(yy_current_buffer)->yy_buf_pos; + yyin = YY_G(yy_current_buffer)->yy_input_file; + YY_G(yy_hold_char) = *YY_G(yy_c_buf_p); + } + + +/* %- */ +#ifdef YY_USE_PROTOS +YY_BUFFER_STATE yy_create_buffer( FILE *file, int size YY_LAST_ARG) +#else +YY_BUFFER_STATE yy_create_buffer( file, size YY_LAST_ARG) +FILE *file; +int size; +YY_DECL_LAST_ARG +#endif +/* %+ */ +/* %* */ + { YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) ssalloc(sizeof( struct yy_buffer_state ) ); + + b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) YY_CALL_LAST_ARG ); if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in ss_create_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_buf_size = size; /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) ssalloc(b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 YY_CALL_LAST_ARG ); if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in ss_create_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - ss_init_buffer(b,file ); + yy_init_buffer( b, file YY_CALL_LAST_ARG); return b; -} + } -/** Destroy the buffer. - * @param b a buffer created with ss_create_buffer() - * - */ - void ss_delete_buffer (YY_BUFFER_STATE b ) -{ - + +/* %- */ +#ifdef YY_USE_PROTOS +void yy_delete_buffer( YY_BUFFER_STATE b YY_LAST_ARG) +#else +void yy_delete_buffer( b YY_LAST_ARG) +YY_BUFFER_STATE b; +YY_DECL_LAST_ARG +#endif +/* %+ */ +/* %* */ + { if ( ! b ) return; - if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ - YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; + if ( b == YY_G(yy_current_buffer) ) + YY_G(yy_current_buffer) = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - ssfree((void *) b->yy_ch_buf ); + yy_flex_free( (void *) b->yy_ch_buf YY_CALL_LAST_ARG ); - ssfree((void *) b ); -} + yy_flex_free( (void *) b YY_CALL_LAST_ARG ); + } -#ifndef __cplusplus -extern int isatty (int ); + +/* %- */ +#ifndef YY_ALWAYS_INTERACTIVE +#ifndef YY_NEVER_INTERACTIVE +#ifdef __cplusplus +extern "C" int isatty YY_PROTO(( int )); +#else +extern int isatty YY_PROTO(( int )); #endif /* __cplusplus */ - -/* Initializes or reinitializes a buffer. - * This function is sometimes called more than once on the same buffer, - * such as during a ssrestart() or at EOF. - */ - static void ss_init_buffer (YY_BUFFER_STATE b, FILE * file ) +#endif /* !YY_NEVER_INTERACTIVE */ +#endif /* !YY_ALWAYS_INTERACTIVE */ -{ +#ifdef YY_USE_PROTOS +void yy_init_buffer( YY_BUFFER_STATE b, FILE *file YY_LAST_ARG) +#else +void yy_init_buffer( b, file YY_LAST_ARG) +YY_BUFFER_STATE b; +FILE *file; +YY_DECL_LAST_ARG +#endif + +/* %+ */ +/* %* */ + + { int oerrno = errno; - - ss_flush_buffer(b ); + + yy_flush_buffer( b YY_CALL_LAST_ARG); b->yy_input_file = file; b->yy_fill_buffer = 1; - /* If b is the current buffer, then ss_init_buffer was _probably_ - * called from ssrestart() or through yy_get_next_buffer. - * In that case, we don't want to reset the lineno or column. - */ - if (b != YY_CURRENT_BUFFER){ - b->yy_bs_lineno = 1; - b->yy_bs_column = 0; - } - - b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; - +/* %- */ +#if YY_ALWAYS_INTERACTIVE + b->yy_is_interactive = 1; +#else +#if YY_NEVER_INTERACTIVE + b->yy_is_interactive = 0; +#else + b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; +#endif +#endif +/* %+ */ +/* %* */ errno = oerrno; -} + } -/** Discard all buffered characters. On the next scan, YY_INPUT will be called. - * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. - * - */ - void ss_flush_buffer (YY_BUFFER_STATE b ) -{ - if ( ! b ) + +/* %- */ +#ifdef YY_USE_PROTOS +void yy_flush_buffer( YY_BUFFER_STATE b YY_LAST_ARG ) +#else +void yy_flush_buffer( b YY_LAST_ARG ) +YY_BUFFER_STATE b; +YY_DECL_LAST_ARG +#endif + +/* %+ */ +/* %* */ + { + if ( ! b ) return; b->yy_n_chars = 0; @@ -1514,123 +1902,34 @@ extern int isatty (int ); b->yy_at_bol = 1; b->yy_buffer_status = YY_BUFFER_NEW; - if ( b == YY_CURRENT_BUFFER ) - ss_load_buffer_state( ); -} - -/** Pushes the new state onto the stack. The new state becomes - * the current state. This function will allocate the stack - * if necessary. - * @param new_buffer The new state. - * - */ -void sspush_buffer_state (YY_BUFFER_STATE new_buffer ) -{ - if (new_buffer == NULL) - return; - - ssensure_buffer_stack(); - - /* This block is copied from ss_switch_to_buffer. */ - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *(yy_c_buf_p) = (yy_hold_char); - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); - } - - /* Only push if top exists. Otherwise, replace top. */ - if (YY_CURRENT_BUFFER) - (yy_buffer_stack_top)++; - YY_CURRENT_BUFFER_LVALUE = new_buffer; - - /* copied from ss_switch_to_buffer. */ - ss_load_buffer_state( ); - (yy_did_buffer_switch_on_eof) = 1; -} - -/** Removes and deletes the top of the stack, if present. - * The next element becomes the new top. - * - */ -void sspop_buffer_state (void) -{ - if (!YY_CURRENT_BUFFER) - return; - - ss_delete_buffer(YY_CURRENT_BUFFER ); - YY_CURRENT_BUFFER_LVALUE = NULL; - if ((yy_buffer_stack_top) > 0) - --(yy_buffer_stack_top); - - if (YY_CURRENT_BUFFER) { - ss_load_buffer_state( ); - (yy_did_buffer_switch_on_eof) = 1; + if ( b == YY_G(yy_current_buffer) ) + yy_load_buffer_state( YY_CALL_ONLY_ARG ); } -} +/* %* */ -/* Allocates the stack if it does not exist. - * Guarantees space for at least one push. - */ -static void ssensure_buffer_stack (void) -{ - int num_to_alloc; - - if (!(yy_buffer_stack)) { - /* First allocation is just for 2 elements, since we don't know if this - * scanner will even need a stack. We use 2 instead of 1 to avoid an - * immediate realloc on the next call. - */ - num_to_alloc = 1; - (yy_buffer_stack) = (struct yy_buffer_state**)ssalloc - (num_to_alloc * sizeof(struct yy_buffer_state*) - ); - - memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - - (yy_buffer_stack_max) = num_to_alloc; - (yy_buffer_stack_top) = 0; - return; - } - - if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ - - /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; - - num_to_alloc = (yy_buffer_stack_max) + grow_size; - (yy_buffer_stack) = (struct yy_buffer_state**)ssrealloc - ((yy_buffer_stack), - num_to_alloc * sizeof(struct yy_buffer_state*) - ); - - /* zero only the new slots.*/ - memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); - (yy_buffer_stack_max) = num_to_alloc; - } -} - -/** Setup the input buffer state to scan directly from a user-specified character buffer. - * @param base the character buffer - * @param size the size in bytes of the character buffer - * - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE ss_scan_buffer (char * base, yy_size_t size ) -{ +#ifndef YY_NO_SCAN_BUFFER +/* %- */ +#ifdef YY_USE_PROTOS +YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size YY_LAST_ARG ) +#else +YY_BUFFER_STATE yy_scan_buffer( base, size YY_LAST_ARG ) +char *base; +yy_size_t size; +YY_DECL_LAST_ARG +#endif + { YY_BUFFER_STATE b; - + if ( size < 2 || base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ return 0; - b = (YY_BUFFER_STATE) ssalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) YY_CALL_LAST_ARG ); if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in ss_scan_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; @@ -1642,53 +1941,64 @@ YY_BUFFER_STATE ss_scan_buffer (char * base, yy_size_t size ) b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - ss_switch_to_buffer(b ); + yy_switch_to_buffer( b YY_CALL_LAST_ARG ); return b; -} + } +/* %* */ +#endif -/** Setup the input buffer state to scan a string. The next call to sslex() will - * scan from a @e copy of @a str. - * @param str a NUL-terminated string to scan - * - * @return the newly allocated buffer state object. - * @note If you want to scan bytes that may contain NUL values, then use - * ss_scan_bytes() instead. - */ -YY_BUFFER_STATE ss_scan_string (yyconst char * yystr ) -{ - - return ss_scan_bytes(yystr,strlen(yystr) ); -} -/** Setup the input buffer state to scan the given bytes. The next call to sslex() will - * scan from a @e copy of @a bytes. - * @param bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. - * - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE ss_scan_bytes (yyconst char * yybytes, int _yybytes_len ) -{ +#ifndef YY_NO_SCAN_STRING +/* %- */ +#ifdef YY_USE_PROTOS +YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str YY_LAST_ARG ) +#else +YY_BUFFER_STATE yy_scan_string( yy_str YY_LAST_ARG) +yyconst char *yy_str; +YY_DECL_LAST_ARG +#endif + { + int len; + for ( len = 0; yy_str[len]; ++len ) + ; + + return yy_scan_bytes( yy_str, len YY_CALL_LAST_ARG); + } +/* %* */ +#endif + + +#ifndef YY_NO_SCAN_BYTES +/* %- */ +#ifdef YY_USE_PROTOS +YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len YY_LAST_ARG) +#else +YY_BUFFER_STATE yy_scan_bytes( bytes, len YY_LAST_ARG) +yyconst char *bytes; +YY_DECL_LAST_ARG +int len; +#endif + { YY_BUFFER_STATE b; char *buf; yy_size_t n; int i; - + /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) ssalloc(n ); + n = len + 2; + buf = (char *) yy_flex_alloc( n YY_CALL_LAST_ARG ); if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in ss_scan_bytes()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); - for ( i = 0; i < _yybytes_len; ++i ) - buf[i] = yybytes[i]; + for ( i = 0; i < len; ++i ) + buf[i] = bytes[i]; - buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; + buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; - b = ss_scan_buffer(buf,n ); + b = yy_scan_buffer( buf, n YY_CALL_LAST_ARG); if ( ! b ) - YY_FATAL_ERROR( "bad buffer in ss_scan_bytes()" ); + YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); /* It's okay to grow etc. this buffer, and we should throw it * away when we're done. @@ -1696,17 +2006,97 @@ YY_BUFFER_STATE ss_scan_bytes (yyconst char * yybytes, int _yybytes_len ) b->yy_is_our_buffer = 1; return b; -} + } +/* %* */ +#endif + + +#ifndef YY_NO_PUSH_STATE +/* %- */ +#ifdef YY_USE_PROTOS +static void yy_push_state( int new_state YY_LAST_ARG) +#else +static void yy_push_state( new_state YY_LAST_ARG) +int new_state; +YY_DECL_LAST_ARG +#endif +/* %+ */ +/* %* */ + { + if ( YY_G(yy_start_stack_ptr) >= YY_G(yy_start_stack_depth) ) + { + yy_size_t new_size; + + YY_G(yy_start_stack_depth) += YY_START_STACK_INCR; + new_size = YY_G(yy_start_stack_depth) * sizeof( int ); + + if ( ! YY_G(yy_start_stack) ) + YY_G(yy_start_stack) = (int *) yy_flex_alloc( new_size YY_CALL_LAST_ARG ); + + else + YY_G(yy_start_stack) = (int *) yy_flex_realloc( + (void *) YY_G(yy_start_stack), new_size YY_CALL_LAST_ARG ); + + if ( ! YY_G(yy_start_stack) ) + YY_FATAL_ERROR( + "out of memory expanding start-condition stack" ); + } + + YY_G(yy_start_stack)[YY_G(yy_start_stack_ptr)++] = YY_START; + + BEGIN(new_state); + } +#endif + + +#ifndef YY_NO_POP_STATE +/* %- */ +#ifdef YY_USE_PROTOS +static void yy_pop_state( YY_ONLY_ARG ) +#else +static void yy_pop_state( YY_ONLY_ARG ) +YY_DECL_LAST_ARG +#endif +/* %+ */ +/* %* */ + { + if ( --YY_G(yy_start_stack_ptr) < 0 ) + YY_FATAL_ERROR( "start-condition stack underflow" ); + + BEGIN(YY_G(yy_start_stack)[YY_G(yy_start_stack_ptr)]); + } +#endif + + +#ifndef YY_NO_TOP_STATE +/* %- */ +#ifdef YY_USE_PROTOS +static int yy_top_state( YY_ONLY_ARG ) +#else +static int yy_top_state( YY_ONLY_ARG ) +YY_DECL_LAST_ARG +#endif +/* %+ */ +/* %* */ + { + return YY_G(yy_start_stack)[YY_G(yy_start_stack_ptr) - 1]; + } +#endif #ifndef YY_EXIT_FAILURE #define YY_EXIT_FAILURE 2 #endif -static void yy_fatal_error (yyconst char* msg ) -{ - (void) fprintf( stderr, "%s\n", msg ); +/* %- */ +static void yy_fatal_error( yyconst char msg[] ) + { + (void) fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); -} + } + +/* %+ */ +/* %* */ + /* Redefine yyless() so it works in section 3 code. */ @@ -1714,178 +2104,335 @@ static void yy_fatal_error (yyconst char* msg ) #define yyless(n) \ do \ { \ - /* Undo effects of setting up sstext. */ \ - int yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - sstext[ssleng] = (yy_hold_char); \ - (yy_c_buf_p) = sstext + yyless_macro_arg; \ - (yy_hold_char) = *(yy_c_buf_p); \ - *(yy_c_buf_p) = '\0'; \ - ssleng = yyless_macro_arg; \ + /* Undo effects of setting up yytext. */ \ + yytext[yyleng] = YY_G(yy_hold_char); \ + YY_G(yy_c_buf_p) = yytext + n; \ + YY_G(yy_hold_char) = *YY_G(yy_c_buf_p); \ + *YY_G(yy_c_buf_p) = '\0'; \ + yyleng = n; \ } \ while ( 0 ) + + +#ifdef YY_REENTRANT + /* Accessor methods (get/set functions) to struct members. */ -/** Get the current line number. - * - */ -int ssget_lineno (void) +#ifndef YY_NO_GET_EXTRA +#ifdef YY_USE_PROTOS +YY_EXTRA_TYPE yyget_extra( YY_ONLY_ARG ) +#else +YY_EXTRA_TYPE yyget_extra( YY_ONLY_ARG ) + YY_DECL_LAST_ARG +#endif { - - return sslineno; + return yyextra; } +#endif /* !YY_NO_GET_EXTRA */ -/** Get the input stream. - * - */ -FILE *ssget_in (void) +#ifndef YY_NO_GET_LINENO +# ifdef YY_USE_PROTOS +int yyget_lineno( YY_ONLY_ARG ) +# else +int yyget_lineno( YY_ONLY_ARG ) + YY_DECL_LAST_ARG +# endif { - return ssin; + return yylineno; } +#endif /* !YY_NO_GET_LINENO */ -/** Get the output stream. - * - */ -FILE *ssget_out (void) +#ifndef YY_NO_GET_IN +#ifdef YY_USE_PROTOS +FILE *yyget_in( YY_ONLY_ARG ) +#else +FILE *yyget_in( YY_ONLY_ARG ) + YY_DECL_LAST_ARG +#endif { - return ssout; + return yyin; } +#endif /* !YY_NO_GET_IN */ -/** Get the length of the current token. - * - */ -int ssget_leng (void) +#ifndef YY_NO_GET_OUT +#ifdef YY_USE_PROTOS +FILE *yyget_out( YY_ONLY_ARG ) +#else +FILE *yyget_out( YY_ONLY_ARG ) + YY_DECL_LAST_ARG +#endif { - return ssleng; + return yyout; } +#endif /* !YY_NO_GET_OUT */ -/** Get the current token. - * - */ - -char *ssget_text (void) +#ifndef YY_NO_GET_LENG +#ifdef YY_USE_PROTOS +int yyget_leng( YY_ONLY_ARG ) +#else +int yyget_leng( YY_ONLY_ARG ) + YY_DECL_LAST_ARG +#endif { - return sstext; + return yyleng; } +#endif /* !YY_NO_GET_LENG */ -/** Set the current line number. - * @param line_number - * - */ -void ssset_lineno (int line_number ) +#ifndef YY_NO_GET_TEXT +#ifdef YY_USE_PROTOS +char *yyget_text( YY_ONLY_ARG ) +#else +char *yyget_text( YY_ONLY_ARG ) + YY_DECL_LAST_ARG +#endif { - - sslineno = line_number; + return yytext; } +#endif /* !YY_NO_GET_TEXT */ -/** Set the input stream. This does not discard the current - * input buffer. - * @param in_str A readable stream. - * - * @see ss_switch_to_buffer - */ -void ssset_in (FILE * in_str ) +#ifndef YY_NO_SET_EXTRA +#ifdef YY_USE_PROTOS +void yyset_extra( YY_EXTRA_TYPE user_defined YY_LAST_ARG ) +#else +void yyset_extra( user_defined YY_LAST_ARG ) + YY_EXTRA_TYPE user_defined; + YY_DECL_LAST_ARG +#endif { - ssin = in_str ; + yyextra = user_defined ; } +#endif /* !YY_NO_SET_EXTRA */ -void ssset_out (FILE * out_str ) +#ifndef YY_NO_SET_LINENO +# ifdef YY_USE_PROTOS +void yyset_lineno( int line_number YY_LAST_ARG ) +# else +void yyset_lineno( line_number YY_LAST_ARG ) + int line_number; + YY_DECL_LAST_ARG +# endif { - ssout = out_str ; + yylineno = line_number; } +#endif /* !YY_NO_SET_LINENO */ -int ssget_debug (void) + +#ifndef YY_NO_SET_IN +#ifdef YY_USE_PROTOS +void yyset_in( FILE * in_str YY_LAST_ARG ) +#else +void yyset_in( in_str YY_LAST_ARG ) + FILE * in_str; + YY_DECL_LAST_ARG +#endif { - return ss_flex_debug; + yyin = in_str ; } +#endif /* !YY_NO_SET_IN */ -void ssset_debug (int bdebug ) +#ifndef YY_NO_SET_OUT +#ifdef YY_USE_PROTOS +void yyset_out( FILE * out_str YY_LAST_ARG ) +#else +void yyset_out( out_str YY_LAST_ARG ) + FILE * out_str; + YY_DECL_LAST_ARG +#endif { - ss_flex_debug = bdebug ; + yyout = out_str ; } +#endif /* !YY_NO_SET_OUT */ -static int yy_init_globals (void) +/* Accessor methods for yylval and yylloc */ + +#ifdef YY_REENTRANT_BISON_PURE +#ifndef YY_NO_GET_LVAL +#ifdef YY_USE_PROTOS +YYSTYPE * yyget_lval( YY_ONLY_ARG ) +#else +YYSTYPE * yyget_lval( YY_ONLY_ARG ) + YY_DECL_LAST_ARG +#endif { - /* Initialization is the same as for the non-reentrant scanner. - * This function is called from sslex_destroy(), so don't allocate here. - */ + return yylval; +} +#endif /* !YY_NO_GET_LVAL */ - (yy_buffer_stack) = 0; - (yy_buffer_stack_top) = 0; - (yy_buffer_stack_max) = 0; - (yy_c_buf_p) = (char *) 0; - (yy_init) = 0; - (yy_start) = 0; +#ifndef YY_NO_SET_LVAL +#ifdef YY_USE_PROTOS +void yyset_lval( YYSTYPE * yylvalp YY_LAST_ARG ) +#else +void yyset_lval( yylvalp YY_LAST_ARG ) + YYSTYPE * yylvalp; + YY_DECL_LAST_ARG +#endif +{ + yylval = yylvalp; +} +#endif /* !YY_NO_SET_LVAL */ + +#ifdef YYLTYPE +#ifndef YY_NO_GET_LLOC +#ifdef YY_USE_PROTOS +YYLTYPE *yyget_lloc( YY_ONLY_ARG ) +#else +YYLTYPE *yyget_lloc( YY_ONLY_ARG ) + YY_DECL_LAST_ARG +#endif +{ + return yylloc; +} +#endif /* !YY_NO_GET_LLOC */ + +#ifndef YY_NO_SET_LLOC +#ifdef YY_USE_PROTOS +void yyset_lloc( YYLTYPE * yyllocp YY_LAST_ARG ) +#else +void yyset_lloc( yyllocp YY_LAST_ARG ) + YYLTYPE * yyllocp; + YY_DECL_LAST_ARG +#endif +{ + yylloc = yyllocp; +} +#endif /* !YY_NO_SET_LLOC */ + +#endif /* YYLTYPE */ +#endif /* YY_REENTRANT_BISON_PURE */ + + +#ifdef YY_USE_PROTOS +static int yy_init_globals( yyscan_t yy_globals) +#else +static int yy_init_globals( yy_globals ) + yyscan_t yy_globals; +#endif + { + /* Initialization is the same as for the non-reentrant scanner. + This function is called once per scanner lifetime. */ + + /* We do not touch yylineno unless the option is enabled. */ +#ifdef YY_USE_LINENO + yylineno = 1; +#endif + YY_G(yy_current_buffer) = 0; + YY_G(yy_c_buf_p) = (char *) 0; + YY_G(yy_init) = 1; + YY_G(yy_start) = 0; + YY_G(yy_start_stack_ptr) = 0; + YY_G(yy_start_stack_depth) = 0; + YY_G(yy_start_stack) = (int *) 0; /* Defined in main.c */ #ifdef YY_STDINIT - ssin = stdin; - ssout = stdout; + yyin = stdin; + yyout = stdout; #else - ssin = (FILE *) 0; - ssout = (FILE *) 0; + yyin = (FILE *) 0; + yyout = (FILE *) 0; #endif - - /* For future reference: Set errno on error, since we are called by - * sslex_init() - */ return 0; -} - -/* sslex_destroy is for both reentrant and non-reentrant scanners. */ -int sslex_destroy (void) -{ - - /* Pop the buffer stack, destroying each element. */ - while(YY_CURRENT_BUFFER){ - ss_delete_buffer(YY_CURRENT_BUFFER ); - YY_CURRENT_BUFFER_LVALUE = NULL; - sspop_buffer_state(); - } - - /* Destroy the stack itself. */ - ssfree((yy_buffer_stack) ); - (yy_buffer_stack) = NULL; - - /* Reset the globals. This is important in a non-reentrant scanner so the next time - * sslex() is called, initialization will occur. */ - yy_init_globals( ); + } +/* User-visible API */ +#ifdef YY_USE_PROTOS +int yylex_init( yyscan_t* ptr_yy_globals) +#else +int yylex_init( ptr_yy_globals ) + yyscan_t* ptr_yy_globals; +#endif + { + *ptr_yy_globals = (yyscan_t) yy_flex_alloc ( sizeof( struct yy_globals_t ), NULL ); + yy_init_globals ( *ptr_yy_globals ); return 0; -} + } -/* - * Internal utility routines. - */ +#ifdef YY_USE_PROTOS +int yylex_destroy( yyscan_t yy_globals ) +#else +int yylex_destroy( yy_globals ) + yyscan_t yy_globals; +#endif + { + if( yy_globals ) + { + + /* Destroy the current (main) buffer. */ + yy_delete_buffer( YY_G(yy_current_buffer) YY_CALL_LAST_ARG ); + YY_G(yy_current_buffer) = NULL; + + /* Destroy the start condition stack. */ + if( YY_G(yy_start_stack) ) { + yy_flex_free( YY_G(yy_start_stack) YY_CALL_LAST_ARG ); + YY_G(yy_start_stack) = NULL; + } + + /* Destroy the main struct. */ + yy_flex_free ( yy_globals YY_CALL_LAST_ARG ); + } + return 0; + } + +#endif /* End YY_REENTRANT */ + +/* Internal utility routines. */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) -{ +#ifdef YY_USE_PROTOS +static void yy_flex_strncpy( char *s1, yyconst char *s2, int n YY_LAST_ARG) +#else +static void yy_flex_strncpy( s1, s2, n YY_LAST_ARG) +char *s1; +yyconst char *s2; +int n; +YY_DECL_LAST_ARG +#endif + { register int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; -} + } #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) -{ +#ifdef YY_USE_PROTOS +static int yy_flex_strlen( yyconst char *s YY_LAST_ARG) +#else +static int yy_flex_strlen( s YY_LAST_ARG) +yyconst char *s; +YY_DECL_LAST_ARG +#endif + { register int n; for ( n = 0; s[n]; ++n ) ; return n; -} + } #endif -void *ssalloc (yy_size_t size ) -{ - return (void *) malloc( size ); -} -void *ssrealloc (void * ptr, yy_size_t size ) -{ +#ifdef YY_USE_PROTOS +static void *yy_flex_alloc( yy_size_t size YY_LAST_ARG ) +#else +static void *yy_flex_alloc( size YY_LAST_ARG ) +yy_size_t size; +YY_DECL_LAST_ARG +#endif + { + return (void *) malloc( size ); + } + +#ifdef YY_USE_PROTOS +static void *yy_flex_realloc( void *ptr, yy_size_t size YY_LAST_ARG ) +#else +static void *yy_flex_realloc( ptr, size YY_LAST_ARG ) +void *ptr; +yy_size_t size; +YY_DECL_LAST_ARG +#endif + { /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -1894,23 +2441,45 @@ void *ssrealloc (void * ptr, yy_size_t size ) * as though doing an assignment. */ return (void *) realloc( (char *) ptr, size ); -} + } -void ssfree (void * ptr ) -{ - free( (char *) ptr ); /* see ssrealloc() for (char *) cast */ -} +#ifdef YY_USE_PROTOS +static void yy_flex_free( void *ptr YY_LAST_ARG ) +#else +static void yy_flex_free( ptr YY_LAST_ARG ) +void *ptr; +YY_DECL_LAST_ARG +#endif + { + free( (char *) ptr ); /* see yy_flex_realloc() for (char *) cast */ + } -#define YYTABLES_NAME "yytables" +#if YY_MAIN +int main() + { -#line 114 "icalsslexer.l" +#ifdef YY_REENTRANT + yyscan_t lexer; + yylex_init(&lexer); + yylex( lexer ); + yylex_destroy( lexer); + +#else + yylex(); +#endif + + return 0; + } +#endif +/* %e */ +#endif /* !ssIN_HEADER */ +#line 111 "icalsslexer.l" +#ifndef ssIN_HEADER - -/* int sswrap(yyscan_t yy_globals) */ -int sswrap() +int yywrap(yyscan_t yy_globals) { return 1; } - +#endif /* !ssIN_HEADER */ diff --git a/mozilla/calendar/libical/src/libicalss/icalsslexer.l b/mozilla/calendar/libical/src/libicalss/icalsslexer.l index 63d13d9a36f..203103d0b99 100644 --- a/mozilla/calendar/libical/src/libicalss/icalsslexer.l +++ b/mozilla/calendar/libical/src/libicalss/icalsslexer.l @@ -6,7 +6,7 @@ DESCRIPTION: - $Id: icalsslexer.l,v 1.9 2007/05/31 21:26:15 artcancro Exp $ + $Id: icalsslexer.l,v 1.7 2002/07/21 17:18:15 lindner Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org @@ -57,9 +57,7 @@ digit [0-9] %array /* Make yytext an array. Slow, but handy. HACK */ %option caseless -/* See http://lists.ximian.com/archives/public/evolution-hackers/2003-September/001304.html - if you run into problems with this option. */ -%option bison-bridge +%option reentrant-bison %s sql string_value @@ -92,11 +90,10 @@ NULL { return SQLNULL; } ; { return EOL; } \'[\@\*A-Za-z0-9\-\.\:\ ]+\' { - /* int c = input(yy_globals); removed this variable, does it work? */ - int c = input(); + int c = input(yy_globals); unput(c); if(c!='\''){ - yylval_param->v_string= icalmemory_tmp_copy(yytext); + yylvalp->v_string= icalmemory_tmp_copy(yytext); return STRING; } else { /*ssmore();*/ @@ -113,8 +110,7 @@ NULL { return SQLNULL; } %% -/* int yywrap(yyscan_t yy_globals) */ -int yywrap() +int yywrap(yyscan_t yy_globals) { return 1; } diff --git a/mozilla/calendar/libical/src/libicalss/icalssyacc.c b/mozilla/calendar/libical/src/libicalss/icalssyacc.c index 465b3a537cb..d668fad083f 100644 --- a/mozilla/calendar/libical/src/libicalss/icalssyacc.c +++ b/mozilla/calendar/libical/src/libicalss/icalssyacc.c @@ -39,7 +39,7 @@ DESCRIPTION: - $Id: icalssyacc.c,v 1.9 2007/04/30 13:57:49 artcancro Exp $ + $Id: icalssyacc.c,v 1.7 2002/07/21 17:18:15 lindner Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org @@ -261,8 +261,8 @@ static const short yycheck[] = 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. diff --git a/mozilla/calendar/libical/src/libicalss/icalssyacc.y b/mozilla/calendar/libical/src/libicalss/icalssyacc.y index b25f3f6e63b..4c589f2396a 100644 --- a/mozilla/calendar/libical/src/libicalss/icalssyacc.y +++ b/mozilla/calendar/libical/src/libicalss/icalssyacc.y @@ -8,7 +8,7 @@ DESCRIPTION: - $Id: icalssyacc.y,v 1.8 2007/04/30 13:57:49 artcancro Exp $ + $Id: icalssyacc.y,v 1.7 2002/07/21 17:18:15 lindner Exp $ $Locker: $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff --git a/mozilla/calendar/libical/src/test/Makefile.am b/mozilla/calendar/libical/src/test/Makefile.am index 6ab706be936..6a0e7ab1e7c 100644 --- a/mozilla/calendar/libical/src/test/Makefile.am +++ b/mozilla/calendar/libical/src/test/Makefile.am @@ -1,7 +1,13 @@ +if WITH_CXX +cxx_inc=-DWITH_CXX +cxx_libs=../libical/.libs/libical_cxx.a +regression_cxx = regression-cxx.cpp +else cxx_inc= cxx_libs= regression_cxx = CXX=@CC@ +endif if WITH_BDB4 bdb4_inc=-DWITH_BDB -I@BDB_DIR@/include @@ -11,14 +17,16 @@ bdb4_inc= bdb4_libs= endif -noinst_PROGRAMS = copycluster regression parser stow recur testmime process +noinst_PROGRAMS = copycluster regression parser stow recur testmime testvcal process -LDADD = ../libicalss/.libs/libicalss.a $(cxx_libs) ../libical/.libs/libical.a $(bdb4_libs) +LDADD = ../libicalss/.libs/libicalss.a ../libicalvcal/.libs/libicalvcal.a $(cxx_libs) ../libical/.libs/libical.a $(bdb4_libs) LIBS = @PTHREAD_LIBS@ INCLUDES = \ -I. \ + -I../libicalvcal \ + -I$(srcdir)/../libicalvcal \ -I$(srcdir) \ -I../libical \ -I$(srcdir)/../libical \ @@ -40,6 +48,7 @@ regression_SOURCES = \ parser_SOURCES = icaltestparser.c stow_SOURCES = stow.c +testvcal_SOURCES = testvcal.c recur_SOURCES = recur.c testmime_SOURCES = testmime.c process_SOURCES = process.c diff --git a/mozilla/calendar/libical/src/test/Makefile.in b/mozilla/calendar/libical/src/test/Makefile.in index fa83a8a94fe..a69ae65846e 100644 --- a/mozilla/calendar/libical/src/test/Makefile.in +++ b/mozilla/calendar/libical/src/test/Makefile.in @@ -1,8 +1,7 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ +# Makefile.in generated automatically by automake 1.5 from Makefile.am. -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,117 +13,57 @@ @SET_MAKE@ +SHELL = @SHELL@ + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) +transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_alias = @build_alias@ build_triplet = @build@ +host_alias = @host_alias@ host_triplet = @host@ +target_alias = @target_alias@ target_triplet = @target@ -noinst_PROGRAMS = copycluster$(EXEEXT) regression$(EXEEXT) \ - parser$(EXEEXT) stow$(EXEEXT) recur$(EXEEXT) testmime$(EXEEXT) \ - process$(EXEEXT) -subdir = src/test -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -PROGRAMS = $(noinst_PROGRAMS) -am_copycluster_OBJECTS = copycluster.$(OBJEXT) -copycluster_OBJECTS = $(am_copycluster_OBJECTS) -copycluster_LDADD = $(LDADD) -am__DEPENDENCIES_1 = -copycluster_DEPENDENCIES = ../libicalss/.libs/libicalss.a \ - $(am__DEPENDENCIES_1) ../libical/.libs/libical.a \ - $(am__DEPENDENCIES_1) -am_parser_OBJECTS = icaltestparser.$(OBJEXT) -parser_OBJECTS = $(am_parser_OBJECTS) -parser_LDADD = $(LDADD) -parser_DEPENDENCIES = ../libicalss/.libs/libicalss.a \ - $(am__DEPENDENCIES_1) ../libical/.libs/libical.a \ - $(am__DEPENDENCIES_1) -am_process_OBJECTS = process.$(OBJEXT) -process_OBJECTS = $(am_process_OBJECTS) -process_LDADD = $(LDADD) -process_DEPENDENCIES = ../libicalss/.libs/libicalss.a \ - $(am__DEPENDENCIES_1) ../libical/.libs/libical.a \ - $(am__DEPENDENCIES_1) -am_recur_OBJECTS = recur.$(OBJEXT) -recur_OBJECTS = $(am_recur_OBJECTS) -recur_LDADD = $(LDADD) -recur_DEPENDENCIES = ../libicalss/.libs/libicalss.a \ - $(am__DEPENDENCIES_1) ../libical/.libs/libical.a \ - $(am__DEPENDENCIES_1) -am__objects_1 = -am_regression_OBJECTS = regression.$(OBJEXT) \ - regression-component.$(OBJEXT) regression-classify.$(OBJEXT) \ - regression-utils.$(OBJEXT) regression-recur.$(OBJEXT) \ - regression-storage.$(OBJEXT) $(am__objects_1) -regression_OBJECTS = $(am_regression_OBJECTS) -regression_LDADD = $(LDADD) -regression_DEPENDENCIES = ../libicalss/.libs/libicalss.a \ - $(am__DEPENDENCIES_1) ../libical/.libs/libical.a \ - $(am__DEPENDENCIES_1) -am_stow_OBJECTS = stow.$(OBJEXT) -stow_OBJECTS = $(am_stow_OBJECTS) -stow_LDADD = $(LDADD) -stow_DEPENDENCIES = ../libicalss/.libs/libicalss.a \ - $(am__DEPENDENCIES_1) ../libical/.libs/libical.a \ - $(am__DEPENDENCIES_1) -am_testmime_OBJECTS = testmime.$(OBJEXT) -testmime_OBJECTS = $(am_testmime_OBJECTS) -testmime_LDADD = $(LDADD) -testmime_DEPENDENCIES = ../libicalss/.libs/libicalss.a \ - $(am__DEPENDENCIES_1) ../libical/.libs/libical.a \ - $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(copycluster_SOURCES) $(parser_SOURCES) $(process_SOURCES) \ - $(recur_SOURCES) $(regression_SOURCES) $(stow_SOURCES) \ - $(testmime_SOURCES) -DIST_SOURCES = $(copycluster_SOURCES) $(parser_SOURCES) \ - $(process_SOURCES) $(recur_SOURCES) $(regression_SOURCES) \ - $(stow_SOURCES) $(testmime_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ +AS = @AS@ AWK = @AWK@ BDB_DIR = @BDB_DIR@ BDB_DIR_INCLUDE = @BDB_DIR_INCLUDE@ @@ -132,128 +71,63 @@ BDB_DIR_LIB = @BDB_DIR_LIB@ BDB_LIB = @BDB_LIB@ BDB_VERSION = @BDB_VERSION@ CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CC@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DEV_FALSE = @DEV_FALSE@ -DEV_TRUE = @DEV_TRUE@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -HAVE_PTHREAD_FALSE = @HAVE_PTHREAD_FALSE@ -HAVE_PTHREAD_TRUE = @HAVE_PTHREAD_TRUE@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ +JAR = @JAR@ +JAVA = @JAVA@ +JAVAC = @JAVAC@ +JAVAH = @JAVAH@ +JAVA_PLATFORM = @JAVA_PLATFORM@ LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBOBJS = @LIBOBJS@ -LIBS = @PTHREAD_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ PTHREAD_LIBS = @PTHREAD_LIBS@ +PY_CFLAGS = @PY_CFLAGS@ +PY_EXTRA_LIBS = @PY_EXTRA_LIBS@ +PY_LIBS = @PY_LIBS@ +PY_LIB_LOC = @PY_LIB_LOC@ RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ +RRCAP_CFLAGS = @RRCAP_CFLAGS@ +RRCAP_LIBS = @RRCAP_LIBS@ VERSION = @VERSION@ -WITH_BDB4_FALSE = @WITH_BDB4_FALSE@ -WITH_BDB4_TRUE = @WITH_BDB4_TRUE@ YACC = @YACC@ -YFLAGS = @YFLAGS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ -am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -cxx_inc = -cxx_libs = -regression_cxx = -@WITH_BDB4_FALSE@bdb4_inc = +python_val = @python_val@ +CXX = @CXX@ +@WITH_CXX_FALSE@CXX = @CC@ + +@WITH_CXX_TRUE@cxx_inc = -DWITH_CXX +@WITH_CXX_FALSE@cxx_inc = +@WITH_CXX_TRUE@cxx_libs = ../libical/.libs/libical_cxx.a +@WITH_CXX_FALSE@cxx_libs = +@WITH_CXX_TRUE@regression_cxx = regression-cxx.cpp +@WITH_CXX_FALSE@regression_cxx = + @WITH_BDB4_TRUE@bdb4_inc = -DWITH_BDB -I@BDB_DIR@/include -@WITH_BDB4_FALSE@bdb4_libs = +@WITH_BDB4_FALSE@bdb4_inc = @WITH_BDB4_TRUE@bdb4_libs = @BDB_DIR_LIB@/@BDB_LIB@ -LDADD = ../libicalss/.libs/libicalss.a $(cxx_libs) ../libical/.libs/libical.a $(bdb4_libs) +@WITH_BDB4_FALSE@bdb4_libs = + +noinst_PROGRAMS = copycluster regression parser stow recur testmime testvcal process + +LDADD = ../libicalss/.libs/libicalss.a ../libicalvcal/.libs/libicalvcal.a $(cxx_libs) ../libical/.libs/libical.a $(bdb4_libs) + +LIBS = @PTHREAD_LIBS@ + INCLUDES = \ -I. \ + -I../libicalvcal \ + -I$(srcdir)/../libicalvcal \ -I$(srcdir) \ -I../libical \ -I$(srcdir)/../libical \ @@ -261,6 +135,7 @@ INCLUDES = \ -I$(srcdir)/../libicalss \ $(cxx_inc) $(bdb4_inc) + TESTS = regression copycluster_SOURCES = copycluster.c regression_SOURCES = \ @@ -273,51 +148,272 @@ regression_SOURCES = \ regression-storage.c \ $(regression_cxx) + parser_SOURCES = icaltestparser.c stow_SOURCES = stow.c +testvcal_SOURCES = testvcal.c recur_SOURCES = recur.c testmime_SOURCES = testmime.c process_SOURCES = process.c +subdir = src/test +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +noinst_PROGRAMS = copycluster$(EXEEXT) regression$(EXEEXT) \ + parser$(EXEEXT) stow$(EXEEXT) recur$(EXEEXT) testmime$(EXEEXT) \ + testvcal$(EXEEXT) process$(EXEEXT) +PROGRAMS = $(noinst_PROGRAMS) + +am_copycluster_OBJECTS = copycluster.$(OBJEXT) +copycluster_OBJECTS = $(am_copycluster_OBJECTS) +copycluster_LDADD = $(LDADD) +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@copycluster_DEPENDENCIES = \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libical/.libs/libical_cxx.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libical/.libs/libical.a +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@copycluster_DEPENDENCIES = \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libical/.libs/libical.a +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@copycluster_DEPENDENCIES = \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libical/.libs/libical_cxx.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libical/.libs/libical.a +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@copycluster_DEPENDENCIES = \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libical/.libs/libical.a +copycluster_LDFLAGS = +am_parser_OBJECTS = icaltestparser.$(OBJEXT) +parser_OBJECTS = $(am_parser_OBJECTS) +parser_LDADD = $(LDADD) +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@parser_DEPENDENCIES = \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libical/.libs/libical_cxx.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libical/.libs/libical.a +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@parser_DEPENDENCIES = \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libical/.libs/libical.a +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@parser_DEPENDENCIES = \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libical/.libs/libical_cxx.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libical/.libs/libical.a +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@parser_DEPENDENCIES = \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libical/.libs/libical.a +parser_LDFLAGS = +am_process_OBJECTS = process.$(OBJEXT) +process_OBJECTS = $(am_process_OBJECTS) +process_LDADD = $(LDADD) +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@process_DEPENDENCIES = \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libical/.libs/libical_cxx.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libical/.libs/libical.a +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@process_DEPENDENCIES = \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libical/.libs/libical.a +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@process_DEPENDENCIES = \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libical/.libs/libical_cxx.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libical/.libs/libical.a +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@process_DEPENDENCIES = \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libical/.libs/libical.a +process_LDFLAGS = +am_recur_OBJECTS = recur.$(OBJEXT) +recur_OBJECTS = $(am_recur_OBJECTS) +recur_LDADD = $(LDADD) +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@recur_DEPENDENCIES = \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libical/.libs/libical_cxx.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libical/.libs/libical.a +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@recur_DEPENDENCIES = \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libical/.libs/libical.a +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@recur_DEPENDENCIES = \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libical/.libs/libical_cxx.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libical/.libs/libical.a +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@recur_DEPENDENCIES = \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libical/.libs/libical.a +recur_LDFLAGS = +@WITH_CXX_TRUE@am_regression_OBJECTS = regression.$(OBJEXT) \ +@WITH_CXX_TRUE@ regression-component.$(OBJEXT) \ +@WITH_CXX_TRUE@ regression-classify.$(OBJEXT) \ +@WITH_CXX_TRUE@ regression-utils.$(OBJEXT) \ +@WITH_CXX_TRUE@ regression-recur.$(OBJEXT) \ +@WITH_CXX_TRUE@ regression-storage.$(OBJEXT) \ +@WITH_CXX_TRUE@ regression-cxx.$(OBJEXT) +@WITH_CXX_FALSE@am_regression_OBJECTS = regression.$(OBJEXT) \ +@WITH_CXX_FALSE@ regression-component.$(OBJEXT) \ +@WITH_CXX_FALSE@ regression-classify.$(OBJEXT) \ +@WITH_CXX_FALSE@ regression-utils.$(OBJEXT) \ +@WITH_CXX_FALSE@ regression-recur.$(OBJEXT) \ +@WITH_CXX_FALSE@ regression-storage.$(OBJEXT) +regression_OBJECTS = $(am_regression_OBJECTS) +regression_LDADD = $(LDADD) +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@regression_DEPENDENCIES = \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libical/.libs/libical_cxx.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libical/.libs/libical.a +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@regression_DEPENDENCIES = \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libical/.libs/libical.a +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@regression_DEPENDENCIES = \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libical/.libs/libical_cxx.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libical/.libs/libical.a +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@regression_DEPENDENCIES = \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libical/.libs/libical.a +regression_LDFLAGS = +am_stow_OBJECTS = stow.$(OBJEXT) +stow_OBJECTS = $(am_stow_OBJECTS) +stow_LDADD = $(LDADD) +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@stow_DEPENDENCIES = \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libical/.libs/libical_cxx.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libical/.libs/libical.a +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@stow_DEPENDENCIES = \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libical/.libs/libical.a +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@stow_DEPENDENCIES = \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libical/.libs/libical_cxx.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libical/.libs/libical.a +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@stow_DEPENDENCIES = \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libical/.libs/libical.a +stow_LDFLAGS = +am_testmime_OBJECTS = testmime.$(OBJEXT) +testmime_OBJECTS = $(am_testmime_OBJECTS) +testmime_LDADD = $(LDADD) +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@testmime_DEPENDENCIES = \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libical/.libs/libical_cxx.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libical/.libs/libical.a +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@testmime_DEPENDENCIES = \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libical/.libs/libical.a +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@testmime_DEPENDENCIES = \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libical/.libs/libical_cxx.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libical/.libs/libical.a +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@testmime_DEPENDENCIES = \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libical/.libs/libical.a +testmime_LDFLAGS = +am_testvcal_OBJECTS = testvcal.$(OBJEXT) +testvcal_OBJECTS = $(am_testvcal_OBJECTS) +testvcal_LDADD = $(LDADD) +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@testvcal_DEPENDENCIES = \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libical/.libs/libical_cxx.a \ +@WITH_BDB4_FALSE@@WITH_CXX_TRUE@ ../libical/.libs/libical.a +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@testvcal_DEPENDENCIES = \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_FALSE@@WITH_CXX_FALSE@ ../libical/.libs/libical.a +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@testvcal_DEPENDENCIES = \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libical/.libs/libical_cxx.a \ +@WITH_BDB4_TRUE@@WITH_CXX_TRUE@ ../libical/.libs/libical.a +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@testvcal_DEPENDENCIES = \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libicalss/.libs/libicalss.a \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libicalvcal/.libs/libicalvcal.a \ +@WITH_BDB4_TRUE@@WITH_CXX_FALSE@ ../libical/.libs/libical.a +testvcal_LDFLAGS = + +DEFS = @DEFS@ +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +depcomp = $(SHELL) $(top_srcdir)/depcomp +@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/copycluster.Po \ +@AMDEP_TRUE@ $(DEPDIR)/icaltestparser.Po $(DEPDIR)/process.Po \ +@AMDEP_TRUE@ $(DEPDIR)/recur.Po $(DEPDIR)/regression-classify.Po \ +@AMDEP_TRUE@ $(DEPDIR)/regression-component.Po \ +@AMDEP_TRUE@ $(DEPDIR)/regression-cxx.Po \ +@AMDEP_TRUE@ $(DEPDIR)/regression-recur.Po \ +@AMDEP_TRUE@ $(DEPDIR)/regression-storage.Po \ +@AMDEP_TRUE@ $(DEPDIR)/regression-utils.Po \ +@AMDEP_TRUE@ $(DEPDIR)/regression.Po $(DEPDIR)/stow.Po \ +@AMDEP_TRUE@ $(DEPDIR)/testmime.Po $(DEPDIR)/testvcal.Po +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +CFLAGS = @CFLAGS@ +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +CXXFLAGS = @CXXFLAGS@ +DIST_SOURCES = $(copycluster_SOURCES) $(parser_SOURCES) \ + $(process_SOURCES) $(recur_SOURCES) $(regression_SOURCES) \ + $(stow_SOURCES) $(testmime_SOURCES) $(testvcal_SOURCES) +DIST_COMMON = Makefile.am Makefile.in +SOURCES = $(copycluster_SOURCES) $(parser_SOURCES) $(process_SOURCES) $(recur_SOURCES) $(regression_SOURCES) $(stow_SOURCES) $(testmime_SOURCES) $(testvcal_SOURCES) + all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/test/Makefile'; \ +.SUFFIXES: .c .cpp .lo .o .obj + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu src/test/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done + -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) copycluster$(EXEEXT): $(copycluster_OBJECTS) $(copycluster_DEPENDENCIES) @rm -f copycluster$(EXEEXT) $(LINK) $(copycluster_LDFLAGS) $(copycluster_OBJECTS) $(copycluster_LDADD) $(LIBS) @@ -332,114 +428,114 @@ recur$(EXEEXT): $(recur_OBJECTS) $(recur_DEPENDENCIES) $(LINK) $(recur_LDFLAGS) $(recur_OBJECTS) $(recur_LDADD) $(LIBS) regression$(EXEEXT): $(regression_OBJECTS) $(regression_DEPENDENCIES) @rm -f regression$(EXEEXT) - $(LINK) $(regression_LDFLAGS) $(regression_OBJECTS) $(regression_LDADD) $(LIBS) + $(CXXLINK) $(regression_LDFLAGS) $(regression_OBJECTS) $(regression_LDADD) $(LIBS) stow$(EXEEXT): $(stow_OBJECTS) $(stow_DEPENDENCIES) @rm -f stow$(EXEEXT) $(LINK) $(stow_LDFLAGS) $(stow_OBJECTS) $(stow_LDADD) $(LIBS) testmime$(EXEEXT): $(testmime_OBJECTS) $(testmime_DEPENDENCIES) @rm -f testmime$(EXEEXT) $(LINK) $(testmime_LDFLAGS) $(testmime_OBJECTS) $(testmime_LDADD) $(LIBS) +testvcal$(EXEEXT): $(testvcal_OBJECTS) $(testvcal_DEPENDENCIES) + @rm -f testvcal$(EXEEXT) + $(LINK) $(testvcal_LDFLAGS) $(testvcal_OBJECTS) $(testvcal_LDADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) + -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copycluster.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icaltestparser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recur.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression-classify.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression-component.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression-recur.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression-storage.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression-utils.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stow.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testmime.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/copycluster.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/icaltestparser.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/process.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/recur.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regression-classify.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regression-component.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regression-cxx.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regression-recur.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regression-storage.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regression-utils.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regression.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stow.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testmime.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testvcal.Po@am__quote@ + +distclean-depend: + -rm -rf $(DEPDIR) .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c `cygpath -w $<` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< +CCDEPMODE = @CCDEPMODE@ -mostlyclean-libtool: - -rm -f *.lo +.cpp.o: +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -clean-libtool: - -rm -rf .libs _libs +.cpp.obj: +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXXCOMPILE) -c -o $@ `cygpath -w $<` -distclean-libtool: - -rm -f libtool +.cpp.lo: +@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< +CXXDEPMODE = @CXXDEPMODE@ uninstall-info-am: +tags: TAGS + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS + mkid -fID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ + here=`CDPATH=: && cd $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + @failed=0; all=0; xfail=0; xpass=0; \ srcdir=$(srcdir); export srcdir; \ list='$(TESTS)'; \ if test -n "$$list"; then \ @@ -451,29 +547,26 @@ check-TESTS: $(TESTS) all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ *" $$tst "*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - echo "XPASS: $$tst"; \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ ;; \ *) \ - echo "PASS: $$tst"; \ + echo "PASS: $$tst"; \ ;; \ esac; \ elif test $$? -ne 77; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ *" $$tst "*) \ - xfail=`expr $$xfail + 1`; \ - echo "XFAIL: $$tst"; \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ ;; \ *) \ - failed=`expr $$failed + 1`; \ - echo "FAIL: $$tst"; \ + failed=`expr $$failed + 1`; \ + echo "FAIL: $$tst"; \ ;; \ esac; \ - else \ - skip=`expr $$skip + 1`; \ - echo "SKIP: $$tst"; \ fi; \ done; \ if test "$$failed" -eq 0; then \ @@ -489,49 +582,28 @@ check-TESTS: $(TESTS) banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ fi; \ fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - skipped="($$skip tests were not run)"; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ + dashes=`echo "$$banner" | sed s/./=/g`; \ echo "$$dashes"; \ echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ echo "$$dashes"; \ test "$$failed" -eq 0; \ - else :; fi + fi + +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + @for file in $(DISTFILES); do \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ fi; \ if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -542,7 +614,9 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am all-am: Makefile $(PROGRAMS) + installdirs: + install: install-am install-exec: install-exec-am install-data: install-data-am @@ -554,7 +628,6 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -562,7 +635,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -573,17 +646,14 @@ clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags + +distclean-am: clean-am distclean-compile distclean-depend \ + distclean-generic distclean-libtool distclean-tags dvi: dvi-am dvi-am: -html: html-am - info: info-am info-am: @@ -599,8 +669,7 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -608,26 +677,17 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - uninstall-am: uninstall-info-am -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-generic clean-libtool clean-noinstPROGRAMS ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +.PHONY: GTAGS all all-am check check-TESTS check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS distclean distclean-compile \ + distclean-depend distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ tags uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/mozilla/calendar/libical/src/test/copycluster.c b/mozilla/calendar/libical/src/test/copycluster.c index e019102f962..63cecbc031b 100644 --- a/mozilla/calendar/libical/src/test/copycluster.c +++ b/mozilla/calendar/libical/src/test/copycluster.c @@ -3,7 +3,7 @@ FILE: copycluster.c CREATOR: eric 15 January 2000 - $Id: copycluster.c,v 1.16 2007/04/30 13:57:49 artcancro Exp $ + $Id: copycluster.c,v 1.15 2002/07/16 10:04:08 acampi Exp $ $Locker: $ (C) COPYRIGHT 2000 Eric Busboom diff --git a/mozilla/calendar/libical/src/test/icaltestparser.c b/mozilla/calendar/libical/src/test/icaltestparser.c index f703ae685ff..6119ec2471a 100644 --- a/mozilla/calendar/libical/src/test/icaltestparser.c +++ b/mozilla/calendar/libical/src/test/icaltestparser.c @@ -3,7 +3,7 @@ FILE: icaltestparser.c CREATOR: eric 20 June 1999 - $Id: icaltestparser.c,v 1.3 2007/04/30 13:57:49 artcancro Exp $ + $Id: icaltestparser.c,v 1.2 2001/01/16 06:55:09 ebusboom Exp $ $Locker: $ The contents of this file are subject to the Mozilla Public License diff --git a/mozilla/calendar/libical/src/test/process.c b/mozilla/calendar/libical/src/test/process.c index 871c14ef3e7..4bf7d82f196 100644 --- a/mozilla/calendar/libical/src/test/process.c +++ b/mozilla/calendar/libical/src/test/process.c @@ -3,7 +3,7 @@ FILE: process.c CREATOR: eric 11 February 2000 - $Id: process.c,v 1.8 2007/04/30 13:57:49 artcancro Exp $ + $Id: process.c,v 1.7 2002/06/28 10:45:12 acampi Exp $ $Locker: $ (C) COPYRIGHT 2000 Eric Busboom diff --git a/mozilla/calendar/libical/src/test/regression-classify.c b/mozilla/calendar/libical/src/test/regression-classify.c index 05029b19d39..b17af03f116 100644 --- a/mozilla/calendar/libical/src/test/regression-classify.c +++ b/mozilla/calendar/libical/src/test/regression-classify.c @@ -3,7 +3,7 @@ FILE: regression-classify.c CREATOR: eric 11 February 2000 - $Id: regression-classify.c,v 1.4 2007/04/30 13:57:49 artcancro Exp $ + $Id: regression-classify.c,v 1.3 2002/08/07 17:18:13 acampi Exp $ $Locker: $ (C) COPYRIGHT 2000 Eric Busboom diff --git a/mozilla/calendar/libical/src/test/regression-component.c b/mozilla/calendar/libical/src/test/regression-component.c index d010718d05e..0babb579ba0 100644 --- a/mozilla/calendar/libical/src/test/regression-component.c +++ b/mozilla/calendar/libical/src/test/regression-component.c @@ -316,7 +316,7 @@ void create_new_component_with_va_args() icalproperty_new_tzoffsetfrom(-4.0), icalproperty_new_tzoffsetto(-5.0), icalproperty_new_tzname("EST"), - NULL + 0 ), icalcomponent_vanew( ICAL_XSTANDARD_COMPONENT, @@ -325,9 +325,9 @@ void create_new_component_with_va_args() icalproperty_new_tzoffsetfrom(-5.0), icalproperty_new_tzoffsetto(-4.0), icalproperty_new_tzname("EST"), - NULL + 0 ), - NULL + 0 ), icalcomponent_vanew( ICAL_VEVENT_COMPONENT, @@ -336,14 +336,14 @@ void create_new_component_with_va_args() icalproperty_vanew_organizer( "mrbig@host.com", icalparameter_new_role(ICAL_ROLE_CHAIR), - NULL + 0 ), icalproperty_vanew_attendee( "employee-A@host.com", icalparameter_new_role(ICAL_ROLE_REQPARTICIPANT), icalparameter_new_rsvp(ICAL_RSVP_TRUE), icalparameter_new_cutype(ICAL_CUTYPE_GROUP), - NULL + 0 ), icalproperty_new_description("Project XYZ Review Meeting"), icalproperty_new_categories("MEETING"), @@ -353,17 +353,17 @@ void create_new_component_with_va_args() icalproperty_vanew_dtstart( atime, icalparameter_new_tzid("America/New_York"), - NULL + 0 ), icalproperty_vanew_dtend( atime, icalparameter_new_tzid("America/New_York"), - NULL + 0 ), icalproperty_new_location("1CP Conference Room 4350"), - NULL + 0 ), - NULL + 0 ); ok("creating a complex vcalendar", (calendar != NULL)); diff --git a/mozilla/calendar/libical/src/test/regression-storage.c b/mozilla/calendar/libical/src/test/regression-storage.c index 8ca836c3614..32ceb7b3c05 100644 --- a/mozilla/calendar/libical/src/test/regression-storage.c +++ b/mozilla/calendar/libical/src/test/regression-storage.c @@ -5,7 +5,7 @@ DESCRIPTION: - $Id: regression-storage.c,v 1.4 2007/04/30 13:57:49 artcancro Exp $ + $Id: regression-storage.c,v 1.3 2002/08/07 17:19:55 acampi Exp $ $Locker: $ (C) COPYRIGHT 1999 Eric Busboom diff --git a/mozilla/calendar/libical/src/test/regression.c b/mozilla/calendar/libical/src/test/regression.c index ed79166c824..0dd6b352a50 100644 --- a/mozilla/calendar/libical/src/test/regression.c +++ b/mozilla/calendar/libical/src/test/regression.c @@ -2,20 +2,20 @@ ====================================================================== FILE: regression.c CREATOR: eric 03 April 1999 - + DESCRIPTION: - - $Id: regression.c,v 1.65 2007/04/30 13:57:49 artcancro Exp $ + + $Id: regression.c,v 1.64 2003/02/17 15:26:18 acampi Exp $ $Locker: $ - (C) COPYRIGHT 1999 Eric Busboom + (C) COPYRIGHT 1999 Eric Busboom http://www.softwarestudio.org The contents of this file are subject to the Mozilla Public License Version 1.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.mozilla.org/MPL/ - + Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and @@ -24,7 +24,7 @@ The original author is Eric Busboom The original code is regression.c - + ======================================================================*/ #include "ical.h" @@ -108,7 +108,7 @@ END:VCALENDAR"; /* Return a list of all attendees who are required. */ - + static char** get_required_attendees(icalcomponent* event) { icalproperty* p; @@ -122,21 +122,21 @@ static char** get_required_attendees(icalcomponent* event) ok("event is non null", (event != 0)); int_is("event is a VEVENT", icalcomponent_isa(event), ICAL_VEVENT_COMPONENT); - + for( p = icalcomponent_get_first_property(event,ICAL_ATTENDEE_PROPERTY); p != 0; p = icalcomponent_get_next_property(event,ICAL_ATTENDEE_PROPERTY) ) { - + parameter = icalproperty_get_first_parameter(p,ICAL_ROLE_PARAMETER); - if ( icalparameter_get_role(parameter) == ICAL_ROLE_REQPARTICIPANT) + if ( icalparameter_get_role(parameter) == ICAL_ROLE_REQPARTICIPANT) { attendees[c++] = icalmemory_strdup(icalproperty_get_attendee(p)); if (c >= max) { - max *= 2; + max *= 2; attendees = realloc(attendees, max * (sizeof (char *))); } @@ -148,7 +148,7 @@ static char** get_required_attendees(icalcomponent* event) /* If an attendee has a PARTSTAT of NEEDSACTION or has no PARTSTAT parameter, change it to TENTATIVE. */ - + static void update_attendees(icalcomponent* event) { icalproperty* p; @@ -157,13 +157,13 @@ static void update_attendees(icalcomponent* event) assert(event != 0); assert(icalcomponent_isa(event) == ICAL_VEVENT_COMPONENT); - + for( p = icalcomponent_get_first_property(event,ICAL_ATTENDEE_PROPERTY); p != 0; p = icalcomponent_get_next_property(event,ICAL_ATTENDEE_PROPERTY) ) { - + parameter = icalproperty_get_first_parameter(p,ICAL_PARTSTAT_PARAMETER); if (parameter == 0) { @@ -176,7 +176,7 @@ static void update_attendees(icalcomponent* event) } else if (icalparameter_get_partstat(parameter) == ICAL_PARTSTAT_NEEDSACTION) { icalproperty_remove_parameter_by_ref(p,parameter); - + icalparameter_free(parameter); icalproperty_add_parameter( @@ -191,12 +191,12 @@ static void update_attendees(icalcomponent* event) void test_values() { - icalvalue *v; - icalvalue *copy; + icalvalue *v; + icalvalue *copy; v = icalvalue_new_caladdress("cap://value/1"); - is("icalvalue_new_caladdress()", + is("icalvalue_new_caladdress()", icalvalue_get_caladdress(v), "cap://value/1"); icalvalue_set_caladdress(v,"cap://value/2"); @@ -259,34 +259,34 @@ void test_values() if (v!=0) icalvalue_free(v); - ok("ICAL_BOOLEAN_VALUE",(ICAL_BOOLEAN_VALUE == + ok("ICAL_BOOLEAN_VALUE",(ICAL_BOOLEAN_VALUE == icalparameter_value_to_value_kind(ICAL_VALUE_BOOLEAN))); - ok("ICAL_UTCOFFSET_VALUE",(ICAL_UTCOFFSET_VALUE == + ok("ICAL_UTCOFFSET_VALUE",(ICAL_UTCOFFSET_VALUE == icalparameter_value_to_value_kind(ICAL_VALUE_UTCOFFSET))); - ok("ICAL_RECUR_VALUE", (ICAL_RECUR_VALUE == + ok("ICAL_RECUR_VALUE", (ICAL_RECUR_VALUE == icalparameter_value_to_value_kind(ICAL_VALUE_RECUR))); - ok("ICAL_CALADDRESS_VALUE",(ICAL_CALADDRESS_VALUE == + ok("ICAL_CALADDRESS_VALUE",(ICAL_CALADDRESS_VALUE == icalparameter_value_to_value_kind(ICAL_VALUE_CALADDRESS))); - ok("ICAL_PERIOD_VALUE", (ICAL_PERIOD_VALUE == + ok("ICAL_PERIOD_VALUE", (ICAL_PERIOD_VALUE == icalparameter_value_to_value_kind(ICAL_VALUE_PERIOD))); - ok("ICAL_BINARY_VALUE",(ICAL_BINARY_VALUE == + ok("ICAL_BINARY_VALUE",(ICAL_BINARY_VALUE == icalparameter_value_to_value_kind(ICAL_VALUE_BINARY))); - ok("ICAL_TEXT_VALUE",(ICAL_TEXT_VALUE == + ok("ICAL_TEXT_VALUE",(ICAL_TEXT_VALUE == icalparameter_value_to_value_kind(ICAL_VALUE_TEXT))); - ok("ICAL_DURATION_VALUE",(ICAL_DURATION_VALUE == + ok("ICAL_DURATION_VALUE",(ICAL_DURATION_VALUE == icalparameter_value_to_value_kind(ICAL_VALUE_DURATION))); ok("ICAL_INTEGER_VALUE", (ICAL_INTEGER_VALUE == icalparameter_value_to_value_kind(ICAL_VALUE_INTEGER))); ok("ICAL_URI_VALUE", (ICAL_URI_VALUE == icalparameter_value_to_value_kind(ICAL_VALUE_URI))); - ok("ICAL_FLOAT_VALUE",(ICAL_FLOAT_VALUE == + ok("ICAL_FLOAT_VALUE",(ICAL_FLOAT_VALUE == icalparameter_value_to_value_kind(ICAL_VALUE_FLOAT))); - ok("ICAL_X_VALUE",(ICAL_X_VALUE == + ok("ICAL_X_VALUE",(ICAL_X_VALUE == icalparameter_value_to_value_kind(ICAL_VALUE_X))); - ok("ICAL_DATETIME_VALUE",(ICAL_DATETIME_VALUE == + ok("ICAL_DATETIME_VALUE",(ICAL_DATETIME_VALUE == icalparameter_value_to_value_kind(ICAL_VALUE_DATETIME))); - ok("ICAL_DATE_TIME",(ICAL_DATE_VALUE == + ok("ICAL_DATE_TIME",(ICAL_DATE_VALUE == icalparameter_value_to_value_kind(ICAL_VALUE_DATE))); /* v = icalvalue_new_caladdress(0); @@ -325,32 +325,32 @@ void test_properties() icalparameter_new_cn("A Common Name 2"), icalparameter_new_cn("A Common Name 3"), icalparameter_new_cn("A Common Name 4"), - 0); + 0); for(param = icalproperty_get_first_parameter(prop,ICAL_ANY_PARAMETER); - param != 0; + param != 0; param = icalproperty_get_next_parameter(prop,ICAL_ANY_PARAMETER)) { const char *str = icalparameter_get_cn(param); if (VERBOSE) printf("Prop parameter: %s\n",icalparameter_get_cn(param)); strcat(test_cn_str, str); - } + } is("fetching parameters", test_cn_str, test_cn_str_good); if (VERBOSE) printf("Prop value: %s\n",icalproperty_get_comment(prop)); - is("icalproperty_get_comment()", + is("icalproperty_get_comment()", icalproperty_get_comment(prop), "Another Comment"); if (VERBOSE) printf("As iCAL string:\n %s\n",icalproperty_as_ical_string(prop)); - + is("icalproperty_as_ical_string()", icalproperty_as_ical_string(prop), test_ical_str_good); - + clone = icalproperty_new_clone(prop); if (VERBOSE) printf("Clone:\n %s\n",icalproperty_as_ical_string(prop)); is("icalproperty_new_clone()", icalproperty_as_ical_string(prop), test_ical_str_good); - + icalproperty_free(clone); icalproperty_free(prop); @@ -392,43 +392,43 @@ void test_parameters() is("icalparameter_new_cn()", icalparameter_get_cn(p), str1); is("icalparameter_as_ical_string()" ,icalparameter_as_ical_string(p),"CN=A Common Name"); - + icalparameter_free(p); p = icalparameter_new_from_string("PARTSTAT=ACCEPTED"); ok("PARTSTAT_PARAMETER", (icalparameter_isa(p) == ICAL_PARTSTAT_PARAMETER)); ok("PARTSTAT_ACCEPTED", (icalparameter_get_partstat(p) == ICAL_PARTSTAT_ACCEPTED)); - + icalparameter_free(p); p = icalparameter_new_from_string("ROLE=CHAIR"); ok("ROLE_PARAMETER", (icalparameter_isa(p) == ICAL_ROLE_PARAMETER)); ok("ROLE_CHAIR", (icalparameter_get_partstat(p) == ICAL_ROLE_CHAIR)); - + icalparameter_free(p); p = icalparameter_new_from_string("PARTSTAT=X-FOO"); ok("PARTSTAT_PARAMETER", (icalparameter_isa(p) == ICAL_PARTSTAT_PARAMETER)); ok("PARTSTAT_X", (icalparameter_get_partstat(p) == ICAL_PARTSTAT_X)); - + icalparameter_free(p); p = icalparameter_new_from_string("X-PARAM=X-FOO"); ok("X_PARAMETER", (icalparameter_isa(p) == ICAL_X_PARAMETER)); - + icalparameter_free(p); for (i=0;enums[i] != -1; i++){ if (VERBOSE) printf("%s\n",icalparameter_enum_to_string(enums[i])); - ok("test paramter enums", + ok("test paramter enums", (icalparameter_string_to_enum(icalparameter_enum_to_string(enums[i]))==enums[i])); } } -char *good_child = +char *good_child = "BEGIN:VEVENT\n" "VERSION:2.0\n" "DESCRIPTION:This is an event\n" @@ -465,24 +465,24 @@ void test_components() "This is only a test", icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_COMPONENTPARSEERROR), 0), - + 0 ), 0 ); - if (VERBOSE) + if (VERBOSE) printf("Original Component:\n%s\n\n",icalcomponent_as_ical_string(c)); child = icalcomponent_get_first_component(c,ICAL_VEVENT_COMPONENT); - + ok("test icalcomponent_get_first_component()", (child != NULL)); if (VERBOSE) printf("Child Component:\n%s\n\n",icalcomponent_as_ical_string(child)); - is("test results of child component", + is("test results of child component", icalcomponent_as_ical_string(child), good_child); icalcomponent_free(c); @@ -507,7 +507,7 @@ void test_memory() /* char S9[] = "9) that they are endowed by their Creator with certain unalienable Rights, "; char S10[] = "10) that among these are Life, Liberty, and the pursuit of Happiness. "; char S11[] = "11) That to secure these rights, Governments are instituted among Men, "; - char S12[] = "12) deriving their just powers from the consent of the governed. "; + char S12[] = "12) deriving their just powers from the consent of the governed. "; */ @@ -559,17 +559,17 @@ void test_memory() printf("6: %p %s\n",b6,b6); printf("7: %p %s\n",b7,b7); printf("8: %p %s\n",b8,b8); - - + + printf("Final: %s\n", f); - + printf("Final buffer size: %d\n",bufsize); } ok("final buffer size == 806", (bufsize == 806)); free(f); - + bufsize = 4; f = icalmemory_new_buffer(bufsize); @@ -618,12 +618,12 @@ void test_memory() if (VERBOSE) printf("Char-by-Char buffer: %s\n", f); icalmemory_append_char(&f, &p, &bufsize, 'j'); if (VERBOSE) printf("Char-by-Char buffer: %s\n", f); - + free(f); - + for(i=0; i<100; i++){ f = icalmemory_tmp_buffer(bufsize); - + assert(f!=0); memset(f,0,bufsize); @@ -673,19 +673,19 @@ void test_dirset() rtime.start.month = i; rtime.end = rtime.start; rtime.end.hour++; - + for (itr = icalfileset_get_first_component(cluster); itr != 0; itr = icalfileset_get_next_component(cluster)){ icalcomponent *clone; icalproperty *p; - + if(icalcomponent_isa(itr) != ICAL_VEVENT_COMPONENT){ continue; } - + /* Change the dtstart and dtend times in the component pointed to by Itr*/ @@ -716,22 +716,22 @@ void test_dirset() icalproperty_set_dtstart(p,rtime.end); } assert(icalerrno == ICAL_NO_ERROR); - + printf("\n----------\n%s\n---------\n",icalcomponent_as_ical_string(clone)); error = icaldirset_add_component(s,clone); - + assert(icalerrno == ICAL_NO_ERROR); } } - + gauge = icalgauge_new_from_sql("SELECT * FROM VEVENT WHERE VEVENT.SUMMARY = 'Submit Income Taxes' OR VEVENT.SUMMARY = 'Bastille Day Party'", 0); icaldirset_select(s,gauge); for(c = icaldirset_get_first_component(s); c != 0; c = icaldirset_get_next_component(s)){ printf("Got one! (%d)\n", count++); - + if (c != 0){ printf("%s", icalcomponent_as_ical_string(c));; if (icaldirset_add_component(s2,c) == 0){ @@ -746,10 +746,10 @@ void test_dirset() icalset_free(s2); - for(c = icaldirset_get_first_component(s); - c != 0; + for(c = icaldirset_get_first_component(s); + c != 0; c = next){ - + next = icaldirset_get_next_component(s); if (c != 0){ @@ -772,7 +772,7 @@ void test_compare() v1 = icalvalue_new_caladdress("cap://value/1"); v2 = icalvalue_new_clone(v1); - ok("compare value and clone", + ok("compare value and clone", (icalvalue_compare(v1,v2) == ICAL_XLICCOMPARETYPE_EQUAL)); icalvalue_free(v1); @@ -783,7 +783,7 @@ void test_compare() ok("test compare of A and B results in LESS", (icalvalue_compare(v1,v2) == ICAL_XLICCOMPARETYPE_LESS)); - + ok("test compare of B and A results in GREATER", (icalvalue_compare(v2,v1) == ICAL_XLICCOMPARETYPE_GREATER)); @@ -795,14 +795,14 @@ void test_compare() ok("test compare of caladdress A and B results in GREATER", (icalvalue_compare(v1,v2) == ICAL_XLICCOMPARETYPE_GREATER)); - + icalvalue_free(v1); icalvalue_free(v2); v1 = icalvalue_new_integer(5); v2 = icalvalue_new_integer(5); - ok("test compare of 5 and 5 results in EQUAL", + ok("test compare of 5 and 5 results in EQUAL", (icalvalue_compare(v1,v2) == ICAL_XLICCOMPARETYPE_EQUAL)); icalvalue_free(v1); @@ -813,7 +813,7 @@ void test_compare() ok("test compare of 5 and 10 results in LESS", (icalvalue_compare(v1,v2) == ICAL_XLICCOMPARETYPE_LESS)); - + ok("test compare of 10 and 5 results in GREATER", (icalvalue_compare(v2,v1) == ICAL_XLICCOMPARETYPE_GREATER)); @@ -826,7 +826,7 @@ void test_restriction() { icalcomponent *comp; struct icaltimetype atime = icaltime_from_timet( time(0),0); - int valid; + int valid; struct icaldatetimeperiodtype rtime; @@ -837,7 +837,7 @@ void test_restriction() rtime.period.end.hour++; rtime.time = icaltime_null_time(); - comp = + comp = icalcomponent_vanew( ICAL_VCALENDAR_COMPONENT, icalproperty_new_version("2.0"), @@ -853,7 +853,7 @@ void test_restriction() icalproperty_new_tzoffsetfrom(-4.0), icalproperty_new_tzoffsetto(-5.0), icalproperty_new_tzname("EST"), - NULL + 0 ), icalcomponent_vanew( ICAL_XSTANDARD_COMPONENT, @@ -862,9 +862,9 @@ void test_restriction() icalproperty_new_tzoffsetfrom(-5.0), icalproperty_new_tzoffsetto(-4.0), icalproperty_new_tzname("EST"), - NULL + 0 ), - NULL + 0 ), icalcomponent_vanew( ICAL_VEVENT_COMPONENT, @@ -873,14 +873,14 @@ void test_restriction() icalproperty_vanew_organizer( "mrbig@host.com", icalparameter_new_role(ICAL_ROLE_CHAIR), - NULL + 0 ), icalproperty_vanew_attendee( "employee-A@host.com", icalparameter_new_role(ICAL_ROLE_REQPARTICIPANT), icalparameter_new_rsvp(ICAL_RSVP_TRUE), icalparameter_new_cutype(ICAL_CUTYPE_GROUP), - NULL + 0 ), icalproperty_new_description("Project XYZ Review Meeting"), icalproperty_new_categories("MEETING"), @@ -890,23 +890,23 @@ void test_restriction() /* icalproperty_new_dtstart( atime, icalparameter_new_tzid("America/New_York"), - NULL + 0 ),*/ icalproperty_vanew_dtend( atime, icalparameter_new_tzid("America/New_York"), - NULL + 0 ), icalproperty_new_location("1CP Conference Room 4350"), - NULL + 0 ), - NULL + 0 ); valid = icalrestriction_check(comp); - + ok("icalrestriction_check() == 0", (valid==0)); - + str = icalcomponent_as_ical_string(comp); icalcomponent_free(comp); @@ -939,18 +939,18 @@ void test_calendar() icalparameter_new_cn("A Common Name 2"), icalparameter_new_cn("A Common Name 3"), icalparameter_new_cn("A Common Name 4"), - NULL), + 0), icalproperty_vanew_xlicerror( "This is only a test", icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_COMPONENTPARSEERROR), - NULL), - - NULL),NULL); - + 0), + + 0),0); + s = icalcalendar_get_booked(calendar); error = icaldirset_add_component(s,comp); - + ok("Adding Component to dirset", (error == ICAL_NO_ERROR)); c = icalcalendar_get_properties(calendar); @@ -971,21 +971,21 @@ void print_occur(struct icalrecurrencetype recur, struct icaltimetype start) { struct icaltimetype next; icalrecur_iterator* ritr; - + time_t tt = icaltime_as_timet(start); printf("#### %s\n",icalrecurrencetype_as_string(&recur)); printf("#### %s\n",ctime(&tt )); - + for(ritr = icalrecur_iterator_new(recur,start), - next = icalrecur_iterator_next(ritr); + next = icalrecur_iterator_next(ritr); !icaltime_is_null_time(next); next = icalrecur_iterator_next(ritr)){ - + tt = icaltime_as_timet(next); - - printf(" %s",ctime(&tt )); - + + printf(" %s",ctime(&tt )); + } icalrecur_iterator_free(ritr); @@ -1001,7 +1001,7 @@ void test_recur() rt = icalrecurrencetype_from_string("FREQ=MONTHLY;UNTIL=19971224T000000Z;INTERVAL=1;BYDAY=TU,2FR,3SA"); start = icaltime_from_string("19970905T090000Z"); - if (VERBOSE) print_occur(rt,start); + if (VERBOSE) print_occur(rt,start); if (VERBOSE) printf("\n Using icalrecur_expand_recurrence\n"); @@ -1014,7 +1014,7 @@ void test_recur() if (VERBOSE) printf(" %s",ctime(&(array[i]))); } - + /* test_increment();*/ } @@ -1063,7 +1063,7 @@ void icalrecurrencetype_test() struct icaltimetype next; time_t tt; - struct icalrecur_iterator_impl* itr + struct icalrecur_iterator_impl* itr = (struct icalrecur_iterator_impl*) icalrecur_iterator_new(r,t); do { @@ -1071,14 +1071,14 @@ void icalrecurrencetype_test() next = icalrecur_iterator_next(itr); tt = icaltime_as_timet(next); - printf("%s",ctime(&tt )); + printf("%s",ctime(&tt )); } while( ! icaltime_is_null_time(next)); icalvalue_free(v); icalrecur_iterator_free(itr); - + } /* From Federico Mena Quintero */ @@ -1087,16 +1087,16 @@ void test_recur_parameter_bug(){ #ifdef HAVE_CONFIG_H #include #endif - + #include #include #include - + static const char test_icalcomp_str[] = "BEGIN:VEVENT\n" "RRULE;X-EVOLUTION-ENDDATE=20030209T081500:FREQ=DAILY;COUNT=10;INTERVAL=6\n" -"END:VEVENT\n\n"; - +"END:VEVENT\n"; + icalcomponent *icalcomp; icalproperty *prop; struct icalrecurrencetype recur; @@ -1106,7 +1106,7 @@ void test_recur_parameter_bug(){ icalcomp = icalparser_parse_string ((char *) test_icalcomp_str); ok("icalparser_parse_string()",(icalcomp!=NULL)); assert(icalcomp!=NULL); - + str = icalcomponent_as_ical_string(icalcomp); is("parsed matches original", str, (char*)test_icalcomp_str); if (VERBOSE) printf("%s\n\n",str); @@ -1116,25 +1116,25 @@ void test_recur_parameter_bug(){ if (n_errors) { icalproperty *p; - + for (p = icalcomponent_get_first_property (icalcomp, ICAL_XLICERROR_PROPERTY); p; p = icalcomponent_get_next_property (icalcomp, ICAL_XLICERROR_PROPERTY)) { const char *str; - + str = icalproperty_as_ical_string (p); fprintf (stderr, "error: %s\n", str); } } - + prop = icalcomponent_get_first_property (icalcomp, ICAL_RRULE_PROPERTY); ok("get RRULE property", (prop!=NULL)); assert(prop!=NULL); - + recur = icalproperty_get_rrule (prop); - + if (VERBOSE) printf("%s\n",icalrecurrencetype_as_string(&recur)); icalcomponent_free(icalcomp); @@ -1148,7 +1148,7 @@ void test_duration() d = icaldurationtype_from_string("PT8H30M"); if (VERBOSE) printf("%s\n",icaldurationtype_as_ical_string(d)); int_is("PT8H30M", icaldurationtype_as_int(d), 30600); - + d = icaldurationtype_from_string("-PT8H30M"); if (VERBOSE) printf("%s\n",icaldurationtype_as_ical_string(d)); int_is("-PT8H30M", icaldurationtype_as_int(d), -30600); @@ -1237,7 +1237,7 @@ void test_strings(){ if (VERBOSE) printf("%s\n",icalvalue_as_ical_string(v)); - is("test encoding of 'foo;bar;bats'", + is("test encoding of 'foo;bar;bats'", "foo\\;bar\\;bats", icalvalue_as_ical_string(v)); icalvalue_free(v); @@ -1246,10 +1246,10 @@ void test_strings(){ v = icalvalue_new_text("foo\\;b\nar\\;ba\tts"); if (VERBOSE) printf("%s\n",icalvalue_as_ical_string(v)); - - is("test encoding of 'foo\\\\;b\\nar\\\\;ba\\tts'", + + is("test encoding of 'foo\\\\;b\\nar\\\\;ba\\tts'", "foo\\\\\\;b\\nar\\\\\\;ba\\tts", icalvalue_as_ical_string(v)); - + icalvalue_free(v); } @@ -1260,66 +1260,66 @@ void test_requeststat() icalrequeststatus s; struct icalreqstattype st, st2; char temp[1024]; - + s = icalenum_num_to_reqstat(2,1); - + ok("icalenum_num_to_reqstat(2,1)",(s == ICAL_2_1_FALLBACK_STATUS)); - + ok("icalenum_reqstat_major()",(icalenum_reqstat_major(s) == 2)); ok("icalenum_reqstat_minor()",(icalenum_reqstat_minor(s) == 1)); - + is ("icalenum_reqstat_desc() -> 2.1", icalenum_reqstat_desc(s), "Success but fallback taken on one or more property values."); - + st.code = s; st.debug = "booga"; st.desc = 0; - + is("icalreqstattype_as_string()", - icalreqstattype_as_string(st), + icalreqstattype_as_string(st), "2.1;Success but fallback taken on one or more property values.;booga"); - + st.desc = " A non-standard description"; - + is("icalreqstattype_as_string() w/ non standard description", icalreqstattype_as_string(st), "2.1; A non-standard description;booga"); - + st.desc = 0; - + sprintf(temp,"%s\n",icalreqstattype_as_string(st)); - - + + st2 = icalreqstattype_from_string("2.1;Success but fallback taken on one or more property values.;booga"); - + /* printf("%d -- %d -- %s -- %s\n",*/ ok("icalenum_reqstat_major()",(icalenum_reqstat_major(st2.code) == 2)); ok("icalenum_reqstat_minor()",(icalenum_reqstat_minor(st2.code) == 1)); is("icalenum_reqstat_desc", icalenum_reqstat_desc(st2.code), "Success but fallback taken on one or more property values."); - + st2 = icalreqstattype_from_string("2.1;Success but fallback taken on one or more property values.;booga"); if (VERBOSE) printf("%s\n",icalreqstattype_as_string(st2)); - + st2 = icalreqstattype_from_string("2.1;Success but fallback taken on one or more property values.;"); if (VERBOSE) printf("%s\n",icalreqstattype_as_string(st2)); - + st2 = icalreqstattype_from_string("2.1;Success but fallback taken on one or more property values."); if (VERBOSE) printf("%s\n",icalreqstattype_as_string(st2)); - + st2 = icalreqstattype_from_string("2.1;"); if (VERBOSE) printf("%s\n",icalreqstattype_as_string(st2)); is("st2 test again", icalreqstattype_as_string(st2), "2.1;Success but fallback taken on one or more property values."); - + st2 = icalreqstattype_from_string("2.1"); is("st2 test #3", icalreqstattype_as_string(st2), "2.1;Success but fallback taken on one or more property values."); - + p = icalproperty_new_from_string("REQUEST-STATUS:2.1;Success but fallback taken on one or more property values.;booga"); is("icalproperty_new_from_string()", @@ -1328,11 +1328,11 @@ void test_requeststat() icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR,ICAL_ERROR_NONFATAL); st2 = icalreqstattype_from_string("16.4"); - + ok("test unknown code", (st2.code == ICAL_UNKNOWN_STATUS)); - + st2 = icalreqstattype_from_string("1."); - + ok("test malformed code", (st2.code == ICAL_UNKNOWN_STATUS)); icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR,ICAL_ERROR_DEFAULT); @@ -1341,11 +1341,11 @@ void test_requeststat() void test_dtstart(){ - + struct icaltimetype tt,tt2; - + icalproperty *p; - + tt = icaltime_from_string("19970101"); @@ -1383,7 +1383,7 @@ void test_dtstart(){ void do_test_time(char* zone) { - struct icaltimetype ictt, icttutc, icttzone, icttdayl, + struct icaltimetype ictt, icttutc, icttzone, icttdayl, icttla, icttny,icttphoenix, icttlocal, icttnorm; time_t tt,tt2, tt_p200; int offset_tz; @@ -1415,7 +1415,7 @@ void do_test_time(char* zone) ictt_as_string(ictt), "2002-06-26 21:44:29 (floating)"); ictt = icaltime_from_timet_with_zone(tt, 0, azone); - ok("icaltime_from_timet_with_zone(tt,0,zone) as zone", + ok("icaltime_from_timet_with_zone(tt,0,zone) as zone", strncmp(ictt_as_string(ictt), "2002-06-26 21:44:29", 19)==0); ictt = icaltime_from_timet_with_zone(tt, 0, utczone); @@ -1431,7 +1431,7 @@ void do_test_time(char* zone) is("Convert from floating to UTC", ictt_as_string(icttutc), "2002-06-26 21:44:29 Z UTC"); - + icttzone = icaltime_convert_to_zone(ictt, azone); ok("Convert from floating to zone", @@ -1491,10 +1491,10 @@ void do_test_time(char* zone) tt = icaltime_as_timet(ictt); - ok("test icaltime -> time_t for 20001103T183030Z", (tt==973276230)); - /* Fri Nov 3 10:30:30 PST 2000 in PST + ok("test icaltime -> time_t for 20001103T183030Z", (tt==973276230)); + /* Fri Nov 3 10:30:30 PST 2000 in PST Fri Nov 3 18:30:30 PST 2000 in UTC */ - + if (VERBOSE) { printf(" Normalize \n"); printf("Orig (ical) : %s\n", ictt_as_string(ictt)); @@ -1503,17 +1503,17 @@ void do_test_time(char* zone) icttnorm.second -= 60 * 60 * 24 * 5; icttnorm = icaltime_normalize(icttnorm); - if (VERBOSE) + if (VERBOSE) printf("-5d in sec : %s\n", ictt_as_string(icttnorm)); icttnorm.day += 60; icttnorm = icaltime_normalize(icttnorm); - if (VERBOSE) + if (VERBOSE) printf("+60 d : %s\n", ictt_as_string(icttnorm)); /** add test case here.. **/ - if (VERBOSE) + if (VERBOSE) printf("\n As time_t \n"); tt2 = icaltime_as_timet(ictt); @@ -1554,7 +1554,7 @@ void do_test_time(char* zone) v = icalvalue_new_datetime(ictt); - if (VERBOSE) + if (VERBOSE) printf("System time from libical: %s\n",icalvalue_as_ical_string(v)); icalvalue_free(v); @@ -1563,7 +1563,7 @@ void do_test_time(char* zone) if (VERBOSE) printf("Converted back to libc: %s\n",ical_timet_string(tt2)); - + if (VERBOSE) printf("\n Incrementing time \n"); icttnorm = ictt; @@ -1616,7 +1616,7 @@ void do_test_time(char* zone) ok("America/Los_Angeles local time is 2000-11-03 10:30:30", (strncmp(ictt_as_string(icttla), "2000-11-03 10:30:30", 19)==0)); - ok("Test conversion back to UTC",(icaltime_compare(icttutc, ictt) == 0)); + ok("Test conversion back to UTC",(icaltime_compare(icttutc, ictt) == 0)); icttny = icaltime_convert_to_zone(ictt, icaltimezone_get_builtin_timezone("America/New_York")); @@ -1676,7 +1676,7 @@ void do_test_time(char* zone) ok("Converted time in zone America/Los_Angeles is 2000-11-03 10:30:30", (strncmp(ictt_as_string(icttla),"2000-11-03 10:30:30",19)==0)); - + icttla = icaltime_convert_to_zone(icttdayl, icaltimezone_get_builtin_timezone("America/Los_Angeles")); @@ -1703,7 +1703,7 @@ void test_iterators() char *remaining_list_good = "568910"; int nomore = 1; - + c= icalcomponent_vanew( ICAL_VCALENDAR_COMPONENT, icalcomponent_vanew(ICAL_VEVENT_COMPONENT, @@ -1727,22 +1727,22 @@ void test_iterators() icalcomponent_vanew(ICAL_VJOURNAL_COMPONENT, icalproperty_new_version("10"),0), 0); - + /* List all of the VEVENTS */ for(i = icalcomponent_begin_component(c,ICAL_VEVENT_COMPONENT); icalcompiter_deref(&i)!= 0; icalcompiter_next(&i)){ - + icalcomponent *this = icalcompiter_deref(&i); - icalproperty *p = + icalproperty *p = icalcomponent_get_first_property(this, ICAL_VERSION_PROPERTY); const char* s = icalproperty_get_version(p); strcat(vevent_list, s); } - is("iterate through VEVENTS in a component", + is("iterate through VEVENTS in a component", vevent_list, vevent_list_good); /* Delete all of the VEVENTS */ @@ -1759,26 +1759,26 @@ void test_iterators() } /* List all remaining components */ - for(inner = icalcomponent_get_first_component(c,ICAL_ANY_COMPONENT); - inner != 0; + for(inner = icalcomponent_get_first_component(c,ICAL_ANY_COMPONENT); + inner != 0; inner = icalcomponent_get_next_component(c,ICAL_ANY_COMPONENT)){ + - - icalproperty *p = + icalproperty *p = icalcomponent_get_first_property(inner,ICAL_VERSION_PROPERTY); - const char* s = icalproperty_get_version(p); + const char* s = icalproperty_get_version(p); strcat(remaining_list, s); } - is("iterate through remaining components", + is("iterate through remaining components", remaining_list, remaining_list_good); - + /* Remove all remaining components */ - for(inner = icalcomponent_get_first_component(c,ICAL_ANY_COMPONENT); - inner != 0; + for(inner = icalcomponent_get_first_component(c,ICAL_ANY_COMPONENT); + inner != 0; inner = next){ icalcomponent *this; @@ -1787,7 +1787,7 @@ void test_iterators() next = icalcomponent_get_next_component(c,ICAL_ANY_COMPONENT); p=icalcomponent_get_first_property(inner,ICAL_VERSION_PROPERTY); - s = icalproperty_get_version(p); + s = icalproperty_get_version(p); icalcomponent_remove_component(c,inner); @@ -1795,7 +1795,7 @@ void test_iterators() if(this != 0){ p=icalcomponent_get_first_property(this,ICAL_VERSION_PROPERTY); - s = icalproperty_get_version(p); + s = icalproperty_get_version(p); } icalcomponent_free(inner); @@ -1803,22 +1803,22 @@ void test_iterators() /* List all remaining components */ - for(inner = icalcomponent_get_first_component(c,ICAL_ANY_COMPONENT); - inner != 0; + for(inner = icalcomponent_get_first_component(c,ICAL_ANY_COMPONENT); + inner != 0; inner = icalcomponent_get_next_component(c,ICAL_ANY_COMPONENT)){ - - icalproperty *p = + + icalproperty *p = icalcomponent_get_first_property(inner,ICAL_VERSION_PROPERTY); - const char* s = icalproperty_get_version(p); + const char* s = icalproperty_get_version(p); if (s) nomore = 0; } - ok("test if any components remain after deleting the rest", + ok("test if any components remain after deleting the rest", nomore == 1); - + icalcomponent_free(c); } @@ -1826,7 +1826,7 @@ void test_iterators() void test_time() { char *zones[6] = { "America/Los_Angeles","America/New_York","Europe/London","Asia/Shanghai", NULL}; - + int i; do_test_time(0); @@ -1834,17 +1834,17 @@ void test_time() for(i = 0; zones[i] != NULL; i++){ if (VERBOSE) printf(" ######### Timezone: %s ############\n",zones[i]); - + do_test_time(zones[i]); - } + } } void test_icalset() { - icalcomponent *c; + icalcomponent *c; icalset* f = icalset_new_file("2446.ics"); icalset* d = icalset_new_dir("outdir"); @@ -1856,7 +1856,7 @@ void test_icalset() c != 0; c = icalset_get_next_component(f)){ - icalcomponent *clone; + icalcomponent *clone; clone = icalcomponent_new_clone(c); @@ -1879,7 +1879,7 @@ void test_overlaps() icalset *set; time_t tm1 = 973378800; /*Sat Nov 4 23:00:00 UTC 2000, Sat Nov 4 15:00:00 PST 2000 */ - time_t tm2 = 973382400; /*Sat Nov 5 00:00:00 UTC 2000 + time_t tm2 = 973382400; /*Sat Nov 5 00:00:00 UTC 2000 Sat Nov 4 16:00:00 PST 2000 */ time_t hh = 1800; /* one half hour */ @@ -1947,7 +1947,7 @@ void test_fblist() sl = icalspanlist_new(set, icaltime_from_string("19980101T000000Z"), icaltime_from_string("19980108T000000Z")); - + ok("open ../../test-data/spanlist.ics", (set!=NULL)); assert(set!=NULL); @@ -1964,7 +1964,7 @@ void test_fblist() is("Next Free time start 19980101T010000", icaltime_as_ical_string(period.start), "19980101T010000"); is("Next Free time end 19980102T010000", icaltime_as_ical_string(period.end), "19980102T010000"); - + if (VERBOSE) printf("%s\n", icalcomponent_as_ical_string(icalspanlist_as_vfreebusy(sl, "a@foo.com", @@ -1972,7 +1972,7 @@ void test_fblist() )); foo = icalspanlist_as_freebusy_matrix(sl,3600); - + for (i=0; foo[i] != -1; i++); /* find number entries */ int_is("Calculating freebusy hourly matrix", i, (7*24)); @@ -2031,12 +2031,12 @@ void test_fblist() icaltime_from_string("19970801T120000Z")); - is("Next Free time start 19980101T010000", + is("Next Free time start 19980101T010000", icaltime_as_ical_string(period.start), "19980101T010000"); - is("Next Free time end 19980102T010000", - icaltime_as_ical_string(period.end), + is("Next Free time end 19980102T010000", + icaltime_as_ical_string(period.end), "19980102T010000"); comp = icalspanlist_as_vfreebusy(sl, "a@foo.com", "b@foo.com"); @@ -2046,7 +2046,7 @@ void test_fblist() new_sl = icalspanlist_from_vfreebusy(comp); - ok("Calculating spanlist from generated VFREEBUSY component", + ok("Calculating spanlist from generated VFREEBUSY component", (new_sl != NULL)); if (VERBOSE) icalspanlist_dump(new_sl); @@ -2271,15 +2271,15 @@ void test_time_parser() void test_recur_parser() { - struct icalrecurrencetype rt; + struct icalrecurrencetype rt; char *str; - str = "FREQ=YEARLY;UNTIL=20000131T090000Z;INTERVAL=1;BYDAY=-1TU,3WE,-4FR,SU,SA;BYYEARDAY=34,65,76,78;BYMONTH=1,2,3,4,8"; + str = "FREQ=YEARLY;UNTIL=20000131T090000Z;INTERVAL=1;BYDAY=-1TU,3WE,-4FR,SA,SU;BYYEARDAY=34,65,76,78;BYMONTH=1,2,3,4,8"; rt = icalrecurrencetype_from_string(str); is(str, icalrecurrencetype_as_string(&rt), str); - str = "FREQ=DAILY;COUNT=3;INTERVAL=1;BYDAY=-1TU,3WE,-4FR,SU,SA;BYYEARDAY=34,65,76,78;BYMONTH=1,2,3,4,8"; - + str = "FREQ=DAILY;COUNT=3;INTERVAL=1;BYDAY=-1TU,3WE,-4FR,SA,SU;BYYEARDAY=34,65,76,78;BYMONTH=1,2,3,4,8"; + rt = icalrecurrencetype_from_string(str); is(str, icalrecurrencetype_as_string(&rt), str); } @@ -2318,7 +2318,7 @@ void test_start_of_week() tt1.day+=1; - + } while(tt1.year < 2010); } @@ -2365,14 +2365,14 @@ void test_doy() assert(doy == doy2); tt1.day+=1; - + } while(tt1.year < 2010); - + if (VERBOSE) printf("\nTest icaltime_day_of_year() agreement with icaltime_from_day_of_year()\n"); tt1 = icaltime_from_string("19900101"); - do{ + do{ if(doy == 1){ /** show some test cases **/ sprintf(msg, "Year %d - icaltime_day_of_year() compare", tt1.year); @@ -2388,7 +2388,7 @@ void test_doy() tt1.day+=1; tt1 = icaltime_normalize(tt1); - + } while(tt1.year < 2010); @@ -2422,11 +2422,11 @@ void test_x(){ #ifdef HAVE_CONFIG_H #include #endif - + #include #include #include - + static const char test_icalcomp_str[] = "BEGIN:VEVENT\r\n" "RRULE\r\n" @@ -2434,15 +2434,15 @@ void test_x(){ " :FREQ=DAILY;COUNT=10;INTERVAL=6\r\n" "X-COMMENT;X-FOO=BAR: Booga\r\n" "END:VEVENT\r\n"; - + icalcomponent *icalcomp; icalproperty *prop; struct icalrecurrencetype recur; int n_errors; - + icalcomp = icalparser_parse_string ((char *) test_icalcomp_str); assert(icalcomp!=NULL); - + if (VERBOSE) printf("%s\n\n",icalcomponent_as_ical_string(icalcomp)); n_errors = icalcomponent_count_errors (icalcomp); @@ -2451,25 +2451,25 @@ void test_x(){ if (n_errors) { /** NOT USED **/ icalproperty *p; - + for (p = icalcomponent_get_first_property (icalcomp, ICAL_XLICERROR_PROPERTY); p; p = icalcomponent_get_next_property (icalcomp, ICAL_XLICERROR_PROPERTY)) { const char *str; - + str = icalproperty_as_ical_string (p); fprintf (stderr, "error: %s\n", str); } } - + prop = icalcomponent_get_first_property (icalcomp, ICAL_RRULE_PROPERTY); ok("get RRULE property", (prop != NULL)); assert(prop!=NULL); - + recur = icalproperty_get_rrule (prop); - + if (VERBOSE) printf("%s\n",icalrecurrencetype_as_string(&recur)); icalcomponent_free(icalcomp); @@ -2479,7 +2479,7 @@ void test_x(){ void test_gauge_sql() { icalgauge *g; char* str; - + str= "SELECT DTSTART,DTEND,COMMENT FROM VEVENT,VTODO WHERE VEVENT.SUMMARY = 'Bongoa' AND SEQUENCE < 5"; g = icalgauge_new_from_sql(str, 0); @@ -2499,7 +2499,7 @@ void test_gauge_sql() { str="SELECT * FROM VEVENT WHERE SUMMARY == 'BA301'"; g = icalgauge_new_from_sql(str, 0); - ok(str, (g!=NULL)); + ok(str, (g!=NULL)); if (VERBOSE) icalgauge_dump(g); icalgauge_free(g); @@ -2507,7 +2507,7 @@ void test_gauge_sql() { str="SELECT * FROM VEVENT WHERE SUMMARY == 'BA301'"; g = icalgauge_new_from_sql(str, 0); - ok(str, (g!=NULL)); + ok(str, (g!=NULL)); if (VERBOSE) icalgauge_dump(g); icalgauge_free(g); @@ -2515,7 +2515,7 @@ void test_gauge_sql() { str="SELECT * FROM VEVENT WHERE LOCATION == '104 Forum'"; g = icalgauge_new_from_sql(str, 0); - ok(str, (g!=NULL)); + ok(str, (g!=NULL)); if (VERBOSE) icalgauge_dump(g); icalgauge_free(g); @@ -2746,12 +2746,12 @@ void test_gauge_compare() { ICAL_VALARM_COMPONENT, icalproperty_new_dtstart( icaltime_from_string("20000101T120000")), - + 0), 0), 0); - - + + str = "SELECT * FROM VEVENT WHERE VALARM.DTSTART = '20000101T120000'"; g = icalgauge_new_from_sql(str, 0); @@ -2766,7 +2766,7 @@ void test_gauge_compare() { int_is("compare",icalgauge_compare(g,c), 1); icalgauge_free(g); - + str = "SELECT * FROM VEVENT WHERE COMMENT = 'foo' AND VALARM.DTSTART = '20000101T120000'"; g = icalgauge_new_from_sql(str, 0); ok(str, (g!=0)); @@ -2831,7 +2831,7 @@ void test_fileset() unlink(path); fs = icalfileset_new(path); - + ok("icalfileset_new()", (fs!=NULL)); assert(fs != 0); @@ -2875,7 +2875,7 @@ void test_fileset() icalset_free(fs); /*icalgauge_free(g);*/ - + } void microsleep(int us) @@ -2912,28 +2912,28 @@ void test_file_locks() if(icalfileset_get_first_component(fs)==0){ c = make_component(0); - + d = icaldurationtype_from_int(1); - + icalcomponent_set_duration(c,d); - + icalfileset_add_component(fs,c); - + c2 = icalcomponent_new_clone(c); - + icalfileset_add_component(fs,c2); - + icalfileset_commit(fs); } - + icalset_free(fs); - + assert(icalerrno == ICAL_NO_ERROR); - + pid = fork(); - + assert(pid >= 0); - + if(pid == 0){ /*child*/ int i; @@ -2949,13 +2949,13 @@ void test_file_locks() c = icalfileset_get_first_component(fs); assert(c!=0); - + d = icalcomponent_get_duration(c); d = icaldurationtype_from_int(icaldurationtype_as_int(d)+1); - + icalcomponent_set_duration(c,d); - icalcomponent_set_summary(c,"Child"); - + icalcomponent_set_summary(c,"Child"); + c2 = icalcomponent_new_clone(c); icalcomponent_set_summary(c2,"Child"); icalfileset_add_component(fs,c2); @@ -2975,19 +2975,19 @@ void test_file_locks() } else { /* parent */ int i; - + for(i = 0; i< 50; i++){ fs = icalfileset_new(path); assert(fs != 0); c = icalfileset_get_first_component(fs); - + assert(c!=0); d = icalcomponent_get_duration(c); d = icaldurationtype_from_int(icaldurationtype_as_int(d)+1); - + icalcomponent_set_duration(c,d); icalcomponent_set_summary(c,"Parent"); @@ -3006,10 +3006,10 @@ void test_file_locks() } assert(waitpid(pid,0,0)==pid); - + fs = icalfileset_new(path); - + i=1; c = icalfileset_get_first_component(fs); @@ -3027,7 +3027,7 @@ void test_file_locks() printf("\nFinal: %d\n",final); - + assert(sec == final); #endif } @@ -3046,12 +3046,12 @@ void test_action() "ACTION:FUBAR\n" "END:VEVENT\n"; - + c = icalparser_parse_string ((char *) test_icalcomp_str); ok("icalparser_parse_string(), ACTIONS", (c!=NULL)); assert(c!=0); - + str = icalcomponent_as_ical_string(c); is("icalcomponent_as_ical_string()", str, ((char*) test_icalcomp_str)); if (VERBOSE) printf("%s\n\n",str); @@ -3075,7 +3075,7 @@ void test_action() icalcomponent_free(c); } - + void test_trigger() { @@ -3084,7 +3084,7 @@ void test_trigger() icalcomponent *c; icalproperty *p; const char* str; - + static const char test_icalcomp_str[] = "BEGIN:VEVENT\n" "TRIGGER;VALUE=DATE-TIME:19980403T120000\n" @@ -3092,12 +3092,12 @@ void test_trigger() "TRIGGER;VALUE=DATE-TIME:19980403T120000\n" "TRIGGER;VALUE=DURATION:-PT15M\n" "END:VEVENT\n"; - - + + c = icalparser_parse_string ((char *) test_icalcomp_str); ok("icalparser_parse_string()", (c!= NULL)); assert(c!=NULL); - + is("parsed triggers", icalcomponent_as_ical_string(c), (char*)test_icalcomp_str); for(p = icalcomponent_get_first_property(c,ICAL_TRIGGER_PROPERTY); @@ -3109,7 +3109,7 @@ void test_trigger() if (VERBOSE) printf("value=DATE-TIME:%s\n", icaltime_as_ical_string(tr.time)); } else { if (VERBOSE) printf("value=DURATION:%s\n", icaldurationtype_as_ical_string(tr.duration)); - } + } } icalcomponent_free(c); @@ -3128,7 +3128,7 @@ void test_trigger() tr.duration = icaldurationtype_from_string("P3DT3H50M45S"); p = icalproperty_new_trigger(tr); str = icalproperty_as_ical_string(p); - + is("TRIGGER;VALUE=DURATION:P3DT3H50M45S", str, "TRIGGER;VALUE=DURATION:P3DT3H50M45S\n"); icalproperty_free(p); @@ -3149,7 +3149,7 @@ void test_trigger() icalproperty_add_parameter(p,icalparameter_new_value( ICAL_VALUE_DATETIME )); str = icalproperty_as_ical_string(p); - + is("TRIGGER;VALUE=DURATION:P3DT3H50M45S", str, "TRIGGER;VALUE=DURATION:P3DT3H50M45S\n"); icalproperty_free(p); @@ -3170,7 +3170,7 @@ void test_trigger() icalproperty_add_parameter(p,icalparameter_new_value( ICAL_VALUE_DURATION)); str = icalproperty_as_ical_string(p); - + is("TRIGGER;VALUE=DURATION:P3DT3H50M45S", str, "TRIGGER;VALUE=DURATION:P3DT3H50M45S\n"); icalproperty_free(p); @@ -3192,7 +3192,7 @@ void test_trigger() icalproperty_add_parameter(p,icalparameter_new_value(ICAL_VALUE_BINARY)); str = icalproperty_as_ical_string(p); - + is("TRIGGER;VALUE=DURATION:P3DT3H50M45S", str, "TRIGGER;VALUE=DURATION:P3DT3H50M45S\n"); icalproperty_free(p); } @@ -3218,7 +3218,7 @@ void test_rdate() is("RDATE as DATE-TIME", "RDATE;VALUE=DATE-TIME:19970101T120000\n",str); - icalproperty_free(p); + icalproperty_free(p); /* RDATE, as PERIOD */ dtp.time = icaltime_null_time(); @@ -3227,7 +3227,7 @@ void test_rdate() str = icalproperty_as_ical_string(p); is("RDATE, as PERIOD", "RDATE;VALUE=PERIOD:19970101T120000/PT3H10M15S\n",str); - icalproperty_free(p); + icalproperty_free(p); /* RDATE, as DATE-TIME, VALUE=DATE-TIME */ dtp.time = icaltime_from_string("19970101T120000"); @@ -3238,7 +3238,7 @@ void test_rdate() is("RDATE, as DATE-TIME, VALUE=DATE-TIME", "RDATE;VALUE=DATE-TIME:19970101T120000\n",str); - icalproperty_free(p); + icalproperty_free(p); /* RDATE, as PERIOD, VALUE=DATE-TIME */ @@ -3249,7 +3249,7 @@ void test_rdate() str = icalproperty_as_ical_string(p); is("RDATE, as PERIOD, VALUE=DATE-TIME", "RDATE;VALUE=PERIOD:19970101T120000/PT3H10M15S\n",str); - icalproperty_free(p); + icalproperty_free(p); /* RDATE, as DATE-TIME, VALUE=PERIOD */ @@ -3261,7 +3261,7 @@ void test_rdate() is("RDATE, as DATE-TIME, VALUE=PERIOD", "RDATE;VALUE=DATE-TIME:19970101T120000\n",str); - icalproperty_free(p); + icalproperty_free(p); /* RDATE, as PERIOD, VALUE=PERIOD */ @@ -3273,7 +3273,7 @@ void test_rdate() is("RDATE, as PERIOD, VALUE=PERIOD", "RDATE;VALUE=PERIOD:19970101T120000/PT3H10M15S\n",str); - icalproperty_free(p); + icalproperty_free(p); /* RDATE, as DATE-TIME, VALUE=BINARY */ @@ -3282,10 +3282,10 @@ void test_rdate() p = icalproperty_new_rdate(dtp); icalproperty_add_parameter(p,icalparameter_new_value(ICAL_VALUE_BINARY)); str = icalproperty_as_ical_string(p); - + is("RDATE, as DATE-TIME, VALUE=BINARY", "RDATE;VALUE=DATE-TIME:19970101T120000\n",str); - icalproperty_free(p); + icalproperty_free(p); /* RDATE, as PERIOD, VALUE=BINARY */ @@ -3297,13 +3297,13 @@ void test_rdate() is("RDAE, as PERIOD, VALUE=BINARY", "RDATE;VALUE=PERIOD:19970101T120000/PT3H10M15S\n",str); - icalproperty_free(p); + icalproperty_free(p); } void test_langbind() { - icalcomponent *c, *inner; + icalcomponent *c, *inner; icalproperty *p; char *test_str_parsed; static const char test_str[] = @@ -3319,7 +3319,7 @@ void test_langbind() "FREEBUSY:19970101T120000/P3DT4H25M\n" "END:VEVENT\n"; - static const char *test_str_parsed_good = + static const char *test_str_parsed_good = "BEGIN:VEVENT\n" "ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MAILTO:\n" " employee-A@host.com\n" @@ -3347,14 +3347,14 @@ void test_langbind() test_str_parsed, test_str_parsed_good); - + inner = icalcomponent_get_inner(c); for( p = icallangbind_get_first_property(inner,"ANY"); p != 0; p = icallangbind_get_next_property(inner,"ANY") - ) { + ) { const char *str = icallangbind_property_eval_string(p,":"); /** TODO add tests **/ @@ -3370,7 +3370,7 @@ void test_langbind() icalproperty_as_ical_string(p), "ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=INDIVIDUAL:MAILTO:\n" " employee-A@host.com\n"); - + icalproperty_set_value_from_string(p,"mary@foo.org","TEXT"); is ("Set attendee parameter value", @@ -3404,26 +3404,26 @@ void test_property_parse() str = icalproperty_as_ical_string(p); if (VERBOSE) printf("%s\n",str); - + icalproperty_free(p); } -void test_value_parameter() +void test_value_parameter() { icalcomponent *c; icalproperty *p; icalparameter *param; - + static const char test_icalcomp_str[] = "BEGIN:VEVENT\n" "DTSTART;VALUE=DATE-TIME:19971123T123000\n" "DTSTART;VALUE=DATE:19971123\n" "DTSTART;VALUE=FOO:19971123T123000\n" "END:VEVENT\n"; - + c = icalparser_parse_string ((char *) test_icalcomp_str); ok("icalparser_parse_string()", (c != NULL)); if (!c) { @@ -3434,7 +3434,7 @@ void test_value_parameter() p = icalcomponent_get_first_property(c,ICAL_DTSTART_PROPERTY); param = icalproperty_get_first_parameter(p,ICAL_VALUE_PARAMETER); - + ok("icalproperty_get_value()", (icalparameter_get_value(param) == ICAL_VALUE_DATETIME)); p = icalcomponent_get_next_property(c,ICAL_DTSTART_PROPERTY); @@ -3474,10 +3474,10 @@ void test_x_parameter() -void test_x_property() +void test_x_property() { icalproperty *p; - + p= icalproperty_new_from_string( "X-LIC-PROPERTY: This is a note"); @@ -3530,13 +3530,13 @@ void test_vcal(void) char* file = "../../test-data/user-cal.vcf"; vcal = Parse_MIME_FromFileName(file); - + ok("Parsing ../../test-data/user-cal.vcf", (vcal != 0)); comp = icalvcal_convert(vcal); ok("Converting to ical component", (comp != 0)); - + if (VERBOSE && comp) printf("%s\n",icalcomponent_as_ical_string(comp)); @@ -3578,7 +3578,7 @@ int main(int argc, char *argv[]) errflg++; } } - } + } if (optind < argc) { do_test = atoi(argv[argc-1]); } @@ -3587,8 +3587,8 @@ int main(int argc, char *argv[]) do_test = atoi(argv[2]); #endif - - + + test_run("Test time parser functions", test_time_parser, do_test, do_header); test_run("Test time", test_time, do_test, do_header); test_run("Test day of Year", test_doy, do_test, do_header); @@ -3603,7 +3603,7 @@ int main(int argc, char *argv[]) test_run("Test Array Expansion", test_expand_recurrence, do_test, do_header); test_run("Test Free/Busy lists", test_fblist, do_test, do_header); test_run("Test Overlaps", test_overlaps, do_test, do_header); - + test_run("Test Span", test_icalcomponent_get_span, do_test, do_header); test_run("Test Gauge SQL", test_gauge_sql, do_test, do_header); test_run("Test Gauge Compare", test_gauge_compare, do_test, do_header); @@ -3611,7 +3611,7 @@ int main(int argc, char *argv[]) test_run("Test File Set (Extended)", test_fileset_extended, do_test, do_header); test_run("Test Dir Set", test_dirset, do_test, do_header); test_run("Test Dir Set (Extended)", test_dirset_extended, do_test, do_header); - + test_run("Test File Locks", test_file_locks, do_test, do_header); test_run("Test X Props and Params", test_x, do_test, do_header); test_run("Test Trigger", test_trigger, do_test, do_header); @@ -3646,6 +3646,10 @@ int main(int argc, char *argv[]) /** OPTIONAL TESTS go here... **/ +#ifdef WITH_CXX + test_run("Test C++ API", test_cxx, do_test, do_header); +#endif + #ifdef WITH_BDB test_run("Test BDB Set", test_bdbset, do_test, do_header); #endif diff --git a/mozilla/calendar/libical/src/test/stow.c b/mozilla/calendar/libical/src/test/stow.c index 4465a2a3515..e37fdcf8f34 100644 --- a/mozilla/calendar/libical/src/test/stow.c +++ b/mozilla/calendar/libical/src/test/stow.c @@ -3,7 +3,7 @@ FILE: stow.c CREATOR: eric 29 April 2000 - $Id: stow.c,v 1.9 2007/04/30 13:57:49 artcancro Exp $ + $Id: stow.c,v 1.8 2003/11/17 22:51:53 gray-john Exp $ $Locker: $ (C) COPYRIGHT 2000 Eric Busboom @@ -121,17 +121,19 @@ enum file_type test_file(char *path) char* lowercase(const char* str) { char* p = 0; - char* new = strdup(str); + char* ret; if(str ==0){ return 0; } - for(p = new; *p!=0; p++){ + ret = strdup(str); + + for(p = ret; *p!=0; p++){ *p = tolower(*p); } - return new; + return ret; } #if 0 diff --git a/mozilla/calendar/libical/src/test/testmime.c b/mozilla/calendar/libical/src/test/testmime.c index 4927e883b6e..c87d3064eba 100644 --- a/mozilla/calendar/libical/src/test/testmime.c +++ b/mozilla/calendar/libical/src/test/testmime.c @@ -3,7 +3,7 @@ FILE: CREATOR: eric 25 June 2000 - $Id: testmime.c,v 1.4 2007/04/30 13:57:49 artcancro Exp $ + $Id: testmime.c,v 1.3 2002/06/28 10:45:12 acampi Exp $ $Locker: $ The contents of this file are subject to the Mozilla Public License diff --git a/mozilla/calendar/libical/src/test/testvcal.c b/mozilla/calendar/libical/src/test/testvcal.c index c08e329dcde..6064834d241 100644 --- a/mozilla/calendar/libical/src/test/testvcal.c +++ b/mozilla/calendar/libical/src/test/testvcal.c @@ -3,7 +3,7 @@ FILE: vcal.c CREATOR: eric 26 May 2000 - $Id: testvcal.c,v 1.3 2007/04/30 13:57:49 artcancro Exp $ + $Id: testvcal.c,v 1.2 2001/04/02 17:16:47 ebusboom Exp $ $Locker: $ (C) COPYRIGHT 2000 Eric Busboom diff --git a/mozilla/calendar/libical/test-data/recur.txt b/mozilla/calendar/libical/test-data/recur.txt index e6f64bf4d24..e1b00a65a2b 100644 --- a/mozilla/calendar/libical/test-data/recur.txt +++ b/mozilla/calendar/libical/test-data/recur.txt @@ -19,7 +19,7 @@ DTSTART :20020402T114500 DTEND :20020402T124500 -X-EXPECT-NUMEVENTS: 6 +X-EXPECT-NUMEVENTS: 7 END:VEVENT @@ -44,7 +44,7 @@ DTSTART :19970512T090000 RRULE :FREQ=YEARLY;INTERVAL=1;COUNT=10;BYDAY=MO;BYWEEKNO=20 -X-EXPECT-NUMEVENTS: 10 +X-EXPECT-NUMEVENTS: 11 END:VEVENT @@ -156,7 +156,7 @@ DTSTART ;TZID=America/Los_Angeles :19980101T090000 RRULE - :FREQ=DAILY;UNTIL=20000131T090000Z;INTERVAL=1;BYMONTH=1 + :FREQ=DAILY;UNTIL=20000131T170000Z;INTERVAL=1;BYMONTH=1 X-EXPECT-NUMEVENTS: 93 END:VEVENT @@ -267,7 +267,7 @@ DTSTART :19970902T090000 RRULE :FREQ=WEEKLY;INTERVAL=2;UNTIL=19971224T000000Z;BYDAY=MO,WE,FR;WKST=SU -X-EXPECT-NUMEVENTS: 24 +X-EXPECT-NUMEVENTS: 25 END:VEVENT BEGIN:VEVENT @@ -435,7 +435,7 @@ DTSTART :19970512T090000 RRULE :FREQ=YEARLY;INTERVAL=1;COUNT=10;BYDAY=MO;BYWEEKNO=20 -X-EXPECT-NUMEVENTS: 10 +X-EXPECT-NUMEVENTS: 11 END:VEVENT @@ -522,8 +522,7 @@ BEGIN:VEVENT DESCRIPTION :Every 3 hours from 9:00 AM to 5:00 PM on a specific day: DTSTART - ;TZID=America/Los_Angeles - :19970902T090000 + :19970902T090000Z RRULE :FREQ=HOURLY;UNTIL=19970902T170000Z;INTERVAL=3 X-EXPECT-NUMEVENTS: 3 diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Abidjan.ics b/mozilla/calendar/libical/zoneinfo/Africa/Abidjan.ics index 6382cf32b6b..cd17b2c2682 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Abidjan.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Abidjan.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Abidjan +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Abidjan X-LIC-LOCATION:Africa/Abidjan BEGIN:STANDARD TZOFFSETFROM:+0000 +TZOFFSETTO:-001608 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-001608 TZOFFSETTO:+0000 TZNAME:GMT -DTSTART:19700101T000000 +DTSTART:19120101T000000 +RDATE:19120101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Accra.ics b/mozilla/calendar/libical/zoneinfo/Africa/Accra.ics index 4b5cf78033f..de0fa1468af 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Accra.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Accra.ics @@ -1,14 +1,48 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Accra +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Accra X-LIC-LOCATION:Africa/Accra BEGIN:STANDARD TZOFFSETFROM:+0000 +TZOFFSETTO:-000052 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-000052 TZOFFSETTO:+0000 TZNAME:GMT -DTSTART:19700101T000000 +DTSTART:19180101T000000 +RDATE:19180101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0000 +TZOFFSETTO:+0020 +TZNAME:GHST +DTSTART:19360901T000000 +RDATE:19360901T000000 +RDATE:19370901T000000 +RDATE:19380901T000000 +RDATE:19390901T000000 +RDATE:19400901T000000 +RDATE:19410901T000000 +RDATE:19420901T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0020 +TZOFFSETTO:+0000 +TZNAME:GMT +DTSTART:19361231T000000 +RDATE:19361231T000000 +RDATE:19371231T000000 +RDATE:19381231T000000 +RDATE:19391231T000000 +RDATE:19401231T000000 +RDATE:19411231T000000 +RDATE:19421231T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Addis_Ababa.ics b/mozilla/calendar/libical/zoneinfo/Africa/Addis_Ababa.ics index 9b48016802f..352c86a6c6b 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Addis_Ababa.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Addis_Ababa.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Addis_Ababa +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Addis_Ababa X-LIC-LOCATION:Africa/Addis_Ababa BEGIN:STANDARD -TZOFFSETFROM:+0300 +TZOFFSETFROM:+0000 +TZOFFSETTO:+023448 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+023448 +TZOFFSETTO:+023520 +TZNAME:ADMT +DTSTART:18700101T000000 +RDATE:18700101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+023520 TZOFFSETTO:+0300 TZNAME:EAT -DTSTART:19700101T000000 +DTSTART:19360505T000000 +RDATE:19360505T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Algiers.ics b/mozilla/calendar/libical/zoneinfo/Africa/Algiers.ics index 09fa13f2bbb..1caf216564a 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Algiers.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Algiers.ics @@ -1,14 +1,97 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Algiers +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Algiers X-LIC-LOCATION:Africa/Algiers BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+001212 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+001212 +TZOFFSETTO:+000921 +TZNAME:PMT +DTSTART:18910315T000100 +RDATE:18910315T000100 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+000921 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19110311T000000 +RDATE:19110311T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:WEST +DTSTART:19160614T230000 +RDATE:19160614T230000 +RDATE:19170324T230000 +RDATE:19180309T230000 +RDATE:19190301T230000 +RDATE:19200214T230000 +RDATE:19210314T230000 +RDATE:19390911T230000 +RDATE:19710425T230000 +RDATE:19770506T000000 +RDATE:19800425T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19161002T000000 +RDATE:19161002T000000 +RDATE:19171008T000000 +RDATE:19181007T000000 +RDATE:19191006T000000 +RDATE:19201024T000000 +RDATE:19210622T000000 +RDATE:19391119T010000 +RDATE:19461007T000000 +RDATE:19630414T000000 +RDATE:19710927T000000 +RDATE:19791026T000000 +RDATE:19801031T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19400225T020000 +RDATE:19400225T020000 +RDATE:19560129T000000 +RDATE:19810501T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19440403T020000 +RDATE:19440403T020000 +RDATE:19450402T020000 +RDATE:19780324T010000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19441008T020000 +RDATE:19441008T020000 +RDATE:19450916T010000 +RDATE:19780922T030000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+0100 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19700101T000000 +DTSTART:19771021T000000 +RDATE:19771021T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Asmara.ics b/mozilla/calendar/libical/zoneinfo/Africa/Asmara.ics deleted file mode 100644 index 333cb2ca7bb..00000000000 --- a/mozilla/calendar/libical/zoneinfo/Africa/Asmara.ics +++ /dev/null @@ -1,14 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Asmara -X-LIC-LOCATION:Africa/Asmara -BEGIN:STANDARD -TZOFFSETFROM:+0300 -TZOFFSETTO:+0300 -TZNAME:EAT -DTSTART:19700101T000000 -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Bamako.ics b/mozilla/calendar/libical/zoneinfo/Africa/Bamako.ics index 8073f3483ef..42d73330300 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Bamako.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Bamako.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Bamako +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Bamako X-LIC-LOCATION:Africa/Bamako BEGIN:STANDARD TZOFFSETFROM:+0000 +TZOFFSETTO:-0032 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0032 TZOFFSETTO:+0000 TZNAME:GMT -DTSTART:19700101T000000 +DTSTART:19120101T000000 +RDATE:19120101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-0100 +TZNAME:WAT +DTSTART:19340226T000000 +RDATE:19340226T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0100 +TZOFFSETTO:+0000 +TZNAME:GMT +DTSTART:19600620T000000 +RDATE:19600620T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Bangui.ics b/mozilla/calendar/libical/zoneinfo/Africa/Bangui.ics index 2901cb2ab3b..1d4413221af 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Bangui.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Bangui.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Bangui +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Bangui X-LIC-LOCATION:Africa/Bangui BEGIN:STANDARD -TZOFFSETFROM:+0100 +TZOFFSETFROM:+0000 +TZOFFSETTO:+011420 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+011420 TZOFFSETTO:+0100 TZNAME:WAT -DTSTART:19700101T000000 +DTSTART:19120101T000000 +RDATE:19120101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Banjul.ics b/mozilla/calendar/libical/zoneinfo/Africa/Banjul.ics index df39b70e6fd..f32cc22e4e9 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Banjul.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Banjul.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Banjul +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Banjul X-LIC-LOCATION:Africa/Banjul BEGIN:STANDARD TZOFFSETFROM:+0000 +TZOFFSETTO:-010636 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-010636 +TZOFFSETTO:-010636 +TZNAME:BMT +DTSTART:19120101T000000 +RDATE:19120101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-010636 +TZOFFSETTO:-0100 +TZNAME:WAT +DTSTART:19350101T000000 +RDATE:19350101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0100 TZOFFSETTO:+0000 TZNAME:GMT -DTSTART:19700101T000000 +DTSTART:19640101T000000 +RDATE:19640101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Bissau.ics b/mozilla/calendar/libical/zoneinfo/Africa/Bissau.ics index a483393f0c1..9c42cf007f3 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Bissau.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Bissau.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Bissau +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Bissau X-LIC-LOCATION:Africa/Bissau BEGIN:STANDARD TZOFFSETFROM:+0000 +TZOFFSETTO:-010220 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-010220 +TZOFFSETTO:-0100 +TZNAME:WAT +DTSTART:19110526T000000 +RDATE:19110526T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0100 TZOFFSETTO:+0000 TZNAME:GMT -DTSTART:19700101T000000 +DTSTART:19750101T000000 +RDATE:19750101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Blantyre.ics b/mozilla/calendar/libical/zoneinfo/Africa/Blantyre.ics index 62d573b441e..edd8dcf8fb4 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Blantyre.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Blantyre.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Blantyre +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Blantyre X-LIC-LOCATION:Africa/Blantyre BEGIN:STANDARD -TZOFFSETFROM:+0200 +TZOFFSETFROM:+0000 +TZOFFSETTO:+0220 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0220 TZOFFSETTO:+0200 TZNAME:CAT -DTSTART:19700101T000000 +DTSTART:19030301T000000 +RDATE:19030301T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Brazzaville.ics b/mozilla/calendar/libical/zoneinfo/Africa/Brazzaville.ics index dbd222de44b..30001f17d9f 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Brazzaville.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Brazzaville.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Brazzaville +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Brazzaville X-LIC-LOCATION:Africa/Brazzaville BEGIN:STANDARD -TZOFFSETFROM:+0100 +TZOFFSETFROM:+0000 +TZOFFSETTO:+010108 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+010108 TZOFFSETTO:+0100 TZNAME:WAT -DTSTART:19700101T000000 +DTSTART:19120101T000000 +RDATE:19120101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Bujumbura.ics b/mozilla/calendar/libical/zoneinfo/Africa/Bujumbura.ics index e5c3028a6be..0e0031f5e89 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Bujumbura.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Bujumbura.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Bujumbura +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Bujumbura X-LIC-LOCATION:Africa/Bujumbura BEGIN:STANDARD -TZOFFSETFROM:+0200 +TZOFFSETFROM:+0000 +TZOFFSETTO:+015728 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+015728 TZOFFSETTO:+0200 TZNAME:CAT -DTSTART:19700101T000000 +DTSTART:18900101T000000 +RDATE:18900101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Cairo.ics b/mozilla/calendar/libical/zoneinfo/Africa/Cairo.ics index bc7d4f256ec..330e121448e 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Cairo.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Cairo.ics @@ -1,22 +1,137 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Cairo +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Cairo X-LIC-LOCATION:Africa/Cairo BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700424T000000 +DTSTART:19950428T000000 RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1FR END:DAYLIGHT BEGIN:STANDARD -TZOFFSETFROM:+0200 +TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19700924T230000 -RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1TH +DTSTART:19950929T000000 +RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=25,26,27,28,29,30;BYDAY=FR +RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=1;BYDAY=FR +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0205 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0205 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19001001T000000 +RDATE:19001001T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19400715T000000 +RDATE:19400715T000000 +RDATE:19410415T000000 +RDATE:19420401T000000 +RDATE:19430401T000000 +RDATE:19440401T000000 +RDATE:19450416T000000 +RDATE:19570510T000000 +RDATE:19580501T000000 +RDATE:19590501T010000 +RDATE:19600501T010000 +RDATE:19610501T010000 +RDATE:19620501T010000 +RDATE:19630501T010000 +RDATE:19640501T010000 +RDATE:19650501T010000 +RDATE:19660501T010000 +RDATE:19670501T010000 +RDATE:19680501T010000 +RDATE:19690501T010000 +RDATE:19700501T010000 +RDATE:19710501T010000 +RDATE:19720501T010000 +RDATE:19730501T010000 +RDATE:19740501T010000 +RDATE:19750501T010000 +RDATE:19760501T010000 +RDATE:19770501T010000 +RDATE:19780501T010000 +RDATE:19790501T010000 +RDATE:19800501T010000 +RDATE:19810501T010000 +RDATE:19820725T010000 +RDATE:19830712T010000 +RDATE:19840501T010000 +RDATE:19850501T010000 +RDATE:19860501T010000 +RDATE:19870501T010000 +RDATE:19880501T010000 +RDATE:19890506T010000 +RDATE:19900501T010000 +RDATE:19910501T010000 +RDATE:19920501T010000 +RDATE:19930501T010000 +RDATE:19940501T010000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19401001T000000 +RDATE:19401001T000000 +RDATE:19410916T000000 +RDATE:19421027T000000 +RDATE:19431101T000000 +RDATE:19441101T000000 +RDATE:19451101T000000 +RDATE:19571001T000000 +RDATE:19581001T000000 +RDATE:19590930T030000 +RDATE:19600930T030000 +RDATE:19610930T030000 +RDATE:19620930T030000 +RDATE:19630930T030000 +RDATE:19640930T030000 +RDATE:19650930T030000 +RDATE:19661001T030000 +RDATE:19671001T030000 +RDATE:19681001T030000 +RDATE:19691001T030000 +RDATE:19701001T030000 +RDATE:19711001T030000 +RDATE:19721001T030000 +RDATE:19731001T030000 +RDATE:19741001T030000 +RDATE:19751001T030000 +RDATE:19761001T030000 +RDATE:19771001T030000 +RDATE:19781001T030000 +RDATE:19791001T030000 +RDATE:19801001T030000 +RDATE:19811001T030000 +RDATE:19821001T030000 +RDATE:19831001T030000 +RDATE:19841001T030000 +RDATE:19851001T030000 +RDATE:19861001T030000 +RDATE:19871001T030000 +RDATE:19881001T030000 +RDATE:19891001T030000 +RDATE:19901001T030000 +RDATE:19911001T030000 +RDATE:19921001T030000 +RDATE:19931001T030000 +RDATE:19941001T030000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Casablanca.ics b/mozilla/calendar/libical/zoneinfo/Africa/Casablanca.ics index 79699020c10..378f1fb27cd 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Casablanca.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Casablanca.ics @@ -1,14 +1,58 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Casablanca +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Casablanca X-LIC-LOCATION:Africa/Casablanca BEGIN:STANDARD TZOFFSETFROM:+0000 +TZOFFSETTO:-003020 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-003020 TZOFFSETTO:+0000 TZNAME:WET -DTSTART:19700101T000000 +DTSTART:19131026T000000 +RDATE:19131026T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:WEST +DTSTART:19390912T000000 +RDATE:19390912T000000 +RDATE:19400225T000000 +RDATE:19500611T000000 +RDATE:19670603T120000 +RDATE:19740624T000000 +RDATE:19760501T000000 +RDATE:19770501T000000 +RDATE:19780601T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19391119T000000 +RDATE:19391119T000000 +RDATE:19451118T000000 +RDATE:19501029T000000 +RDATE:19671001T000000 +RDATE:19740901T000000 +RDATE:19760801T000000 +RDATE:19770928T000000 +RDATE:19780804T000000 +RDATE:19860101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19840316T000000 +RDATE:19840316T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Ceuta.ics b/mozilla/calendar/libical/zoneinfo/Africa/Ceuta.ics index 8b5bd63262c..f1421f4f706 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Ceuta.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Ceuta.ics @@ -1,22 +1,106 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Ceuta +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Ceuta X-LIC-LOCATION:Africa/Ceuta BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19860330T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-002116 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-002116 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19010101T000000 +RDATE:19010101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:WEST +DTSTART:19180506T230000 +RDATE:19180506T230000 +RDATE:19240416T230000 +RDATE:19260417T230000 +RDATE:19270409T230000 +RDATE:19280414T230000 +RDATE:19670603T120000 +RDATE:19740624T000000 +RDATE:19760501T000000 +RDATE:19770501T000000 +RDATE:19780601T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19181007T230000 +RDATE:19181007T230000 +RDATE:19241005T000000 +RDATE:19261003T000000 +RDATE:19271002T000000 +RDATE:19281007T000000 +RDATE:19671001T000000 +RDATE:19740901T000000 +RDATE:19760801T000000 +RDATE:19770928T000000 +RDATE:19780804T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19240101T000000 +RDATE:19240101T000000 +RDATE:19290101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19840316T000000 +RDATE:19840316T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19860101T000000 +RDATE:19860101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19860928T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Conakry.ics b/mozilla/calendar/libical/zoneinfo/Africa/Conakry.ics index b3900ff4097..8742216dbbf 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Conakry.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Conakry.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Conakry +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Conakry X-LIC-LOCATION:Africa/Conakry BEGIN:STANDARD TZOFFSETFROM:+0000 +TZOFFSETTO:-005452 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-005452 TZOFFSETTO:+0000 TZNAME:GMT -DTSTART:19700101T000000 +DTSTART:19120101T000000 +RDATE:19120101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-0100 +TZNAME:WAT +DTSTART:19340226T000000 +RDATE:19340226T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0100 +TZOFFSETTO:+0000 +TZNAME:GMT +DTSTART:19600101T000000 +RDATE:19600101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Dakar.ics b/mozilla/calendar/libical/zoneinfo/Africa/Dakar.ics index bf23430bf6a..fac3b5b3c2e 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Dakar.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Dakar.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Dakar +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Dakar X-LIC-LOCATION:Africa/Dakar BEGIN:STANDARD TZOFFSETFROM:+0000 +TZOFFSETTO:-010944 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-010944 +TZOFFSETTO:-0100 +TZNAME:WAT +DTSTART:19120101T000000 +RDATE:19120101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0100 TZOFFSETTO:+0000 TZNAME:GMT -DTSTART:19700101T000000 +DTSTART:19410601T000000 +RDATE:19410601T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Dar_es_Salaam.ics b/mozilla/calendar/libical/zoneinfo/Africa/Dar_es_Salaam.ics index 225e3a0f9ef..9df58090a19 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Dar_es_Salaam.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Dar_es_Salaam.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Dar_es_Salaam +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Dar_es_Salaam X-LIC-LOCATION:Africa/Dar_es_Salaam BEGIN:STANDARD -TZOFFSETFROM:+0300 +TZOFFSETFROM:+0000 +TZOFFSETTO:+023708 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+023708 TZOFFSETTO:+0300 TZNAME:EAT -DTSTART:19700101T000000 +DTSTART:19310101T000000 +RDATE:19310101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0245 +TZNAME:BEAUT +DTSTART:19480101T000000 +RDATE:19480101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0245 +TZOFFSETTO:+0300 +TZNAME:EAT +DTSTART:19610101T000000 +RDATE:19610101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Djibouti.ics b/mozilla/calendar/libical/zoneinfo/Africa/Djibouti.ics index 12318d82cce..95e18f093cb 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Djibouti.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Djibouti.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Djibouti +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Djibouti X-LIC-LOCATION:Africa/Djibouti BEGIN:STANDARD -TZOFFSETFROM:+0300 +TZOFFSETFROM:+0000 +TZOFFSETTO:+025236 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+025236 TZOFFSETTO:+0300 TZNAME:EAT -DTSTART:19700101T000000 +DTSTART:19110701T000000 +RDATE:19110701T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Douala.ics b/mozilla/calendar/libical/zoneinfo/Africa/Douala.ics index 4d1d41261cd..37adaf437e7 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Douala.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Douala.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Douala +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Douala X-LIC-LOCATION:Africa/Douala BEGIN:STANDARD -TZOFFSETFROM:+0100 +TZOFFSETFROM:+0000 +TZOFFSETTO:+003848 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+003848 TZOFFSETTO:+0100 TZNAME:WAT -DTSTART:19700101T000000 +DTSTART:19120101T000000 +RDATE:19120101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/El_Aaiun.ics b/mozilla/calendar/libical/zoneinfo/Africa/El_Aaiun.ics index e698b3e548f..5784b2377f5 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/El_Aaiun.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/El_Aaiun.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/El_Aaiun +TZID:/softwarestudio.org/Olson_20010626_2/Africa/El_Aaiun X-LIC-LOCATION:Africa/El_Aaiun BEGIN:STANDARD TZOFFSETFROM:+0000 +TZOFFSETTO:-005248 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-005248 +TZOFFSETTO:-0100 +TZNAME:WAT +DTSTART:19340101T000000 +RDATE:19340101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0100 TZOFFSETTO:+0000 TZNAME:WET -DTSTART:19700101T000000 +DTSTART:19760414T000000 +RDATE:19760414T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Freetown.ics b/mozilla/calendar/libical/zoneinfo/Africa/Freetown.ics index 90a3ef764d6..47114489f27 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Freetown.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Freetown.ics @@ -1,14 +1,88 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Freetown +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Freetown X-LIC-LOCATION:Africa/Freetown BEGIN:STANDARD TZOFFSETFROM:+0000 +TZOFFSETTO:-0053 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0053 +TZOFFSETTO:-0053 +TZNAME:FMT +DTSTART:18820101T000000 +RDATE:18820101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0053 +TZOFFSETTO:-0100 +TZNAME:WAT +DTSTART:19130601T000000 +RDATE:19130601T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0100 +TZOFFSETTO:-0020 +TZNAME:SLST +DTSTART:19350601T000000 +RDATE:19350601T000000 +RDATE:19360601T000000 +RDATE:19370601T000000 +RDATE:19380601T000000 +RDATE:19390601T000000 +RDATE:19400601T000000 +RDATE:19410601T000000 +RDATE:19420601T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0020 +TZOFFSETTO:-0100 +TZNAME:WAT +DTSTART:19351001T000000 +RDATE:19351001T000000 +RDATE:19361001T000000 +RDATE:19371001T000000 +RDATE:19381001T000000 +RDATE:19391001T000000 +RDATE:19401001T000000 +RDATE:19411001T000000 +RDATE:19421001T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0100 TZOFFSETTO:+0000 TZNAME:GMT -DTSTART:19700101T000000 +DTSTART:19570101T000000 +RDATE:19570101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:SLST +DTSTART:19570601T000000 +RDATE:19570601T000000 +RDATE:19580601T000000 +RDATE:19590601T000000 +RDATE:19600601T000000 +RDATE:19610601T000000 +RDATE:19620601T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0000 +TZNAME:GMT +DTSTART:19570901T000000 +RDATE:19570901T000000 +RDATE:19580901T000000 +RDATE:19590901T000000 +RDATE:19600901T000000 +RDATE:19610901T000000 +RDATE:19620901T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Gaborone.ics b/mozilla/calendar/libical/zoneinfo/Africa/Gaborone.ics index 8197173cd30..fab7968b392 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Gaborone.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Gaborone.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Gaborone +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Gaborone X-LIC-LOCATION:Africa/Gaborone BEGIN:STANDARD -TZOFFSETFROM:+0200 +TZOFFSETFROM:+0000 +TZOFFSETTO:+014340 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+014340 TZOFFSETTO:+0200 TZNAME:CAT -DTSTART:19700101T000000 +DTSTART:18850101T000000 +RDATE:18850101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:CAST +DTSTART:19430919T020000 +RDATE:19430919T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:CAT +DTSTART:19440319T020000 +RDATE:19440319T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Harare.ics b/mozilla/calendar/libical/zoneinfo/Africa/Harare.ics index eae0911e8ae..2a8a0a4fd49 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Harare.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Harare.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Harare +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Harare X-LIC-LOCATION:Africa/Harare BEGIN:STANDARD -TZOFFSETFROM:+0200 +TZOFFSETFROM:+0000 +TZOFFSETTO:+020412 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+020412 TZOFFSETTO:+0200 TZNAME:CAT -DTSTART:19700101T000000 +DTSTART:19030301T000000 +RDATE:19030301T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Johannesburg.ics b/mozilla/calendar/libical/zoneinfo/Africa/Johannesburg.ics index 71de99dcc83..f3b1e2dbfd7 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Johannesburg.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Johannesburg.ics @@ -1,14 +1,45 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Johannesburg +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Johannesburg X-LIC-LOCATION:Africa/Johannesburg BEGIN:STANDARD -TZOFFSETFROM:+0200 +TZOFFSETFROM:+0000 +TZOFFSETTO:+0152 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0152 +TZOFFSETTO:+0130 +TZNAME:SAST +DTSTART:18920208T000000 +RDATE:18920208T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0130 TZOFFSETTO:+0200 TZNAME:SAST -DTSTART:19700101T000000 +DTSTART:19030301T000000 +RDATE:19030301T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:SAST +DTSTART:19420920T020000 +RDATE:19420920T020000 +RDATE:19430919T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:SAST +DTSTART:19430321T020000 +RDATE:19430321T020000 +RDATE:19440319T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Kampala.ics b/mozilla/calendar/libical/zoneinfo/Africa/Kampala.ics index f21821ce5ff..6c8088cc0bb 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Kampala.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Kampala.ics @@ -1,14 +1,43 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Kampala +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Kampala X-LIC-LOCATION:Africa/Kampala BEGIN:STANDARD -TZOFFSETFROM:+0300 +TZOFFSETFROM:+0000 +TZOFFSETTO:+020940 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+020940 TZOFFSETTO:+0300 TZNAME:EAT -DTSTART:19700101T000000 +DTSTART:19280701T000000 +RDATE:19280701T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0230 +TZNAME:BEAT +DTSTART:19300101T000000 +RDATE:19300101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0230 +TZOFFSETTO:+0245 +TZNAME:BEAUT +DTSTART:19480101T000000 +RDATE:19480101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0245 +TZOFFSETTO:+0300 +TZNAME:EAT +DTSTART:19570101T000000 +RDATE:19570101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Khartoum.ics b/mozilla/calendar/libical/zoneinfo/Africa/Khartoum.ics index 8daa02ca5f0..7f44295d920 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Khartoum.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Khartoum.ics @@ -1,14 +1,73 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Khartoum +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Khartoum X-LIC-LOCATION:Africa/Khartoum BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+021008 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+021008 +TZOFFSETTO:+0200 +TZNAME:CAT +DTSTART:19310101T000000 +RDATE:19310101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:CAST +DTSTART:19700501T000000 +RDATE:19700501T000000 +RDATE:19710430T000000 +RDATE:19720430T000000 +RDATE:19730429T000000 +RDATE:19740428T000000 +RDATE:19750427T000000 +RDATE:19760425T000000 +RDATE:19770424T000000 +RDATE:19780430T000000 +RDATE:19790429T000000 +RDATE:19800427T000000 +RDATE:19810426T000000 +RDATE:19820425T000000 +RDATE:19830424T000000 +RDATE:19840429T000000 +RDATE:19850428T000000 +END:DAYLIGHT +BEGIN:STANDARD TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:CAT +DTSTART:19701015T000000 +RDATE:19701015T000000 +RDATE:19711015T000000 +RDATE:19721015T000000 +RDATE:19731015T000000 +RDATE:19741015T000000 +RDATE:19751015T000000 +RDATE:19761015T000000 +RDATE:19771015T000000 +RDATE:19781015T000000 +RDATE:19791015T000000 +RDATE:19801015T000000 +RDATE:19811015T000000 +RDATE:19821015T000000 +RDATE:19831015T000000 +RDATE:19841015T000000 +RDATE:19851015T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EAT -DTSTART:19700101T000000 +DTSTART:20000115T120000 +RDATE:20000115T120000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Kigali.ics b/mozilla/calendar/libical/zoneinfo/Africa/Kigali.ics index 7f04fb4992d..95089685f8e 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Kigali.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Kigali.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Kigali +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Kigali X-LIC-LOCATION:Africa/Kigali BEGIN:STANDARD -TZOFFSETFROM:+0200 +TZOFFSETFROM:+0000 +TZOFFSETTO:+020016 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+020016 TZOFFSETTO:+0200 TZNAME:CAT -DTSTART:19700101T000000 +DTSTART:19350601T000000 +RDATE:19350601T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Kinshasa.ics b/mozilla/calendar/libical/zoneinfo/Africa/Kinshasa.ics index 377b6df201f..f02bc23731d 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Kinshasa.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Kinshasa.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Kinshasa +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Kinshasa X-LIC-LOCATION:Africa/Kinshasa BEGIN:STANDARD -TZOFFSETFROM:+0100 +TZOFFSETFROM:+0000 +TZOFFSETTO:+010112 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+010112 TZOFFSETTO:+0100 TZNAME:WAT -DTSTART:19700101T000000 +DTSTART:18971109T000000 +RDATE:18971109T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Lagos.ics b/mozilla/calendar/libical/zoneinfo/Africa/Lagos.ics index f0cf9f44720..49c7ec559ea 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Lagos.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Lagos.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Lagos +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Lagos X-LIC-LOCATION:Africa/Lagos BEGIN:STANDARD -TZOFFSETFROM:+0100 +TZOFFSETFROM:+0000 +TZOFFSETTO:+001336 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+001336 TZOFFSETTO:+0100 TZNAME:WAT -DTSTART:19700101T000000 +DTSTART:19190901T000000 +RDATE:19190901T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Libreville.ics b/mozilla/calendar/libical/zoneinfo/Africa/Libreville.ics index b165a7ba5c4..0ec374449ab 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Libreville.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Libreville.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Libreville +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Libreville X-LIC-LOCATION:Africa/Libreville BEGIN:STANDARD -TZOFFSETFROM:+0100 +TZOFFSETFROM:+0000 +TZOFFSETTO:+003748 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+003748 TZOFFSETTO:+0100 TZNAME:WAT -DTSTART:19700101T000000 +DTSTART:19120101T000000 +RDATE:19120101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Lome.ics b/mozilla/calendar/libical/zoneinfo/Africa/Lome.ics index e28ce26a5f1..22133bdfec7 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Lome.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Lome.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Lome +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Lome X-LIC-LOCATION:Africa/Lome BEGIN:STANDARD TZOFFSETFROM:+0000 +TZOFFSETTO:+000452 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+000452 TZOFFSETTO:+0000 TZNAME:GMT -DTSTART:19700101T000000 +DTSTART:18930101T000000 +RDATE:18930101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Luanda.ics b/mozilla/calendar/libical/zoneinfo/Africa/Luanda.ics index a5e8ebbe85d..b4f49edce22 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Luanda.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Luanda.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Luanda +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Luanda X-LIC-LOCATION:Africa/Luanda BEGIN:STANDARD -TZOFFSETFROM:+0100 +TZOFFSETFROM:+0000 +TZOFFSETTO:+005256 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+005256 +TZOFFSETTO:+005204 +TZNAME:LMT +DTSTART:18920101T000000 +RDATE:18920101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+005204 TZOFFSETTO:+0100 TZNAME:WAT -DTSTART:19700101T000000 +DTSTART:19110526T000000 +RDATE:19110526T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Lubumbashi.ics b/mozilla/calendar/libical/zoneinfo/Africa/Lubumbashi.ics index 7f4fc1c7459..b3350645d38 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Lubumbashi.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Lubumbashi.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Lubumbashi +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Lubumbashi X-LIC-LOCATION:Africa/Lubumbashi BEGIN:STANDARD -TZOFFSETFROM:+0200 +TZOFFSETFROM:+0000 +TZOFFSETTO:+014952 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+014952 TZOFFSETTO:+0200 TZNAME:CAT -DTSTART:19700101T000000 +DTSTART:18971109T000000 +RDATE:18971109T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Lusaka.ics b/mozilla/calendar/libical/zoneinfo/Africa/Lusaka.ics index 65139271f39..14ef32720f9 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Lusaka.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Lusaka.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Lusaka +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Lusaka X-LIC-LOCATION:Africa/Lusaka BEGIN:STANDARD -TZOFFSETFROM:+0200 +TZOFFSETFROM:+0000 +TZOFFSETTO:+015308 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+015308 TZOFFSETTO:+0200 TZNAME:CAT -DTSTART:19700101T000000 +DTSTART:19030301T000000 +RDATE:19030301T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Malabo.ics b/mozilla/calendar/libical/zoneinfo/Africa/Malabo.ics index a82df2eea75..27978a435df 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Malabo.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Malabo.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Malabo +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Malabo X-LIC-LOCATION:Africa/Malabo BEGIN:STANDARD -TZOFFSETFROM:+0100 +TZOFFSETFROM:+0000 +TZOFFSETTO:+003508 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+003508 +TZOFFSETTO:+0000 +TZNAME:GMT +DTSTART:19120101T000000 +RDATE:19120101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 TZOFFSETTO:+0100 TZNAME:WAT -DTSTART:19700101T000000 +DTSTART:19631215T000000 +RDATE:19631215T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Maputo.ics b/mozilla/calendar/libical/zoneinfo/Africa/Maputo.ics index 3d4c27a4092..d071698caaa 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Maputo.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Maputo.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Maputo +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Maputo X-LIC-LOCATION:Africa/Maputo BEGIN:STANDARD -TZOFFSETFROM:+0200 +TZOFFSETFROM:+0000 +TZOFFSETTO:+021020 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+021020 TZOFFSETTO:+0200 TZNAME:CAT -DTSTART:19700101T000000 +DTSTART:19030301T000000 +RDATE:19030301T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Maseru.ics b/mozilla/calendar/libical/zoneinfo/Africa/Maseru.ics index d798820700d..674f0e044b4 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Maseru.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Maseru.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Maseru +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Maseru X-LIC-LOCATION:Africa/Maseru BEGIN:STANDARD -TZOFFSETFROM:+0200 +TZOFFSETFROM:+0000 +TZOFFSETTO:+0150 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0150 TZOFFSETTO:+0200 TZNAME:SAST -DTSTART:19700101T000000 +DTSTART:19030301T000000 +RDATE:19030301T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:SAST +DTSTART:19430919T020000 +RDATE:19430919T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:SAST +DTSTART:19440319T020000 +RDATE:19440319T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Mbabane.ics b/mozilla/calendar/libical/zoneinfo/Africa/Mbabane.ics index 409c30ba73b..7eb3264d445 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Mbabane.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Mbabane.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Mbabane +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Mbabane X-LIC-LOCATION:Africa/Mbabane BEGIN:STANDARD -TZOFFSETFROM:+0200 +TZOFFSETFROM:+0000 +TZOFFSETTO:+020424 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+020424 TZOFFSETTO:+0200 TZNAME:SAST -DTSTART:19700101T000000 +DTSTART:19030301T000000 +RDATE:19030301T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Mogadishu.ics b/mozilla/calendar/libical/zoneinfo/Africa/Mogadishu.ics index f513a7ac53d..07572384f9a 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Mogadishu.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Mogadishu.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Mogadishu +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Mogadishu X-LIC-LOCATION:Africa/Mogadishu BEGIN:STANDARD -TZOFFSETFROM:+0300 +TZOFFSETFROM:+0000 +TZOFFSETTO:+030128 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+030128 TZOFFSETTO:+0300 TZNAME:EAT -DTSTART:19700101T000000 +DTSTART:18931101T000000 +RDATE:18931101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0230 +TZNAME:BEAT +DTSTART:19310101T000000 +RDATE:19310101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0230 +TZOFFSETTO:+0300 +TZNAME:EAT +DTSTART:19570101T000000 +RDATE:19570101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Monrovia.ics b/mozilla/calendar/libical/zoneinfo/Africa/Monrovia.ics index 01fa09c50bf..c4ce90fbb4e 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Monrovia.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Monrovia.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Monrovia +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Monrovia X-LIC-LOCATION:Africa/Monrovia BEGIN:STANDARD TZOFFSETFROM:+0000 +TZOFFSETTO:-004308 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-004308 +TZOFFSETTO:-004308 +TZNAME:MMT +DTSTART:18820101T000000 +RDATE:18820101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-004308 +TZOFFSETTO:-004430 +TZNAME:LRT +DTSTART:19190301T000000 +RDATE:19190301T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-004430 TZOFFSETTO:+0000 TZNAME:GMT -DTSTART:19700101T000000 +DTSTART:19720501T000000 +RDATE:19720501T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Nairobi.ics b/mozilla/calendar/libical/zoneinfo/Africa/Nairobi.ics index 5103d0abae2..ee76195558e 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Nairobi.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Nairobi.ics @@ -1,14 +1,43 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Nairobi +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Nairobi X-LIC-LOCATION:Africa/Nairobi BEGIN:STANDARD -TZOFFSETFROM:+0300 +TZOFFSETFROM:+0000 +TZOFFSETTO:+022716 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+022716 TZOFFSETTO:+0300 TZNAME:EAT -DTSTART:19700101T000000 +DTSTART:19280701T000000 +RDATE:19280701T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0230 +TZNAME:BEAT +DTSTART:19300101T000000 +RDATE:19300101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0230 +TZOFFSETTO:+0245 +TZNAME:BEAUT +DTSTART:19400101T000000 +RDATE:19400101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0245 +TZOFFSETTO:+0300 +TZNAME:EAT +DTSTART:19600101T000000 +RDATE:19600101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Ndjamena.ics b/mozilla/calendar/libical/zoneinfo/Africa/Ndjamena.ics index 43722c0527a..e742c9c357b 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Ndjamena.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Ndjamena.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Ndjamena +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Ndjamena X-LIC-LOCATION:Africa/Ndjamena BEGIN:STANDARD -TZOFFSETFROM:+0100 +TZOFFSETFROM:+0000 +TZOFFSETTO:+010012 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+010012 TZOFFSETTO:+0100 TZNAME:WAT -DTSTART:19700101T000000 +DTSTART:19120101T000000 +RDATE:19120101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:WAST +DTSTART:19791014T000000 +RDATE:19791014T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:WAT +DTSTART:19800308T000000 +RDATE:19800308T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Niamey.ics b/mozilla/calendar/libical/zoneinfo/Africa/Niamey.ics index 165291dcd09..cb921cfaad4 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Niamey.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Niamey.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Niamey +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Niamey X-LIC-LOCATION:Africa/Niamey BEGIN:STANDARD -TZOFFSETFROM:+0100 +TZOFFSETFROM:+0000 +TZOFFSETTO:+000828 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+000828 +TZOFFSETTO:-0100 +TZNAME:WAT +DTSTART:19120101T000000 +RDATE:19120101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0100 +TZOFFSETTO:+0000 +TZNAME:GMT +DTSTART:19340226T000000 +RDATE:19340226T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 TZOFFSETTO:+0100 TZNAME:WAT -DTSTART:19700101T000000 +DTSTART:19600101T000000 +RDATE:19600101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Nouakchott.ics b/mozilla/calendar/libical/zoneinfo/Africa/Nouakchott.ics index d038ef15e7b..01890cc99ef 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Nouakchott.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Nouakchott.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Nouakchott +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Nouakchott X-LIC-LOCATION:Africa/Nouakchott BEGIN:STANDARD TZOFFSETFROM:+0000 +TZOFFSETTO:-010348 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-010348 TZOFFSETTO:+0000 TZNAME:GMT -DTSTART:19700101T000000 +DTSTART:19120101T000000 +RDATE:19120101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-0100 +TZNAME:WAT +DTSTART:19340226T000000 +RDATE:19340226T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0100 +TZOFFSETTO:+0000 +TZNAME:GMT +DTSTART:19601128T000000 +RDATE:19601128T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Ouagadougou.ics b/mozilla/calendar/libical/zoneinfo/Africa/Ouagadougou.ics index 2efd56934c6..0c0781b7a3b 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Ouagadougou.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Ouagadougou.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Ouagadougou +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Ouagadougou X-LIC-LOCATION:Africa/Ouagadougou BEGIN:STANDARD TZOFFSETFROM:+0000 +TZOFFSETTO:-000604 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-000604 TZOFFSETTO:+0000 TZNAME:GMT -DTSTART:19700101T000000 +DTSTART:19120101T000000 +RDATE:19120101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Porto-Novo.ics b/mozilla/calendar/libical/zoneinfo/Africa/Porto-Novo.ics index 663d189a56a..a7e8f6b04e9 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Porto-Novo.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Porto-Novo.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Porto-Novo +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Porto-Novo X-LIC-LOCATION:Africa/Porto-Novo BEGIN:STANDARD -TZOFFSETFROM:+0100 +TZOFFSETFROM:+0000 +TZOFFSETTO:+001028 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+001028 +TZOFFSETTO:+0000 +TZNAME:GMT +DTSTART:19120101T000000 +RDATE:19120101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 TZOFFSETTO:+0100 TZNAME:WAT -DTSTART:19700101T000000 +DTSTART:19340226T000000 +RDATE:19340226T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Sao_Tome.ics b/mozilla/calendar/libical/zoneinfo/Africa/Sao_Tome.ics index 10a03a18582..d9da25497de 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Sao_Tome.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Sao_Tome.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Sao_Tome +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Sao_Tome X-LIC-LOCATION:Africa/Sao_Tome BEGIN:STANDARD TZOFFSETFROM:+0000 +TZOFFSETTO:+002656 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+002656 +TZOFFSETTO:-003632 +TZNAME:LMT +DTSTART:18840101T000000 +RDATE:18840101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-003632 TZOFFSETTO:+0000 TZNAME:GMT -DTSTART:19700101T000000 +DTSTART:19120101T000000 +RDATE:19120101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Tripoli.ics b/mozilla/calendar/libical/zoneinfo/Africa/Tripoli.ics index 81a3daa2f09..d10dce31dab 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Tripoli.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Tripoli.ics @@ -1,14 +1,74 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Tripoli +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Tripoli X-LIC-LOCATION:Africa/Tripoli BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+005244 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+005244 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19200101T000000 +RDATE:19200101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19511014T020000 +RDATE:19511014T020000 +RDATE:19531009T020000 +RDATE:19550930T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850406T000000 +RDATE:19860404T000000 +RDATE:19870401T000000 +RDATE:19880401T000000 +RDATE:19890401T000000 +RDATE:19970404T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19520101T000000 +RDATE:19520101T000000 +RDATE:19540101T000000 +RDATE:19560101T000000 +RDATE:19820101T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19841001T000000 +RDATE:19851001T000000 +RDATE:19861003T000000 +RDATE:19871001T000000 +RDATE:19881001T000000 +RDATE:19891001T000000 +RDATE:19960930T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19590101T000000 +RDATE:19590101T000000 +RDATE:19900504T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19700101T000000 +DTSTART:19971004T000000 +RDATE:19971004T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Tunis.ics b/mozilla/calendar/libical/zoneinfo/Africa/Tunis.ics index 90f4acf93b0..f9ee09f1b2c 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Tunis.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Tunis.ics @@ -1,22 +1,65 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Tunis +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Tunis X-LIC-LOCATION:Africa/Tunis +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+004044 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+004044 +TZOFFSETTO:+000921 +TZNAME:PMT +DTSTART:18810512T000000 +RDATE:18810512T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+000921 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19110311T000000 +RDATE:19110311T000000 +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +DTSTART:19390415T230000 +RDATE:19390415T230000 +RDATE:19400225T230000 +RDATE:19420309T000000 +RDATE:19430329T020000 +RDATE:19430425T020000 +RDATE:19440403T020000 +RDATE:19450402T020000 +RDATE:19770430T000000 +RDATE:19780501T000000 +RDATE:19880601T000000 +RDATE:19890326T000000 +RDATE:19900501T000000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +DTSTART:19391119T000000 +RDATE:19391119T000000 +RDATE:19411006T000000 +RDATE:19421102T030000 +RDATE:19430417T020000 +RDATE:19431004T020000 +RDATE:19441008T000000 +RDATE:19450916T000000 +RDATE:19770924T010000 +RDATE:19781001T010000 +RDATE:19880925T010000 +RDATE:19890924T010000 +RDATE:19900930T010000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Africa/Windhoek.ics b/mozilla/calendar/libical/zoneinfo/Africa/Windhoek.ics index ed99f46bbd6..82701f8937e 100644 --- a/mozilla/calendar/libical/zoneinfo/Africa/Windhoek.ics +++ b/mozilla/calendar/libical/zoneinfo/Africa/Windhoek.ics @@ -1,22 +1,71 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Africa/Windhoek +TZID:/softwarestudio.org/Olson_20010626_2/Africa/Windhoek X-LIC-LOCATION:Africa/Windhoek BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:WAST -DTSTART:19700906T020000 -RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=1SU +DTSTART:19940904T020000 +RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:WAT -DTSTART:19700405T020000 -RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:19950402T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+010824 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+010824 +TZOFFSETTO:+0130 +TZNAME:SWAT +DTSTART:18920208T000000 +RDATE:18920208T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0130 +TZOFFSETTO:+0200 +TZNAME:SAST +DTSTART:19030301T000000 +RDATE:19030301T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:SAST +DTSTART:19420920T020000 +RDATE:19420920T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:SAST +DTSTART:19430321T020000 +RDATE:19430321T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0200 +TZNAME:CAT +DTSTART:19900321T000000 +RDATE:19900321T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:WAT +DTSTART:19940403T000000 +RDATE:19940403T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Adak.ics b/mozilla/calendar/libical/zoneinfo/America/Adak.ics index 35435f2e7eb..cd4f663c4f9 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Adak.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Adak.ics @@ -1,22 +1,137 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Adak +TZID:/softwarestudio.org/Olson_20010626_2/America/Adak X-LIC-LOCATION:America/Adak -BEGIN:DAYLIGHT -TZOFFSETFROM:-1000 -TZOFFSETTO:-0900 -TZNAME:HADT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU -END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0900 TZOFFSETTO:-1000 TZNAME:HAST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19841028T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-1000 +TZOFFSETTO:-0900 +TZNAME:HADT +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+121321 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+121321 +TZOFFSETTO:-114638 +TZNAME:LMT +DTSTART:18671018T000000 +RDATE:18671018T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-114638 +TZOFFSETTO:-1100 +TZNAME:NST +DTSTART:19000820T120000 +RDATE:19000820T120000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-1100 +TZOFFSETTO:-1100 +TZNAME:NST +DTSTART:19420101T000000 +RDATE:19420101T000000 +RDATE:19460101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-1100 +TZOFFSETTO:-1000 +TZNAME:NWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-1000 +TZOFFSETTO:-1000 +TZNAME:NPT +DTSTART:19450814T130000 +RDATE:19450814T130000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-1000 +TZOFFSETTO:-1100 +TZNAME:NST +DTSTART:19450930T020000 +RDATE:19450930T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-1100 +TZOFFSETTO:-1100 +TZNAME:BST +DTSTART:19670401T000000 +RDATE:19670401T000000 +RDATE:19690101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-1100 +TZOFFSETTO:-1000 +TZNAME:BDT +DTSTART:19690427T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19740106T020000 +RDATE:19750223T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-1000 +TZOFFSETTO:-1100 +TZNAME:BST +DTSTART:19691026T020000 +RDATE:19691026T020000 +RDATE:19701025T020000 +RDATE:19711031T020000 +RDATE:19721029T020000 +RDATE:19731028T020000 +RDATE:19741027T020000 +RDATE:19751026T020000 +RDATE:19761031T020000 +RDATE:19771030T020000 +RDATE:19781029T020000 +RDATE:19791028T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-1000 +TZOFFSETTO:-1000 +TZNAME:HAST +DTSTART:19831030T020000 +RDATE:19831030T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-1000 +TZOFFSETTO:-0900 +TZNAME:HADT +DTSTART:19840429T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Anchorage.ics b/mozilla/calendar/libical/zoneinfo/America/Anchorage.ics index ced6fd3b478..5bbfefea288 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Anchorage.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Anchorage.ics @@ -1,22 +1,137 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Anchorage +TZID:/softwarestudio.org/Olson_20010626_2/America/Anchorage X-LIC-LOCATION:America/Anchorage -BEGIN:DAYLIGHT -TZOFFSETFROM:-0900 -TZOFFSETTO:-0800 -TZNAME:AKDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU -END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0800 TZOFFSETTO:-0900 TZNAME:AKST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19841028T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0900 +TZOFFSETTO:-0800 +TZNAME:AKDT +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+140024 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+140024 +TZOFFSETTO:-095936 +TZNAME:LMT +DTSTART:18671018T000000 +RDATE:18671018T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-095936 +TZOFFSETTO:-1000 +TZNAME:CAT +DTSTART:19000820T120000 +RDATE:19000820T120000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-1000 +TZOFFSETTO:-1000 +TZNAME:CAT +DTSTART:19420101T000000 +RDATE:19420101T000000 +RDATE:19460101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-1000 +TZOFFSETTO:-0900 +TZNAME:CAWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0900 +TZOFFSETTO:-0900 +TZNAME:CAWT +DTSTART:19450814T140000 +RDATE:19450814T140000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0900 +TZOFFSETTO:-1000 +TZNAME:CAT +DTSTART:19450930T020000 +RDATE:19450930T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-1000 +TZOFFSETTO:-1000 +TZNAME:AHST +DTSTART:19670401T000000 +RDATE:19670401T000000 +RDATE:19690101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-1000 +TZOFFSETTO:-0900 +TZNAME:AHDT +DTSTART:19690427T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19740106T020000 +RDATE:19750223T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0900 +TZOFFSETTO:-1000 +TZNAME:AHST +DTSTART:19691026T020000 +RDATE:19691026T020000 +RDATE:19701025T020000 +RDATE:19711031T020000 +RDATE:19721029T020000 +RDATE:19731028T020000 +RDATE:19741027T020000 +RDATE:19751026T020000 +RDATE:19761031T020000 +RDATE:19771030T020000 +RDATE:19781029T020000 +RDATE:19791028T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0900 +TZOFFSETTO:-0900 +TZNAME:AKST +DTSTART:19831030T020000 +RDATE:19831030T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0900 +TZOFFSETTO:-0800 +TZNAME:AKDT +DTSTART:19840429T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Anguilla.ics b/mozilla/calendar/libical/zoneinfo/America/Anguilla.ics index 09694b6cfc7..827282e4f36 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Anguilla.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Anguilla.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Anguilla +TZID:/softwarestudio.org/Olson_20010626_2/America/Anguilla X-LIC-LOCATION:America/Anguilla BEGIN:STANDARD -TZOFFSETFROM:-0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:-041216 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-041216 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:19120302T000000 +RDATE:19120302T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Antigua.ics b/mozilla/calendar/libical/zoneinfo/America/Antigua.ics index 81d71047c6c..788e1127772 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Antigua.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Antigua.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Antigua +TZID:/softwarestudio.org/Olson_20010626_2/America/Antigua X-LIC-LOCATION:America/Antigua BEGIN:STANDARD -TZOFFSETFROM:-0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:-040712 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-040712 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19120302T000000 +RDATE:19120302T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0500 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:19510101T000000 +RDATE:19510101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Araguaina.ics b/mozilla/calendar/libical/zoneinfo/America/Araguaina.ics index cb064fb2370..4309dfa0812 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Araguaina.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Araguaina.ics @@ -1,14 +1,98 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Araguaina +TZID:/softwarestudio.org/Olson_20010626_2/America/Araguaina X-LIC-LOCATION:America/Araguaina +BEGIN:DAYLIGHT +TZOFFSETFROM:-0300 +TZOFFSETTO:-0200 +TZNAME:BRST +DTSTART:20001008T000000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=8,9,10,11,12,13,14;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0200 +TZOFFSETTO:-0300 +TZNAME:BRT +DTSTART:20010218T000000 +RRULE:FREQ=YEARLY;BYMONTH=2;BYMONTHDAY=15,16,17,18,19,20,21;BYDAY=SU +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-031248 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-031248 +TZOFFSETTO:-0300 +TZNAME:BRT +DTSTART:19140101T000000 +RDATE:19140101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0300 +TZOFFSETTO:-0200 +TZNAME:BRST +DTSTART:19311003T110000 +RDATE:19311003T110000 +RDATE:19321003T000000 +RDATE:19491201T000000 +RDATE:19501201T000000 +RDATE:19511201T000000 +RDATE:19521201T000000 +RDATE:19631209T000000 +RDATE:19650131T000000 +RDATE:19651201T000000 +RDATE:19661101T000000 +RDATE:19671101T000000 +RDATE:19851102T000000 +RDATE:19861025T000000 +RDATE:19871025T000000 +RDATE:19881016T000000 +RDATE:19891015T000000 +RDATE:19951015T000000 +RDATE:19961006T000000 +RDATE:19971006T000000 +RDATE:19981011T000000 +RDATE:19991003T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0200 +TZOFFSETTO:-0300 +TZNAME:BRT +DTSTART:19320401T000000 +RDATE:19320401T000000 +RDATE:19330401T000000 +RDATE:19500416T010000 +RDATE:19510401T000000 +RDATE:19520401T000000 +RDATE:19530301T000000 +RDATE:19640301T000000 +RDATE:19650331T000000 +RDATE:19660301T000000 +RDATE:19670301T000000 +RDATE:19680301T000000 +RDATE:19860315T000000 +RDATE:19870214T000000 +RDATE:19880207T000000 +RDATE:19890129T000000 +RDATE:19900211T000000 +RDATE:19960211T000000 +RDATE:19970216T000000 +RDATE:19980301T000000 +RDATE:19990221T000000 +RDATE:20000227T000000 +END:STANDARD BEGIN:STANDARD TZOFFSETFROM:-0300 TZOFFSETTO:-0300 TZNAME:BRT -DTSTART:19700101T000000 +DTSTART:19900917T000000 +RDATE:19900917T000000 +RDATE:19950914T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Aruba.ics b/mozilla/calendar/libical/zoneinfo/America/Aruba.ics index 2b0f74f1c47..1c8affa68d2 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Aruba.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Aruba.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Aruba +TZID:/softwarestudio.org/Olson_20010626_2/America/Aruba X-LIC-LOCATION:America/Aruba BEGIN:STANDARD -TZOFFSETFROM:-0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:-044024 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-044024 +TZOFFSETTO:-0430 +TZNAME:ANT +DTSTART:19120212T000000 +RDATE:19120212T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0430 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:19650101T000000 +RDATE:19650101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Asuncion.ics b/mozilla/calendar/libical/zoneinfo/America/Asuncion.ics index 73efff15d0d..43b7948b604 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Asuncion.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Asuncion.ics @@ -1,22 +1,113 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Asuncion +TZID:/softwarestudio.org/Olson_20010626_2/America/Asuncion X-LIC-LOCATION:America/Asuncion BEGIN:DAYLIGHT TZOFFSETFROM:-0400 TZOFFSETTO:-0300 TZNAME:PYST -DTSTART:19701018T000000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU +DTSTART:19961006T000000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0300 TZOFFSETTO:-0400 TZNAME:PYT -DTSTART:19700308T000000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19980301T000000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-035040 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-035040 +TZOFFSETTO:-035040 +TZNAME:AMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-035040 +TZOFFSETTO:-0400 +TZNAME:PYT +DTSTART:19311010T000000 +RDATE:19311010T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:PYT +DTSTART:19721001T000000 +RDATE:19721001T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0400 +TZNAME:PYT +DTSTART:19740401T000000 +RDATE:19740401T000000 +RDATE:19760301T000000 +RDATE:19770301T000000 +RDATE:19780301T000000 +RDATE:19790401T000000 +RDATE:19800401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850401T000000 +RDATE:19860401T000000 +RDATE:19870401T000000 +RDATE:19880401T000000 +RDATE:19890401T000000 +RDATE:19900401T000000 +RDATE:19910401T000000 +RDATE:19920301T000000 +RDATE:19930331T000000 +RDATE:19940227T000000 +RDATE:19950226T000000 +RDATE:19960301T000000 +RDATE:19970223T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0400 +TZNAME:PYT +DTSTART:19750301T000000 +RDATE:19750301T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:PYST +DTSTART:19751001T000000 +RDATE:19751001T000000 +RDATE:19761001T000000 +RDATE:19771001T000000 +RDATE:19781001T000000 +RDATE:19791001T000000 +RDATE:19801001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19841001T000000 +RDATE:19851001T000000 +RDATE:19861001T000000 +RDATE:19871001T000000 +RDATE:19881001T000000 +RDATE:19891022T000000 +RDATE:19901001T000000 +RDATE:19911006T000000 +RDATE:19921005T000000 +RDATE:19931001T000000 +RDATE:19941001T000000 +RDATE:19951001T000000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Atikokan.ics b/mozilla/calendar/libical/zoneinfo/America/Atikokan.ics deleted file mode 100644 index 3244e19452c..00000000000 --- a/mozilla/calendar/libical/zoneinfo/America/Atikokan.ics +++ /dev/null @@ -1,14 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Atikokan -X-LIC-LOCATION:America/Atikokan -BEGIN:STANDARD -TZOFFSETFROM:-0500 -TZOFFSETTO:-0500 -TZNAME:EST -DTSTART:19700101T000000 -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Bahia.ics b/mozilla/calendar/libical/zoneinfo/America/Bahia.ics deleted file mode 100644 index 5512bf9473b..00000000000 --- a/mozilla/calendar/libical/zoneinfo/America/Bahia.ics +++ /dev/null @@ -1,14 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Bahia -X-LIC-LOCATION:America/Bahia -BEGIN:STANDARD -TZOFFSETFROM:-0300 -TZOFFSETTO:-0300 -TZNAME:BRT -DTSTART:19700101T000000 -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Barbados.ics b/mozilla/calendar/libical/zoneinfo/America/Barbados.ics index 57744efcc4e..2cc28f432e8 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Barbados.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Barbados.ics @@ -1,14 +1,49 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Barbados +TZID:/softwarestudio.org/Olson_20010626_2/America/Barbados X-LIC-LOCATION:America/Barbados BEGIN:STANDARD -TZOFFSETFROM:-0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:-035828 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-035828 +TZOFFSETTO:-035828 +TZNAME:BMT +DTSTART:19240101T000000 +RDATE:19240101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-035828 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:19320101T000000 +RDATE:19320101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:ADT +DTSTART:19770612T020000 +RDATE:19770612T020000 +RDATE:19780416T020000 +RDATE:19790415T020000 +RDATE:19800420T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0400 +TZNAME:AST +DTSTART:19771002T020000 +RDATE:19771002T020000 +RDATE:19781001T020000 +RDATE:19790930T020000 +RDATE:19800925T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Belem.ics b/mozilla/calendar/libical/zoneinfo/America/Belem.ics index 30309717dc1..46d81974c21 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Belem.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Belem.ics @@ -1,14 +1,69 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Belem +TZID:/softwarestudio.org/Olson_20010626_2/America/Belem X-LIC-LOCATION:America/Belem BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-031356 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-031356 +TZOFFSETTO:-0300 +TZNAME:BRT +DTSTART:19140101T000000 +RDATE:19140101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0300 +TZOFFSETTO:-0200 +TZNAME:BRST +DTSTART:19311003T110000 +RDATE:19311003T110000 +RDATE:19321003T000000 +RDATE:19491201T000000 +RDATE:19501201T000000 +RDATE:19511201T000000 +RDATE:19521201T000000 +RDATE:19631209T000000 +RDATE:19650131T000000 +RDATE:19651201T000000 +RDATE:19661101T000000 +RDATE:19671101T000000 +RDATE:19851102T000000 +RDATE:19861025T000000 +RDATE:19871025T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0200 +TZOFFSETTO:-0300 +TZNAME:BRT +DTSTART:19320401T000000 +RDATE:19320401T000000 +RDATE:19330401T000000 +RDATE:19500416T010000 +RDATE:19510401T000000 +RDATE:19520401T000000 +RDATE:19530301T000000 +RDATE:19640301T000000 +RDATE:19650331T000000 +RDATE:19660301T000000 +RDATE:19670301T000000 +RDATE:19680301T000000 +RDATE:19860315T000000 +RDATE:19870214T000000 +RDATE:19880207T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:-0300 TZOFFSETTO:-0300 TZNAME:BRT -DTSTART:19700101T000000 +DTSTART:19880912T000000 +RDATE:19880912T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Belize.ics b/mozilla/calendar/libical/zoneinfo/America/Belize.ics index 3449e018003..660dacdfeef 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Belize.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Belize.ics @@ -1,14 +1,100 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Belize +TZID:/softwarestudio.org/Olson_20010626_2/America/Belize X-LIC-LOCATION:America/Belize BEGIN:STANDARD -TZOFFSETFROM:-0600 +TZOFFSETFROM:+0000 +TZOFFSETTO:-055248 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-055248 TZOFFSETTO:-0600 TZNAME:CST -DTSTART:19700101T000000 +DTSTART:19120401T000000 +RDATE:19120401T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0530 +TZNAME:CHDT +DTSTART:19181006T000000 +RDATE:19181006T000000 +RDATE:19191005T000000 +RDATE:19201003T000000 +RDATE:19211002T000000 +RDATE:19221008T000000 +RDATE:19231007T000000 +RDATE:19241005T000000 +RDATE:19251004T000000 +RDATE:19261003T000000 +RDATE:19271002T000000 +RDATE:19281007T000000 +RDATE:19291006T000000 +RDATE:19301005T000000 +RDATE:19311004T000000 +RDATE:19321002T000000 +RDATE:19331008T000000 +RDATE:19341007T000000 +RDATE:19351006T000000 +RDATE:19361004T000000 +RDATE:19371003T000000 +RDATE:19381002T000000 +RDATE:19391008T000000 +RDATE:19401006T000000 +RDATE:19411005T000000 +RDATE:19421004T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0530 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19190209T000000 +RDATE:19190209T000000 +RDATE:19200215T000000 +RDATE:19210213T000000 +RDATE:19220212T000000 +RDATE:19230211T000000 +RDATE:19240210T000000 +RDATE:19250215T000000 +RDATE:19260214T000000 +RDATE:19270213T000000 +RDATE:19280212T000000 +RDATE:19290210T000000 +RDATE:19300209T000000 +RDATE:19310215T000000 +RDATE:19320214T000000 +RDATE:19330212T000000 +RDATE:19340211T000000 +RDATE:19350210T000000 +RDATE:19360209T000000 +RDATE:19370214T000000 +RDATE:19380213T000000 +RDATE:19390212T000000 +RDATE:19400211T000000 +RDATE:19410209T000000 +RDATE:19420215T000000 +RDATE:19430214T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19731205T000000 +RDATE:19731205T000000 +RDATE:19821218T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19740209T000000 +RDATE:19740209T000000 +RDATE:19830212T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Blanc-Sablon.ics b/mozilla/calendar/libical/zoneinfo/America/Blanc-Sablon.ics deleted file mode 100644 index c7ec96265f7..00000000000 --- a/mozilla/calendar/libical/zoneinfo/America/Blanc-Sablon.ics +++ /dev/null @@ -1,14 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Blanc-Sablon -X-LIC-LOCATION:America/Blanc-Sablon -BEGIN:STANDARD -TZOFFSETFROM:-0400 -TZOFFSETTO:-0400 -TZNAME:AST -DTSTART:19700101T000000 -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Boa_Vista.ics b/mozilla/calendar/libical/zoneinfo/America/Boa_Vista.ics index cefdf18bcee..4e00df4da58 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Boa_Vista.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Boa_Vista.ics @@ -1,14 +1,74 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Boa_Vista +TZID:/softwarestudio.org/Olson_20010626_2/America/Boa_Vista X-LIC-LOCATION:America/Boa_Vista BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-040240 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-040240 +TZOFFSETTO:-0400 +TZNAME:AMT +DTSTART:19140101T000000 +RDATE:19140101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:AMST +DTSTART:19311003T110000 +RDATE:19311003T110000 +RDATE:19321003T000000 +RDATE:19491201T000000 +RDATE:19501201T000000 +RDATE:19511201T000000 +RDATE:19521201T000000 +RDATE:19631209T000000 +RDATE:19650131T000000 +RDATE:19651201T000000 +RDATE:19661101T000000 +RDATE:19671101T000000 +RDATE:19851102T000000 +RDATE:19861025T000000 +RDATE:19871025T000000 +RDATE:19991003T000000 +RDATE:20001008T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0400 +TZNAME:AMT +DTSTART:19320401T000000 +RDATE:19320401T000000 +RDATE:19330401T000000 +RDATE:19500416T010000 +RDATE:19510401T000000 +RDATE:19520401T000000 +RDATE:19530301T000000 +RDATE:19640301T000000 +RDATE:19650331T000000 +RDATE:19660301T000000 +RDATE:19670301T000000 +RDATE:19680301T000000 +RDATE:19860315T000000 +RDATE:19870214T000000 +RDATE:19880207T000000 +RDATE:20000227T000000 +RDATE:20001015T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:-0400 TZOFFSETTO:-0400 TZNAME:AMT -DTSTART:19700101T000000 +DTSTART:19880912T000000 +RDATE:19880912T000000 +RDATE:19990930T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Bogota.ics b/mozilla/calendar/libical/zoneinfo/America/Bogota.ics index c1eeffc4a7f..22519f500fe 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Bogota.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Bogota.ics @@ -1,14 +1,43 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Bogota +TZID:/softwarestudio.org/Olson_20010626_2/America/Bogota X-LIC-LOCATION:America/Bogota BEGIN:STANDARD -TZOFFSETFROM:-0500 +TZOFFSETFROM:+0000 +TZOFFSETTO:-045620 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-045620 +TZOFFSETTO:-045620 +TZNAME:BMT +DTSTART:18840313T000000 +RDATE:18840313T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-045620 TZOFFSETTO:-0500 TZNAME:COT -DTSTART:19700101T000000 +DTSTART:19141123T000000 +RDATE:19141123T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:COST +DTSTART:19920502T000000 +RDATE:19920502T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +TZNAME:COT +DTSTART:19921231T000000 +RDATE:19921231T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Boise.ics b/mozilla/calendar/libical/zoneinfo/America/Boise.ics index bb51ac3c68b..3b5020f62d9 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Boise.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Boise.ics @@ -1,22 +1,121 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Boise +TZID:/softwarestudio.org/Olson_20010626_2/America/Boise X-LIC-LOCATION:America/Boise +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19751026T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0700 TZOFFSETTO:-0600 TZNAME:MDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-074449 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-074449 +TZOFFSETTO:-0800 +TZNAME:PST +DTSTART:18831118T120000 +RDATE:18831118T120000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +TZNAME:PDT +DTSTART:19180331T020000 +RDATE:19180331T020000 +RDATE:19190330T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0800 +TZNAME:PST +DTSTART:19181027T020000 +RDATE:19181027T020000 +RDATE:19191026T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19230513T020000 +RDATE:19230513T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0600 +TZNAME:MPT +DTSTART:19450814T170000 +RDATE:19450814T170000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0600 TZOFFSETTO:-0700 TZNAME:MST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19450930T020000 +RDATE:19450930T020000 +RDATE:19671029T020000 +RDATE:19681027T020000 +RDATE:19691026T020000 +RDATE:19701025T020000 +RDATE:19711031T020000 +RDATE:19721029T020000 +RDATE:19731028T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MDT +DTSTART:19670430T020000 +RDATE:19670430T020000 +RDATE:19680428T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19750223T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19740101T000000 +RDATE:19740101T000000 +RDATE:19740203T020000 +RDATE:19741027T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Cambridge_Bay.ics b/mozilla/calendar/libical/zoneinfo/America/Cambridge_Bay.ics index e63cacb24ce..803d52dbe7c 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Cambridge_Bay.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Cambridge_Bay.ics @@ -1,22 +1,149 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Cambridge_Bay +TZID:/softwarestudio.org/Olson_20010626_2/America/Cambridge_Bay X-LIC-LOCATION:America/Cambridge_Bay BEGIN:DAYLIGHT TZOFFSETFROM:-0700 TZOFFSETTO:-0600 TZNAME:MDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:20020407T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0600 TZOFFSETTO:-0700 TZNAME:MST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:20021027T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-070020 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-070020 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:18840101T000000 +RDATE:18840101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MDT +DTSTART:19180414T020000 +RDATE:19180414T020000 +RDATE:19190525T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +RDATE:19870405T020000 +RDATE:19880403T020000 +RDATE:19890402T020000 +RDATE:19900401T020000 +RDATE:19910407T020000 +RDATE:19920405T020000 +RDATE:19930404T020000 +RDATE:19940403T020000 +RDATE:19950402T020000 +RDATE:19960407T020000 +RDATE:19970406T020000 +RDATE:19980405T020000 +RDATE:19990404T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19181027T020000 +RDATE:19181027T020000 +RDATE:19191101T000000 +RDATE:19450930T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +RDATE:19831030T020000 +RDATE:19841028T020000 +RDATE:19851027T020000 +RDATE:19861026T020000 +RDATE:19871025T020000 +RDATE:19881030T020000 +RDATE:19891029T020000 +RDATE:19901028T020000 +RDATE:19911027T020000 +RDATE:19921025T020000 +RDATE:19931031T020000 +RDATE:19941030T020000 +RDATE:19951029T020000 +RDATE:19961027T020000 +RDATE:19971026T020000 +RDATE:19981025T020000 +RDATE:20010401T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0500 +TZNAME:MDDT +DTSTART:19650425T000000 +RDATE:19650425T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19651031T020000 +RDATE:19651031T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19991031T020000 +RDATE:19991031T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:20000402T020000 +RDATE:20000402T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:20001029T020000 +RDATE:20001029T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:20001105T000000 +RDATE:20001105T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:20011028T020000 +RDATE:20011028T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Campo_Grande.ics b/mozilla/calendar/libical/zoneinfo/America/Campo_Grande.ics deleted file mode 100644 index b2b615f9ecf..00000000000 --- a/mozilla/calendar/libical/zoneinfo/America/Campo_Grande.ics +++ /dev/null @@ -1,22 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Campo_Grande -X-LIC-LOCATION:America/Campo_Grande -BEGIN:DAYLIGHT -TZOFFSETFROM:-0400 -TZOFFSETTO:-0300 -TZNAME:AMST -DTSTART:19701101T000000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU -END:DAYLIGHT -BEGIN:STANDARD -TZOFFSETFROM:-0300 -TZOFFSETTO:-0400 -TZNAME:AMT -DTSTART:19700222T000000 -RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=-1SU -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Cancun.ics b/mozilla/calendar/libical/zoneinfo/America/Cancun.ics index 2df37a7c4bd..d07558e947f 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Cancun.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Cancun.ics @@ -1,22 +1,90 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Cancun +TZID:/softwarestudio.org/Olson_20010626_2/America/Cancun X-LIC-LOCATION:America/Cancun BEGIN:DAYLIGHT TZOFFSETFROM:-0600 TZOFFSETTO:-0500 TZNAME:CDT -DTSTART:19700405T020000 -RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:20010506T020000 +RRULE:FREQ=YEARLY;BYMONTH=5;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0500 TZOFFSETTO:-0600 TZNAME:CST -DTSTART:19701025T020000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +DTSTART:20010930T020000 +RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-054704 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-054704 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19220101T001256 +RDATE:19220101T001256 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19811223T000000 +RDATE:19811223T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:EDT +DTSTART:19960407T020000 +RDATE:19960407T020000 +RDATE:19970406T020000 +RDATE:19980405T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19961027T020000 +RDATE:19961027T020000 +RDATE:19971026T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19980802T020000 +RDATE:19980802T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19981025T020000 +RDATE:19981025T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19990404T020000 +RDATE:19990404T020000 +RDATE:20000402T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19991031T020000 +RDATE:19991031T020000 +RDATE:20001029T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Caracas.ics b/mozilla/calendar/libical/zoneinfo/America/Caracas.ics index 80f20a65f77..6efc2c9af33 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Caracas.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Caracas.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Caracas +TZID:/softwarestudio.org/Olson_20010626_2/America/Caracas X-LIC-LOCATION:America/Caracas BEGIN:STANDARD -TZOFFSETFROM:-0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:-042744 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-042744 +TZOFFSETTO:-042744 +TZNAME:CMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-042744 +TZOFFSETTO:-0430 +TZNAME:VET +DTSTART:19120212T000000 +RDATE:19120212T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0430 TZOFFSETTO:-0400 TZNAME:VET -DTSTART:19700101T000000 +DTSTART:19650101T000000 +RDATE:19650101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Cayenne.ics b/mozilla/calendar/libical/zoneinfo/America/Cayenne.ics index 352470733c5..56298a3072f 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Cayenne.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Cayenne.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Cayenne +TZID:/softwarestudio.org/Olson_20010626_2/America/Cayenne X-LIC-LOCATION:America/Cayenne BEGIN:STANDARD -TZOFFSETFROM:-0300 +TZOFFSETFROM:+0000 +TZOFFSETTO:-032920 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-032920 +TZOFFSETTO:-0400 +TZNAME:GFT +DTSTART:19110701T000000 +RDATE:19110701T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0400 TZOFFSETTO:-0300 TZNAME:GFT -DTSTART:19700101T000000 +DTSTART:19671001T000000 +RDATE:19671001T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Cayman.ics b/mozilla/calendar/libical/zoneinfo/America/Cayman.ics index dbc0ce98755..e8e21141cbe 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Cayman.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Cayman.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Cayman +TZID:/softwarestudio.org/Olson_20010626_2/America/Cayman X-LIC-LOCATION:America/Cayman BEGIN:STANDARD -TZOFFSETFROM:-0500 +TZOFFSETFROM:+0000 +TZOFFSETTO:-052532 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-052532 +TZOFFSETTO:-050712 +TZNAME:KMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-050712 TZOFFSETTO:-0500 TZNAME:EST -DTSTART:19700101T000000 +DTSTART:19120201T000000 +RDATE:19120201T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Chicago.ics b/mozilla/calendar/libical/zoneinfo/America/Chicago.ics index 1760af05bc6..c8fc0f79375 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Chicago.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Chicago.ics @@ -1,22 +1,177 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Chicago +TZID:/softwarestudio.org/Olson_20010626_2/America/Chicago X-LIC-LOCATION:America/Chicago +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19551030T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0600 TZOFFSETTO:-0500 TZNAME:CDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-055036 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-055036 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:18831118T120000 +RDATE:18831118T120000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19180331T020000 +RDATE:19180331T020000 +RDATE:19190330T020000 +RDATE:19200613T020000 +RDATE:19210327T020000 +RDATE:19220430T020000 +RDATE:19230429T020000 +RDATE:19240427T020000 +RDATE:19250426T020000 +RDATE:19260425T020000 +RDATE:19270424T020000 +RDATE:19280429T020000 +RDATE:19290428T020000 +RDATE:19300427T020000 +RDATE:19310426T020000 +RDATE:19320424T020000 +RDATE:19330430T020000 +RDATE:19340429T020000 +RDATE:19350428T020000 +RDATE:19370425T020000 +RDATE:19380424T020000 +RDATE:19390430T020000 +RDATE:19400428T020000 +RDATE:19410427T020000 +RDATE:19460428T020000 +RDATE:19470427T020000 +RDATE:19480425T020000 +RDATE:19490424T020000 +RDATE:19500430T020000 +RDATE:19510429T020000 +RDATE:19520427T020000 +RDATE:19530426T020000 +RDATE:19540425T020000 +RDATE:19550424T020000 +RDATE:19560429T020000 +RDATE:19570428T020000 +RDATE:19580427T020000 +RDATE:19590426T020000 +RDATE:19600424T020000 +RDATE:19610430T020000 +RDATE:19620429T020000 +RDATE:19630428T020000 +RDATE:19640426T020000 +RDATE:19650425T020000 +RDATE:19660424T020000 +RDATE:19670430T020000 +RDATE:19680428T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19740106T020000 +RDATE:19750223T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0500 TZOFFSETTO:-0600 TZNAME:CST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19181027T020000 +RDATE:19181027T020000 +RDATE:19191026T020000 +RDATE:19201031T020000 +RDATE:19211030T020000 +RDATE:19220924T020000 +RDATE:19230930T020000 +RDATE:19240928T020000 +RDATE:19250927T020000 +RDATE:19260926T020000 +RDATE:19270925T020000 +RDATE:19280930T020000 +RDATE:19290929T020000 +RDATE:19300928T020000 +RDATE:19310927T020000 +RDATE:19320925T020000 +RDATE:19330924T020000 +RDATE:19340930T020000 +RDATE:19350929T020000 +RDATE:19361115T020000 +RDATE:19370926T020000 +RDATE:19380925T020000 +RDATE:19390924T020000 +RDATE:19400929T020000 +RDATE:19410928T020000 +RDATE:19450930T020000 +RDATE:19460929T020000 +RDATE:19470928T020000 +RDATE:19480926T020000 +RDATE:19490925T020000 +RDATE:19500924T020000 +RDATE:19510930T020000 +RDATE:19520928T020000 +RDATE:19530927T020000 +RDATE:19540926T020000 END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19200101T000000 +RDATE:19200101T000000 +RDATE:19420101T000000 +RDATE:19460101T000000 +RDATE:19670101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19360301T020000 +RDATE:19360301T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:CPT +DTSTART:19450814T180000 +RDATE:19450814T180000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Chihuahua.ics b/mozilla/calendar/libical/zoneinfo/America/Chihuahua.ics index 1b3b7f987d8..0b266ac27f5 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Chihuahua.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Chihuahua.ics @@ -1,22 +1,95 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Chihuahua +TZID:/softwarestudio.org/Olson_20010626_2/America/Chihuahua X-LIC-LOCATION:America/Chihuahua BEGIN:DAYLIGHT TZOFFSETFROM:-0700 TZOFFSETTO:-0600 TZNAME:MDT -DTSTART:19700405T020000 -RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:20010506T020000 +RRULE:FREQ=YEARLY;BYMONTH=5;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0600 TZOFFSETTO:-0700 TZNAME:MST -DTSTART:19701025T020000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +DTSTART:20010930T020000 +RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-070420 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-070420 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19211231T235540 +RDATE:19211231T235540 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19270610T230000 +RDATE:19270610T230000 +RDATE:19310501T230000 +RDATE:19320401T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19301115T000000 +RDATE:19301115T000000 +RDATE:19311001T000000 +RDATE:19980405T030000 +RDATE:19991031T020000 +RDATE:20001029T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19960101T000000 +RDATE:19960101T000000 +RDATE:19980101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19960407T020000 +RDATE:19960407T020000 +RDATE:19970406T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19961027T020000 +RDATE:19961027T020000 +RDATE:19971026T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19981025T020000 +RDATE:19981025T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MDT +DTSTART:19990404T020000 +RDATE:19990404T020000 +RDATE:20000402T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Costa_Rica.ics b/mozilla/calendar/libical/zoneinfo/America/Costa_Rica.ics index d77b6b8f0e6..e722f739d5f 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Costa_Rica.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Costa_Rica.ics @@ -1,14 +1,49 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Costa_Rica +TZID:/softwarestudio.org/Olson_20010626_2/America/Costa_Rica X-LIC-LOCATION:America/Costa_Rica BEGIN:STANDARD -TZOFFSETFROM:-0600 +TZOFFSETFROM:+0000 +TZOFFSETTO:-053620 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-053620 +TZOFFSETTO:-053620 +TZNAME:SJMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-053620 TZOFFSETTO:-0600 TZNAME:CST -DTSTART:19700101T000000 +DTSTART:19210115T000000 +RDATE:19210115T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19790225T000000 +RDATE:19790225T000000 +RDATE:19800224T000000 +RDATE:19910119T000000 +RDATE:19920118T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19790603T000000 +RDATE:19790603T000000 +RDATE:19800601T000000 +RDATE:19910701T000000 +RDATE:19920315T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Cuiaba.ics b/mozilla/calendar/libical/zoneinfo/America/Cuiaba.ics index 989de1dc181..de62202c54b 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Cuiaba.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Cuiaba.ics @@ -1,22 +1,100 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Cuiaba +TZID:/softwarestudio.org/Olson_20010626_2/America/Cuiaba X-LIC-LOCATION:America/Cuiaba BEGIN:DAYLIGHT TZOFFSETFROM:-0400 TZOFFSETTO:-0300 TZNAME:AMST -DTSTART:19701101T000000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:20001008T000000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=8,9,10,11,12,13,14;BYDAY=SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0300 TZOFFSETTO:-0400 TZNAME:AMT -DTSTART:19700222T000000 -RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=-1SU +DTSTART:20010218T000000 +RRULE:FREQ=YEARLY;BYMONTH=2;BYMONTHDAY=15,16,17,18,19,20,21;BYDAY=SU +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-034420 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-034420 +TZOFFSETTO:-0400 +TZNAME:AMT +DTSTART:19140101T000000 +RDATE:19140101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:AMST +DTSTART:19311003T110000 +RDATE:19311003T110000 +RDATE:19321003T000000 +RDATE:19491201T000000 +RDATE:19501201T000000 +RDATE:19511201T000000 +RDATE:19521201T000000 +RDATE:19631209T000000 +RDATE:19650131T000000 +RDATE:19651201T000000 +RDATE:19661101T000000 +RDATE:19671101T000000 +RDATE:19851102T000000 +RDATE:19861025T000000 +RDATE:19871025T000000 +RDATE:19881016T000000 +RDATE:19891015T000000 +RDATE:19901021T000000 +RDATE:19911020T000000 +RDATE:19921025T000000 +RDATE:19931017T000000 +RDATE:19941016T000000 +RDATE:19951015T000000 +RDATE:19961006T000000 +RDATE:19971006T000000 +RDATE:19981011T000000 +RDATE:19991003T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0400 +TZNAME:AMT +DTSTART:19320401T000000 +RDATE:19320401T000000 +RDATE:19330401T000000 +RDATE:19500416T010000 +RDATE:19510401T000000 +RDATE:19520401T000000 +RDATE:19530301T000000 +RDATE:19640301T000000 +RDATE:19650331T000000 +RDATE:19660301T000000 +RDATE:19670301T000000 +RDATE:19680301T000000 +RDATE:19860315T000000 +RDATE:19870214T000000 +RDATE:19880207T000000 +RDATE:19890129T000000 +RDATE:19900211T000000 +RDATE:19910217T000000 +RDATE:19920209T000000 +RDATE:19930131T000000 +RDATE:19940220T000000 +RDATE:19950219T000000 +RDATE:19960211T000000 +RDATE:19970216T000000 +RDATE:19980301T000000 +RDATE:19990221T000000 +RDATE:20000227T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Curacao.ics b/mozilla/calendar/libical/zoneinfo/America/Curacao.ics index 05c2c9febb0..d2c82ad0dec 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Curacao.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Curacao.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Curacao +TZID:/softwarestudio.org/Olson_20010626_2/America/Curacao X-LIC-LOCATION:America/Curacao BEGIN:STANDARD -TZOFFSETFROM:-0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:-043544 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-043544 +TZOFFSETTO:-0430 +TZNAME:ANT +DTSTART:19120212T000000 +RDATE:19120212T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0430 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:19650101T000000 +RDATE:19650101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Danmarkshavn.ics b/mozilla/calendar/libical/zoneinfo/America/Danmarkshavn.ics deleted file mode 100644 index d3bb58c4f1d..00000000000 --- a/mozilla/calendar/libical/zoneinfo/America/Danmarkshavn.ics +++ /dev/null @@ -1,14 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Danmarkshavn -X-LIC-LOCATION:America/Danmarkshavn -BEGIN:STANDARD -TZOFFSETFROM:+0000 -TZOFFSETTO:+0000 -TZNAME:GMT -DTSTART:19700101T000000 -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Dawson.ics b/mozilla/calendar/libical/zoneinfo/America/Dawson.ics index 32a0da785c5..3fbb98034c7 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Dawson.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Dawson.ics @@ -1,22 +1,94 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Dawson +TZID:/softwarestudio.org/Olson_20010626_2/America/Dawson X-LIC-LOCATION:America/Dawson -BEGIN:DAYLIGHT -TZOFFSETFROM:-0800 -TZOFFSETTO:-0700 -TZNAME:PDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU -END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0700 TZOFFSETTO:-0800 TZNAME:PST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19801026T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +TZNAME:PDT +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-091740 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-091740 +TZOFFSETTO:-0900 +TZNAME:YST +DTSTART:19000820T000000 +RDATE:19000820T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0900 +TZOFFSETTO:-0800 +TZNAME:YDT +DTSTART:19180414T020000 +RDATE:19180414T020000 +RDATE:19190525T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0800 +TZOFFSETTO:-0900 +TZNAME:YST +DTSTART:19181027T020000 +RDATE:19181027T020000 +RDATE:19191101T000000 +RDATE:19450930T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0900 +TZOFFSETTO:-0800 +TZNAME:YWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0900 +TZOFFSETTO:-0700 +TZNAME:YDDT +DTSTART:19650425T000000 +RDATE:19650425T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0900 +TZNAME:YST +DTSTART:19651031T020000 +RDATE:19651031T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0900 +TZOFFSETTO:-0800 +TZNAME:PST +DTSTART:19731028T000000 +RDATE:19731028T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +TZNAME:PDT +DTSTART:19800427T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Dawson_Creek.ics b/mozilla/calendar/libical/zoneinfo/America/Dawson_Creek.ics index 86822d208ea..75a98c75315 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Dawson_Creek.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Dawson_Creek.ics @@ -1,14 +1,109 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Dawson_Creek +TZID:/softwarestudio.org/Olson_20010626_2/America/Dawson_Creek X-LIC-LOCATION:America/Dawson_Creek BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-080056 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-080056 +TZOFFSETTO:-0800 +TZNAME:PST +DTSTART:18840101T000000 +RDATE:18840101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +TZNAME:PDT +DTSTART:19180414T020000 +RDATE:19180414T020000 +RDATE:19470427T020000 +RDATE:19480425T020000 +RDATE:19490424T020000 +RDATE:19500430T020000 +RDATE:19510429T020000 +RDATE:19520427T020000 +RDATE:19530426T020000 +RDATE:19540425T020000 +RDATE:19550424T020000 +RDATE:19560429T020000 +RDATE:19570428T020000 +RDATE:19580427T020000 +RDATE:19590426T020000 +RDATE:19600424T020000 +RDATE:19610430T020000 +RDATE:19620429T020000 +RDATE:19630428T020000 +RDATE:19640426T020000 +RDATE:19650425T020000 +RDATE:19660424T020000 +RDATE:19670430T020000 +RDATE:19680428T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0800 +TZNAME:PST +DTSTART:19181031T020000 +RDATE:19181031T020000 +RDATE:19450930T020000 +RDATE:19470928T020000 +RDATE:19480926T020000 +RDATE:19490925T020000 +RDATE:19500924T020000 +RDATE:19510930T020000 +RDATE:19520928T020000 +RDATE:19530927T020000 +RDATE:19540926T020000 +RDATE:19550925T020000 +RDATE:19560930T020000 +RDATE:19570929T020000 +RDATE:19580928T020000 +RDATE:19590927T020000 +RDATE:19600925T020000 +RDATE:19610924T020000 +RDATE:19621028T020000 +RDATE:19631027T020000 +RDATE:19641025T020000 +RDATE:19651031T020000 +RDATE:19661030T020000 +RDATE:19671029T020000 +RDATE:19681027T020000 +RDATE:19691026T020000 +RDATE:19701025T020000 +RDATE:19711031T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +TZNAME:PWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0800 +TZOFFSETTO:-0800 +TZNAME:PST +DTSTART:19470101T000000 +RDATE:19470101T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:-0700 TZOFFSETTO:-0700 TZNAME:MST -DTSTART:19700101T000000 +DTSTART:19720830T020000 +RDATE:19720830T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Denver.ics b/mozilla/calendar/libical/zoneinfo/America/Denver.ics index 9fe8be49327..74a69a4610b 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Denver.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Denver.ics @@ -1,22 +1,103 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Denver +TZID:/softwarestudio.org/Olson_20010626_2/America/Denver X-LIC-LOCATION:America/Denver +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19651031T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0700 TZOFFSETTO:-0600 TZNAME:MDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-065956 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-065956 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:18831118T120000 +RDATE:18831118T120000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MDT +DTSTART:19180331T020000 +RDATE:19180331T020000 +RDATE:19190330T020000 +RDATE:19200328T020000 +RDATE:19210327T020000 +RDATE:19650425T020000 +RDATE:19660424T020000 +RDATE:19670430T020000 +RDATE:19680428T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19740106T020000 +RDATE:19750223T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0600 TZOFFSETTO:-0700 TZNAME:MST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19181027T020000 +RDATE:19181027T020000 +RDATE:19191026T020000 +RDATE:19201031T020000 +RDATE:19210522T020000 +RDATE:19450930T020000 END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19200101T000000 +RDATE:19200101T000000 +RDATE:19420101T000000 +RDATE:19460101T000000 +RDATE:19670101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0600 +TZNAME:MPT +DTSTART:19450814T170000 +RDATE:19450814T170000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Detroit.ics b/mozilla/calendar/libical/zoneinfo/America/Detroit.ics index 73bb5471a49..47ee2403cfc 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Detroit.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Detroit.ics @@ -1,22 +1,101 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Detroit +TZID:/softwarestudio.org/Olson_20010626_2/America/Detroit X-LIC-LOCATION:America/Detroit +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19761031T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0500 TZOFFSETTO:-0400 TZNAME:EDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-053211 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-053211 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19050101T000000 +RDATE:19050101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19150515T020000 +RDATE:19150515T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19420101T000000 +RDATE:19420101T000000 +RDATE:19460101T000000 +RDATE:19730101T000000 +RDATE:19750101T000000 +RDATE:19750427T020000 +RDATE:19751026T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:EWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0400 +TZNAME:EPT +DTSTART:19450814T190000 +RDATE:19450814T190000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0400 TZOFFSETTO:-0500 TZNAME:EST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19450930T020000 +RDATE:19450930T020000 +RDATE:19480926T020000 +RDATE:19671029T020000 +RDATE:19731028T020000 +RDATE:19741027T020000 END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:EDT +DTSTART:19480425T020000 +RDATE:19480425T020000 +RDATE:19670614T020000 +RDATE:19730429T020000 +RDATE:19740106T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Dominica.ics b/mozilla/calendar/libical/zoneinfo/America/Dominica.ics index 948d4df0f29..1e7d1924160 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Dominica.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Dominica.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Dominica +TZID:/softwarestudio.org/Olson_20010626_2/America/Dominica X-LIC-LOCATION:America/Dominica BEGIN:STANDARD -TZOFFSETFROM:-0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:-040536 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-040536 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:19110701T000100 +RDATE:19110701T000100 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Edmonton.ics b/mozilla/calendar/libical/zoneinfo/America/Edmonton.ics index de89ad4b68e..d473abd26d5 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Edmonton.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Edmonton.ics @@ -1,22 +1,89 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Edmonton +TZID:/softwarestudio.org/Olson_20010626_2/America/Edmonton X-LIC-LOCATION:America/Edmonton +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19721029T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0700 TZOFFSETTO:-0600 TZNAME:MDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-073352 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-073352 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19060901T000000 +RDATE:19060901T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MDT +DTSTART:19180414T020000 +RDATE:19180414T020000 +RDATE:19190413T020000 +RDATE:19200425T020000 +RDATE:19210424T020000 +RDATE:19220430T020000 +RDATE:19230429T020000 +RDATE:19470427T020000 +RDATE:19670430T020000 +RDATE:19690427T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19740428T020000 +RDATE:19750427T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0600 TZOFFSETTO:-0700 TZNAME:MST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19181031T020000 +RDATE:19181031T020000 +RDATE:19190527T020000 +RDATE:19201031T020000 +RDATE:19210925T020000 +RDATE:19220924T020000 +RDATE:19230930T020000 +RDATE:19450930T020000 +RDATE:19470928T020000 +RDATE:19671029T020000 +RDATE:19691026T020000 END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Eirunepe.ics b/mozilla/calendar/libical/zoneinfo/America/Eirunepe.ics index d2ef7fad57e..456e84ef52c 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Eirunepe.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Eirunepe.ics @@ -1,14 +1,73 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Eirunepe +TZID:/softwarestudio.org/Olson_20010626_2/America/Eirunepe X-LIC-LOCATION:America/Eirunepe BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-043928 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-043928 +TZOFFSETTO:-0500 +TZNAME:ACT +DTSTART:19140101T000000 +RDATE:19140101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:ACST +DTSTART:19311003T110000 +RDATE:19311003T110000 +RDATE:19321003T000000 +RDATE:19491201T000000 +RDATE:19501201T000000 +RDATE:19511201T000000 +RDATE:19521201T000000 +RDATE:19631209T000000 +RDATE:19650131T000000 +RDATE:19651201T000000 +RDATE:19661101T000000 +RDATE:19671101T000000 +RDATE:19851102T000000 +RDATE:19861025T000000 +RDATE:19871025T000000 +RDATE:19931017T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +TZNAME:ACT +DTSTART:19320401T000000 +RDATE:19320401T000000 +RDATE:19330401T000000 +RDATE:19500416T010000 +RDATE:19510401T000000 +RDATE:19520401T000000 +RDATE:19530301T000000 +RDATE:19640301T000000 +RDATE:19650331T000000 +RDATE:19660301T000000 +RDATE:19670301T000000 +RDATE:19680301T000000 +RDATE:19860315T000000 +RDATE:19870214T000000 +RDATE:19880207T000000 +RDATE:19940220T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:-0500 TZOFFSETTO:-0500 TZNAME:ACT -DTSTART:19700101T000000 +DTSTART:19880912T000000 +RDATE:19880912T000000 +RDATE:19930928T000000 +RDATE:19940922T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/El_Salvador.ics b/mozilla/calendar/libical/zoneinfo/America/El_Salvador.ics index 8785483a8d6..84aaf3f0b40 100644 --- a/mozilla/calendar/libical/zoneinfo/America/El_Salvador.ics +++ b/mozilla/calendar/libical/zoneinfo/America/El_Salvador.ics @@ -1,14 +1,38 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/El_Salvador +TZID:/softwarestudio.org/Olson_20010626_2/America/El_Salvador X-LIC-LOCATION:America/El_Salvador BEGIN:STANDARD -TZOFFSETFROM:-0600 +TZOFFSETFROM:+0000 +TZOFFSETTO:-055648 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-055648 TZOFFSETTO:-0600 TZNAME:CST -DTSTART:19700101T000000 +DTSTART:19210101T000000 +RDATE:19210101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19870503T000000 +RDATE:19870503T000000 +RDATE:19880501T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19870927T000000 +RDATE:19870927T000000 +RDATE:19880925T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Fortaleza.ics b/mozilla/calendar/libical/zoneinfo/America/Fortaleza.ics index 384dd115ce5..25dc1fa7b66 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Fortaleza.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Fortaleza.ics @@ -1,14 +1,78 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Fortaleza +TZID:/softwarestudio.org/Olson_20010626_2/America/Fortaleza X-LIC-LOCATION:America/Fortaleza BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-0234 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0234 +TZOFFSETTO:-0300 +TZNAME:BRT +DTSTART:19140101T000000 +RDATE:19140101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0300 +TZOFFSETTO:-0200 +TZNAME:BRST +DTSTART:19311003T110000 +RDATE:19311003T110000 +RDATE:19321003T000000 +RDATE:19491201T000000 +RDATE:19501201T000000 +RDATE:19511201T000000 +RDATE:19521201T000000 +RDATE:19631209T000000 +RDATE:19650131T000000 +RDATE:19651201T000000 +RDATE:19661101T000000 +RDATE:19671101T000000 +RDATE:19851102T000000 +RDATE:19861025T000000 +RDATE:19871025T000000 +RDATE:19881016T000000 +RDATE:19891015T000000 +RDATE:19991003T000000 +RDATE:20001008T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0200 +TZOFFSETTO:-0300 +TZNAME:BRT +DTSTART:19320401T000000 +RDATE:19320401T000000 +RDATE:19330401T000000 +RDATE:19500416T010000 +RDATE:19510401T000000 +RDATE:19520401T000000 +RDATE:19530301T000000 +RDATE:19640301T000000 +RDATE:19650331T000000 +RDATE:19660301T000000 +RDATE:19670301T000000 +RDATE:19680301T000000 +RDATE:19860315T000000 +RDATE:19870214T000000 +RDATE:19880207T000000 +RDATE:19890129T000000 +RDATE:19900211T000000 +RDATE:20000227T000000 +RDATE:20001022T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:-0300 TZOFFSETTO:-0300 TZNAME:BRT -DTSTART:19700101T000000 +DTSTART:19900917T000000 +RDATE:19900917T000000 +RDATE:19990930T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Glace_Bay.ics b/mozilla/calendar/libical/zoneinfo/America/Glace_Bay.ics index e76f7ba317e..6a51fe56552 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Glace_Bay.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Glace_Bay.ics @@ -1,22 +1,84 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Glace_Bay +TZID:/softwarestudio.org/Olson_20010626_2/America/Glace_Bay X-LIC-LOCATION:America/Glace_Bay +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0400 +TZNAME:AST +DTSTART:19721029T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0400 TZOFFSETTO:-0300 TZNAME:ADT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-035948 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-035948 +TZOFFSETTO:-0400 +TZNAME:AST +DTSTART:19020615T000000 +RDATE:19020615T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:ADT +DTSTART:19180414T020000 +RDATE:19180414T020000 +RDATE:19530426T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19740428T020000 +RDATE:19750427T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0300 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19181031T020000 +RDATE:19181031T020000 +RDATE:19450930T020000 +RDATE:19530927T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:AWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0400 +TZNAME:AST +DTSTART:19530101T000000 +RDATE:19530101T000000 +RDATE:19540101T000000 +RDATE:19720101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Godthab.ics b/mozilla/calendar/libical/zoneinfo/America/Godthab.ics index bed808246e6..8504ca8d8d6 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Godthab.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Godthab.ics @@ -1,22 +1,65 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Godthab +TZID:/softwarestudio.org/Olson_20010626_2/America/Godthab X-LIC-LOCATION:America/Godthab BEGIN:DAYLIGHT TZOFFSETFROM:-0300 TZOFFSETTO:-0200 TZNAME:WGST -DTSTART:19700328T220000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA +DTSTART:19810328T220000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=24,25,26,27,28,29,30;BYDAY=SA END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0200 TZOFFSETTO:-0300 TZNAME:WGT -DTSTART:19701024T230000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SA +DTSTART:19961026T230000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=24,25,26,27,28,29,30;BYDAY=SA +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-032656 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-032656 +TZOFFSETTO:-0300 +TZNAME:WGT +DTSTART:19160728T000000 +RDATE:19160728T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0300 +TZNAME:WGT +DTSTART:19800406T020000 +RDATE:19800406T020000 +RDATE:19800927T220000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0200 +TZOFFSETTO:-0300 +TZNAME:WGT +DTSTART:19810926T230000 +RDATE:19810926T230000 +RDATE:19820925T230000 +RDATE:19830924T230000 +RDATE:19840929T230000 +RDATE:19850928T230000 +RDATE:19860927T230000 +RDATE:19870926T230000 +RDATE:19880924T230000 +RDATE:19890923T230000 +RDATE:19900929T230000 +RDATE:19910928T230000 +RDATE:19920926T230000 +RDATE:19930925T230000 +RDATE:19940924T230000 +RDATE:19950923T230000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Goose_Bay.ics b/mozilla/calendar/libical/zoneinfo/America/Goose_Bay.ics index 262a8e25a0e..3c6f8eae93b 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Goose_Bay.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Goose_Bay.ics @@ -1,22 +1,228 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Goose_Bay +TZID:/softwarestudio.org/Olson_20010626_2/America/Goose_Bay X-LIC-LOCATION:America/Goose_Bay BEGIN:DAYLIGHT TZOFFSETFROM:-0400 TZOFFSETTO:-0300 TZNAME:ADT -DTSTART:19700308T000100 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19890402T000100 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0300 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19701101T000100 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19891029T000100 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-040140 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-040140 +TZOFFSETTO:-033052 +TZNAME:NST +DTSTART:18840101T000000 +RDATE:18840101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-033052 +TZOFFSETTO:-023052 +TZNAME:NST +DTSTART:19170408T020000 +RDATE:19170408T020000 +RDATE:19180414T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-023052 +TZOFFSETTO:-033052 +TZNAME:NST +DTSTART:19170917T020000 +RDATE:19170917T020000 +RDATE:19181031T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-033052 +TZOFFSETTO:-033052 +TZNAME:NST +DTSTART:19190101T000000 +RDATE:19190101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-033052 +TZOFFSETTO:-0330 +TZNAME:NST +DTSTART:19350330T000000 +RDATE:19350330T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0330 +TZOFFSETTO:-0330 +TZNAME:NST +DTSTART:19360101T000000 +RDATE:19360101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0330 +TZOFFSETTO:-0230 +TZNAME:NDT +DTSTART:19360510T000000 +RDATE:19360510T000000 +RDATE:19370509T000000 +RDATE:19380508T000000 +RDATE:19390514T000000 +RDATE:19400512T000000 +RDATE:19410511T000000 +RDATE:19460512T020000 +RDATE:19470511T020000 +RDATE:19480509T020000 +RDATE:19490508T020000 +RDATE:19500514T020000 +RDATE:19510429T020000 +RDATE:19520427T020000 +RDATE:19530426T020000 +RDATE:19540425T020000 +RDATE:19550424T020000 +RDATE:19560429T020000 +RDATE:19570428T020000 +RDATE:19580427T020000 +RDATE:19590426T020000 +RDATE:19600424T020000 +RDATE:19610430T020000 +RDATE:19620429T020000 +RDATE:19630428T020000 +RDATE:19640426T020000 +RDATE:19650425T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0230 +TZOFFSETTO:-0330 +TZNAME:NST +DTSTART:19361004T000000 +RDATE:19361004T000000 +RDATE:19371003T000000 +RDATE:19381002T000000 +RDATE:19391001T000000 +RDATE:19401006T000000 +RDATE:19411005T000000 +RDATE:19421231T000000 +RDATE:19430905T000000 +RDATE:19440902T000000 +RDATE:19451007T020000 +RDATE:19461006T020000 +RDATE:19471005T020000 +RDATE:19481003T020000 +RDATE:19491002T020000 +RDATE:19501008T020000 +RDATE:19510930T020000 +RDATE:19520928T020000 +RDATE:19530927T020000 +RDATE:19540926T020000 +RDATE:19550925T020000 +RDATE:19560930T020000 +RDATE:19570929T020000 +RDATE:19580928T020000 +RDATE:19590927T020000 +RDATE:19601030T020000 +RDATE:19611029T020000 +RDATE:19621028T020000 +RDATE:19631027T020000 +RDATE:19641025T020000 +RDATE:19651031T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0330 +TZOFFSETTO:-0230 +TZNAME:NWT +DTSTART:19420301T000000 +RDATE:19420301T000000 +RDATE:19430530T000000 +RDATE:19440710T000000 +RDATE:19450101T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0330 +TZOFFSETTO:-0400 +TZNAME:AST +DTSTART:19660315T020000 +RDATE:19660315T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:ADT +DTSTART:19660424T020000 +RDATE:19660424T020000 +RDATE:19670430T020000 +RDATE:19680428T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19740428T020000 +RDATE:19750427T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +RDATE:19870405T000100 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0400 +TZNAME:AST +DTSTART:19661030T020000 +RDATE:19661030T020000 +RDATE:19671029T020000 +RDATE:19681027T020000 +RDATE:19691026T020000 +RDATE:19701025T020000 +RDATE:19711031T020000 +RDATE:19721029T020000 +RDATE:19731028T020000 +RDATE:19741027T020000 +RDATE:19751026T020000 +RDATE:19761031T020000 +RDATE:19771030T020000 +RDATE:19781029T020000 +RDATE:19791028T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +RDATE:19831030T020000 +RDATE:19841028T020000 +RDATE:19851027T020000 +RDATE:19861026T020000 +RDATE:19871025T000100 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0200 +TZNAME:ADDT +DTSTART:19880403T000100 +RDATE:19880403T000100 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0200 +TZOFFSETTO:-0400 +TZNAME:AST +DTSTART:19881030T000100 +RDATE:19881030T000100 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Grand_Turk.ics b/mozilla/calendar/libical/zoneinfo/America/Grand_Turk.ics index 9c627c62399..c451ac103d5 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Grand_Turk.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Grand_Turk.ics @@ -1,22 +1,57 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Grand_Turk +TZID:/softwarestudio.org/Olson_20010626_2/America/Grand_Turk X-LIC-LOCATION:America/Grand_Turk BEGIN:STANDARD TZOFFSETFROM:-0400 TZOFFSETTO:-0500 TZNAME:EST -DTSTART:19701025T000000 +DTSTART:19791028T000000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0500 TZOFFSETTO:-0400 TZNAME:EDT -DTSTART:19700405T000000 -RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:19870405T000000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-044432 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-044432 +TZOFFSETTO:-050712 +TZNAME:KMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-050712 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19120201T000000 +RDATE:19120201T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:EDT +DTSTART:19790429T000000 +RDATE:19790429T000000 +RDATE:19800427T000000 +RDATE:19810426T000000 +RDATE:19820425T000000 +RDATE:19830424T000000 +RDATE:19840429T000000 +RDATE:19850428T000000 +RDATE:19860427T000000 END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Grenada.ics b/mozilla/calendar/libical/zoneinfo/America/Grenada.ics index f4c954a5e51..6c5b9235642 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Grenada.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Grenada.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Grenada +TZID:/softwarestudio.org/Olson_20010626_2/America/Grenada X-LIC-LOCATION:America/Grenada BEGIN:STANDARD -TZOFFSETFROM:-0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:-0407 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0407 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:19110701T000000 +RDATE:19110701T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Guadeloupe.ics b/mozilla/calendar/libical/zoneinfo/America/Guadeloupe.ics index d6b2f11cbab..263a1055213 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Guadeloupe.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Guadeloupe.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Guadeloupe +TZID:/softwarestudio.org/Olson_20010626_2/America/Guadeloupe X-LIC-LOCATION:America/Guadeloupe BEGIN:STANDARD -TZOFFSETFROM:-0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:-040608 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-040608 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:19110608T000000 +RDATE:19110608T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Guatemala.ics b/mozilla/calendar/libical/zoneinfo/America/Guatemala.ics index d5ac43aae0f..e327d6978f9 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Guatemala.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Guatemala.ics @@ -1,14 +1,40 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Guatemala +TZID:/softwarestudio.org/Olson_20010626_2/America/Guatemala X-LIC-LOCATION:America/Guatemala BEGIN:STANDARD -TZOFFSETFROM:-0600 +TZOFFSETFROM:+0000 +TZOFFSETTO:-060204 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-060204 TZOFFSETTO:-0600 TZNAME:CST -DTSTART:19700101T000000 +DTSTART:19181005T000000 +RDATE:19181005T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19731125T000000 +RDATE:19731125T000000 +RDATE:19830521T000000 +RDATE:19910323T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19740224T000000 +RDATE:19740224T000000 +RDATE:19830922T000000 +RDATE:19910907T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Guayaquil.ics b/mozilla/calendar/libical/zoneinfo/America/Guayaquil.ics index fd940636638..f1aefdf46e7 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Guayaquil.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Guayaquil.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Guayaquil +TZID:/softwarestudio.org/Olson_20010626_2/America/Guayaquil X-LIC-LOCATION:America/Guayaquil BEGIN:STANDARD -TZOFFSETFROM:-0500 +TZOFFSETFROM:+0000 +TZOFFSETTO:-051920 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-051920 +TZOFFSETTO:-0514 +TZNAME:QMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0514 TZOFFSETTO:-0500 TZNAME:ECT -DTSTART:19700101T000000 +DTSTART:19310101T000000 +RDATE:19310101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Guyana.ics b/mozilla/calendar/libical/zoneinfo/America/Guyana.ics index 48190f00baf..c2fa1a984ae 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Guyana.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Guyana.ics @@ -1,14 +1,43 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Guyana +TZID:/softwarestudio.org/Olson_20010626_2/America/Guyana X-LIC-LOCATION:America/Guyana BEGIN:STANDARD -TZOFFSETFROM:-0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:-035240 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-035240 +TZOFFSETTO:-0345 +TZNAME:GBGT +DTSTART:19150301T000000 +RDATE:19150301T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0345 +TZOFFSETTO:-0345 +TZNAME:GYT +DTSTART:19660526T000000 +RDATE:19660526T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0345 +TZOFFSETTO:-0300 +TZNAME:GYT +DTSTART:19750731T000000 +RDATE:19750731T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0300 TZOFFSETTO:-0400 TZNAME:GYT -DTSTART:19700101T000000 +DTSTART:19910101T000000 +RDATE:19910101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Halifax.ics b/mozilla/calendar/libical/zoneinfo/America/Halifax.ics index 4bc670058f9..1fa824f0598 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Halifax.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Halifax.ics @@ -1,22 +1,162 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Halifax +TZID:/softwarestudio.org/Olson_20010626_2/America/Halifax X-LIC-LOCATION:America/Halifax +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0400 +TZNAME:AST +DTSTART:19621028T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0400 TZOFFSETTO:-0300 TZNAME:ADT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-041424 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-041424 +TZOFFSETTO:-0400 +TZNAME:AST +DTSTART:19020615T000000 +RDATE:19020615T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:ADT +DTSTART:19160401T000000 +RDATE:19160401T000000 +RDATE:19180414T020000 +RDATE:19200509T000000 +RDATE:19210506T000000 +RDATE:19220430T000000 +RDATE:19230506T000000 +RDATE:19240504T000000 +RDATE:19250503T000000 +RDATE:19260516T000000 +RDATE:19270501T000000 +RDATE:19280513T000000 +RDATE:19290512T000000 +RDATE:19300511T000000 +RDATE:19310510T000000 +RDATE:19330430T000000 +RDATE:19340520T000000 +RDATE:19350602T000000 +RDATE:19360601T000000 +RDATE:19370502T000000 +RDATE:19380501T000000 +RDATE:19390528T000000 +RDATE:19400505T000000 +RDATE:19410504T000000 +RDATE:19460428T020000 +RDATE:19470427T020000 +RDATE:19480425T020000 +RDATE:19490424T020000 +RDATE:19500430T020000 +RDATE:19510429T020000 +RDATE:19520427T020000 +RDATE:19530426T020000 +RDATE:19540425T020000 +RDATE:19550424T020000 +RDATE:19560429T020000 +RDATE:19570428T020000 +RDATE:19580427T020000 +RDATE:19590426T020000 +RDATE:19620429T020000 +RDATE:19630428T020000 +RDATE:19640426T020000 +RDATE:19650425T020000 +RDATE:19660424T020000 +RDATE:19670430T020000 +RDATE:19680428T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19740428T020000 +RDATE:19750427T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0300 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19161001T000000 +RDATE:19161001T000000 +RDATE:19181031T020000 +RDATE:19200829T000000 +RDATE:19210905T000000 +RDATE:19220905T000000 +RDATE:19230904T000000 +RDATE:19240915T000000 +RDATE:19250928T000000 +RDATE:19260913T000000 +RDATE:19270926T000000 +RDATE:19280909T000000 +RDATE:19290903T000000 +RDATE:19300915T000000 +RDATE:19310928T000000 +RDATE:19331002T000000 +RDATE:19340916T000000 +RDATE:19350930T000000 +RDATE:19360914T000000 +RDATE:19370927T000000 +RDATE:19380926T000000 +RDATE:19390925T000000 +RDATE:19400930T000000 +RDATE:19410929T000000 +RDATE:19450930T020000 +RDATE:19460929T020000 +RDATE:19470928T020000 +RDATE:19480926T020000 +RDATE:19490925T020000 +RDATE:19500924T020000 +RDATE:19510930T020000 +RDATE:19520928T020000 +RDATE:19530927T020000 +RDATE:19540926T020000 +RDATE:19550925T020000 +RDATE:19560930T020000 +RDATE:19570929T020000 +RDATE:19580928T020000 +RDATE:19590927T020000 END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0400 +TZNAME:AST +DTSTART:19320926T000000 +RDATE:19320926T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:AWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Havana.ics b/mozilla/calendar/libical/zoneinfo/America/Havana.ics index 467943ee29e..3e68532696b 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Havana.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Havana.ics @@ -1,22 +1,135 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Havana +TZID:/softwarestudio.org/Olson_20010626_2/America/Havana X-LIC-LOCATION:America/Havana BEGIN:STANDARD TZOFFSETFROM:-0400 TZOFFSETTO:-0500 TZNAME:CST -DTSTART:19701025T010000 +DTSTART:19981025T010000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0500 TZOFFSETTO:-0400 TZNAME:CDT -DTSTART:19700405T000000 -RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:20000402T000000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-052928 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-052928 +TZOFFSETTO:-052936 +TZNAME:HMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-052936 +TZOFFSETTO:-0500 +TZNAME:CST +DTSTART:19250719T120000 +RDATE:19250719T120000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:CDT +DTSTART:19280610T000000 +RDATE:19280610T000000 +RDATE:19400602T000000 +RDATE:19410601T000000 +RDATE:19420607T000000 +RDATE:19450603T000000 +RDATE:19460602T000000 +RDATE:19650601T000000 +RDATE:19660529T000000 +RDATE:19670408T000000 +RDATE:19680414T000000 +RDATE:19690427T000000 +RDATE:19700426T000000 +RDATE:19710425T000000 +RDATE:19720430T000000 +RDATE:19730429T000000 +RDATE:19740428T000000 +RDATE:19750427T000000 +RDATE:19760425T000000 +RDATE:19770424T000000 +RDATE:19780507T000000 +RDATE:19790318T000000 +RDATE:19800316T000000 +RDATE:19810510T000000 +RDATE:19820509T000000 +RDATE:19830508T000000 +RDATE:19840506T000000 +RDATE:19850505T000000 +RDATE:19860316T000000 +RDATE:19870315T000000 +RDATE:19880320T000000 +RDATE:19890319T000000 +RDATE:19900401T000000 +RDATE:19910407T000000 +RDATE:19920405T000000 +RDATE:19930404T000000 +RDATE:19940403T000000 +RDATE:19950402T000000 +RDATE:19960407T000000 +RDATE:19970406T000000 +RDATE:19980329T000000 +RDATE:19990328T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +TZNAME:CST +DTSTART:19281010T000000 +RDATE:19281010T000000 +RDATE:19400901T000000 +RDATE:19410907T000000 +RDATE:19420906T000000 +RDATE:19450902T000000 +RDATE:19460901T000000 +RDATE:19650930T000000 +RDATE:19661002T000000 +RDATE:19670910T000000 +RDATE:19680908T000000 +RDATE:19691026T000000 +RDATE:19701025T000000 +RDATE:19711031T000000 +RDATE:19721008T000000 +RDATE:19731008T000000 +RDATE:19741008T000000 +RDATE:19751026T000000 +RDATE:19761031T000000 +RDATE:19771030T000000 +RDATE:19781008T000000 +RDATE:19791014T000000 +RDATE:19801012T000000 +RDATE:19811011T000000 +RDATE:19821010T000000 +RDATE:19831009T000000 +RDATE:19841014T000000 +RDATE:19851013T000000 +RDATE:19861012T000000 +RDATE:19871011T000000 +RDATE:19881009T000000 +RDATE:19891008T000000 +RDATE:19901014T000000 +RDATE:19911013T010000 +RDATE:19921011T010000 +RDATE:19931010T010000 +RDATE:19941009T010000 +RDATE:19951008T010000 +RDATE:19961006T010000 +RDATE:19971012T010000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Hermosillo.ics b/mozilla/calendar/libical/zoneinfo/America/Hermosillo.ics index eb68df20c79..195d0ae6410 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Hermosillo.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Hermosillo.ics @@ -1,14 +1,73 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Hermosillo +TZID:/softwarestudio.org/Olson_20010626_2/America/Hermosillo X-LIC-LOCATION:America/Hermosillo BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-072352 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-072352 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19211231T233608 +RDATE:19211231T233608 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19270610T230000 +RDATE:19270610T230000 +RDATE:19310501T230000 +RDATE:19320401T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19301115T000000 +RDATE:19301115T000000 +RDATE:19311001T000000 +RDATE:19420424T000000 +RDATE:19961027T020000 +RDATE:19971026T020000 +RDATE:19981025T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0800 +TZNAME:PST +DTSTART:19490114T000000 +RDATE:19490114T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19700101T000000 +RDATE:19700101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MDT +DTSTART:19960407T020000 +RDATE:19960407T020000 +RDATE:19970406T020000 +RDATE:19980405T020000 +END:DAYLIGHT +BEGIN:STANDARD TZOFFSETFROM:-0700 TZOFFSETTO:-0700 TZNAME:MST -DTSTART:19700101T000000 +DTSTART:19990101T000000 +RDATE:19990101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Indiana/Indianapolis.ics b/mozilla/calendar/libical/zoneinfo/America/Indiana/Indianapolis.ics index c27bd27e6ca..4a0ca905728 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Indiana/Indianapolis.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Indiana/Indianapolis.ics @@ -1,22 +1,115 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Indiana/Indianapolis +TZID:/softwarestudio.org/Olson_20010626_2/America/Indiana/Indianapolis X-LIC-LOCATION:America/Indiana/Indianapolis +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-054438 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-054438 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:18831118T120000 +RDATE:18831118T120000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19180331T020000 +RDATE:19180331T020000 +RDATE:19190330T020000 +RDATE:19410622T020000 +RDATE:19460428T020000 +RDATE:19470427T020000 +RDATE:19480425T020000 +RDATE:19490424T020000 +RDATE:19500430T020000 +RDATE:19510429T020000 +RDATE:19520427T020000 +RDATE:19530426T020000 +RDATE:19540425T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19181027T020000 +RDATE:19181027T020000 +RDATE:19191026T020000 +RDATE:19410928T020000 +RDATE:19450930T020000 +RDATE:19460929T020000 +RDATE:19470928T020000 +RDATE:19480926T020000 +RDATE:19490925T020000 +RDATE:19500924T020000 +RDATE:19510930T020000 +RDATE:19520928T020000 +RDATE:19530927T020000 +RDATE:19540926T020000 +RDATE:19570929T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19200101T000000 +RDATE:19200101T000000 +RDATE:19420101T000000 +RDATE:19460101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:CPT +DTSTART:19450814T180000 +RDATE:19450814T180000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19550424T020000 +RDATE:19550424T020000 +RDATE:19580427T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19690101T000000 +RDATE:19690101T000000 +RDATE:19710101T000000 +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0500 TZOFFSETTO:-0400 TZNAME:EDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19690427T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0400 TZOFFSETTO:-0500 TZNAME:EST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19691026T020000 +RDATE:19691026T020000 +RDATE:19701025T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Indiana/Knox.ics b/mozilla/calendar/libical/zoneinfo/America/Indiana/Knox.ics index 85583c8c15f..11b1070875f 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Indiana/Knox.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Indiana/Knox.ics @@ -1,22 +1,154 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Indiana/Knox +TZID:/softwarestudio.org/Olson_20010626_2/America/Indiana/Knox X-LIC-LOCATION:America/Indiana/Knox +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-054630 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-054630 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:18831118T120000 +RDATE:18831118T120000 +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0600 TZOFFSETTO:-0500 TZNAME:CDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19180331T020000 +RDATE:19180331T020000 +RDATE:19190330T020000 +RDATE:19470427T020000 +RDATE:19480425T020000 +RDATE:19490424T020000 +RDATE:19500430T020000 +RDATE:19510429T020000 +RDATE:19520427T020000 +RDATE:19530426T020000 +RDATE:19540425T020000 +RDATE:19550424T020000 +RDATE:19560429T020000 +RDATE:19570428T020000 +RDATE:19580427T020000 +RDATE:19590426T020000 +RDATE:19600424T020000 +RDATE:19610430T020000 +RDATE:19670430T020000 +RDATE:19680428T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19740106T020000 +RDATE:19750223T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +RDATE:19870405T020000 +RDATE:19880403T020000 +RDATE:19890402T020000 +RDATE:19900401T020000 +RDATE:19910407T020000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0500 TZOFFSETTO:-0600 TZNAME:CST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19181027T020000 +RDATE:19181027T020000 +RDATE:19191026T020000 +RDATE:19450930T020000 +RDATE:19470928T020000 +RDATE:19480926T020000 +RDATE:19490925T020000 +RDATE:19500924T020000 +RDATE:19510930T020000 +RDATE:19520928T020000 +RDATE:19530927T020000 +RDATE:19540926T020000 +RDATE:19551030T020000 +RDATE:19561028T020000 +RDATE:19570929T020000 +RDATE:19580928T020000 +RDATE:19591025T020000 +RDATE:19601030T020000 +RDATE:19611029T020000 +RDATE:19631027T020000 +RDATE:19671029T020000 +RDATE:19681027T020000 +RDATE:19691026T020000 +RDATE:19701025T020000 +RDATE:19711031T020000 +RDATE:19721029T020000 +RDATE:19731028T020000 +RDATE:19741027T020000 +RDATE:19751026T020000 +RDATE:19761031T020000 +RDATE:19771030T020000 +RDATE:19781029T020000 +RDATE:19791028T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +RDATE:19831030T020000 +RDATE:19841028T020000 +RDATE:19851027T020000 +RDATE:19861026T020000 +RDATE:19871025T020000 +RDATE:19881030T020000 +RDATE:19891029T020000 +RDATE:19901028T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:CPT +DTSTART:19450814T180000 +RDATE:19450814T180000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19470101T000000 +RDATE:19470101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19620429T020000 +RDATE:19620429T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19911027T020000 +RDATE:19911027T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Indiana/Marengo.ics b/mozilla/calendar/libical/zoneinfo/America/Indiana/Marengo.ics index 4880f2e2dfd..5fd01d742c2 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Indiana/Marengo.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Indiana/Marengo.ics @@ -1,22 +1,123 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Indiana/Marengo +TZID:/softwarestudio.org/Olson_20010626_2/America/Indiana/Marengo X-LIC-LOCATION:America/Indiana/Marengo +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-054523 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-054523 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:18831118T120000 +RDATE:18831118T120000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19180331T020000 +RDATE:19180331T020000 +RDATE:19190330T020000 +RDATE:19510429T020000 +RDATE:19540425T020000 +RDATE:19550424T020000 +RDATE:19560429T020000 +RDATE:19570428T020000 +RDATE:19580427T020000 +RDATE:19590426T020000 +RDATE:19600424T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19181027T020000 +RDATE:19181027T020000 +RDATE:19191026T020000 +RDATE:19450930T020000 +RDATE:19510930T020000 +RDATE:19540926T020000 +RDATE:19550925T020000 +RDATE:19560930T020000 +RDATE:19570929T020000 +RDATE:19580928T020000 +RDATE:19590927T020000 +RDATE:19600925T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:CPT +DTSTART:19450814T180000 +RDATE:19450814T180000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19510101T000000 +RDATE:19510101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19610430T020000 +RDATE:19610430T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19690101T000000 +RDATE:19690101T000000 +RDATE:19741027T020000 +RDATE:19760101T000000 +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0500 TZOFFSETTO:-0400 TZNAME:EDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19690427T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19750223T020000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0400 TZOFFSETTO:-0500 TZNAME:EST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19691026T020000 +RDATE:19691026T020000 +RDATE:19701025T020000 +RDATE:19711031T020000 +RDATE:19721029T020000 +RDATE:19731028T020000 +RDATE:19751026T020000 END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19740106T020000 +RDATE:19740106T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Indiana/Petersburg.ics b/mozilla/calendar/libical/zoneinfo/America/Indiana/Petersburg.ics deleted file mode 100644 index 5e65a12ddec..00000000000 --- a/mozilla/calendar/libical/zoneinfo/America/Indiana/Petersburg.ics +++ /dev/null @@ -1,22 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Indiana/Petersburg -X-LIC-LOCATION:America/Indiana/Petersburg -BEGIN:DAYLIGHT -TZOFFSETFROM:-0600 -TZOFFSETTO:-0500 -TZNAME:CDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU -END:DAYLIGHT -BEGIN:STANDARD -TZOFFSETFROM:-0500 -TZOFFSETTO:-0600 -TZNAME:CST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Indiana/Vevay.ics b/mozilla/calendar/libical/zoneinfo/America/Indiana/Vevay.ics index ebb1300473f..ec888f8290a 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Indiana/Vevay.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Indiana/Vevay.ics @@ -1,22 +1,88 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Indiana/Vevay +TZID:/softwarestudio.org/Olson_20010626_2/America/Indiana/Vevay X-LIC-LOCATION:America/Indiana/Vevay +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-054016 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-054016 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:18831118T120000 +RDATE:18831118T120000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19180331T020000 +RDATE:19180331T020000 +RDATE:19190330T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19181027T020000 +RDATE:19181027T020000 +RDATE:19191026T020000 +RDATE:19450930T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:CPT +DTSTART:19450814T180000 +RDATE:19450814T180000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19540425T020000 +RDATE:19540425T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19690101T000000 +RDATE:19690101T000000 +RDATE:19730101T000000 +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0500 TZOFFSETTO:-0400 TZNAME:EDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19690427T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0400 TZOFFSETTO:-0500 TZNAME:EST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19691026T020000 +RDATE:19691026T020000 +RDATE:19701025T020000 +RDATE:19711031T020000 +RDATE:19721029T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Indiana/Vincennes.ics b/mozilla/calendar/libical/zoneinfo/America/Indiana/Vincennes.ics deleted file mode 100644 index 31f1f61d171..00000000000 --- a/mozilla/calendar/libical/zoneinfo/America/Indiana/Vincennes.ics +++ /dev/null @@ -1,22 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Indiana/Vincennes -X-LIC-LOCATION:America/Indiana/Vincennes -BEGIN:DAYLIGHT -TZOFFSETFROM:-0600 -TZOFFSETTO:-0500 -TZNAME:CDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU -END:DAYLIGHT -BEGIN:STANDARD -TZOFFSETFROM:-0500 -TZOFFSETTO:-0600 -TZNAME:CST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Indiana/Winamac.ics b/mozilla/calendar/libical/zoneinfo/America/Indiana/Winamac.ics deleted file mode 100644 index 5fb9e390adc..00000000000 --- a/mozilla/calendar/libical/zoneinfo/America/Indiana/Winamac.ics +++ /dev/null @@ -1,22 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Indiana/Winamac -X-LIC-LOCATION:America/Indiana/Winamac -BEGIN:STANDARD -TZOFFSETFROM:-0400 -TZOFFSETTO:-0500 -TZNAME:EST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU -END:STANDARD -BEGIN:DAYLIGHT -TZOFFSETFROM:-0500 -TZOFFSETTO:-0400 -TZNAME:EDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU -END:DAYLIGHT -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Inuvik.ics b/mozilla/calendar/libical/zoneinfo/America/Inuvik.ics index 516e2e7e72b..5b90688d1af 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Inuvik.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Inuvik.ics @@ -1,22 +1,94 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Inuvik +TZID:/softwarestudio.org/Olson_20010626_2/America/Inuvik X-LIC-LOCATION:America/Inuvik -BEGIN:DAYLIGHT -TZOFFSETFROM:-0700 -TZOFFSETTO:-0600 -TZNAME:MDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU -END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0600 TZOFFSETTO:-0700 TZNAME:MST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19801026T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MDT +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-0854 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0854 +TZOFFSETTO:-0800 +TZNAME:PST +DTSTART:18840101T000000 +RDATE:18840101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +TZNAME:PDT +DTSTART:19180414T020000 +RDATE:19180414T020000 +RDATE:19190525T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0800 +TZNAME:PST +DTSTART:19181027T020000 +RDATE:19181027T020000 +RDATE:19191101T000000 +RDATE:19450930T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +TZNAME:PWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0800 +TZOFFSETTO:-0600 +TZNAME:PDDT +DTSTART:19650425T000000 +RDATE:19650425T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0800 +TZNAME:PST +DTSTART:19651031T020000 +RDATE:19651031T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19790429T020000 +RDATE:19790429T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MDT +DTSTART:19800427T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Iqaluit.ics b/mozilla/calendar/libical/zoneinfo/America/Iqaluit.ics index 4fb38bb8d3d..4dbd087b00c 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Iqaluit.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Iqaluit.ics @@ -1,22 +1,134 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Iqaluit +TZID:/softwarestudio.org/Olson_20010626_2/America/Iqaluit X-LIC-LOCATION:America/Iqaluit BEGIN:DAYLIGHT TZOFFSETFROM:-0500 TZOFFSETTO:-0400 TZNAME:EDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:20010401T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0400 TZOFFSETTO:-0500 TZNAME:EST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:20011028T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-043352 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-043352 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:18840101T000000 +RDATE:18840101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:EDT +DTSTART:19180414T020000 +RDATE:19180414T020000 +RDATE:19190525T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +RDATE:19870405T020000 +RDATE:19880403T020000 +RDATE:19890402T020000 +RDATE:19900401T020000 +RDATE:19910407T020000 +RDATE:19920405T020000 +RDATE:19930404T020000 +RDATE:19940403T020000 +RDATE:19950402T020000 +RDATE:19960407T020000 +RDATE:19970406T020000 +RDATE:19980405T020000 +RDATE:19990404T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19181027T020000 +RDATE:19181027T020000 +RDATE:19191101T000000 +RDATE:19450930T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +RDATE:19831030T020000 +RDATE:19841028T020000 +RDATE:19851027T020000 +RDATE:19861026T020000 +RDATE:19871025T020000 +RDATE:19881030T020000 +RDATE:19891029T020000 +RDATE:19901028T020000 +RDATE:19911027T020000 +RDATE:19921025T020000 +RDATE:19931031T020000 +RDATE:19941030T020000 +RDATE:19951029T020000 +RDATE:19961027T020000 +RDATE:19971026T020000 +RDATE:19981025T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:EWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0300 +TZNAME:EDDT +DTSTART:19650425T000000 +RDATE:19650425T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19651031T020000 +RDATE:19651031T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19991031T020000 +RDATE:19991031T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:20000402T020000 +RDATE:20000402T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:20001029T020000 +RDATE:20001029T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Jamaica.ics b/mozilla/calendar/libical/zoneinfo/America/Jamaica.ics index f7c67d5dfd3..f05814989e3 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Jamaica.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Jamaica.ics @@ -1,14 +1,68 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Jamaica +TZID:/softwarestudio.org/Olson_20010626_2/America/Jamaica X-LIC-LOCATION:America/Jamaica BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-050712 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-050712 +TZOFFSETTO:-050712 +TZNAME:KMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-050712 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19120201T000000 +RDATE:19120201T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:-0500 TZOFFSETTO:-0500 TZNAME:EST -DTSTART:19700101T000000 +DTSTART:19740428T020000 +RDATE:19740428T020000 +RDATE:19741027T020000 +RDATE:19840101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:EDT +DTSTART:19750223T020000 +RDATE:19750223T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19751026T020000 +RDATE:19751026T020000 +RDATE:19761031T020000 +RDATE:19771030T020000 +RDATE:19781029T020000 +RDATE:19791028T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +RDATE:19831030T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Juneau.ics b/mozilla/calendar/libical/zoneinfo/America/Juneau.ics index 4b36b2f985d..337c3790dcd 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Juneau.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Juneau.ics @@ -1,22 +1,124 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Juneau +TZID:/softwarestudio.org/Olson_20010626_2/America/Juneau X-LIC-LOCATION:America/Juneau -BEGIN:DAYLIGHT -TZOFFSETFROM:-0900 -TZOFFSETTO:-0800 -TZNAME:AKDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU -END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0800 TZOFFSETTO:-0900 TZNAME:AKST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19841028T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0900 +TZOFFSETTO:-0800 +TZNAME:AKDT +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+150219 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+150219 +TZOFFSETTO:-085741 +TZNAME:LMT +DTSTART:18671018T000000 +RDATE:18671018T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-085741 +TZOFFSETTO:-0800 +TZNAME:PST +DTSTART:19000820T120000 +RDATE:19000820T120000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0800 +TZOFFSETTO:-0800 +TZNAME:PST +DTSTART:19420101T000000 +RDATE:19420101T000000 +RDATE:19460101T000000 +RDATE:19690101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +TZNAME:PWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0700 +TZNAME:PPT +DTSTART:19450814T160000 +RDATE:19450814T160000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0800 +TZNAME:PST +DTSTART:19450930T020000 +RDATE:19450930T020000 +RDATE:19691026T020000 +RDATE:19701025T020000 +RDATE:19711031T020000 +RDATE:19721029T020000 +RDATE:19731028T020000 +RDATE:19741027T020000 +RDATE:19751026T020000 +RDATE:19761031T020000 +RDATE:19771030T020000 +RDATE:19781029T020000 +RDATE:19791028T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +TZNAME:PDT +DTSTART:19690427T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19740106T020000 +RDATE:19750223T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0900 +TZNAME:AKST +DTSTART:19831030T020000 +RDATE:19831030T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0900 +TZOFFSETTO:-0800 +TZNAME:AKDT +DTSTART:19840429T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Kentucky/Louisville.ics b/mozilla/calendar/libical/zoneinfo/America/Kentucky/Louisville.ics index 60e6e686c43..1c68285e7a2 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Kentucky/Louisville.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Kentucky/Louisville.ics @@ -1,22 +1,160 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Kentucky/Louisville +TZID:/softwarestudio.org/Olson_20010626_2/America/Kentucky/Louisville X-LIC-LOCATION:America/Kentucky/Louisville +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19751026T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0500 TZOFFSETTO:-0400 TZNAME:EDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-054302 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-054302 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:18831118T120000 +RDATE:18831118T120000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19180331T020000 +RDATE:19180331T020000 +RDATE:19190330T020000 +RDATE:19210501T020000 +RDATE:19410427T020000 +RDATE:19460428T020000 +RDATE:19470427T020000 +RDATE:19510429T020000 +RDATE:19520427T020000 +RDATE:19530426T020000 +RDATE:19540425T020000 +RDATE:19550424T020000 +RDATE:19560429T020000 +RDATE:19570428T020000 +RDATE:19580427T020000 +RDATE:19590426T020000 +RDATE:19600424T020000 +RDATE:19610430T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19181027T020000 +RDATE:19181027T020000 +RDATE:19191026T020000 +RDATE:19210901T020000 +RDATE:19410928T020000 +RDATE:19450930T020000 +RDATE:19460602T020000 +RDATE:19500924T020000 +RDATE:19510930T020000 +RDATE:19520928T020000 +RDATE:19530927T020000 +RDATE:19540926T020000 +RDATE:19550925T020000 +RDATE:19561028T020000 +RDATE:19571027T020000 +RDATE:19581026T020000 +RDATE:19591025T020000 +RDATE:19601030T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19210101T000000 +RDATE:19210101T000000 +RDATE:19420101T000000 +RDATE:19460101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:CPT +DTSTART:19450814T180000 +RDATE:19450814T180000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19480425T020000 +RDATE:19480425T020000 +RDATE:19490424T020000 +RDATE:19500430T020000 +RDATE:19740106T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19610723T020000 +RDATE:19610723T020000 +RDATE:19680101T000000 +RDATE:19741027T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:EDT +DTSTART:19680428T020000 +RDATE:19680428T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19750223T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0400 TZOFFSETTO:-0500 TZNAME:EST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19681027T020000 +RDATE:19681027T020000 +RDATE:19691026T020000 +RDATE:19701025T020000 +RDATE:19711031T020000 +RDATE:19721029T020000 +RDATE:19731028T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Kentucky/Monticello.ics b/mozilla/calendar/libical/zoneinfo/America/Kentucky/Monticello.ics index a4c4e416bdc..7ee42c75703 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Kentucky/Monticello.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Kentucky/Monticello.ics @@ -1,22 +1,147 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Kentucky/Monticello +TZID:/softwarestudio.org/Olson_20010626_2/America/Kentucky/Monticello X-LIC-LOCATION:America/Kentucky/Monticello BEGIN:DAYLIGHT TZOFFSETFROM:-0500 TZOFFSETTO:-0400 TZNAME:EDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:20010401T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0400 TZOFFSETTO:-0500 TZNAME:EST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:20011028T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-053924 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-053924 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:18831118T120000 +RDATE:18831118T120000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19180331T020000 +RDATE:19180331T020000 +RDATE:19190330T020000 +RDATE:19680428T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19740106T020000 +RDATE:19750223T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +RDATE:19870405T020000 +RDATE:19880403T020000 +RDATE:19890402T020000 +RDATE:19900401T020000 +RDATE:19910407T020000 +RDATE:19920405T020000 +RDATE:19930404T020000 +RDATE:19940403T020000 +RDATE:19950402T020000 +RDATE:19960407T020000 +RDATE:19970406T020000 +RDATE:19980405T020000 +RDATE:19990404T020000 +RDATE:20000402T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19181027T020000 +RDATE:19181027T020000 +RDATE:19191026T020000 +RDATE:19450930T020000 +RDATE:19681027T020000 +RDATE:19691026T020000 +RDATE:19701025T020000 +RDATE:19711031T020000 +RDATE:19721029T020000 +RDATE:19731028T020000 +RDATE:19741027T020000 +RDATE:19751026T020000 +RDATE:19761031T020000 +RDATE:19771030T020000 +RDATE:19781029T020000 +RDATE:19791028T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +RDATE:19831030T020000 +RDATE:19841028T020000 +RDATE:19851027T020000 +RDATE:19861026T020000 +RDATE:19871025T020000 +RDATE:19881030T020000 +RDATE:19891029T020000 +RDATE:19901028T020000 +RDATE:19911027T020000 +RDATE:19921025T020000 +RDATE:19931031T020000 +RDATE:19941030T020000 +RDATE:19951029T020000 +RDATE:19961027T020000 +RDATE:19971026T020000 +RDATE:19981025T020000 +RDATE:19991031T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:CPT +DTSTART:19450814T180000 +RDATE:19450814T180000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19460101T000000 +RDATE:19460101T000000 +RDATE:19680101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:20001029T020000 +RDATE:20001029T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/La_Paz.ics b/mozilla/calendar/libical/zoneinfo/America/La_Paz.ics index 7cfd0901aa4..5d91750c5a0 100644 --- a/mozilla/calendar/libical/zoneinfo/America/La_Paz.ics +++ b/mozilla/calendar/libical/zoneinfo/America/La_Paz.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/La_Paz +TZID:/softwarestudio.org/Olson_20010626_2/America/La_Paz X-LIC-LOCATION:America/La_Paz BEGIN:STANDARD -TZOFFSETFROM:-0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:-043236 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-043236 +TZOFFSETTO:-043236 +TZNAME:LPMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-043236 +TZOFFSETTO:-033236 +TZNAME:BOST +DTSTART:19311015T000000 +RDATE:19311015T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-033236 TZOFFSETTO:-0400 TZNAME:BOT -DTSTART:19700101T000000 +DTSTART:19320321T000000 +RDATE:19320321T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Lima.ics b/mozilla/calendar/libical/zoneinfo/America/Lima.ics index 19cdf1019e5..6dfa4c8f2cf 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Lima.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Lima.ics @@ -1,14 +1,53 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Lima +TZID:/softwarestudio.org/Olson_20010626_2/America/Lima X-LIC-LOCATION:America/Lima BEGIN:STANDARD -TZOFFSETFROM:-0500 +TZOFFSETFROM:+0000 +TZOFFSETTO:-050812 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-050812 +TZOFFSETTO:-0509 +TZNAME:LMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0509 TZOFFSETTO:-0500 TZNAME:PET -DTSTART:19700101T000000 +DTSTART:19080728T000000 +RDATE:19080728T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:PEST +DTSTART:19380101T000000 +RDATE:19380101T000000 +RDATE:19380925T000000 +RDATE:19390924T000000 +RDATE:19870101T000000 +RDATE:19900101T000000 +RDATE:19940101T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +TZNAME:PET +DTSTART:19380401T000000 +RDATE:19380401T000000 +RDATE:19390326T000000 +RDATE:19400324T000000 +RDATE:19870401T000000 +RDATE:19900401T000000 +RDATE:19940401T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Los_Angeles.ics b/mozilla/calendar/libical/zoneinfo/America/Los_Angeles.ics index b4c4549a065..c4394527365 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Los_Angeles.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Los_Angeles.ics @@ -1,22 +1,126 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Los_Angeles +TZID:/softwarestudio.org/Olson_20010626_2/America/Los_Angeles X-LIC-LOCATION:America/Los_Angeles +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0800 +TZNAME:PST +DTSTART:19621028T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0800 TZOFFSETTO:-0700 TZNAME:PDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-075258 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-075258 +TZOFFSETTO:-0800 +TZNAME:PST +DTSTART:18831118T120000 +RDATE:18831118T120000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +TZNAME:PDT +DTSTART:19180331T020000 +RDATE:19180331T020000 +RDATE:19190330T020000 +RDATE:19480314T020000 +RDATE:19500430T020000 +RDATE:19510429T020000 +RDATE:19520427T020000 +RDATE:19530426T020000 +RDATE:19540425T020000 +RDATE:19550424T020000 +RDATE:19560429T020000 +RDATE:19570428T020000 +RDATE:19580427T020000 +RDATE:19590426T020000 +RDATE:19600424T020000 +RDATE:19610430T020000 +RDATE:19620429T020000 +RDATE:19630428T020000 +RDATE:19640426T020000 +RDATE:19650425T020000 +RDATE:19660424T020000 +RDATE:19670430T020000 +RDATE:19680428T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19740106T020000 +RDATE:19750223T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0700 TZOFFSETTO:-0800 TZNAME:PST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19181027T020000 +RDATE:19181027T020000 +RDATE:19191026T020000 +RDATE:19450930T020000 +RDATE:19490101T020000 +RDATE:19500924T020000 +RDATE:19510930T020000 +RDATE:19520928T020000 +RDATE:19530927T020000 +RDATE:19540926T020000 +RDATE:19550925T020000 +RDATE:19560930T020000 +RDATE:19570929T020000 +RDATE:19580928T020000 +RDATE:19590927T020000 +RDATE:19600925T020000 +RDATE:19610924T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +TZNAME:PWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0700 +TZNAME:PPT +DTSTART:19450814T160000 +RDATE:19450814T160000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0800 +TZOFFSETTO:-0800 +TZNAME:PST +DTSTART:19460101T000000 +RDATE:19460101T000000 +RDATE:19670101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Maceio.ics b/mozilla/calendar/libical/zoneinfo/America/Maceio.ics index b0d5efe7d94..1716d295d24 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Maceio.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Maceio.ics @@ -1,14 +1,82 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Maceio +TZID:/softwarestudio.org/Olson_20010626_2/America/Maceio X-LIC-LOCATION:America/Maceio BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-022252 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-022252 +TZOFFSETTO:-0300 +TZNAME:BRT +DTSTART:19140101T000000 +RDATE:19140101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0300 +TZOFFSETTO:-0200 +TZNAME:BRST +DTSTART:19311003T110000 +RDATE:19311003T110000 +RDATE:19321003T000000 +RDATE:19491201T000000 +RDATE:19501201T000000 +RDATE:19511201T000000 +RDATE:19521201T000000 +RDATE:19631209T000000 +RDATE:19650131T000000 +RDATE:19651201T000000 +RDATE:19661101T000000 +RDATE:19671101T000000 +RDATE:19851102T000000 +RDATE:19861025T000000 +RDATE:19871025T000000 +RDATE:19881016T000000 +RDATE:19891015T000000 +RDATE:19951015T000000 +RDATE:19991003T000000 +RDATE:20001008T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0200 +TZOFFSETTO:-0300 +TZNAME:BRT +DTSTART:19320401T000000 +RDATE:19320401T000000 +RDATE:19330401T000000 +RDATE:19500416T010000 +RDATE:19510401T000000 +RDATE:19520401T000000 +RDATE:19530301T000000 +RDATE:19640301T000000 +RDATE:19650331T000000 +RDATE:19660301T000000 +RDATE:19670301T000000 +RDATE:19680301T000000 +RDATE:19860315T000000 +RDATE:19870214T000000 +RDATE:19880207T000000 +RDATE:19890129T000000 +RDATE:19900211T000000 +RDATE:19960211T000000 +RDATE:20000227T000000 +RDATE:20001022T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:-0300 TZOFFSETTO:-0300 TZNAME:BRT -DTSTART:19700101T000000 +DTSTART:19900917T000000 +RDATE:19900917T000000 +RDATE:19951013T000000 +RDATE:19960904T000000 +RDATE:19990930T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Managua.ics b/mozilla/calendar/libical/zoneinfo/America/Managua.ics index 44e2a8e5d69..bd663b7f0d3 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Managua.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Managua.ics @@ -1,14 +1,57 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Managua +TZID:/softwarestudio.org/Olson_20010626_2/America/Managua X-LIC-LOCATION:America/Managua BEGIN:STANDARD -TZOFFSETFROM:-0600 +TZOFFSETFROM:+0000 +TZOFFSETTO:-054508 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-054508 +TZOFFSETTO:-0545 +TZNAME:MMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0545 TZOFFSETTO:-0600 TZNAME:CST -DTSTART:19700101T000000 +DTSTART:19340623T000000 +RDATE:19340623T000000 END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19730501T000000 +RDATE:19730501T000000 +RDATE:19930101T040000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19750216T000000 +RDATE:19750216T000000 +RDATE:19790625T000000 +RDATE:19800623T000000 +RDATE:19920924T000000 +RDATE:19981201T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19790318T000000 +RDATE:19790318T000000 +RDATE:19800316T000000 +RDATE:19920101T040000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Manaus.ics b/mozilla/calendar/libical/zoneinfo/America/Manaus.ics index 03962f96c3a..5878b821b93 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Manaus.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Manaus.ics @@ -1,14 +1,73 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Manaus +TZID:/softwarestudio.org/Olson_20010626_2/America/Manaus X-LIC-LOCATION:America/Manaus BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-040004 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-040004 +TZOFFSETTO:-0400 +TZNAME:AMT +DTSTART:19140101T000000 +RDATE:19140101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:AMST +DTSTART:19311003T110000 +RDATE:19311003T110000 +RDATE:19321003T000000 +RDATE:19491201T000000 +RDATE:19501201T000000 +RDATE:19511201T000000 +RDATE:19521201T000000 +RDATE:19631209T000000 +RDATE:19650131T000000 +RDATE:19651201T000000 +RDATE:19661101T000000 +RDATE:19671101T000000 +RDATE:19851102T000000 +RDATE:19861025T000000 +RDATE:19871025T000000 +RDATE:19931017T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0400 +TZNAME:AMT +DTSTART:19320401T000000 +RDATE:19320401T000000 +RDATE:19330401T000000 +RDATE:19500416T010000 +RDATE:19510401T000000 +RDATE:19520401T000000 +RDATE:19530301T000000 +RDATE:19640301T000000 +RDATE:19650331T000000 +RDATE:19660301T000000 +RDATE:19670301T000000 +RDATE:19680301T000000 +RDATE:19860315T000000 +RDATE:19870214T000000 +RDATE:19880207T000000 +RDATE:19940220T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:-0400 TZOFFSETTO:-0400 TZNAME:AMT -DTSTART:19700101T000000 +DTSTART:19880912T000000 +RDATE:19880912T000000 +RDATE:19930928T000000 +RDATE:19940922T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Martinique.ics b/mozilla/calendar/libical/zoneinfo/America/Martinique.ics index 4e1f4cf43c9..e3cc8b62cad 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Martinique.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Martinique.ics @@ -1,14 +1,43 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Martinique +TZID:/softwarestudio.org/Olson_20010626_2/America/Martinique X-LIC-LOCATION:America/Martinique BEGIN:STANDARD -TZOFFSETFROM:-0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:-040420 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-040420 +TZOFFSETTO:-0404 +TZNAME:FFMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0404 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:19110501T000000 +RDATE:19110501T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:ADT +DTSTART:19800406T000000 +RDATE:19800406T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0400 +TZNAME:AST +DTSTART:19800928T000000 +RDATE:19800928T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Mazatlan.ics b/mozilla/calendar/libical/zoneinfo/America/Mazatlan.ics index e393075985d..bddae378726 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Mazatlan.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Mazatlan.ics @@ -1,22 +1,84 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Mazatlan +TZID:/softwarestudio.org/Olson_20010626_2/America/Mazatlan X-LIC-LOCATION:America/Mazatlan BEGIN:DAYLIGHT TZOFFSETFROM:-0700 TZOFFSETTO:-0600 TZNAME:MDT -DTSTART:19700405T020000 -RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:20010506T020000 +RRULE:FREQ=YEARLY;BYMONTH=5;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0600 TZOFFSETTO:-0700 TZNAME:MST -DTSTART:19701025T020000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +DTSTART:20010930T020000 +RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-070540 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-070540 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19211231T235420 +RDATE:19211231T235420 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19270610T230000 +RDATE:19270610T230000 +RDATE:19310501T230000 +RDATE:19320401T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19301115T000000 +RDATE:19301115T000000 +RDATE:19311001T000000 +RDATE:19420424T000000 +RDATE:19961027T020000 +RDATE:19971026T020000 +RDATE:19981025T020000 +RDATE:19991031T020000 +RDATE:20001029T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0800 +TZNAME:PST +DTSTART:19490114T000000 +RDATE:19490114T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19700101T000000 +RDATE:19700101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MDT +DTSTART:19960407T020000 +RDATE:19960407T020000 +RDATE:19970406T020000 +RDATE:19980405T020000 +RDATE:19990404T020000 +RDATE:20000402T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Menominee.ics b/mozilla/calendar/libical/zoneinfo/America/Menominee.ics index a2fff69fe83..f39eec2b54d 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Menominee.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Menominee.ics @@ -1,22 +1,105 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Menominee +TZID:/softwarestudio.org/Olson_20010626_2/America/Menominee X-LIC-LOCATION:America/Menominee +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19731028T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0600 TZOFFSETTO:-0500 TZNAME:CDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-055027 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-055027 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:18850918T120000 +RDATE:18850918T120000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19180331T020000 +RDATE:19180331T020000 +RDATE:19190330T020000 +RDATE:19460428T020000 +RDATE:19660424T020000 +RDATE:19740106T020000 +RDATE:19750223T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0500 TZOFFSETTO:-0600 TZNAME:CST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19181027T020000 +RDATE:19181027T020000 +RDATE:19191026T020000 +RDATE:19450930T020000 +RDATE:19460929T020000 +RDATE:19661030T020000 END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:CPT +DTSTART:19450814T180000 +RDATE:19450814T180000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19460101T000000 +RDATE:19460101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19690427T020000 +RDATE:19690427T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19730429T020000 +RDATE:19730429T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Merida.ics b/mozilla/calendar/libical/zoneinfo/America/Merida.ics index 387696b6468..ccd0a5065f9 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Merida.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Merida.ics @@ -1,22 +1,66 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Merida +TZID:/softwarestudio.org/Olson_20010626_2/America/Merida X-LIC-LOCATION:America/Merida BEGIN:DAYLIGHT TZOFFSETFROM:-0600 TZOFFSETTO:-0500 TZNAME:CDT -DTSTART:19700405T020000 -RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:20010506T020000 +RRULE:FREQ=YEARLY;BYMONTH=5;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0500 TZOFFSETTO:-0600 TZNAME:CST -DTSTART:19701025T020000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +DTSTART:20010930T020000 +RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-055828 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-055828 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19220101T000132 +RDATE:19220101T000132 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19811223T000000 +RDATE:19811223T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19821202T000000 +RDATE:19821202T000000 +RDATE:19961027T020000 +RDATE:19971026T020000 +RDATE:19981025T020000 +RDATE:19991031T020000 +RDATE:20001029T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19960407T020000 +RDATE:19960407T020000 +RDATE:19970406T020000 +RDATE:19980405T020000 +RDATE:19990404T020000 +RDATE:20000402T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Mexico_City.ics b/mozilla/calendar/libical/zoneinfo/America/Mexico_City.ics index 7ab4bacc003..a2a4dda1d80 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Mexico_City.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Mexico_City.ics @@ -1,22 +1,89 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Mexico_City +TZID:/softwarestudio.org/Olson_20010626_2/America/Mexico_City X-LIC-LOCATION:America/Mexico_City BEGIN:DAYLIGHT TZOFFSETFROM:-0600 TZOFFSETTO:-0500 TZNAME:CDT -DTSTART:19700405T020000 -RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:20010506T020000 +RRULE:FREQ=YEARLY;BYMONTH=5;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0500 TZOFFSETTO:-0600 TZNAME:CST -DTSTART:19701025T020000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +DTSTART:20010930T020000 +RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-063636 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-063636 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19220101T002324 +RDATE:19220101T002324 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19270610T230000 +RDATE:19270610T230000 +RDATE:19310501T230000 +RDATE:19320401T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19301115T000000 +RDATE:19301115T000000 +RDATE:19311001T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19390205T000000 +RDATE:19390205T000000 +RDATE:19401209T000000 +RDATE:19500212T000000 +RDATE:19960407T020000 +RDATE:19970406T020000 +RDATE:19980405T020000 +RDATE:19990404T020000 +RDATE:20000402T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19390625T000000 +RDATE:19390625T000000 +RDATE:19410401T000000 +RDATE:19440501T000000 +RDATE:19500730T000000 +RDATE:19961027T020000 +RDATE:19971026T020000 +RDATE:19981025T020000 +RDATE:19991031T020000 +RDATE:20001029T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CWT +DTSTART:19431216T000000 +RDATE:19431216T000000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Miquelon.ics b/mozilla/calendar/libical/zoneinfo/America/Miquelon.ics index 13eff29f3c1..5807e442029 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Miquelon.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Miquelon.ics @@ -1,22 +1,62 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Miquelon +TZID:/softwarestudio.org/Olson_20010626_2/America/Miquelon X-LIC-LOCATION:America/Miquelon -BEGIN:DAYLIGHT -TZOFFSETFROM:-0300 -TZOFFSETTO:-0200 -TZNAME:PMDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU -END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0200 TZOFFSETTO:-0300 TZNAME:PMST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19811025T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0300 +TZOFFSETTO:-0200 +TZNAME:PMDT +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-034440 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-034440 +TZOFFSETTO:-0400 +TZNAME:AST +DTSTART:19110515T000000 +RDATE:19110515T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:PMST +DTSTART:19800501T000000 +RDATE:19800501T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0300 +TZNAME:PMST +DTSTART:19801026T020000 +RDATE:19801026T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0300 +TZOFFSETTO:-0200 +TZNAME:PMDT +DTSTART:19810426T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Moncton.ics b/mozilla/calendar/libical/zoneinfo/America/Moncton.ics deleted file mode 100644 index ab583a9adef..00000000000 --- a/mozilla/calendar/libical/zoneinfo/America/Moncton.ics +++ /dev/null @@ -1,22 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Moncton -X-LIC-LOCATION:America/Moncton -BEGIN:DAYLIGHT -TZOFFSETFROM:-0400 -TZOFFSETTO:-0300 -TZNAME:ADT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU -END:DAYLIGHT -BEGIN:STANDARD -TZOFFSETFROM:-0300 -TZOFFSETTO:-0400 -TZNAME:AST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Monterrey.ics b/mozilla/calendar/libical/zoneinfo/America/Monterrey.ics index c6c854c9196..824e90d99cb 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Monterrey.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Monterrey.ics @@ -1,22 +1,68 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Monterrey +TZID:/softwarestudio.org/Olson_20010626_2/America/Monterrey X-LIC-LOCATION:America/Monterrey BEGIN:DAYLIGHT TZOFFSETFROM:-0600 TZOFFSETTO:-0500 TZNAME:CDT -DTSTART:19700405T020000 -RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:20010506T020000 +RRULE:FREQ=YEARLY;BYMONTH=5;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0500 TZOFFSETTO:-0600 TZNAME:CST -DTSTART:19701025T020000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +DTSTART:20010930T020000 +RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-064116 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-064116 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19211231T231844 +RDATE:19211231T231844 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19880101T000000 +RDATE:19880101T000000 +RDATE:19890101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19880403T020000 +RDATE:19880403T020000 +RDATE:19960407T020000 +RDATE:19970406T020000 +RDATE:19980405T020000 +RDATE:19990404T020000 +RDATE:20000402T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19881030T020000 +RDATE:19881030T020000 +RDATE:19961027T020000 +RDATE:19971026T020000 +RDATE:19981025T020000 +RDATE:19991031T020000 +RDATE:20001029T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Montevideo.ics b/mozilla/calendar/libical/zoneinfo/America/Montevideo.ics index 7b3b380d69b..6038665c0e4 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Montevideo.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Montevideo.ics @@ -1,22 +1,140 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Montevideo +TZID:/softwarestudio.org/Olson_20010626_2/America/Montevideo X-LIC-LOCATION:America/Montevideo +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-034444 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-034444 +TZOFFSETTO:-034444 +TZNAME:MMT +DTSTART:18980628T000000 +RDATE:18980628T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-034444 +TZOFFSETTO:-0330 +TZNAME:UYT +DTSTART:19200501T000000 +RDATE:19200501T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0330 +TZOFFSETTO:-0300 +TZNAME:UYHST +DTSTART:19231002T000000 +RDATE:19231002T000000 +RDATE:19241001T000000 +RDATE:19251001T000000 +RDATE:19331029T000000 +RDATE:19341028T000000 +RDATE:19351027T000000 +RDATE:19361101T000000 +RDATE:19371031T000000 +RDATE:19381030T000000 +RDATE:19391029T000000 +RDATE:19401027T000000 +RDATE:19420101T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0330 +TZNAME:UYT +DTSTART:19240401T000000 +RDATE:19240401T000000 +RDATE:19250401T000000 +RDATE:19260401T000000 +RDATE:19340401T000000 +RDATE:19350331T000000 +RDATE:19360329T000000 +RDATE:19370328T000000 +RDATE:19380327T000000 +RDATE:19390326T000000 +RDATE:19400331T000000 +RDATE:19410330T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0330 +TZOFFSETTO:-0330 +TZNAME:UYT +DTSTART:19410801T000000 +RDATE:19410801T000000 +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0300 TZOFFSETTO:-0200 TZNAME:UYST -DTSTART:19701004T020000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU +DTSTART:19421214T000000 +RDATE:19421214T000000 +RDATE:19590524T000000 +RDATE:19600117T000000 +RDATE:19650404T000000 +RDATE:19660403T000000 +RDATE:19670402T000000 +RDATE:19720424T000000 +RDATE:19771204T000000 +RDATE:19791001T000000 +RDATE:19871214T000000 +RDATE:19881211T000000 +RDATE:19891029T000000 +RDATE:19901021T000000 +RDATE:19911027T000000 +RDATE:19921018T000000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0200 TZOFFSETTO:-0300 TZNAME:UYT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19430314T000000 +RDATE:19430314T000000 +RDATE:19591115T000000 +RDATE:19600306T000000 +RDATE:19650926T000000 +RDATE:19661031T000000 +RDATE:19671031T000000 +RDATE:19720815T000000 +RDATE:19761001T000000 +RDATE:19780401T000000 +RDATE:19800501T000000 +RDATE:19880314T000000 +RDATE:19890312T000000 +RDATE:19900304T000000 +RDATE:19910303T000000 +RDATE:19920301T000000 +RDATE:19930228T000000 END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0300 +TZOFFSETTO:-0230 +TZNAME:UYHST +DTSTART:19680527T000000 +RDATE:19680527T000000 +RDATE:19690527T000000 +RDATE:19700527T000000 +RDATE:19740310T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0230 +TZOFFSETTO:-0300 +TZNAME:UYT +DTSTART:19681202T000000 +RDATE:19681202T000000 +RDATE:19691202T000000 +RDATE:19701202T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0230 +TZOFFSETTO:-0200 +TZNAME:UYST +DTSTART:19741222T000000 +RDATE:19741222T000000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Montreal.ics b/mozilla/calendar/libical/zoneinfo/America/Montreal.ics index b06dd304b9a..221ff9bd47f 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Montreal.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Montreal.ics @@ -1,22 +1,146 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Montreal +TZID:/softwarestudio.org/Olson_20010626_2/America/Montreal X-LIC-LOCATION:America/Montreal +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19571027T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0500 TZOFFSETTO:-0400 TZNAME:EDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-045416 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-045416 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:18840101T000000 +RDATE:18840101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:EDT +DTSTART:19170325T020000 +RDATE:19170325T020000 +RDATE:19180414T020000 +RDATE:19190331T023000 +RDATE:19200502T023000 +RDATE:19210501T020000 +RDATE:19220430T020000 +RDATE:19240517T020000 +RDATE:19250503T020000 +RDATE:19260502T020000 +RDATE:19270501T000000 +RDATE:19280429T000000 +RDATE:19290428T000000 +RDATE:19300427T000000 +RDATE:19310426T000000 +RDATE:19320501T000000 +RDATE:19330430T000000 +RDATE:19340429T000000 +RDATE:19350428T000000 +RDATE:19360426T000000 +RDATE:19370425T000000 +RDATE:19380424T000000 +RDATE:19390430T000000 +RDATE:19400428T000000 +RDATE:19460428T020000 +RDATE:19470427T020000 +RDATE:19480425T020000 +RDATE:19490424T020000 +RDATE:19500430T020000 +RDATE:19510429T020000 +RDATE:19520427T020000 +RDATE:19530426T020000 +RDATE:19540425T020000 +RDATE:19550424T020000 +RDATE:19560429T020000 +RDATE:19570428T020000 +RDATE:19580427T020000 +RDATE:19590426T020000 +RDATE:19600424T020000 +RDATE:19610430T020000 +RDATE:19620429T020000 +RDATE:19630428T020000 +RDATE:19640426T020000 +RDATE:19650425T020000 +RDATE:19660424T020000 +RDATE:19670430T020000 +RDATE:19680428T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19740428T020000 +RDATE:19750427T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0400 TZOFFSETTO:-0500 TZNAME:EST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19170424T000000 +RDATE:19170424T000000 +RDATE:19181031T020000 +RDATE:19191025T023000 +RDATE:19201003T023000 +RDATE:19211002T023000 +RDATE:19221001T023000 +RDATE:19240928T023000 +RDATE:19250927T023000 +RDATE:19260926T023000 +RDATE:19270925T000000 +RDATE:19280930T000000 +RDATE:19290929T000000 +RDATE:19300928T000000 +RDATE:19310927T000000 +RDATE:19320925T000000 +RDATE:19331001T000000 +RDATE:19340930T000000 +RDATE:19350929T000000 +RDATE:19360927T000000 +RDATE:19370926T000000 +RDATE:19380925T000000 +RDATE:19390924T000000 +RDATE:19450930T020000 +RDATE:19460929T020000 +RDATE:19470928T020000 +RDATE:19480926T020000 +RDATE:19491030T020000 +RDATE:19501029T020000 +RDATE:19510930T020000 +RDATE:19520928T020000 +RDATE:19530927T020000 +RDATE:19540926T020000 +RDATE:19550925T020000 +RDATE:19560930T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Montserrat.ics b/mozilla/calendar/libical/zoneinfo/America/Montserrat.ics index 2cffdada613..6dbed7b6fce 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Montserrat.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Montserrat.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Montserrat +TZID:/softwarestudio.org/Olson_20010626_2/America/Montserrat X-LIC-LOCATION:America/Montserrat BEGIN:STANDARD -TZOFFSETFROM:-0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:-040852 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-040852 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:19110701T000100 +RDATE:19110701T000100 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Nassau.ics b/mozilla/calendar/libical/zoneinfo/America/Nassau.ics index 781a4825392..8738a578481 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Nassau.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Nassau.ics @@ -1,22 +1,65 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Nassau +TZID:/softwarestudio.org/Olson_20010626_2/America/Nassau X-LIC-LOCATION:America/Nassau -BEGIN:DAYLIGHT -TZOFFSETFROM:-0500 -TZOFFSETTO:-0400 -TZNAME:EDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU -END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0400 TZOFFSETTO:-0500 TZNAME:EST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19641025T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:EDT +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-050924 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-050924 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19120302T000000 +RDATE:19120302T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:EDT +DTSTART:19640426T020000 +RDATE:19640426T020000 +RDATE:19650425T020000 +RDATE:19660424T020000 +RDATE:19670430T020000 +RDATE:19680428T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19740428T020000 +RDATE:19750427T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/New_York.ics b/mozilla/calendar/libical/zoneinfo/America/New_York.ics index 62e85a25a37..db22337f2d4 100644 --- a/mozilla/calendar/libical/zoneinfo/America/New_York.ics +++ b/mozilla/calendar/libical/zoneinfo/America/New_York.ics @@ -1,22 +1,171 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/New_York +TZID:/softwarestudio.org/Olson_20010626_2/America/New_York X-LIC-LOCATION:America/New_York +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19551030T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0500 TZOFFSETTO:-0400 TZNAME:EDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-045602 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-045602 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:18831118T120000 +RDATE:18831118T120000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:EDT +DTSTART:19180331T020000 +RDATE:19180331T020000 +RDATE:19190330T020000 +RDATE:19200328T020000 +RDATE:19210424T020000 +RDATE:19220430T020000 +RDATE:19230429T020000 +RDATE:19240427T020000 +RDATE:19250426T020000 +RDATE:19260425T020000 +RDATE:19270424T020000 +RDATE:19280429T020000 +RDATE:19290428T020000 +RDATE:19300427T020000 +RDATE:19310426T020000 +RDATE:19320424T020000 +RDATE:19330430T020000 +RDATE:19340429T020000 +RDATE:19350428T020000 +RDATE:19360426T020000 +RDATE:19370425T020000 +RDATE:19380424T020000 +RDATE:19390430T020000 +RDATE:19400428T020000 +RDATE:19410427T020000 +RDATE:19460428T020000 +RDATE:19470427T020000 +RDATE:19480425T020000 +RDATE:19490424T020000 +RDATE:19500430T020000 +RDATE:19510429T020000 +RDATE:19520427T020000 +RDATE:19530426T020000 +RDATE:19540425T020000 +RDATE:19550424T020000 +RDATE:19560429T020000 +RDATE:19570428T020000 +RDATE:19580427T020000 +RDATE:19590426T020000 +RDATE:19600424T020000 +RDATE:19610430T020000 +RDATE:19620429T020000 +RDATE:19630428T020000 +RDATE:19640426T020000 +RDATE:19650425T020000 +RDATE:19660424T020000 +RDATE:19670430T020000 +RDATE:19680428T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19740106T020000 +RDATE:19750223T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0400 TZOFFSETTO:-0500 TZNAME:EST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19181027T020000 +RDATE:19181027T020000 +RDATE:19191026T020000 +RDATE:19201031T020000 +RDATE:19210925T020000 +RDATE:19220924T020000 +RDATE:19230930T020000 +RDATE:19240928T020000 +RDATE:19250927T020000 +RDATE:19260926T020000 +RDATE:19270925T020000 +RDATE:19280930T020000 +RDATE:19290929T020000 +RDATE:19300928T020000 +RDATE:19310927T020000 +RDATE:19320925T020000 +RDATE:19330924T020000 +RDATE:19340930T020000 +RDATE:19350929T020000 +RDATE:19360927T020000 +RDATE:19370926T020000 +RDATE:19380925T020000 +RDATE:19390924T020000 +RDATE:19400929T020000 +RDATE:19410928T020000 +RDATE:19450930T020000 +RDATE:19460929T020000 +RDATE:19470928T020000 +RDATE:19480926T020000 +RDATE:19490925T020000 +RDATE:19500924T020000 +RDATE:19510930T020000 +RDATE:19520928T020000 +RDATE:19530927T020000 +RDATE:19540926T020000 END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19200101T000000 +RDATE:19200101T000000 +RDATE:19420101T000000 +RDATE:19460101T000000 +RDATE:19670101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:EWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0400 +TZNAME:EPT +DTSTART:19450814T190000 +RDATE:19450814T190000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Nipigon.ics b/mozilla/calendar/libical/zoneinfo/America/Nipigon.ics index a5a569edf3f..f8272478e4c 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Nipigon.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Nipigon.ics @@ -1,22 +1,71 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Nipigon +TZID:/softwarestudio.org/Olson_20010626_2/America/Nipigon X-LIC-LOCATION:America/Nipigon +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19741027T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0500 TZOFFSETTO:-0400 TZNAME:EDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-055304 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-055304 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:18950101T000000 +RDATE:18950101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:EDT +DTSTART:19180414T020000 +RDATE:19180414T020000 +RDATE:19740428T020000 +RDATE:19750427T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0400 TZOFFSETTO:-0500 TZNAME:EST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19181031T020000 +RDATE:19181031T020000 +RDATE:19450930T020000 END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:EWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Nome.ics b/mozilla/calendar/libical/zoneinfo/America/Nome.ics index 4c11cde4cd6..268af0f810a 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Nome.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Nome.ics @@ -1,22 +1,137 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Nome +TZID:/softwarestudio.org/Olson_20010626_2/America/Nome X-LIC-LOCATION:America/Nome -BEGIN:DAYLIGHT -TZOFFSETFROM:-0900 -TZOFFSETTO:-0800 -TZNAME:AKDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU -END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0800 TZOFFSETTO:-0900 TZNAME:AKST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19841028T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0900 +TZOFFSETTO:-0800 +TZNAME:AKDT +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+125821 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+125821 +TZOFFSETTO:-110138 +TZNAME:LMT +DTSTART:18671018T000000 +RDATE:18671018T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-110138 +TZOFFSETTO:-1100 +TZNAME:NST +DTSTART:19000820T120000 +RDATE:19000820T120000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-1100 +TZOFFSETTO:-1100 +TZNAME:NST +DTSTART:19420101T000000 +RDATE:19420101T000000 +RDATE:19460101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-1100 +TZOFFSETTO:-1000 +TZNAME:NWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-1000 +TZOFFSETTO:-1000 +TZNAME:NPT +DTSTART:19450814T130000 +RDATE:19450814T130000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-1000 +TZOFFSETTO:-1100 +TZNAME:NST +DTSTART:19450930T020000 +RDATE:19450930T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-1100 +TZOFFSETTO:-1100 +TZNAME:BST +DTSTART:19670401T000000 +RDATE:19670401T000000 +RDATE:19690101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-1100 +TZOFFSETTO:-1000 +TZNAME:BDT +DTSTART:19690427T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19740106T020000 +RDATE:19750223T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-1000 +TZOFFSETTO:-1100 +TZNAME:BST +DTSTART:19691026T020000 +RDATE:19691026T020000 +RDATE:19701025T020000 +RDATE:19711031T020000 +RDATE:19721029T020000 +RDATE:19731028T020000 +RDATE:19741027T020000 +RDATE:19751026T020000 +RDATE:19761031T020000 +RDATE:19771030T020000 +RDATE:19781029T020000 +RDATE:19791028T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-1000 +TZOFFSETTO:-0900 +TZNAME:AKST +DTSTART:19831030T020000 +RDATE:19831030T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0900 +TZOFFSETTO:-0800 +TZNAME:AKDT +DTSTART:19840429T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Noronha.ics b/mozilla/calendar/libical/zoneinfo/America/Noronha.ics index 7a0ec2762d9..d5bc5c8bd7d 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Noronha.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Noronha.ics @@ -1,14 +1,73 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Noronha +TZID:/softwarestudio.org/Olson_20010626_2/America/Noronha X-LIC-LOCATION:America/Noronha BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-020940 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-020940 +TZOFFSETTO:-0200 +TZNAME:FNT +DTSTART:19140101T000000 +RDATE:19140101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0200 +TZOFFSETTO:-0100 +TZNAME:FNST +DTSTART:19311003T110000 +RDATE:19311003T110000 +RDATE:19321003T000000 +RDATE:19491201T000000 +RDATE:19501201T000000 +RDATE:19511201T000000 +RDATE:19521201T000000 +RDATE:19631209T000000 +RDATE:19650131T000000 +RDATE:19651201T000000 +RDATE:19661101T000000 +RDATE:19671101T000000 +RDATE:19851102T000000 +RDATE:19861025T000000 +RDATE:19871025T000000 +RDATE:19881016T000000 +RDATE:19891015T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0100 +TZOFFSETTO:-0200 +TZNAME:FNT +DTSTART:19320401T000000 +RDATE:19320401T000000 +RDATE:19330401T000000 +RDATE:19500416T010000 +RDATE:19510401T000000 +RDATE:19520401T000000 +RDATE:19530301T000000 +RDATE:19640301T000000 +RDATE:19650331T000000 +RDATE:19660301T000000 +RDATE:19670301T000000 +RDATE:19680301T000000 +RDATE:19860315T000000 +RDATE:19870214T000000 +RDATE:19880207T000000 +RDATE:19890129T000000 +RDATE:19900211T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:-0200 TZOFFSETTO:-0200 TZNAME:FNT -DTSTART:19700101T000000 +DTSTART:19900917T000000 +RDATE:19900917T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Panama.ics b/mozilla/calendar/libical/zoneinfo/America/Panama.ics index ac0311347e0..8f9e76ad6be 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Panama.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Panama.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Panama +TZID:/softwarestudio.org/Olson_20010626_2/America/Panama X-LIC-LOCATION:America/Panama BEGIN:STANDARD -TZOFFSETFROM:-0500 +TZOFFSETFROM:+0000 +TZOFFSETTO:-051808 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-051808 +TZOFFSETTO:-0520 +TZNAME:PMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0520 TZOFFSETTO:-0500 TZNAME:EST -DTSTART:19700101T000000 +DTSTART:19080422T000000 +RDATE:19080422T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Pangnirtung.ics b/mozilla/calendar/libical/zoneinfo/America/Pangnirtung.ics index ee1bc8930b9..03fb2d7730d 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Pangnirtung.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Pangnirtung.ics @@ -1,22 +1,152 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Pangnirtung +TZID:/softwarestudio.org/Olson_20010626_2/America/Pangnirtung X-LIC-LOCATION:America/Pangnirtung BEGIN:DAYLIGHT TZOFFSETFROM:-0500 TZOFFSETTO:-0400 TZNAME:EDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:20010401T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0400 TZOFFSETTO:-0500 TZNAME:EST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:20011028T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-042256 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-042256 +TZOFFSETTO:-0400 +TZNAME:AST +DTSTART:18840101T000000 +RDATE:18840101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:ADT +DTSTART:19180414T020000 +RDATE:19180414T020000 +RDATE:19190525T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +RDATE:19870405T020000 +RDATE:19880403T020000 +RDATE:19890402T020000 +RDATE:19900401T020000 +RDATE:19910407T020000 +RDATE:19920405T020000 +RDATE:19930404T020000 +RDATE:19940403T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0400 +TZNAME:AST +DTSTART:19181027T020000 +RDATE:19181027T020000 +RDATE:19191101T000000 +RDATE:19450930T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +RDATE:19831030T020000 +RDATE:19841028T020000 +RDATE:19851027T020000 +RDATE:19861026T020000 +RDATE:19871025T020000 +RDATE:19881030T020000 +RDATE:19891029T020000 +RDATE:19901028T020000 +RDATE:19911027T020000 +RDATE:19921025T020000 +RDATE:19931031T020000 +RDATE:19941030T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:AWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0200 +TZNAME:ADDT +DTSTART:19650425T000000 +RDATE:19650425T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0200 +TZOFFSETTO:-0400 +TZNAME:AST +DTSTART:19651031T020000 +RDATE:19651031T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0400 +TZNAME:EDT +DTSTART:19950402T020000 +RDATE:19950402T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19951029T020000 +RDATE:19951029T020000 +RDATE:19961027T020000 +RDATE:19971026T020000 +RDATE:19981025T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:EDT +DTSTART:19960407T020000 +RDATE:19960407T020000 +RDATE:19970406T020000 +RDATE:19980405T020000 +RDATE:19990404T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19991031T020000 +RDATE:19991031T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:20000402T020000 +RDATE:20000402T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:20001029T020000 +RDATE:20001029T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Paramaribo.ics b/mozilla/calendar/libical/zoneinfo/America/Paramaribo.ics index 8b7866e440f..152b3885268 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Paramaribo.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Paramaribo.ics @@ -1,14 +1,50 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Paramaribo +TZID:/softwarestudio.org/Olson_20010626_2/America/Paramaribo X-LIC-LOCATION:America/Paramaribo BEGIN:STANDARD -TZOFFSETFROM:-0300 +TZOFFSETFROM:+0000 +TZOFFSETTO:-034040 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-034040 +TZOFFSETTO:-034052 +TZNAME:PMT +DTSTART:19110101T000000 +RDATE:19110101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-034052 +TZOFFSETTO:-034036 +TZNAME:PMT +DTSTART:19350101T000000 +RDATE:19350101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-034036 +TZOFFSETTO:-0330 +TZNAME:NEGT +DTSTART:19451001T000000 +RDATE:19451001T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0330 +TZOFFSETTO:-0330 +TZNAME:SRT +DTSTART:19751120T000000 +RDATE:19751120T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0330 TZOFFSETTO:-0300 TZNAME:SRT -DTSTART:19700101T000000 +DTSTART:19841001T000000 +RDATE:19841001T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Phoenix.ics b/mozilla/calendar/libical/zoneinfo/America/Phoenix.ics index c694b92ca2c..a8cb513798c 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Phoenix.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Phoenix.ics @@ -1,14 +1,58 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Phoenix +TZID:/softwarestudio.org/Olson_20010626_2/America/Phoenix X-LIC-LOCATION:America/Phoenix BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-072818 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-072818 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:18831118T120000 +RDATE:18831118T120000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MDT +DTSTART:19180331T020000 +RDATE:19180331T020000 +RDATE:19190330T020000 +RDATE:19670430T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19181027T020000 +RDATE:19181027T020000 +RDATE:19191026T020000 +RDATE:19440101T000100 +RDATE:19671029T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:STANDARD TZOFFSETFROM:-0700 TZOFFSETTO:-0700 TZNAME:MST -DTSTART:19700101T000000 +DTSTART:19440317T000100 +RDATE:19440317T000100 +RDATE:19441001T000100 +RDATE:19670101T000000 +RDATE:19680101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Port-au-Prince.ics b/mozilla/calendar/libical/zoneinfo/America/Port-au-Prince.ics index 3f41b777259..bb6b2970f79 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Port-au-Prince.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Port-au-Prince.ics @@ -1,22 +1,71 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Port-au-Prince +TZID:/softwarestudio.org/Olson_20010626_2/America/Port-au-Prince X-LIC-LOCATION:America/Port-au-Prince +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-044920 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-044920 +TZOFFSETTO:-0449 +TZNAME:PPMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0449 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19170124T120000 +RDATE:19170124T120000 +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0500 TZOFFSETTO:-0400 TZNAME:EDT -DTSTART:19700405T000000 -RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:19830508T000000 +RDATE:19830508T000000 +RDATE:19840429T000000 +RDATE:19850428T000000 +RDATE:19860427T000000 +RDATE:19870426T000000 +RDATE:19880403T010000 +RDATE:19890402T010000 +RDATE:19900401T010000 +RDATE:19910407T010000 +RDATE:19920405T010000 +RDATE:19930404T010000 +RDATE:19940403T010000 +RDATE:19950402T010000 +RDATE:19960407T010000 +RDATE:19970406T010000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0400 TZOFFSETTO:-0500 TZNAME:EST -DTSTART:19701025T000000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +DTSTART:19831030T000000 +RDATE:19831030T000000 +RDATE:19841028T000000 +RDATE:19851027T000000 +RDATE:19861026T000000 +RDATE:19871025T000000 +RDATE:19881030T020000 +RDATE:19891029T020000 +RDATE:19901028T020000 +RDATE:19911027T020000 +RDATE:19921025T020000 +RDATE:19931031T020000 +RDATE:19941030T020000 +RDATE:19951029T020000 +RDATE:19961027T020000 +RDATE:19971026T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Port_of_Spain.ics b/mozilla/calendar/libical/zoneinfo/America/Port_of_Spain.ics index ef2360482ab..4f05142f13b 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Port_of_Spain.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Port_of_Spain.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Port_of_Spain +TZID:/softwarestudio.org/Olson_20010626_2/America/Port_of_Spain X-LIC-LOCATION:America/Port_of_Spain BEGIN:STANDARD -TZOFFSETFROM:-0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:-040604 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-040604 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:19120302T000000 +RDATE:19120302T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Porto_Velho.ics b/mozilla/calendar/libical/zoneinfo/America/Porto_Velho.ics index 66b272d516b..806766bd64d 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Porto_Velho.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Porto_Velho.ics @@ -1,14 +1,69 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Porto_Velho +TZID:/softwarestudio.org/Olson_20010626_2/America/Porto_Velho X-LIC-LOCATION:America/Porto_Velho BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-041536 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-041536 +TZOFFSETTO:-0400 +TZNAME:AMT +DTSTART:19140101T000000 +RDATE:19140101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:AMST +DTSTART:19311003T110000 +RDATE:19311003T110000 +RDATE:19321003T000000 +RDATE:19491201T000000 +RDATE:19501201T000000 +RDATE:19511201T000000 +RDATE:19521201T000000 +RDATE:19631209T000000 +RDATE:19650131T000000 +RDATE:19651201T000000 +RDATE:19661101T000000 +RDATE:19671101T000000 +RDATE:19851102T000000 +RDATE:19861025T000000 +RDATE:19871025T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0400 +TZNAME:AMT +DTSTART:19320401T000000 +RDATE:19320401T000000 +RDATE:19330401T000000 +RDATE:19500416T010000 +RDATE:19510401T000000 +RDATE:19520401T000000 +RDATE:19530301T000000 +RDATE:19640301T000000 +RDATE:19650331T000000 +RDATE:19660301T000000 +RDATE:19670301T000000 +RDATE:19680301T000000 +RDATE:19860315T000000 +RDATE:19870214T000000 +RDATE:19880207T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:-0400 TZOFFSETTO:-0400 TZNAME:AMT -DTSTART:19700101T000000 +DTSTART:19880912T000000 +RDATE:19880912T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Puerto_Rico.ics b/mozilla/calendar/libical/zoneinfo/America/Puerto_Rico.ics index 68fe63dbd2b..074fb0f314d 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Puerto_Rico.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Puerto_Rico.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Puerto_Rico +TZID:/softwarestudio.org/Olson_20010626_2/America/Puerto_Rico X-LIC-LOCATION:America/Puerto_Rico BEGIN:STANDARD -TZOFFSETFROM:-0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:-042425 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-042425 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:18990328T120000 +RDATE:18990328T120000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:AWT +DTSTART:19420503T000000 +RDATE:19420503T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0400 +TZNAME:AST +DTSTART:19450930T020000 +RDATE:19450930T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Rainy_River.ics b/mozilla/calendar/libical/zoneinfo/America/Rainy_River.ics index d27e31482ed..2ba102d7347 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Rainy_River.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Rainy_River.ics @@ -1,22 +1,71 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Rainy_River +TZID:/softwarestudio.org/Olson_20010626_2/America/Rainy_River X-LIC-LOCATION:America/Rainy_River +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19741027T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0600 TZOFFSETTO:-0500 TZNAME:CDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-061756 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-061756 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:18950101T000000 +RDATE:18950101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19180414T020000 +RDATE:19180414T020000 +RDATE:19740428T020000 +RDATE:19750427T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0500 TZOFFSETTO:-0600 TZNAME:CST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19181031T020000 +RDATE:19181031T020000 +RDATE:19450930T020000 END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Rankin_Inlet.ics b/mozilla/calendar/libical/zoneinfo/America/Rankin_Inlet.ics index e3868c8ec7b..91360946c34 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Rankin_Inlet.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Rankin_Inlet.ics @@ -1,22 +1,130 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Rankin_Inlet +TZID:/softwarestudio.org/Olson_20010626_2/America/Rankin_Inlet X-LIC-LOCATION:America/Rankin_Inlet BEGIN:DAYLIGHT TZOFFSETFROM:-0600 TZOFFSETTO:-0500 TZNAME:CDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:20020407T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0500 TZOFFSETTO:-0600 TZNAME:CST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:20021027T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-060840 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-060840 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:18840101T000000 +RDATE:18840101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19180414T020000 +RDATE:19180414T020000 +RDATE:19190525T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +RDATE:19870405T020000 +RDATE:19880403T020000 +RDATE:19890402T020000 +RDATE:19900401T020000 +RDATE:19910407T020000 +RDATE:19920405T020000 +RDATE:19930404T020000 +RDATE:19940403T020000 +RDATE:19950402T020000 +RDATE:19960407T020000 +RDATE:19970406T020000 +RDATE:19980405T020000 +RDATE:19990404T020000 +RDATE:20000402T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19181027T020000 +RDATE:19181027T020000 +RDATE:19191101T000000 +RDATE:19450930T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +RDATE:19831030T020000 +RDATE:19841028T020000 +RDATE:19851027T020000 +RDATE:19861026T020000 +RDATE:19871025T020000 +RDATE:19881030T020000 +RDATE:19891029T020000 +RDATE:19901028T020000 +RDATE:19911027T020000 +RDATE:19921025T020000 +RDATE:19931031T020000 +RDATE:19941030T020000 +RDATE:19951029T020000 +RDATE:19961027T020000 +RDATE:19971026T020000 +RDATE:19981025T020000 +RDATE:19991031T020000 +RDATE:20010401T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0400 +TZNAME:CDDT +DTSTART:19650425T000000 +RDATE:19650425T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19651031T020000 +RDATE:19651031T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:20001029T020000 +RDATE:20001029T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:20011028T020000 +RDATE:20011028T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Recife.ics b/mozilla/calendar/libical/zoneinfo/America/Recife.ics index 5604efe0930..d671dd9ba02 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Recife.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Recife.ics @@ -1,14 +1,78 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Recife +TZID:/softwarestudio.org/Olson_20010626_2/America/Recife X-LIC-LOCATION:America/Recife BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-021936 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-021936 +TZOFFSETTO:-0300 +TZNAME:BRT +DTSTART:19140101T000000 +RDATE:19140101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0300 +TZOFFSETTO:-0200 +TZNAME:BRST +DTSTART:19311003T110000 +RDATE:19311003T110000 +RDATE:19321003T000000 +RDATE:19491201T000000 +RDATE:19501201T000000 +RDATE:19511201T000000 +RDATE:19521201T000000 +RDATE:19631209T000000 +RDATE:19650131T000000 +RDATE:19651201T000000 +RDATE:19661101T000000 +RDATE:19671101T000000 +RDATE:19851102T000000 +RDATE:19861025T000000 +RDATE:19871025T000000 +RDATE:19881016T000000 +RDATE:19891015T000000 +RDATE:19991003T000000 +RDATE:20001008T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0200 +TZOFFSETTO:-0300 +TZNAME:BRT +DTSTART:19320401T000000 +RDATE:19320401T000000 +RDATE:19330401T000000 +RDATE:19500416T010000 +RDATE:19510401T000000 +RDATE:19520401T000000 +RDATE:19530301T000000 +RDATE:19640301T000000 +RDATE:19650331T000000 +RDATE:19660301T000000 +RDATE:19670301T000000 +RDATE:19680301T000000 +RDATE:19860315T000000 +RDATE:19870214T000000 +RDATE:19880207T000000 +RDATE:19890129T000000 +RDATE:19900211T000000 +RDATE:20000227T000000 +RDATE:20001015T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:-0300 TZOFFSETTO:-0300 TZNAME:BRT -DTSTART:19700101T000000 +DTSTART:19900917T000000 +RDATE:19900917T000000 +RDATE:19990930T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Regina.ics b/mozilla/calendar/libical/zoneinfo/America/Regina.ics index d3a57f434b0..e7792a13d9c 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Regina.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Regina.ics @@ -1,14 +1,99 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Regina +TZID:/softwarestudio.org/Olson_20010626_2/America/Regina X-LIC-LOCATION:America/Regina BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-065836 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-065836 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19050901T000000 +RDATE:19050901T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MDT +DTSTART:19180414T020000 +RDATE:19180414T020000 +RDATE:19300504T000000 +RDATE:19310503T000000 +RDATE:19320501T000000 +RDATE:19330507T000000 +RDATE:19340506T000000 +RDATE:19370411T000000 +RDATE:19380410T000000 +RDATE:19390409T000000 +RDATE:19400414T000000 +RDATE:19410413T000000 +RDATE:19460414T020000 +RDATE:19470427T020000 +RDATE:19480425T020000 +RDATE:19490424T020000 +RDATE:19500430T020000 +RDATE:19510429T020000 +RDATE:19520427T020000 +RDATE:19530426T020000 +RDATE:19540425T020000 +RDATE:19550424T020000 +RDATE:19560429T020000 +RDATE:19570428T020000 +RDATE:19580427T020000 +RDATE:19590426T020000 +END:DAYLIGHT +BEGIN:STANDARD TZOFFSETFROM:-0600 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19181031T020000 +RDATE:19181031T020000 +RDATE:19301005T000000 +RDATE:19311004T000000 +RDATE:19321002T000000 +RDATE:19331001T000000 +RDATE:19341007T000000 +RDATE:19371010T000000 +RDATE:19381002T000000 +RDATE:19391008T000000 +RDATE:19401013T000000 +RDATE:19411012T000000 +RDATE:19450930T020000 +RDATE:19461013T020000 +RDATE:19470928T020000 +RDATE:19480926T020000 +RDATE:19490925T020000 +RDATE:19500924T020000 +RDATE:19510930T020000 +RDATE:19520928T020000 +RDATE:19530927T020000 +RDATE:19540926T020000 +RDATE:19550925T020000 +RDATE:19560930T020000 +RDATE:19570929T020000 +RDATE:19580928T020000 +RDATE:19591025T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0700 TZOFFSETTO:-0600 TZNAME:CST -DTSTART:19700101T000000 +DTSTART:19600424T020000 +RDATE:19600424T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Rio_Branco.ics b/mozilla/calendar/libical/zoneinfo/America/Rio_Branco.ics index ccb9a2f2b9c..5fdd418b72c 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Rio_Branco.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Rio_Branco.ics @@ -1,14 +1,69 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Rio_Branco +TZID:/softwarestudio.org/Olson_20010626_2/America/Rio_Branco X-LIC-LOCATION:America/Rio_Branco BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-043112 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-043112 +TZOFFSETTO:-0500 +TZNAME:ACT +DTSTART:19140101T000000 +RDATE:19140101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:ACST +DTSTART:19311003T110000 +RDATE:19311003T110000 +RDATE:19321003T000000 +RDATE:19491201T000000 +RDATE:19501201T000000 +RDATE:19511201T000000 +RDATE:19521201T000000 +RDATE:19631209T000000 +RDATE:19650131T000000 +RDATE:19651201T000000 +RDATE:19661101T000000 +RDATE:19671101T000000 +RDATE:19851102T000000 +RDATE:19861025T000000 +RDATE:19871025T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +TZNAME:ACT +DTSTART:19320401T000000 +RDATE:19320401T000000 +RDATE:19330401T000000 +RDATE:19500416T010000 +RDATE:19510401T000000 +RDATE:19520401T000000 +RDATE:19530301T000000 +RDATE:19640301T000000 +RDATE:19650331T000000 +RDATE:19660301T000000 +RDATE:19670301T000000 +RDATE:19680301T000000 +RDATE:19860315T000000 +RDATE:19870214T000000 +RDATE:19880207T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:-0500 TZOFFSETTO:-0500 TZNAME:ACT -DTSTART:19700101T000000 +DTSTART:19880912T000000 +RDATE:19880912T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Santiago.ics b/mozilla/calendar/libical/zoneinfo/America/Santiago.ics index 5571edb0d14..d53f4ddb5c4 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Santiago.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Santiago.ics @@ -1,22 +1,152 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Santiago +TZID:/softwarestudio.org/Olson_20010626_2/America/Santiago X-LIC-LOCATION:America/Santiago BEGIN:DAYLIGHT TZOFFSETFROM:-0400 TZOFFSETTO:-0300 TZNAME:CLST -DTSTART:19701011T000000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU +DTSTART:19991010T000000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0300 TZOFFSETTO:-0400 TZNAME:CLT -DTSTART:19700315T000000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:20000312T000000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-044240 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-044240 +TZOFFSETTO:-044240 +TZNAME:SMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-044240 +TZOFFSETTO:-0500 +TZNAME:CLT +DTSTART:19100101T000000 +RDATE:19100101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:CLST +DTSTART:19180901T000000 +RDATE:19180901T000000 +RDATE:19270901T000000 +RDATE:19280901T000000 +RDATE:19290901T000000 +RDATE:19300901T000000 +RDATE:19310901T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +TZNAME:CLT +DTSTART:19190702T000000 +RDATE:19190702T000000 +RDATE:19280401T000000 +RDATE:19290401T000000 +RDATE:19300401T000000 +RDATE:19310401T000000 +RDATE:19320401T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:CLT +DTSTART:19320901T000000 +RDATE:19320901T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:CLST +DTSTART:19661009T000000 +RDATE:19661009T000000 +RDATE:19671015T000000 +RDATE:19681013T000000 +RDATE:19691012T000000 +RDATE:19701011T000000 +RDATE:19711010T000000 +RDATE:19721015T000000 +RDATE:19731014T000000 +RDATE:19741013T000000 +RDATE:19751012T000000 +RDATE:19761010T000000 +RDATE:19771009T000000 +RDATE:19781015T000000 +RDATE:19791014T000000 +RDATE:19801012T000000 +RDATE:19811011T000000 +RDATE:19821010T000000 +RDATE:19831009T000000 +RDATE:19841014T000000 +RDATE:19851013T000000 +RDATE:19861012T000000 +RDATE:19871011T000000 +RDATE:19881009T000000 +RDATE:19891015T000000 +RDATE:19901014T000000 +RDATE:19911013T000000 +RDATE:19921011T000000 +RDATE:19931010T000000 +RDATE:19941009T000000 +RDATE:19951015T000000 +RDATE:19961013T000000 +RDATE:19971012T000000 +RDATE:19980927T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0400 +TZNAME:CLT +DTSTART:19670312T000000 +RDATE:19670312T000000 +RDATE:19680310T000000 +RDATE:19690309T000000 +RDATE:19700315T000000 +RDATE:19710314T000000 +RDATE:19720312T000000 +RDATE:19730311T000000 +RDATE:19740310T000000 +RDATE:19750309T000000 +RDATE:19760314T000000 +RDATE:19770313T000000 +RDATE:19780312T000000 +RDATE:19790311T000000 +RDATE:19800309T000000 +RDATE:19810315T000000 +RDATE:19820314T000000 +RDATE:19830313T000000 +RDATE:19840311T000000 +RDATE:19850310T000000 +RDATE:19860309T000000 +RDATE:19870315T000000 +RDATE:19880313T000000 +RDATE:19890312T000000 +RDATE:19900311T000000 +RDATE:19910310T000000 +RDATE:19920315T000000 +RDATE:19930314T000000 +RDATE:19940313T000000 +RDATE:19950312T000000 +RDATE:19960310T000000 +RDATE:19970309T000000 +RDATE:19980315T000000 +RDATE:19990404T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Santo_Domingo.ics b/mozilla/calendar/libical/zoneinfo/America/Santo_Domingo.ics index d87a0625b0e..98ff2047a74 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Santo_Domingo.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Santo_Domingo.ics @@ -1,14 +1,74 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Santo_Domingo +TZID:/softwarestudio.org/Olson_20010626_2/America/Santo_Domingo X-LIC-LOCATION:America/Santo_Domingo BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-043936 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-043936 +TZOFFSETTO:-0440 +TZNAME:SDMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0440 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19330401T120000 +RDATE:19330401T120000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:EDT +DTSTART:19661030T000000 +RDATE:19661030T000000 +END:DAYLIGHT +BEGIN:STANDARD TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19670228T000000 +RDATE:19670228T000000 +RDATE:20001029T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0430 +TZNAME:EHDT +DTSTART:19691026T000000 +RDATE:19691026T000000 +RDATE:19701025T000000 +RDATE:19711031T000000 +RDATE:19721029T000000 +RDATE:19731028T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0430 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19700221T000000 +RDATE:19700221T000000 +RDATE:19710120T000000 +RDATE:19720121T000000 +RDATE:19730121T000000 +RDATE:19740121T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0500 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:19741027T000000 +RDATE:19741027T000000 +RDATE:20001203T010000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Sao_Paulo.ics b/mozilla/calendar/libical/zoneinfo/America/Sao_Paulo.ics index 9220389e1b6..c33a6e7f2aa 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Sao_Paulo.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Sao_Paulo.ics @@ -1,22 +1,107 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Sao_Paulo +TZID:/softwarestudio.org/Olson_20010626_2/America/Sao_Paulo X-LIC-LOCATION:America/Sao_Paulo BEGIN:DAYLIGHT TZOFFSETFROM:-0300 TZOFFSETTO:-0200 TZNAME:BRST -DTSTART:19701101T000000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:20001008T000000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=8,9,10,11,12,13,14;BYDAY=SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0200 TZOFFSETTO:-0300 TZNAME:BRT -DTSTART:19700222T000000 -RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=-1SU +DTSTART:20010218T000000 +RRULE:FREQ=YEARLY;BYMONTH=2;BYMONTHDAY=15,16,17,18,19,20,21;BYDAY=SU +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-030628 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-030628 +TZOFFSETTO:-0300 +TZNAME:BRT +DTSTART:19140101T000000 +RDATE:19140101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0300 +TZOFFSETTO:-0200 +TZNAME:BRST +DTSTART:19311003T110000 +RDATE:19311003T110000 +RDATE:19321003T000000 +RDATE:19491201T000000 +RDATE:19501201T000000 +RDATE:19511201T000000 +RDATE:19521201T000000 +RDATE:19631023T000000 +RDATE:19650131T000000 +RDATE:19651201T000000 +RDATE:19661101T000000 +RDATE:19671101T000000 +RDATE:19851102T000000 +RDATE:19861025T000000 +RDATE:19871025T000000 +RDATE:19881016T000000 +RDATE:19891015T000000 +RDATE:19901021T000000 +RDATE:19911020T000000 +RDATE:19921025T000000 +RDATE:19931017T000000 +RDATE:19941016T000000 +RDATE:19951015T000000 +RDATE:19961006T000000 +RDATE:19971006T000000 +RDATE:19981011T000000 +RDATE:19991003T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0200 +TZOFFSETTO:-0300 +TZNAME:BRT +DTSTART:19320401T000000 +RDATE:19320401T000000 +RDATE:19330401T000000 +RDATE:19500416T010000 +RDATE:19510401T000000 +RDATE:19520401T000000 +RDATE:19530301T000000 +RDATE:19640101T000000 +RDATE:19650331T000000 +RDATE:19660301T000000 +RDATE:19670301T000000 +RDATE:19680301T000000 +RDATE:19860315T000000 +RDATE:19870214T000000 +RDATE:19880207T000000 +RDATE:19890129T000000 +RDATE:19900211T000000 +RDATE:19910217T000000 +RDATE:19920209T000000 +RDATE:19930131T000000 +RDATE:19940220T000000 +RDATE:19950219T000000 +RDATE:19960211T000000 +RDATE:19970216T000000 +RDATE:19980301T000000 +RDATE:19990221T000000 +RDATE:20000227T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0300 +TZNAME:BRT +DTSTART:19640301T000000 +RDATE:19640301T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Scoresbysund.ics b/mozilla/calendar/libical/zoneinfo/America/Scoresbysund.ics index 4cef52e6f1f..101248e6153 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Scoresbysund.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Scoresbysund.ics @@ -1,22 +1,78 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Scoresbysund +TZID:/softwarestudio.org/Olson_20010626_2/America/Scoresbysund X-LIC-LOCATION:America/Scoresbysund BEGIN:DAYLIGHT TZOFFSETFROM:-0100 TZOFFSETTO:+0000 TZNAME:EGST -DTSTART:19700329T000000 +DTSTART:19820328T000000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0000 TZOFFSETTO:-0100 TZNAME:EGT -DTSTART:19701025T010000 +DTSTART:19961027T010000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-0129 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0129 +TZOFFSETTO:-0200 +TZNAME:CGT +DTSTART:19160728T000000 +RDATE:19160728T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0200 +TZOFFSETTO:-0100 +TZNAME:CGST +DTSTART:19800406T020000 +RDATE:19800406T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0100 +TZOFFSETTO:-0200 +TZNAME:CGT +DTSTART:19800928T030000 +RDATE:19800928T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0200 +TZOFFSETTO:+0000 +TZNAME:EGST +DTSTART:19810328T230000 +RDATE:19810328T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-0100 +TZNAME:EGT +DTSTART:19810927T010000 +RDATE:19810927T010000 +RDATE:19820926T010000 +RDATE:19830925T010000 +RDATE:19840930T010000 +RDATE:19850929T010000 +RDATE:19860928T010000 +RDATE:19870927T010000 +RDATE:19880925T010000 +RDATE:19890924T010000 +RDATE:19900930T010000 +RDATE:19910929T010000 +RDATE:19920927T010000 +RDATE:19930926T010000 +RDATE:19940925T010000 +RDATE:19950924T010000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Shiprock.ics b/mozilla/calendar/libical/zoneinfo/America/Shiprock.ics index b5f8b2ad1d9..dcaa4900001 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Shiprock.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Shiprock.ics @@ -1,22 +1,103 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Shiprock +TZID:/softwarestudio.org/Olson_20010626_2/America/Shiprock X-LIC-LOCATION:America/Shiprock +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19651031T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0700 TZOFFSETTO:-0600 TZNAME:MDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-065956 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-065956 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:18831118T120000 +RDATE:18831118T120000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MDT +DTSTART:19180331T020000 +RDATE:19180331T020000 +RDATE:19190330T020000 +RDATE:19200328T020000 +RDATE:19210327T020000 +RDATE:19650425T020000 +RDATE:19660424T020000 +RDATE:19670430T020000 +RDATE:19680428T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19740106T020000 +RDATE:19750223T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0600 TZOFFSETTO:-0700 TZNAME:MST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19181027T020000 +RDATE:19181027T020000 +RDATE:19191026T020000 +RDATE:19201031T020000 +RDATE:19210522T020000 +RDATE:19450930T020000 END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19200101T000000 +RDATE:19200101T000000 +RDATE:19420101T000000 +RDATE:19460101T000000 +RDATE:19670101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0600 +TZNAME:MPT +DTSTART:19450814T170000 +RDATE:19450814T170000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/St_Johns.ics b/mozilla/calendar/libical/zoneinfo/America/St_Johns.ics index 0a1dc8e9bb1..21631d4100b 100644 --- a/mozilla/calendar/libical/zoneinfo/America/St_Johns.ics +++ b/mozilla/calendar/libical/zoneinfo/America/St_Johns.ics @@ -1,22 +1,229 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/St_Johns +TZID:/softwarestudio.org/Olson_20010626_2/America/St_Johns X-LIC-LOCATION:America/St_Johns BEGIN:DAYLIGHT TZOFFSETFROM:-0330 TZOFFSETTO:-0230 TZNAME:NDT -DTSTART:19700308T000100 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19890402T000100 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0230 TZOFFSETTO:-0330 TZNAME:NST -DTSTART:19701101T000100 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19891029T000100 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-033052 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-033052 +TZOFFSETTO:-033052 +TZNAME:NST +DTSTART:18840101T000000 +RDATE:18840101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-033052 +TZOFFSETTO:-023052 +TZNAME:NDT +DTSTART:19170408T020000 +RDATE:19170408T020000 +RDATE:19180414T020000 +RDATE:19190505T230000 +RDATE:19200502T230000 +RDATE:19210501T230000 +RDATE:19220507T230000 +RDATE:19230506T230000 +RDATE:19240504T230000 +RDATE:19250503T230000 +RDATE:19260502T230000 +RDATE:19270501T230000 +RDATE:19280506T230000 +RDATE:19290505T230000 +RDATE:19300504T230000 +RDATE:19310503T230000 +RDATE:19320501T230000 +RDATE:19330507T230000 +RDATE:19340506T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-023052 +TZOFFSETTO:-033052 +TZNAME:NST +DTSTART:19170917T020000 +RDATE:19170917T020000 +RDATE:19181031T020000 +RDATE:19190812T230000 +RDATE:19201031T230000 +RDATE:19211030T230000 +RDATE:19221029T230000 +RDATE:19231028T230000 +RDATE:19241026T230000 +RDATE:19251025T230000 +RDATE:19261031T230000 +RDATE:19271030T230000 +RDATE:19281028T230000 +RDATE:19291027T230000 +RDATE:19301026T230000 +RDATE:19311025T230000 +RDATE:19321030T230000 +RDATE:19331029T230000 +RDATE:19341028T230000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-033052 +TZOFFSETTO:-0330 +TZNAME:NST +DTSTART:19350330T000000 +RDATE:19350330T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0330 +TZOFFSETTO:-0230 +TZNAME:NDT +DTSTART:19350505T230000 +RDATE:19350505T230000 +RDATE:19360510T000000 +RDATE:19370509T000000 +RDATE:19380508T000000 +RDATE:19390514T000000 +RDATE:19400512T000000 +RDATE:19410511T000000 +RDATE:19460512T020000 +RDATE:19470511T020000 +RDATE:19480509T020000 +RDATE:19490508T020000 +RDATE:19500514T020000 +RDATE:19510429T020000 +RDATE:19520427T020000 +RDATE:19530426T020000 +RDATE:19540425T020000 +RDATE:19550424T020000 +RDATE:19560429T020000 +RDATE:19570428T020000 +RDATE:19580427T020000 +RDATE:19590426T020000 +RDATE:19600424T020000 +RDATE:19610430T020000 +RDATE:19620429T020000 +RDATE:19630428T020000 +RDATE:19640426T020000 +RDATE:19650425T020000 +RDATE:19660424T020000 +RDATE:19670430T020000 +RDATE:19680428T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19740428T020000 +RDATE:19750427T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +RDATE:19870405T000100 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0230 +TZOFFSETTO:-0330 +TZNAME:NST +DTSTART:19351027T230000 +RDATE:19351027T230000 +RDATE:19361004T000000 +RDATE:19371003T000000 +RDATE:19381002T000000 +RDATE:19391001T000000 +RDATE:19401006T000000 +RDATE:19411005T000000 +RDATE:19421231T000000 +RDATE:19430905T000000 +RDATE:19440902T000000 +RDATE:19451007T020000 +RDATE:19461006T020000 +RDATE:19471005T020000 +RDATE:19481003T020000 +RDATE:19491002T020000 +RDATE:19501008T020000 +RDATE:19510930T020000 +RDATE:19520928T020000 +RDATE:19530927T020000 +RDATE:19540926T020000 +RDATE:19550925T020000 +RDATE:19560930T020000 +RDATE:19570929T020000 +RDATE:19580928T020000 +RDATE:19590927T020000 +RDATE:19601030T020000 +RDATE:19611029T020000 +RDATE:19621028T020000 +RDATE:19631027T020000 +RDATE:19641025T020000 +RDATE:19651031T020000 +RDATE:19661030T020000 +RDATE:19671029T020000 +RDATE:19681027T020000 +RDATE:19691026T020000 +RDATE:19701025T020000 +RDATE:19711031T020000 +RDATE:19721029T020000 +RDATE:19731028T020000 +RDATE:19741027T020000 +RDATE:19751026T020000 +RDATE:19761031T020000 +RDATE:19771030T020000 +RDATE:19781029T020000 +RDATE:19791028T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +RDATE:19831030T020000 +RDATE:19841028T020000 +RDATE:19851027T020000 +RDATE:19861026T020000 +RDATE:19871025T000100 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0330 +TZOFFSETTO:-0230 +TZNAME:NWT +DTSTART:19420301T000000 +RDATE:19420301T000000 +RDATE:19430530T000000 +RDATE:19440710T000000 +RDATE:19450101T000000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0330 +TZOFFSETTO:-0130 +TZNAME:NDDT +DTSTART:19880403T000100 +RDATE:19880403T000100 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0130 +TZOFFSETTO:-0330 +TZNAME:NST +DTSTART:19881030T000100 +RDATE:19881030T000100 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/St_Kitts.ics b/mozilla/calendar/libical/zoneinfo/America/St_Kitts.ics index 95571598b1c..c131b5456bc 100644 --- a/mozilla/calendar/libical/zoneinfo/America/St_Kitts.ics +++ b/mozilla/calendar/libical/zoneinfo/America/St_Kitts.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/St_Kitts +TZID:/softwarestudio.org/Olson_20010626_2/America/St_Kitts X-LIC-LOCATION:America/St_Kitts BEGIN:STANDARD -TZOFFSETFROM:-0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:-041052 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-041052 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:19120302T000000 +RDATE:19120302T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/St_Lucia.ics b/mozilla/calendar/libical/zoneinfo/America/St_Lucia.ics index 8fee342bbc7..e7aa4a80fd9 100644 --- a/mozilla/calendar/libical/zoneinfo/America/St_Lucia.ics +++ b/mozilla/calendar/libical/zoneinfo/America/St_Lucia.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/St_Lucia +TZID:/softwarestudio.org/Olson_20010626_2/America/St_Lucia X-LIC-LOCATION:America/St_Lucia BEGIN:STANDARD -TZOFFSETFROM:-0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:-0404 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0404 +TZOFFSETTO:-0404 +TZNAME:CMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0404 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:19120101T000000 +RDATE:19120101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/St_Thomas.ics b/mozilla/calendar/libical/zoneinfo/America/St_Thomas.ics index 8c8caa021aa..a7a7425feec 100644 --- a/mozilla/calendar/libical/zoneinfo/America/St_Thomas.ics +++ b/mozilla/calendar/libical/zoneinfo/America/St_Thomas.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/St_Thomas +TZID:/softwarestudio.org/Olson_20010626_2/America/St_Thomas X-LIC-LOCATION:America/St_Thomas BEGIN:STANDARD -TZOFFSETFROM:-0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:-041944 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-041944 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:19110701T000000 +RDATE:19110701T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/St_Vincent.ics b/mozilla/calendar/libical/zoneinfo/America/St_Vincent.ics index 9b5821c596c..844c278dbf0 100644 --- a/mozilla/calendar/libical/zoneinfo/America/St_Vincent.ics +++ b/mozilla/calendar/libical/zoneinfo/America/St_Vincent.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/St_Vincent +TZID:/softwarestudio.org/Olson_20010626_2/America/St_Vincent X-LIC-LOCATION:America/St_Vincent BEGIN:STANDARD -TZOFFSETFROM:-0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:-040456 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-040456 +TZOFFSETTO:-040456 +TZNAME:KMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-040456 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:19120101T000000 +RDATE:19120101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Swift_Current.ics b/mozilla/calendar/libical/zoneinfo/America/Swift_Current.ics index 2cc96f9f582..179589e07ea 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Swift_Current.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Swift_Current.ics @@ -1,14 +1,74 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Swift_Current +TZID:/softwarestudio.org/Olson_20010626_2/America/Swift_Current X-LIC-LOCATION:America/Swift_Current BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-071120 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-071120 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19050901T000000 +RDATE:19050901T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MDT +DTSTART:19180414T020000 +RDATE:19180414T020000 +RDATE:19470427T020000 +RDATE:19480425T020000 +RDATE:19490424T020000 +RDATE:19570428T020000 +RDATE:19590426T020000 +RDATE:19600424T020000 +RDATE:19610430T020000 +END:DAYLIGHT +BEGIN:STANDARD TZOFFSETFROM:-0600 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19181031T020000 +RDATE:19181031T020000 +RDATE:19450930T020000 +RDATE:19470928T020000 +RDATE:19480926T020000 +RDATE:19490925T020000 +RDATE:19571027T020000 +RDATE:19591025T020000 +RDATE:19600925T020000 +RDATE:19610924T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19460428T020000 +RDATE:19460428T020000 +RDATE:19461013T020000 +RDATE:19500101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0700 TZOFFSETTO:-0600 TZNAME:CST -DTSTART:19700101T000000 +DTSTART:19720430T020000 +RDATE:19720430T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Tegucigalpa.ics b/mozilla/calendar/libical/zoneinfo/America/Tegucigalpa.ics index e8220c4a0ca..b2143540544 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Tegucigalpa.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Tegucigalpa.ics @@ -1,14 +1,38 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Tegucigalpa +TZID:/softwarestudio.org/Olson_20010626_2/America/Tegucigalpa X-LIC-LOCATION:America/Tegucigalpa BEGIN:STANDARD -TZOFFSETFROM:-0600 +TZOFFSETFROM:+0000 +TZOFFSETTO:-054852 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-054852 TZOFFSETTO:-0600 TZNAME:CST -DTSTART:19700101T000000 +DTSTART:19210401T000000 +RDATE:19210401T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19870503T000000 +RDATE:19870503T000000 +RDATE:19880501T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19870927T000000 +RDATE:19870927T000000 +RDATE:19880925T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Thule.ics b/mozilla/calendar/libical/zoneinfo/America/Thule.ics index e092687132b..becad38b445 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Thule.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Thule.ics @@ -1,22 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Thule +TZID:/softwarestudio.org/Olson_20010626_2/America/Thule X-LIC-LOCATION:America/Thule BEGIN:DAYLIGHT TZOFFSETFROM:-0400 TZOFFSETTO:-0300 TZNAME:ADT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19930404T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0300 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19931031T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-043508 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-043508 +TZOFFSETTO:-0400 +TZNAME:AST +DTSTART:19160728T000000 +RDATE:19160728T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Thunder_Bay.ics b/mozilla/calendar/libical/zoneinfo/America/Thunder_Bay.ics index b8358ba947f..e747cc88e8c 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Thunder_Bay.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Thunder_Bay.ics @@ -1,22 +1,86 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Thunder_Bay +TZID:/softwarestudio.org/Olson_20010626_2/America/Thunder_Bay X-LIC-LOCATION:America/Thunder_Bay +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19741027T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0500 TZOFFSETTO:-0400 TZNAME:EDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-0557 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0557 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:18950101T000000 +RDATE:18950101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:EDT +DTSTART:19180414T020000 +RDATE:19180414T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19740428T020000 +RDATE:19750427T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0400 TZOFFSETTO:-0500 TZNAME:EST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19181031T020000 +RDATE:19181031T020000 +RDATE:19450930T020000 +RDATE:19701025T020000 +RDATE:19711031T020000 +RDATE:19721029T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +TZNAME:EWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0500 +TZNAME:EST +DTSTART:19700101T000000 +RDATE:19700101T000000 +RDATE:19730101T000000 +RDATE:19740101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Tijuana.ics b/mozilla/calendar/libical/zoneinfo/America/Tijuana.ics index 2de75e1093f..21713b5f63b 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Tijuana.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Tijuana.ics @@ -1,22 +1,105 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Tijuana +TZID:/softwarestudio.org/Olson_20010626_2/America/Tijuana X-LIC-LOCATION:America/Tijuana BEGIN:STANDARD TZOFFSETFROM:-0700 TZOFFSETTO:-0800 TZNAME:PST -DTSTART:19701025T020000 +DTSTART:19761031T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0800 TZOFFSETTO:-0700 TZNAME:PDT -DTSTART:19700405T020000 -RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-074804 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-074804 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19220101T001156 +RDATE:19220101T001156 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0800 +TZNAME:PST +DTSTART:19240101T000000 +RDATE:19240101T000000 +RDATE:19301115T000000 +RDATE:19310930T000000 +RDATE:19451112T000000 +RDATE:19490114T000000 +RDATE:19540926T020000 +RDATE:19550925T020000 +RDATE:19560930T020000 +RDATE:19570929T020000 +RDATE:19580928T020000 +RDATE:19590927T020000 +RDATE:19600925T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19270610T230000 +RDATE:19270610T230000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +TZNAME:PDT +DTSTART:19310401T000000 +RDATE:19310401T000000 +RDATE:19480405T000000 +RDATE:19540425T020000 +RDATE:19550424T020000 +RDATE:19560429T020000 +RDATE:19570428T020000 +RDATE:19580427T020000 +RDATE:19590426T020000 +RDATE:19600424T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +TZNAME:PWT +DTSTART:19420424T000000 +RDATE:19420424T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0800 +TZOFFSETTO:-0800 +TZNAME:PST +DTSTART:19540101T000000 +RDATE:19540101T000000 +RDATE:19610101T000000 +RDATE:19760101T000000 +RDATE:19960101T000000 +RDATE:20010101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Toronto.ics b/mozilla/calendar/libical/zoneinfo/America/Toronto.ics deleted file mode 100644 index 54a0c5f722c..00000000000 --- a/mozilla/calendar/libical/zoneinfo/America/Toronto.ics +++ /dev/null @@ -1,22 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Toronto -X-LIC-LOCATION:America/Toronto -BEGIN:DAYLIGHT -TZOFFSETFROM:-0500 -TZOFFSETTO:-0400 -TZNAME:EDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU -END:DAYLIGHT -BEGIN:STANDARD -TZOFFSETFROM:-0400 -TZOFFSETTO:-0500 -TZNAME:EST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Tortola.ics b/mozilla/calendar/libical/zoneinfo/America/Tortola.ics index a2cff0af278..e1ee946ad80 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Tortola.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Tortola.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Tortola +TZID:/softwarestudio.org/Olson_20010626_2/America/Tortola X-LIC-LOCATION:America/Tortola BEGIN:STANDARD -TZOFFSETFROM:-0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:-041828 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-041828 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:19110701T000000 +RDATE:19110701T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Vancouver.ics b/mozilla/calendar/libical/zoneinfo/America/Vancouver.ics index 7df910ed397..8ebc1b95ecb 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Vancouver.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Vancouver.ics @@ -1,22 +1,115 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Vancouver +TZID:/softwarestudio.org/Olson_20010626_2/America/Vancouver X-LIC-LOCATION:America/Vancouver +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0800 +TZNAME:PST +DTSTART:19621028T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0800 TZOFFSETTO:-0700 TZNAME:PDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-081228 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-081228 +TZOFFSETTO:-0800 +TZNAME:PST +DTSTART:18840101T000000 +RDATE:18840101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +TZNAME:PDT +DTSTART:19180414T020000 +RDATE:19180414T020000 +RDATE:19460428T020000 +RDATE:19470427T020000 +RDATE:19480425T020000 +RDATE:19490424T020000 +RDATE:19500430T020000 +RDATE:19510429T020000 +RDATE:19520427T020000 +RDATE:19530426T020000 +RDATE:19540425T020000 +RDATE:19550424T020000 +RDATE:19560429T020000 +RDATE:19570428T020000 +RDATE:19580427T020000 +RDATE:19590426T020000 +RDATE:19600424T020000 +RDATE:19610430T020000 +RDATE:19620429T020000 +RDATE:19630428T020000 +RDATE:19640426T020000 +RDATE:19650425T020000 +RDATE:19660424T020000 +RDATE:19670430T020000 +RDATE:19680428T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19740428T020000 +RDATE:19750427T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0700 TZOFFSETTO:-0800 TZNAME:PST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19181031T020000 +RDATE:19181031T020000 +RDATE:19450930T020000 +RDATE:19461013T020000 +RDATE:19470928T020000 +RDATE:19480926T020000 +RDATE:19490925T020000 +RDATE:19500924T020000 +RDATE:19510930T020000 +RDATE:19520928T020000 +RDATE:19530927T020000 +RDATE:19540926T020000 +RDATE:19550925T020000 +RDATE:19560930T020000 +RDATE:19570929T020000 +RDATE:19580928T020000 +RDATE:19590927T020000 +RDATE:19600925T020000 +RDATE:19610924T020000 END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +TZNAME:PWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Whitehorse.ics b/mozilla/calendar/libical/zoneinfo/America/Whitehorse.ics index 1b74c9bec3f..20a0abecdc7 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Whitehorse.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Whitehorse.ics @@ -1,22 +1,94 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Whitehorse +TZID:/softwarestudio.org/Olson_20010626_2/America/Whitehorse X-LIC-LOCATION:America/Whitehorse -BEGIN:DAYLIGHT -TZOFFSETFROM:-0800 -TZOFFSETTO:-0700 -TZNAME:PDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU -END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0700 TZOFFSETTO:-0800 TZNAME:PST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19801026T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +TZNAME:PDT +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-090012 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-090012 +TZOFFSETTO:-0900 +TZNAME:YST +DTSTART:19000820T000000 +RDATE:19000820T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0900 +TZOFFSETTO:-0800 +TZNAME:YDT +DTSTART:19180414T020000 +RDATE:19180414T020000 +RDATE:19190525T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0800 +TZOFFSETTO:-0900 +TZNAME:YST +DTSTART:19181027T020000 +RDATE:19181027T020000 +RDATE:19191101T000000 +RDATE:19450930T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0900 +TZOFFSETTO:-0800 +TZNAME:YWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0900 +TZOFFSETTO:-0700 +TZNAME:YDDT +DTSTART:19650425T000000 +RDATE:19650425T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0900 +TZNAME:YST +DTSTART:19651031T020000 +RDATE:19651031T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0900 +TZOFFSETTO:-0800 +TZNAME:PST +DTSTART:19660701T020000 +RDATE:19660701T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +TZNAME:PDT +DTSTART:19800427T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Winnipeg.ics b/mozilla/calendar/libical/zoneinfo/America/Winnipeg.ics index 5903d682614..f263d192878 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Winnipeg.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Winnipeg.ics @@ -1,22 +1,136 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Winnipeg +TZID:/softwarestudio.org/Olson_20010626_2/America/Winnipeg X-LIC-LOCATION:America/Winnipeg BEGIN:DAYLIGHT TZOFFSETFROM:-0600 TZOFFSETTO:-0500 TZNAME:CDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0500 TZOFFSETTO:-0600 TZNAME:CST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19871025T030000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-062836 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-062836 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:18870716T000000 +RDATE:18870716T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CDT +DTSTART:19160423T000000 +RDATE:19160423T000000 +RDATE:19180414T020000 +RDATE:19370516T020000 +RDATE:19460512T020000 +RDATE:19470427T020000 +RDATE:19480425T020000 +RDATE:19490424T020000 +RDATE:19500501T020000 +RDATE:19510429T020000 +RDATE:19520427T020000 +RDATE:19530426T020000 +RDATE:19540425T020000 +RDATE:19550424T020000 +RDATE:19560429T020000 +RDATE:19570428T020000 +RDATE:19580427T020000 +RDATE:19590426T020000 +RDATE:19600424T020000 +RDATE:19630428T020000 +RDATE:19660424T020000 +RDATE:19670430T020000 +RDATE:19680428T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19740428T020000 +RDATE:19750427T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:CST +DTSTART:19160917T000000 +RDATE:19160917T000000 +RDATE:19181031T020000 +RDATE:19370926T020000 +RDATE:19450930T020000 +RDATE:19461013T020000 +RDATE:19470928T020000 +RDATE:19480926T020000 +RDATE:19490925T020000 +RDATE:19500930T020000 +RDATE:19510930T020000 +RDATE:19520928T020000 +RDATE:19530927T020000 +RDATE:19540926T020000 +RDATE:19550925T020000 +RDATE:19560930T020000 +RDATE:19570929T020000 +RDATE:19580928T020000 +RDATE:19591025T020000 +RDATE:19600925T020000 +RDATE:19630922T020000 +RDATE:19661030T020000 +RDATE:19671029T020000 +RDATE:19681027T020000 +RDATE:19691026T020000 +RDATE:19701025T020000 +RDATE:19711031T020000 +RDATE:19721029T020000 +RDATE:19731028T020000 +RDATE:19741027T020000 +RDATE:19751026T020000 +RDATE:19761031T020000 +RDATE:19771030T020000 +RDATE:19781029T020000 +RDATE:19791028T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +RDATE:19831030T020000 +RDATE:19841028T020000 +RDATE:19851027T020000 +RDATE:19861026T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:CWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Yakutat.ics b/mozilla/calendar/libical/zoneinfo/America/Yakutat.ics index 15bdec9e4f9..8b56274563a 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Yakutat.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Yakutat.ics @@ -1,22 +1,117 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Yakutat +TZID:/softwarestudio.org/Olson_20010626_2/America/Yakutat X-LIC-LOCATION:America/Yakutat -BEGIN:DAYLIGHT -TZOFFSETFROM:-0900 -TZOFFSETTO:-0800 -TZNAME:AKDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU -END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0800 TZOFFSETTO:-0900 TZNAME:AKST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19831030T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0900 +TZOFFSETTO:-0800 +TZNAME:AKDT +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+144105 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+144105 +TZOFFSETTO:-091855 +TZNAME:LMT +DTSTART:18671018T000000 +RDATE:18671018T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-091855 +TZOFFSETTO:-0900 +TZNAME:YST +DTSTART:19000820T120000 +RDATE:19000820T120000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0900 +TZOFFSETTO:-0900 +TZNAME:YST +DTSTART:19420101T000000 +RDATE:19420101T000000 +RDATE:19460101T000000 +RDATE:19690101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0900 +TZOFFSETTO:-0800 +TZNAME:YWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0800 +TZOFFSETTO:-0800 +TZNAME:YPT +DTSTART:19450814T150000 +RDATE:19450814T150000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0800 +TZOFFSETTO:-0900 +TZNAME:YST +DTSTART:19450930T020000 +RDATE:19450930T020000 +RDATE:19691026T020000 +RDATE:19701025T020000 +RDATE:19711031T020000 +RDATE:19721029T020000 +RDATE:19731028T020000 +RDATE:19741027T020000 +RDATE:19751026T020000 +RDATE:19761031T020000 +RDATE:19771030T020000 +RDATE:19781029T020000 +RDATE:19791028T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0900 +TZOFFSETTO:-0800 +TZNAME:YDT +DTSTART:19690427T020000 +RDATE:19690427T020000 +RDATE:19700426T020000 +RDATE:19710425T020000 +RDATE:19720430T020000 +RDATE:19730429T020000 +RDATE:19740106T020000 +RDATE:19750223T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0900 +TZOFFSETTO:-0800 +TZNAME:AKDT +DTSTART:19840429T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/America/Yellowknife.ics b/mozilla/calendar/libical/zoneinfo/America/Yellowknife.ics index 5ab53dd1961..c2ca3a4f943 100644 --- a/mozilla/calendar/libical/zoneinfo/America/Yellowknife.ics +++ b/mozilla/calendar/libical/zoneinfo/America/Yellowknife.ics @@ -1,22 +1,81 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/America/Yellowknife +TZID:/softwarestudio.org/Olson_20010626_2/America/Yellowknife X-LIC-LOCATION:America/Yellowknife +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19801026T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0700 TZOFFSETTO:-0600 TZNAME:MDT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-073724 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-073724 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:18840101T000000 +RDATE:18840101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MDT +DTSTART:19180414T020000 +RDATE:19180414T020000 +RDATE:19190525T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0600 TZOFFSETTO:-0700 TZNAME:MST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19181027T020000 +RDATE:19181027T020000 +RDATE:19191101T000000 +RDATE:19450930T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:MWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0500 +TZNAME:MDDT +DTSTART:19650425T000000 +RDATE:19650425T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0700 +TZNAME:MST +DTSTART:19651031T020000 +RDATE:19651031T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Antarctica/Casey.ics b/mozilla/calendar/libical/zoneinfo/Antarctica/Casey.ics index 9522ea74a65..59180bacad1 100644 --- a/mozilla/calendar/libical/zoneinfo/Antarctica/Casey.ics +++ b/mozilla/calendar/libical/zoneinfo/Antarctica/Casey.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Antarctica/Casey +TZID:/softwarestudio.org/Olson_20010626_2/Antarctica/Casey X-LIC-LOCATION:Antarctica/Casey BEGIN:STANDARD -TZOFFSETFROM:+0800 +TZOFFSETFROM:+0000 +TZOFFSETTO:+0000 +TZNAME:zzz +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 TZOFFSETTO:+0800 TZNAME:WST -DTSTART:19700101T000000 +DTSTART:19690101T000000 +RDATE:19690101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Antarctica/Davis.ics b/mozilla/calendar/libical/zoneinfo/Antarctica/Davis.ics index 2750930f370..5f8d6066de4 100644 --- a/mozilla/calendar/libical/zoneinfo/Antarctica/Davis.ics +++ b/mozilla/calendar/libical/zoneinfo/Antarctica/Davis.ics @@ -1,14 +1,30 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Antarctica/Davis +TZID:/softwarestudio.org/Olson_20010626_2/Antarctica/Davis X-LIC-LOCATION:Antarctica/Davis BEGIN:STANDARD -TZOFFSETFROM:+0700 +TZOFFSETFROM:+0000 +TZOFFSETTO:+0000 +TZNAME:zzz +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 TZOFFSETTO:+0700 TZNAME:DAVT -DTSTART:19700101T000000 +DTSTART:19570113T000000 +RDATE:19570113T000000 +RDATE:19690201T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0700 +TZOFFSETTO:+0000 +TZNAME:zzz +DTSTART:19641101T000000 +RDATE:19641101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Antarctica/DumontDUrville.ics b/mozilla/calendar/libical/zoneinfo/Antarctica/DumontDUrville.ics index ebec2bcfab5..bb31dad546a 100644 --- a/mozilla/calendar/libical/zoneinfo/Antarctica/DumontDUrville.ics +++ b/mozilla/calendar/libical/zoneinfo/Antarctica/DumontDUrville.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Antarctica/DumontDUrville +TZID:/softwarestudio.org/Olson_20010626_2/Antarctica/DumontDUrville X-LIC-LOCATION:Antarctica/DumontDUrville BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0000 +TZNAME:zzz +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+1000 +TZNAME:PMT +DTSTART:19470101T000000 +RDATE:19470101T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+1000 +TZOFFSETTO:+0000 +TZNAME:zzz +DTSTART:19520114T000000 +RDATE:19520114T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 TZOFFSETTO:+1000 TZNAME:DDUT -DTSTART:19700101T000000 +DTSTART:19561101T000000 +RDATE:19561101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Antarctica/Mawson.ics b/mozilla/calendar/libical/zoneinfo/Antarctica/Mawson.ics index 980810a02a2..6847c41c10c 100644 --- a/mozilla/calendar/libical/zoneinfo/Antarctica/Mawson.ics +++ b/mozilla/calendar/libical/zoneinfo/Antarctica/Mawson.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Antarctica/Mawson +TZID:/softwarestudio.org/Olson_20010626_2/Antarctica/Mawson X-LIC-LOCATION:Antarctica/Mawson BEGIN:STANDARD -TZOFFSETFROM:+0600 +TZOFFSETFROM:+0000 +TZOFFSETTO:+0000 +TZNAME:zzz +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 TZOFFSETTO:+0600 TZNAME:MAWT -DTSTART:19700101T000000 +DTSTART:19540213T000000 +RDATE:19540213T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Antarctica/McMurdo.ics b/mozilla/calendar/libical/zoneinfo/Antarctica/McMurdo.ics index ff633f32a68..550262a8bca 100644 --- a/mozilla/calendar/libical/zoneinfo/Antarctica/McMurdo.ics +++ b/mozilla/calendar/libical/zoneinfo/Antarctica/McMurdo.ics @@ -1,22 +1,79 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Antarctica/McMurdo +TZID:/softwarestudio.org/Olson_20010626_2/Antarctica/McMurdo X-LIC-LOCATION:Antarctica/McMurdo BEGIN:STANDARD TZOFFSETFROM:+1300 TZOFFSETTO:+1200 TZNAME:NZST -DTSTART:19700315T030000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU +DTSTART:19900318T030000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=15,16,17,18,19,20,21;BYDAY=SU END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+1200 TZOFFSETTO:+1300 TZNAME:NZDT -DTSTART:19701004T020000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU +DTSTART:19901007T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0000 +TZNAME:zzz +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+1200 +TZNAME:NZST +DTSTART:19560101T000000 +RDATE:19560101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1200 +TZOFFSETTO:+1300 +TZNAME:NZDT +DTSTART:19741103T020000 +RDATE:19741103T020000 +RDATE:19751026T020000 +RDATE:19761031T020000 +RDATE:19771030T020000 +RDATE:19781029T020000 +RDATE:19791028T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +RDATE:19831030T020000 +RDATE:19841028T020000 +RDATE:19851027T020000 +RDATE:19861026T020000 +RDATE:19871025T020000 +RDATE:19881030T020000 +RDATE:19891008T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1300 +TZOFFSETTO:+1200 +TZNAME:NZST +DTSTART:19750223T030000 +RDATE:19750223T030000 +RDATE:19760307T030000 +RDATE:19770306T030000 +RDATE:19780305T030000 +RDATE:19790304T030000 +RDATE:19800302T030000 +RDATE:19810301T030000 +RDATE:19820307T030000 +RDATE:19830306T030000 +RDATE:19840304T030000 +RDATE:19850303T030000 +RDATE:19860302T030000 +RDATE:19870301T030000 +RDATE:19880306T030000 +RDATE:19890305T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Antarctica/Palmer.ics b/mozilla/calendar/libical/zoneinfo/Antarctica/Palmer.ics index f65c178ddd4..5a653132ccf 100644 --- a/mozilla/calendar/libical/zoneinfo/Antarctica/Palmer.ics +++ b/mozilla/calendar/libical/zoneinfo/Antarctica/Palmer.ics @@ -1,22 +1,137 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Antarctica/Palmer +TZID:/softwarestudio.org/Olson_20010626_2/Antarctica/Palmer X-LIC-LOCATION:Antarctica/Palmer BEGIN:DAYLIGHT TZOFFSETFROM:-0400 TZOFFSETTO:-0300 TZNAME:CLST -DTSTART:19701011T000000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU +DTSTART:19991010T000000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0300 TZOFFSETTO:-0400 TZNAME:CLT -DTSTART:19700315T000000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +DTSTART:20000312T000000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0000 +TZNAME:zzz +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-0400 +TZNAME:ART +DTSTART:19650101T000000 +RDATE:19650101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0400 +TZNAME:ART +DTSTART:19650301T000000 +RDATE:19650301T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:ARST +DTSTART:19651015T000000 +RDATE:19651015T000000 +RDATE:19661015T000000 +RDATE:19671001T000000 +RDATE:19681006T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0400 +TZNAME:ART +DTSTART:19660301T000000 +RDATE:19660301T000000 +RDATE:19670401T000000 +RDATE:19680407T000000 +RDATE:19690406T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:ART +DTSTART:19691005T000000 +RDATE:19691005T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0300 +TZOFFSETTO:-0200 +TZNAME:ARST +DTSTART:19740123T000000 +RDATE:19740123T000000 +RDATE:19741006T000000 +RDATE:19751005T000000 +RDATE:19761003T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0200 +TZOFFSETTO:-0300 +TZNAME:ART +DTSTART:19740501T000000 +RDATE:19740501T000000 +RDATE:19750406T000000 +RDATE:19760404T000000 +RDATE:19770403T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0400 +TZNAME:CLT +DTSTART:19820501T000000 +RDATE:19820501T000000 +RDATE:19830313T000000 +RDATE:19840311T000000 +RDATE:19850310T000000 +RDATE:19860309T000000 +RDATE:19870315T000000 +RDATE:19880313T000000 +RDATE:19890312T000000 +RDATE:19900311T000000 +RDATE:19910310T000000 +RDATE:19920315T000000 +RDATE:19930314T000000 +RDATE:19940313T000000 +RDATE:19950312T000000 +RDATE:19960310T000000 +RDATE:19970309T000000 +RDATE:19980315T000000 +RDATE:19990404T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:CLST +DTSTART:19821010T000000 +RDATE:19821010T000000 +RDATE:19831009T000000 +RDATE:19841014T000000 +RDATE:19851013T000000 +RDATE:19861012T000000 +RDATE:19871011T000000 +RDATE:19881009T000000 +RDATE:19891015T000000 +RDATE:19901014T000000 +RDATE:19911013T000000 +RDATE:19921011T000000 +RDATE:19931010T000000 +RDATE:19941009T000000 +RDATE:19951015T000000 +RDATE:19961013T000000 +RDATE:19971012T000000 +RDATE:19980927T000000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Antarctica/Rothera.ics b/mozilla/calendar/libical/zoneinfo/Antarctica/Rothera.ics deleted file mode 100644 index 841d76a2354..00000000000 --- a/mozilla/calendar/libical/zoneinfo/Antarctica/Rothera.ics +++ /dev/null @@ -1,14 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Antarctica/Rothera -X-LIC-LOCATION:Antarctica/Rothera -BEGIN:STANDARD -TZOFFSETFROM:-0300 -TZOFFSETTO:-0300 -TZNAME:ROTT -DTSTART:19700101T000000 -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Antarctica/South_Pole.ics b/mozilla/calendar/libical/zoneinfo/Antarctica/South_Pole.ics index 78c41c1dd40..08d17227f4f 100644 --- a/mozilla/calendar/libical/zoneinfo/Antarctica/South_Pole.ics +++ b/mozilla/calendar/libical/zoneinfo/Antarctica/South_Pole.ics @@ -1,22 +1,79 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Antarctica/South_Pole +TZID:/softwarestudio.org/Olson_20010626_2/Antarctica/South_Pole X-LIC-LOCATION:Antarctica/South_Pole BEGIN:STANDARD TZOFFSETFROM:+1300 TZOFFSETTO:+1200 TZNAME:NZST -DTSTART:19700315T030000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU +DTSTART:19900318T030000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=15,16,17,18,19,20,21;BYDAY=SU END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+1200 TZOFFSETTO:+1300 TZNAME:NZDT -DTSTART:19701004T020000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU +DTSTART:19901007T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0000 +TZNAME:zzz +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+1200 +TZNAME:NZST +DTSTART:19560101T000000 +RDATE:19560101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1200 +TZOFFSETTO:+1300 +TZNAME:NZDT +DTSTART:19741103T020000 +RDATE:19741103T020000 +RDATE:19751026T020000 +RDATE:19761031T020000 +RDATE:19771030T020000 +RDATE:19781029T020000 +RDATE:19791028T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +RDATE:19831030T020000 +RDATE:19841028T020000 +RDATE:19851027T020000 +RDATE:19861026T020000 +RDATE:19871025T020000 +RDATE:19881030T020000 +RDATE:19891008T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1300 +TZOFFSETTO:+1200 +TZNAME:NZST +DTSTART:19750223T030000 +RDATE:19750223T030000 +RDATE:19760307T030000 +RDATE:19770306T030000 +RDATE:19780305T030000 +RDATE:19790304T030000 +RDATE:19800302T030000 +RDATE:19810301T030000 +RDATE:19820307T030000 +RDATE:19830306T030000 +RDATE:19840304T030000 +RDATE:19850303T030000 +RDATE:19860302T030000 +RDATE:19870301T030000 +RDATE:19880306T030000 +RDATE:19890305T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Antarctica/Syowa.ics b/mozilla/calendar/libical/zoneinfo/Antarctica/Syowa.ics index 711a625306a..b9e1d5d1978 100644 --- a/mozilla/calendar/libical/zoneinfo/Antarctica/Syowa.ics +++ b/mozilla/calendar/libical/zoneinfo/Antarctica/Syowa.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Antarctica/Syowa +TZID:/softwarestudio.org/Olson_20010626_2/Antarctica/Syowa X-LIC-LOCATION:Antarctica/Syowa BEGIN:STANDARD -TZOFFSETFROM:+0300 +TZOFFSETFROM:+0000 +TZOFFSETTO:+0000 +TZNAME:zzz +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 TZOFFSETTO:+0300 TZNAME:SYOT -DTSTART:19700101T000000 +DTSTART:19570129T000000 +RDATE:19570129T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Antarctica/Vostok.ics b/mozilla/calendar/libical/zoneinfo/Antarctica/Vostok.ics index 84adfcc52ec..6d7a08b3e4f 100644 --- a/mozilla/calendar/libical/zoneinfo/Antarctica/Vostok.ics +++ b/mozilla/calendar/libical/zoneinfo/Antarctica/Vostok.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Antarctica/Vostok +TZID:/softwarestudio.org/Olson_20010626_2/Antarctica/Vostok X-LIC-LOCATION:Antarctica/Vostok BEGIN:STANDARD -TZOFFSETFROM:+0600 +TZOFFSETFROM:+0000 +TZOFFSETTO:+0000 +TZNAME:zzz +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 TZOFFSETTO:+0600 TZNAME:VOST -DTSTART:19700101T000000 +DTSTART:19571216T000000 +RDATE:19571216T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Arctic/Longyearbyen.ics b/mozilla/calendar/libical/zoneinfo/Arctic/Longyearbyen.ics index 47824808c90..9b8e3981c70 100644 --- a/mozilla/calendar/libical/zoneinfo/Arctic/Longyearbyen.ics +++ b/mozilla/calendar/libical/zoneinfo/Arctic/Longyearbyen.ics @@ -1,22 +1,96 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Arctic/Longyearbyen +TZID:/softwarestudio.org/Olson_20010626_2/Arctic/Longyearbyen X-LIC-LOCATION:Arctic/Longyearbyen BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19810329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0043 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0043 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:18950101T000000 +RDATE:18950101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19160522T010000 +RDATE:19160522T010000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19450402T020000 +RDATE:19590315T020000 +RDATE:19600320T020000 +RDATE:19610319T020000 +RDATE:19620318T020000 +RDATE:19630317T020000 +RDATE:19640315T020000 +RDATE:19650425T020000 +RDATE:19800406T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19160930T000000 +RDATE:19160930T000000 +RDATE:19431004T030000 +RDATE:19441002T030000 +RDATE:19451001T030000 +RDATE:19590920T030000 +RDATE:19600918T030000 +RDATE:19610917T030000 +RDATE:19620916T030000 +RDATE:19630915T030000 +RDATE:19640920T030000 +RDATE:19650919T030000 +RDATE:19800928T030000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19400810T230000 +RDATE:19400810T230000 +RDATE:19421102T020000 +RDATE:19800101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Aden.ics b/mozilla/calendar/libical/zoneinfo/Asia/Aden.ics index 750edf8a00b..db342807b01 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Aden.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Aden.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Aden +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Aden X-LIC-LOCATION:Asia/Aden BEGIN:STANDARD -TZOFFSETFROM:+0300 +TZOFFSETFROM:+0000 +TZOFFSETTO:+030048 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+030048 TZOFFSETTO:+0300 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:19500101T000000 +RDATE:19500101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Almaty.ics b/mozilla/calendar/libical/zoneinfo/Asia/Almaty.ics index ec1e0a2e327..bcb8c4da7b3 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Almaty.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Almaty.ics @@ -1,14 +1,94 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Almaty +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Almaty X-LIC-LOCATION:Asia/Almaty -BEGIN:STANDARD +BEGIN:DAYLIGHT TZOFFSETFROM:+0600 +TZOFFSETTO:+0700 +TZNAME:ALMST +DTSTART:19920329T000000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0700 TZOFFSETTO:+0600 TZNAME:ALMT -DTSTART:19700101T000000 +DTSTART:19961027T000000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+050748 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+050748 +TZOFFSETTO:+0500 +TZNAME:ALMT +DTSTART:19240502T000000 +RDATE:19240502T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0500 +TZOFFSETTO:+0600 +TZNAME:ALMT +DTSTART:19570301T000000 +RDATE:19570301T000000 +RDATE:19920119T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0600 +TZOFFSETTO:+0700 +TZNAME:ALMST +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0700 +TZOFFSETTO:+0600 +TZNAME:ALMT +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19920927T000000 +RDATE:19930926T000000 +RDATE:19940925T000000 +RDATE:19950924T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0600 +TZOFFSETTO:+0600 +TZNAME:ALMST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0600 +TZOFFSETTO:+0500 +TZNAME:ALMT +DTSTART:19910929T030000 +RDATE:19910929T030000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Amman.ics b/mozilla/calendar/libical/zoneinfo/Asia/Amman.ics index 8a0120c8669..afea520b197 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Amman.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Amman.ics @@ -1,22 +1,89 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Amman +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Amman X-LIC-LOCATION:Asia/Amman +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19990930T010000 +RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1TH +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700326T000000 +DTSTART:20000330T000000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1TH END:DAYLIGHT BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+022344 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+022344 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19310101T000000 +RDATE:19310101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19730606T000000 +RDATE:19730606T000000 +RDATE:19740501T000000 +RDATE:19750501T000000 +RDATE:19760501T000000 +RDATE:19770501T000000 +RDATE:19780430T000000 +RDATE:19850401T000000 +RDATE:19860404T000000 +RDATE:19870403T000000 +RDATE:19880401T000000 +RDATE:19890508T000000 +RDATE:19900427T000000 +RDATE:19910417T000000 +RDATE:19920410T000000 +RDATE:19930402T000000 +RDATE:19940401T000000 +RDATE:19950407T000000 +RDATE:19960405T000000 +RDATE:19970404T000000 +RDATE:19980403T000000 +RDATE:19990701T000000 +END:DAYLIGHT +BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701030T010000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1FR +DTSTART:19731001T000000 +RDATE:19731001T000000 +RDATE:19741001T000000 +RDATE:19751001T000000 +RDATE:19761101T000000 +RDATE:19771001T000000 +RDATE:19780930T000000 +RDATE:19851001T000000 +RDATE:19861003T000000 +RDATE:19871002T000000 +RDATE:19881007T000000 +RDATE:19891006T000000 +RDATE:19901005T000000 +RDATE:19910927T000000 +RDATE:19921002T000000 +RDATE:19931001T000000 +RDATE:19940916T000000 +RDATE:19950915T010000 +RDATE:19960920T010000 +RDATE:19970919T010000 +RDATE:19980918T010000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Anadyr.ics b/mozilla/calendar/libical/zoneinfo/Asia/Anadyr.ics index 9c04016a71a..8ca9d3c7a1e 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Anadyr.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Anadyr.ics @@ -1,22 +1,119 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Anadyr +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Anadyr X-LIC-LOCATION:Asia/Anadyr BEGIN:DAYLIGHT TZOFFSETFROM:+1200 TZOFFSETTO:+1300 TZNAME:ANAST -DTSTART:19700329T020000 +DTSTART:19930328T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+1300 TZOFFSETTO:+1200 TZNAME:ANAT -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+114956 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+114956 +TZOFFSETTO:+1200 +TZNAME:ANAT +DTSTART:19240502T000000 +RDATE:19240502T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+1200 +TZOFFSETTO:+1300 +TZNAME:ANAT +DTSTART:19300621T000000 +RDATE:19300621T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1300 +TZOFFSETTO:+1400 +TZNAME:ANAST +DTSTART:19810401T000000 +RDATE:19810401T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1400 +TZOFFSETTO:+1300 +TZNAME:ANAT +DTSTART:19811001T000000 +RDATE:19811001T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1300 +TZOFFSETTO:+1300 +TZNAME:ANAST +DTSTART:19820401T000000 +RDATE:19820401T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1300 +TZOFFSETTO:+1200 +TZNAME:ANAT +DTSTART:19821001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19920926T230000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1200 +TZOFFSETTO:+1300 +TZNAME:ANAST +DTSTART:19830401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +RDATE:19920328T230000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:+1200 +TZOFFSETTO:+1200 +TZNAME:ANAST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1200 +TZOFFSETTO:+1100 +TZNAME:ANAT +DTSTART:19910929T030000 +RDATE:19910929T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+1100 +TZOFFSETTO:+1200 +TZNAME:ANAT +DTSTART:19920119T020000 +RDATE:19920119T020000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Aqtau.ics b/mozilla/calendar/libical/zoneinfo/Asia/Aqtau.ics index c78bb41c0f4..d05b20026d0 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Aqtau.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Aqtau.ics @@ -1,14 +1,122 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Aqtau +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Aqtau X-LIC-LOCATION:Asia/Aqtau +BEGIN:DAYLIGHT +TZOFFSETFROM:+0400 +TZOFFSETTO:+0500 +TZNAME:AQTST +DTSTART:19960331T000000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0500 +TZOFFSETTO:+0400 +TZNAME:AQTT +DTSTART:19961027T000000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+032104 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+032104 +TZOFFSETTO:+0400 +TZNAME:SHET +DTSTART:19240502T000000 +RDATE:19240502T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0500 +TZNAME:SHET +DTSTART:19570301T000000 +RDATE:19570301T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0500 +TZOFFSETTO:+0600 +TZNAME:SHEST +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0600 +TZOFFSETTO:+0500 +TZNAME:SHET +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0500 +TZOFFSETTO:+0500 +TZNAME:AQTST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0500 +TZOFFSETTO:+0400 +TZNAME:AQTT +DTSTART:19910929T030000 +RDATE:19910929T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0400 TZOFFSETTO:+0500 TZNAME:AQTT -DTSTART:19700101T000000 +DTSTART:19920119T020000 +RDATE:19920119T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0500 +TZOFFSETTO:+0600 +TZNAME:AQTST +DTSTART:19920329T000000 +RDATE:19920329T000000 +RDATE:19930328T000000 +RDATE:19940327T000000 +RDATE:19950326T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0600 +TZOFFSETTO:+0500 +TZNAME:AQTT +DTSTART:19920927T000000 +RDATE:19920927T000000 +RDATE:19930926T000000 +RDATE:19940925T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0600 +TZOFFSETTO:+0400 +TZNAME:AQTT +DTSTART:19950924T000000 +RDATE:19950924T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Aqtobe.ics b/mozilla/calendar/libical/zoneinfo/Asia/Aqtobe.ics index 23da8a7b2b9..b50aeb945d0 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Aqtobe.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Aqtobe.ics @@ -1,14 +1,106 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Aqtobe +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Aqtobe X-LIC-LOCATION:Asia/Aqtobe -BEGIN:STANDARD +BEGIN:DAYLIGHT TZOFFSETFROM:+0500 +TZOFFSETTO:+0600 +TZNAME:AQTST +DTSTART:19920329T000000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0600 TZOFFSETTO:+0500 TZNAME:AQTT -DTSTART:19700101T000000 +DTSTART:19961027T000000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+034840 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+034840 +TZOFFSETTO:+0400 +TZNAME:AKT +DTSTART:19240502T000000 +RDATE:19240502T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0500 +TZNAME:AKT +DTSTART:19570301T000000 +RDATE:19570301T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0500 +TZOFFSETTO:+0600 +TZNAME:AKST +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0600 +TZOFFSETTO:+0500 +TZNAME:AKT +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0500 +TZOFFSETTO:+0500 +TZNAME:AKTST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0500 +TZOFFSETTO:+0400 +TZNAME:AQTT +DTSTART:19910929T030000 +RDATE:19910929T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0500 +TZNAME:AQTT +DTSTART:19920119T020000 +RDATE:19920119T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0600 +TZOFFSETTO:+0500 +TZNAME:AQTT +DTSTART:19920927T000000 +RDATE:19920927T000000 +RDATE:19930926T000000 +RDATE:19940925T000000 +RDATE:19950924T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Ashgabat.ics b/mozilla/calendar/libical/zoneinfo/Asia/Ashgabat.ics index c33546fd282..45eb76e641a 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Ashgabat.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Ashgabat.ics @@ -1,14 +1,89 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Ashgabat +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Ashgabat X-LIC-LOCATION:Asia/Ashgabat BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+035332 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+035332 +TZOFFSETTO:+0400 +TZNAME:ASHT +DTSTART:19240502T000000 +RDATE:19240502T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0500 +TZNAME:ASHT +DTSTART:19300621T000000 +RDATE:19300621T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0500 +TZOFFSETTO:+0600 +TZNAME:ASHST +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0600 +TZOFFSETTO:+0500 +TZNAME:ASHT +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +END:STANDARD +BEGIN:DAYLIGHT TZOFFSETFROM:+0500 TZOFFSETTO:+0500 +TZNAME:ASHST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0500 +TZOFFSETTO:+0400 +TZNAME:ASHT +DTSTART:19910929T030000 +RDATE:19910929T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0400 TZNAME:TMT -DTSTART:19700101T000000 +DTSTART:19911027T000000 +RDATE:19911027T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0500 +TZNAME:TMT +DTSTART:19920119T020000 +RDATE:19920119T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Baghdad.ics b/mozilla/calendar/libical/zoneinfo/Asia/Baghdad.ics index 9fbc9ac064b..4700a0335ae 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Baghdad.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Baghdad.ics @@ -1,22 +1,73 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Baghdad +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Baghdad X-LIC-LOCATION:Asia/Baghdad BEGIN:DAYLIGHT TZOFFSETFROM:+0300 TZOFFSETTO:+0400 TZNAME:ADT -DTSTART:19700401T030000 -RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:19910401T030000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0400 TZOFFSETTO:+0300 TZNAME:AST -DTSTART:19701001T040000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU +DTSTART:19911001T040000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=1 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+025740 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+025740 +TZOFFSETTO:+025736 +TZNAME:BMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+025736 +TZOFFSETTO:+0300 +TZNAME:AST +DTSTART:19180101T000000 +RDATE:19180101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:ADT +DTSTART:19820501T000000 +RDATE:19820501T000000 +RDATE:19830331T000000 +RDATE:19840401T000000 +RDATE:19850401T000000 +RDATE:19860330T010000 +RDATE:19870329T010000 +RDATE:19880327T010000 +RDATE:19890326T010000 +RDATE:19900325T010000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0300 +TZNAME:AST +DTSTART:19821001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19841001T000000 +RDATE:19850929T020000 +RDATE:19860928T020000 +RDATE:19870927T020000 +RDATE:19880925T020000 +RDATE:19890924T020000 +RDATE:19900930T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Bahrain.ics b/mozilla/calendar/libical/zoneinfo/Asia/Bahrain.ics index 73af48a41c2..f32d459b24c 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Bahrain.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Bahrain.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Bahrain +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Bahrain X-LIC-LOCATION:Asia/Bahrain BEGIN:STANDARD -TZOFFSETFROM:+0300 +TZOFFSETFROM:+0000 +TZOFFSETTO:+032220 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+032220 +TZOFFSETTO:+0400 +TZNAME:GST +DTSTART:19200101T000000 +RDATE:19200101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0400 TZOFFSETTO:+0300 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:19720601T000000 +RDATE:19720601T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Baku.ics b/mozilla/calendar/libical/zoneinfo/Asia/Baku.ics index ed3fce10bd2..4d50cf1b409 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Baku.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Baku.ics @@ -1,22 +1,133 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Baku +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Baku X-LIC-LOCATION:Asia/Baku BEGIN:DAYLIGHT TZOFFSETFROM:+0400 TZOFFSETTO:+0500 TZNAME:AZST -DTSTART:19700329T040000 +DTSTART:19970330T010000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0500 TZOFFSETTO:+0400 TZNAME:AZT -DTSTART:19701025T050000 +DTSTART:19971026T010000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+031924 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+031924 +TZOFFSETTO:+0300 +TZNAME:BAKT +DTSTART:19240502T000000 +RDATE:19240502T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:BAKT +DTSTART:19570301T000000 +RDATE:19570301T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0400 +TZOFFSETTO:+0500 +TZNAME:BAKST +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0500 +TZOFFSETTO:+0400 +TZNAME:BAKT +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0400 +TZOFFSETTO:+0400 +TZNAME:BAKST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0300 +TZNAME:AZT +DTSTART:19910830T000000 +RDATE:19910830T000000 +RDATE:19920926T230000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0300 +TZNAME:AZT +DTSTART:19910929T020000 +RDATE:19910929T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:AZST +DTSTART:19920328T230000 +RDATE:19920328T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:AZT +DTSTART:19920927T020000 +RDATE:19920927T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0400 +TZNAME:AZT +DTSTART:19960101T000000 +RDATE:19960101T000000 +RDATE:19970101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0400 +TZOFFSETTO:+0500 +TZNAME:AZST +DTSTART:19960331T050000 +RDATE:19960331T050000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0500 +TZOFFSETTO:+0400 +TZNAME:AZT +DTSTART:19961027T060000 +RDATE:19961027T060000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Bangkok.ics b/mozilla/calendar/libical/zoneinfo/Asia/Bangkok.ics index 2bdc91b1ff6..a1c65a5f306 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Bangkok.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Bangkok.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Bangkok +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Bangkok X-LIC-LOCATION:Asia/Bangkok BEGIN:STANDARD -TZOFFSETFROM:+0700 +TZOFFSETFROM:+0000 +TZOFFSETTO:+064204 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+064204 +TZOFFSETTO:+064204 +TZNAME:BMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+064204 TZOFFSETTO:+0700 TZNAME:ICT -DTSTART:19700101T000000 +DTSTART:19200401T000000 +RDATE:19200401T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Beirut.ics b/mozilla/calendar/libical/zoneinfo/Asia/Beirut.ics index 5463fb6d6f7..d92c69a6ed7 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Beirut.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Beirut.ics @@ -1,22 +1,104 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Beirut +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Beirut X-LIC-LOCATION:Asia/Beirut BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700329T000000 +DTSTART:19930328T000000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701025T000000 +DTSTART:19991031T000000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0222 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0222 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19200328T000000 +RDATE:19200328T000000 +RDATE:19210403T000000 +RDATE:19220326T000000 +RDATE:19230422T000000 +RDATE:19570501T000000 +RDATE:19580501T000000 +RDATE:19590501T000000 +RDATE:19600501T000000 +RDATE:19610501T000000 +RDATE:19720622T000000 +RDATE:19730501T000000 +RDATE:19740501T000000 +RDATE:19750501T000000 +RDATE:19760501T000000 +RDATE:19770501T000000 +RDATE:19780430T000000 +RDATE:19840501T000000 +RDATE:19850501T000000 +RDATE:19860501T000000 +RDATE:19870501T000000 +RDATE:19880601T000000 +RDATE:19890510T000000 +RDATE:19900501T000000 +RDATE:19910501T000000 +RDATE:19920501T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19201025T000000 +RDATE:19201025T000000 +RDATE:19211003T000000 +RDATE:19221008T000000 +RDATE:19230916T000000 +RDATE:19571001T000000 +RDATE:19581001T000000 +RDATE:19591001T000000 +RDATE:19601001T000000 +RDATE:19611001T000000 +RDATE:19721001T000000 +RDATE:19731001T000000 +RDATE:19741001T000000 +RDATE:19751001T000000 +RDATE:19761001T000000 +RDATE:19771001T000000 +RDATE:19780930T000000 +RDATE:19841016T000000 +RDATE:19851016T000000 +RDATE:19861016T000000 +RDATE:19871016T000000 +RDATE:19881016T000000 +RDATE:19891016T000000 +RDATE:19901016T000000 +RDATE:19911016T000000 +RDATE:19921004T000000 +RDATE:19930926T000000 +RDATE:19940925T000000 +RDATE:19950924T000000 +RDATE:19960929T000000 +RDATE:19970928T000000 +RDATE:19980927T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Bishkek.ics b/mozilla/calendar/libical/zoneinfo/Asia/Bishkek.ics index 436dd93b5f9..957109ba16d 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Bishkek.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Bishkek.ics @@ -1,14 +1,105 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Bishkek +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Bishkek X-LIC-LOCATION:Asia/Bishkek +BEGIN:DAYLIGHT +TZOFFSETFROM:+0500 +TZOFFSETTO:+0600 +TZNAME:KGST +DTSTART:19970330T023000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0600 -TZOFFSETTO:+0600 +TZOFFSETTO:+0500 TZNAME:KGT -DTSTART:19700101T000000 +DTSTART:19971026T023000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+045824 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+045824 +TZOFFSETTO:+0500 +TZNAME:FRUT +DTSTART:19240502T000000 +RDATE:19240502T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0500 +TZOFFSETTO:+0600 +TZNAME:FRUT +DTSTART:19300621T000000 +RDATE:19300621T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0600 +TZOFFSETTO:+0700 +TZNAME:FRUST +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0700 +TZOFFSETTO:+0600 +TZNAME:FRUT +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0600 +TZOFFSETTO:+0600 +TZNAME:FRUST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0600 +TZOFFSETTO:+0500 +TZNAME:KGT +DTSTART:19910831T020000 +RDATE:19910831T020000 +RDATE:19920927T000000 +RDATE:19930926T000000 +RDATE:19940925T000000 +RDATE:19950924T000000 +RDATE:19960929T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0500 +TZOFFSETTO:+0600 +TZNAME:KGST +DTSTART:19920412T000000 +RDATE:19920412T000000 +RDATE:19930411T000000 +RDATE:19940410T000000 +RDATE:19950409T000000 +RDATE:19960407T000000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Brunei.ics b/mozilla/calendar/libical/zoneinfo/Asia/Brunei.ics index b37c9f7453a..fc960dc0b21 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Brunei.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Brunei.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Brunei +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Brunei X-LIC-LOCATION:Asia/Brunei BEGIN:STANDARD -TZOFFSETFROM:+0800 +TZOFFSETFROM:+0000 +TZOFFSETTO:+073940 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+073940 +TZOFFSETTO:+0730 +TZNAME:BNT +DTSTART:19260301T000000 +RDATE:19260301T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0730 TZOFFSETTO:+0800 TZNAME:BNT -DTSTART:19700101T000000 +DTSTART:19330101T000000 +RDATE:19330101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Calcutta.ics b/mozilla/calendar/libical/zoneinfo/Asia/Calcutta.ics index a881f171f17..4253ba239ad 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Calcutta.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Calcutta.ics @@ -1,14 +1,44 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Calcutta +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Calcutta X-LIC-LOCATION:Asia/Calcutta BEGIN:STANDARD -TZOFFSETFROM:+0530 +TZOFFSETFROM:+0000 +TZOFFSETTO:+055328 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+055328 +TZOFFSETTO:+055320 +TZNAME:HMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+055320 +TZOFFSETTO:+0630 +TZNAME:BURT +DTSTART:19411001T000000 +RDATE:19411001T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0630 TZOFFSETTO:+0530 TZNAME:IST -DTSTART:19700101T000000 +DTSTART:19420515T000000 +RDATE:19420515T000000 +RDATE:19451015T000000 END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0530 +TZOFFSETTO:+0630 +TZNAME:IST +DTSTART:19420901T000000 +RDATE:19420901T000000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Choibalsan.ics b/mozilla/calendar/libical/zoneinfo/Asia/Choibalsan.ics deleted file mode 100644 index e6730ef68cc..00000000000 --- a/mozilla/calendar/libical/zoneinfo/Asia/Choibalsan.ics +++ /dev/null @@ -1,22 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Choibalsan -X-LIC-LOCATION:Asia/Choibalsan -BEGIN:STANDARD -TZOFFSETFROM:+1000 -TZOFFSETTO:+0900 -TZNAME:CHOT -DTSTART:19700926T020000 -RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA -END:STANDARD -BEGIN:DAYLIGHT -TZOFFSETFROM:+0900 -TZOFFSETTO:+1000 -TZNAME:CHOST -DTSTART:19700328T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA -END:DAYLIGHT -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Chongqing.ics b/mozilla/calendar/libical/zoneinfo/Asia/Chongqing.ics deleted file mode 100644 index ab00196b244..00000000000 --- a/mozilla/calendar/libical/zoneinfo/Asia/Chongqing.ics +++ /dev/null @@ -1,14 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Chongqing -X-LIC-LOCATION:Asia/Chongqing -BEGIN:STANDARD -TZOFFSETFROM:+0800 -TZOFFSETTO:+0800 -TZNAME:CST -DTSTART:19700101T000000 -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Colombo.ics b/mozilla/calendar/libical/zoneinfo/Asia/Colombo.ics index 502dab2ca1b..5bf92f5395d 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Colombo.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Colombo.ics @@ -1,14 +1,64 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Colombo +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Colombo X-LIC-LOCATION:Asia/Colombo BEGIN:STANDARD -TZOFFSETFROM:+0530 +TZOFFSETFROM:+0000 +TZOFFSETTO:+051924 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+051924 +TZOFFSETTO:+051932 +TZNAME:MMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+051932 TZOFFSETTO:+0530 TZNAME:IST -DTSTART:19700101T000000 +DTSTART:19060101T000000 +RDATE:19060101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0530 +TZOFFSETTO:+0600 +TZNAME:IHST +DTSTART:19420105T000000 +RDATE:19420105T000000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:+0600 +TZOFFSETTO:+0630 +TZNAME:IST +DTSTART:19420901T000000 +RDATE:19420901T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0630 +TZOFFSETTO:+0530 +TZNAME:IST +DTSTART:19451016T020000 +RDATE:19451016T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0530 +TZOFFSETTO:+0630 +TZNAME:LKT +DTSTART:19960525T000000 +RDATE:19960525T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0630 +TZOFFSETTO:+0600 +TZNAME:LKT +DTSTART:19961026T003000 +RDATE:19961026T003000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Damascus.ics b/mozilla/calendar/libical/zoneinfo/Asia/Damascus.ics index 56776303fb7..d11bf0121f6 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Damascus.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Damascus.ics @@ -1,22 +1,115 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Damascus +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Damascus X-LIC-LOCATION:Asia/Damascus +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19941001T000000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=1 +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700401T000000 -RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:19990401T000000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+022512 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+022512 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19200101T000000 +RDATE:19200101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19200418T020000 +RDATE:19200418T020000 +RDATE:19210417T020000 +RDATE:19220416T020000 +RDATE:19230415T020000 +RDATE:19620429T020000 +RDATE:19630501T020000 +RDATE:19640501T020000 +RDATE:19650501T020000 +RDATE:19660424T020000 +RDATE:19670501T020000 +RDATE:19680501T020000 +RDATE:19690501T020000 +RDATE:19700501T020000 +RDATE:19710501T020000 +RDATE:19720501T020000 +RDATE:19730501T020000 +RDATE:19740501T020000 +RDATE:19750501T020000 +RDATE:19760501T020000 +RDATE:19770501T020000 +RDATE:19780501T020000 +RDATE:19830409T020000 +RDATE:19840409T020000 +RDATE:19860216T020000 +RDATE:19870301T020000 +RDATE:19880315T020000 +RDATE:19890331T020000 +RDATE:19900401T020000 +RDATE:19910401T000000 +RDATE:19920408T000000 +RDATE:19930326T000000 +RDATE:19940401T000000 +RDATE:19950401T000000 +RDATE:19960401T000000 +RDATE:19970331T000000 +RDATE:19980330T000000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701001T000000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU +DTSTART:19201003T020000 +RDATE:19201003T020000 +RDATE:19211002T020000 +RDATE:19221001T020000 +RDATE:19231007T020000 +RDATE:19621001T020000 +RDATE:19630930T020000 +RDATE:19641001T020000 +RDATE:19650930T020000 +RDATE:19661001T020000 +RDATE:19671001T020000 +RDATE:19681001T020000 +RDATE:19691001T020000 +RDATE:19701001T020000 +RDATE:19711001T020000 +RDATE:19721001T020000 +RDATE:19731001T020000 +RDATE:19741001T020000 +RDATE:19751001T020000 +RDATE:19761001T020000 +RDATE:19770901T020000 +RDATE:19780901T020000 +RDATE:19831001T020000 +RDATE:19841001T020000 +RDATE:19861009T020000 +RDATE:19871031T020000 +RDATE:19881031T020000 +RDATE:19891001T020000 +RDATE:19900930T020000 +RDATE:19911001T000000 +RDATE:19921001T000000 +RDATE:19930925T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Dhaka.ics b/mozilla/calendar/libical/zoneinfo/Asia/Dhaka.ics index dabeebb6ff3..d61b7e26242 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Dhaka.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Dhaka.ics @@ -1,14 +1,57 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Dhaka +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Dhaka X-LIC-LOCATION:Asia/Dhaka BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+060140 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+060140 +TZOFFSETTO:+055320 +TZNAME:HMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+055320 +TZOFFSETTO:+0630 +TZNAME:BURT +DTSTART:19411001T000000 +RDATE:19411001T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0630 +TZOFFSETTO:+0530 +TZNAME:IST +DTSTART:19420515T000000 +RDATE:19420515T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0530 +TZOFFSETTO:+0630 +TZNAME:BURT +DTSTART:19420901T000000 +RDATE:19420901T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0630 +TZOFFSETTO:+0600 +TZNAME:DACT +DTSTART:19510930T000000 +RDATE:19510930T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+0600 TZOFFSETTO:+0600 TZNAME:BDT -DTSTART:19700101T000000 +DTSTART:19710326T000000 +RDATE:19710326T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Dili.ics b/mozilla/calendar/libical/zoneinfo/Asia/Dili.ics index 64857aed741..b8141f55838 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Dili.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Dili.ics @@ -1,14 +1,50 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Dili +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Dili X-LIC-LOCATION:Asia/Dili BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+082220 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+082220 +TZOFFSETTO:+0800 +TZNAME:TPT +DTSTART:19120101T000000 +RDATE:19120101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0800 +TZOFFSETTO:+0900 +TZNAME:JST +DTSTART:19420221T230000 +RDATE:19420221T230000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+0900 TZOFFSETTO:+0900 -TZNAME:TLT -DTSTART:19700101T000000 +TZNAME:TPT +DTSTART:19450801T000000 +RDATE:19450801T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0800 +TZNAME:CIT +DTSTART:19760503T000000 +RDATE:19760503T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0800 +TZOFFSETTO:+0900 +TZNAME:TPT +DTSTART:20000917T000000 +RDATE:20000917T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Dubai.ics b/mozilla/calendar/libical/zoneinfo/Asia/Dubai.ics index 5c128a5bf03..32776916829 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Dubai.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Dubai.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Dubai +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Dubai X-LIC-LOCATION:Asia/Dubai BEGIN:STANDARD -TZOFFSETFROM:+0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:+034112 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+034112 TZOFFSETTO:+0400 TZNAME:GST -DTSTART:19700101T000000 +DTSTART:19200101T000000 +RDATE:19200101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Dushanbe.ics b/mozilla/calendar/libical/zoneinfo/Asia/Dushanbe.ics index da7d9fd4da5..04df6880531 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Dushanbe.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Dushanbe.ics @@ -1,14 +1,75 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Dushanbe +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Dushanbe X-LIC-LOCATION:Asia/Dushanbe BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+043512 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+043512 +TZOFFSETTO:+0500 +TZNAME:DUST +DTSTART:19240502T000000 +RDATE:19240502T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+0500 +TZOFFSETTO:+0600 +TZNAME:DUST +DTSTART:19300621T000000 +RDATE:19300621T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0600 +TZOFFSETTO:+0700 +TZNAME:DUSST +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0700 +TZOFFSETTO:+0600 +TZNAME:DUST +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0600 +TZOFFSETTO:+0600 +TZNAME:DUSST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0600 TZOFFSETTO:+0500 TZNAME:TJT -DTSTART:19700101T000000 +DTSTART:19910909T030000 +RDATE:19910909T030000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Gaza.ics b/mozilla/calendar/libical/zoneinfo/Asia/Gaza.ics index 4adeedb4e15..55d05fc27dd 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Gaza.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Gaza.ics @@ -1,22 +1,139 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Gaza +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Gaza X-LIC-LOCATION:Asia/Gaza BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700401T000000 -RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:19990416T000000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=15,16,17,18,19,20,21;BYDAY=FR END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701016T000000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3FR +DTSTART:19991015T000000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=15,16,17,18,19,20,21;BYDAY=FR END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+021752 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+021752 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19001001T000000 +RDATE:19001001T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EET +DTSTART:19400601T000000 +RDATE:19400601T000000 +RDATE:19430401T020000 +RDATE:19440401T000000 +RDATE:19450416T000000 +RDATE:19460416T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19421101T000000 +RDATE:19421101T000000 +RDATE:19431101T000000 +RDATE:19441101T000000 +RDATE:19451101T020000 +RDATE:19461101T000000 +RDATE:19571001T000000 +RDATE:19581001T000000 +RDATE:19590930T030000 +RDATE:19600930T030000 +RDATE:19610930T030000 +RDATE:19620930T030000 +RDATE:19630930T030000 +RDATE:19640930T030000 +RDATE:19650930T030000 +RDATE:19661001T030000 +RDATE:19960920T010000 +RDATE:19970919T010000 +RDATE:19980918T010000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19480515T000000 +RDATE:19480515T000000 +RDATE:19960101T000000 +RDATE:19990101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19570510T000000 +RDATE:19570510T000000 +RDATE:19580501T000000 +RDATE:19590501T010000 +RDATE:19600501T010000 +RDATE:19610501T010000 +RDATE:19620501T010000 +RDATE:19630501T010000 +RDATE:19640501T010000 +RDATE:19650501T010000 +RDATE:19660501T010000 +RDATE:19670501T010000 +RDATE:19960405T000000 +RDATE:19970404T000000 +RDATE:19980403T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:IST +DTSTART:19670605T000000 +RDATE:19670605T000000 +RDATE:19741013T000000 +RDATE:19750831T000000 +RDATE:19850915T000000 +RDATE:19860907T000000 +RDATE:19870913T000000 +RDATE:19880903T000000 +RDATE:19890903T000000 +RDATE:19900826T000000 +RDATE:19910901T000000 +RDATE:19920906T000000 +RDATE:19930905T000000 +RDATE:19940828T000000 +RDATE:19950903T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:IDT +DTSTART:19740707T000000 +RDATE:19740707T000000 +RDATE:19750420T000000 +RDATE:19850414T000000 +RDATE:19860518T000000 +RDATE:19870415T000000 +RDATE:19880409T000000 +RDATE:19890430T000000 +RDATE:19900325T000000 +RDATE:19910324T000000 +RDATE:19920329T000000 +RDATE:19930402T000000 +RDATE:19940401T000000 +RDATE:19950331T000000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Harbin.ics b/mozilla/calendar/libical/zoneinfo/Asia/Harbin.ics index 142579cd609..43749b268fd 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Harbin.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Harbin.ics @@ -1,14 +1,68 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Harbin +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Harbin X-LIC-LOCATION:Asia/Harbin BEGIN:STANDARD -TZOFFSETFROM:+0800 +TZOFFSETFROM:+0000 +TZOFFSETTO:+082644 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+082644 +TZOFFSETTO:+0830 +TZNAME:HART +DTSTART:19280101T000000 +RDATE:19280101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0830 TZOFFSETTO:+0800 TZNAME:CST -DTSTART:19700101T000000 +DTSTART:19320301T000000 +RDATE:19320301T000000 +RDATE:19800501T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0800 +TZOFFSETTO:+0900 +TZNAME:HART +DTSTART:19400101T000000 +RDATE:19400101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0830 +TZNAME:HART +DTSTART:19660501T000000 +RDATE:19660501T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0800 +TZOFFSETTO:+0900 +TZNAME:CDT +DTSTART:19860504T000000 +RDATE:19860504T000000 +RDATE:19870412T000000 +RDATE:19880410T000000 +RDATE:19890416T000000 +RDATE:19900415T000000 +RDATE:19910414T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0800 +TZNAME:CST +DTSTART:19860914T000000 +RDATE:19860914T000000 +RDATE:19870913T000000 +RDATE:19880911T000000 +RDATE:19890917T000000 +RDATE:19900916T000000 +RDATE:19910915T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Hong_Kong.ics b/mozilla/calendar/libical/zoneinfo/Asia/Hong_Kong.ics index 6a68d3dbfd2..b448275aa61 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Hong_Kong.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Hong_Kong.ics @@ -1,14 +1,102 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Hong_Kong +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Hong_Kong X-LIC-LOCATION:Asia/Hong_Kong BEGIN:STANDARD -TZOFFSETFROM:+0800 +TZOFFSETFROM:+0000 +TZOFFSETTO:+073636 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+073636 TZOFFSETTO:+0800 TZNAME:HKT -DTSTART:19700101T000000 +DTSTART:19041030T000000 +RDATE:19041030T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0800 +TZOFFSETTO:+0900 +TZNAME:HKST +DTSTART:19460420T033000 +RDATE:19460420T033000 +RDATE:19470413T033000 +RDATE:19480502T033000 +RDATE:19490403T033000 +RDATE:19500402T033000 +RDATE:19510401T033000 +RDATE:19520406T033000 +RDATE:19530405T033000 +RDATE:19540321T033000 +RDATE:19550320T033000 +RDATE:19560318T033000 +RDATE:19570324T033000 +RDATE:19580323T033000 +RDATE:19590322T033000 +RDATE:19600320T033000 +RDATE:19610319T033000 +RDATE:19620318T033000 +RDATE:19630324T033000 +RDATE:19640322T033000 +RDATE:19650418T033000 +RDATE:19660417T033000 +RDATE:19670416T033000 +RDATE:19680421T033000 +RDATE:19690420T033000 +RDATE:19700419T033000 +RDATE:19710418T033000 +RDATE:19720416T033000 +RDATE:19730422T033000 +RDATE:19740421T033000 +RDATE:19750420T033000 +RDATE:19760418T033000 +RDATE:19770417T033000 +RDATE:19790513T033000 +RDATE:19800511T033000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0800 +TZNAME:HKT +DTSTART:19461201T033000 +RDATE:19461201T033000 +RDATE:19471230T033000 +RDATE:19481031T033000 +RDATE:19491030T033000 +RDATE:19501029T033000 +RDATE:19511028T033000 +RDATE:19521026T033000 +RDATE:19531101T033000 +RDATE:19541031T033000 +RDATE:19551106T033000 +RDATE:19561104T033000 +RDATE:19571103T033000 +RDATE:19581102T033000 +RDATE:19591101T033000 +RDATE:19601106T033000 +RDATE:19611105T033000 +RDATE:19621104T033000 +RDATE:19631103T033000 +RDATE:19641101T033000 +RDATE:19651017T033000 +RDATE:19661016T033000 +RDATE:19671022T033000 +RDATE:19681020T033000 +RDATE:19691019T033000 +RDATE:19701018T033000 +RDATE:19711017T033000 +RDATE:19721022T033000 +RDATE:19731021T033000 +RDATE:19741020T033000 +RDATE:19751019T033000 +RDATE:19761017T033000 +RDATE:19771016T033000 +RDATE:19791021T033000 +RDATE:19801019T033000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Hovd.ics b/mozilla/calendar/libical/zoneinfo/Asia/Hovd.ics index 9c1e8142f73..dc8f2445627 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Hovd.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Hovd.ics @@ -1,22 +1,75 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Hovd +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Hovd X-LIC-LOCATION:Asia/Hovd BEGIN:STANDARD -TZOFFSETFROM:+0800 +TZOFFSETFROM:+0000 +TZOFFSETTO:+060636 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+060636 +TZOFFSETTO:+0600 +TZNAME:HOVT +DTSTART:19050801T000000 +RDATE:19050801T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0600 TZOFFSETTO:+0700 TZNAME:HOVT -DTSTART:19700926T020000 -RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA +DTSTART:19780101T000000 +RDATE:19780101T000000 END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+0700 TZOFFSETTO:+0800 TZNAME:HOVST -DTSTART:19700328T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA +DTSTART:19830401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +RDATE:19910331T020000 +RDATE:19920329T020000 +RDATE:19930328T020000 +RDATE:19940327T020000 +RDATE:19950326T020000 +RDATE:19960331T020000 +RDATE:19970330T020000 +RDATE:19980329T020000 +RDATE:20010427T020000 END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0800 +TZOFFSETTO:+0700 +TZNAME:HOVT +DTSTART:19831001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +RDATE:19960929T030000 +RDATE:19970928T030000 +RDATE:19980927T030000 +RDATE:20010928T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Irkutsk.ics b/mozilla/calendar/libical/zoneinfo/Asia/Irkutsk.ics index fab46d84da5..4578626678c 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Irkutsk.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Irkutsk.ics @@ -1,22 +1,102 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Irkutsk +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Irkutsk X-LIC-LOCATION:Asia/Irkutsk BEGIN:DAYLIGHT TZOFFSETFROM:+0800 TZOFFSETTO:+0900 TZNAME:IRKST -DTSTART:19700329T020000 +DTSTART:19930328T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0900 TZOFFSETTO:+0800 TZNAME:IRKT -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+065720 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+065720 +TZOFFSETTO:+065720 +TZNAME:IMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+065720 +TZOFFSETTO:+0700 +TZNAME:IRKT +DTSTART:19200125T000000 +RDATE:19200125T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0700 +TZOFFSETTO:+0800 +TZNAME:IRKT +DTSTART:19300621T000000 +RDATE:19300621T000000 +RDATE:19920119T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0800 +TZOFFSETTO:+0900 +TZNAME:IRKST +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +RDATE:19920328T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0800 +TZNAME:IRKT +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19920926T230000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0800 +TZOFFSETTO:+0800 +TZNAME:IRKST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0800 +TZOFFSETTO:+0700 +TZNAME:IRKT +DTSTART:19910929T030000 +RDATE:19910929T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Istanbul.ics b/mozilla/calendar/libical/zoneinfo/Asia/Istanbul.ics index 96cbdd678ef..e1b9f532118 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Istanbul.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Istanbul.ics @@ -1,22 +1,168 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Istanbul +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Istanbul X-LIC-LOCATION:Asia/Istanbul BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700329T010000 +DTSTART:19910331T030000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701025T020000 +DTSTART:19961027T040000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+015552 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+015552 +TZOFFSETTO:+015656 +TZNAME:IMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+015656 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19101001T000000 +RDATE:19101001T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19160501T000000 +RDATE:19160501T000000 +RDATE:19200328T000000 +RDATE:19210403T000000 +RDATE:19220326T000000 +RDATE:19240513T000000 +RDATE:19250501T000000 +RDATE:19400630T000000 +RDATE:19401201T000000 +RDATE:19420401T000000 +RDATE:19450402T000000 +RDATE:19460601T000000 +RDATE:19470420T000000 +RDATE:19480418T000000 +RDATE:19490410T000000 +RDATE:19500419T000000 +RDATE:19510422T000000 +RDATE:19620715T000000 +RDATE:19640515T000000 +RDATE:19700503T000000 +RDATE:19710502T000000 +RDATE:19720507T000000 +RDATE:19730603T010000 +RDATE:19740331T020000 +RDATE:19750330T000000 +RDATE:19760601T000000 +RDATE:19770403T000000 +RDATE:19780402T000000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19161001T000000 +RDATE:19161001T000000 +RDATE:19201025T000000 +RDATE:19211003T000000 +RDATE:19221008T000000 +RDATE:19241001T000000 +RDATE:19251001T000000 +RDATE:19401005T000000 +RDATE:19410921T000000 +RDATE:19421101T000000 +RDATE:19451008T000000 +RDATE:19461001T000000 +RDATE:19471005T000000 +RDATE:19481003T000000 +RDATE:19491002T000000 +RDATE:19501008T000000 +RDATE:19511008T000000 +RDATE:19621008T000000 +RDATE:19641001T000000 +RDATE:19701004T000000 +RDATE:19711003T000000 +RDATE:19721008T000000 +RDATE:19731104T030000 +RDATE:19741103T050000 +RDATE:19751026T000000 +RDATE:19761031T000000 +RDATE:19771016T000000 +RDATE:19850928T000000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T040000 +RDATE:19920927T040000 +RDATE:19930926T040000 +RDATE:19940925T040000 +RDATE:19950924T040000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0300 +TZNAME:TRT +DTSTART:19781015T000000 +RDATE:19781015T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:TRST +DTSTART:19790401T030000 +RDATE:19790401T030000 +RDATE:19800406T030000 +RDATE:19810329T030000 +RDATE:19820328T030000 +RDATE:19830731T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0300 +TZNAME:TRT +DTSTART:19791015T000000 +RDATE:19791015T000000 +RDATE:19801013T000000 +RDATE:19811012T000000 +RDATE:19821011T000000 +RDATE:19831002T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19850420T000000 +RDATE:19850420T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19860101T000000 +RDATE:19860101T000000 +RDATE:19910101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Jakarta.ics b/mozilla/calendar/libical/zoneinfo/Asia/Jakarta.ics index 3ef83a9f5f1..8a332d634aa 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Jakarta.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Jakarta.ics @@ -1,14 +1,71 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Jakarta +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Jakarta X-LIC-LOCATION:Asia/Jakarta BEGIN:STANDARD -TZOFFSETFROM:+0700 +TZOFFSETFROM:+0000 +TZOFFSETTO:+070712 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+070712 +TZOFFSETTO:+070712 +TZNAME:JMT +DTSTART:18670810T000000 +RDATE:18670810T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+070712 +TZOFFSETTO:+0720 +TZNAME:JAVT +DTSTART:19231231T234712 +RDATE:19231231T234712 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0720 +TZOFFSETTO:+0730 +TZNAME:WIT +DTSTART:19321101T000000 +RDATE:19321101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0730 +TZOFFSETTO:+0900 +TZNAME:JST +DTSTART:19420323T000000 +RDATE:19420323T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0730 +TZNAME:WIT +DTSTART:19450801T000000 +RDATE:19450801T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0730 +TZOFFSETTO:+0800 +TZNAME:WIT +DTSTART:19480501T000000 +RDATE:19480501T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0800 +TZOFFSETTO:+0730 +TZNAME:WIT +DTSTART:19500501T000000 +RDATE:19500501T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0730 TZOFFSETTO:+0700 TZNAME:WIT -DTSTART:19700101T000000 +DTSTART:19640101T000000 +RDATE:19640101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Jayapura.ics b/mozilla/calendar/libical/zoneinfo/Asia/Jayapura.ics index 4f458669088..2df4c4811f6 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Jayapura.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Jayapura.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Jayapura +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Jayapura X-LIC-LOCATION:Asia/Jayapura BEGIN:STANDARD -TZOFFSETFROM:+0900 +TZOFFSETFROM:+0000 +TZOFFSETTO:+092248 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+092248 TZOFFSETTO:+0900 TZNAME:EIT -DTSTART:19700101T000000 +DTSTART:19321101T000000 +RDATE:19321101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0930 +TZNAME:CST +DTSTART:19440101T000000 +RDATE:19440101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0930 +TZOFFSETTO:+0900 +TZNAME:EIT +DTSTART:19640101T000000 +RDATE:19640101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Jerusalem.ics b/mozilla/calendar/libical/zoneinfo/Asia/Jerusalem.ics index d4fc79ea9fe..8373e975d8b 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Jerusalem.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Jerusalem.ics @@ -1,14 +1,142 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Jerusalem +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Jerusalem X-LIC-LOCATION:Asia/Jerusalem -BEGIN:STANDARD +BEGIN:DAYLIGHT TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:IDT +DTSTART:20050401T010000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:IST -DTSTART:19700101T000000 +DTSTART:20051001T010000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=1 END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+022056 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+022056 +TZOFFSETTO:+022040 +TZNAME:JMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+022040 +TZOFFSETTO:+0200 +TZNAME:IST +DTSTART:19180101T000000 +RDATE:19180101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:IDT +DTSTART:19400601T000000 +RDATE:19400601T000000 +RDATE:19430401T020000 +RDATE:19440401T000000 +RDATE:19450416T000000 +RDATE:19460416T020000 +RDATE:19490501T000000 +RDATE:19500416T000000 +RDATE:19510401T000000 +RDATE:19520420T020000 +RDATE:19530412T020000 +RDATE:19540613T000000 +RDATE:19550611T020000 +RDATE:19560603T000000 +RDATE:19570429T020000 +RDATE:19740707T000000 +RDATE:19750420T000000 +RDATE:19850414T000000 +RDATE:19860518T000000 +RDATE:19870415T000000 +RDATE:19880409T000000 +RDATE:19890430T000000 +RDATE:19900325T000000 +RDATE:19910324T000000 +RDATE:19920329T000000 +RDATE:19930402T000000 +RDATE:19940401T000000 +RDATE:19950331T000000 +RDATE:19960315T000000 +RDATE:19970321T000000 +RDATE:19980320T000000 +RDATE:19990402T020000 +RDATE:20000414T020000 +RDATE:20010409T010000 +RDATE:20020329T010000 +RDATE:20030328T010000 +RDATE:20040407T010000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:IST +DTSTART:19421101T000000 +RDATE:19421101T000000 +RDATE:19431101T000000 +RDATE:19441101T000000 +RDATE:19451101T020000 +RDATE:19461101T000000 +RDATE:19481101T020000 +RDATE:19491101T020000 +RDATE:19500915T030000 +RDATE:19511111T030000 +RDATE:19521019T030000 +RDATE:19530913T030000 +RDATE:19540912T000000 +RDATE:19550911T000000 +RDATE:19560930T030000 +RDATE:19570922T000000 +RDATE:19741013T000000 +RDATE:19750831T000000 +RDATE:19850915T000000 +RDATE:19860907T000000 +RDATE:19870913T000000 +RDATE:19880903T000000 +RDATE:19890903T000000 +RDATE:19900826T000000 +RDATE:19910901T000000 +RDATE:19920906T000000 +RDATE:19930905T000000 +RDATE:19940828T000000 +RDATE:19950903T000000 +RDATE:19960916T000000 +RDATE:19970914T000000 +RDATE:19980906T000000 +RDATE:19990903T020000 +RDATE:20001006T010000 +RDATE:20010924T010000 +RDATE:20021007T010000 +RDATE:20031003T010000 +RDATE:20040922T010000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0400 +TZNAME:IDDT +DTSTART:19480523T000000 +RDATE:19480523T000000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:+0400 +TZOFFSETTO:+0300 +TZNAME:IDT +DTSTART:19480901T000000 +RDATE:19480901T000000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Kabul.ics b/mozilla/calendar/libical/zoneinfo/Asia/Kabul.ics index b95ab8524ed..c3421356ed5 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Kabul.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Kabul.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Kabul +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Kabul X-LIC-LOCATION:Asia/Kabul BEGIN:STANDARD -TZOFFSETFROM:+0430 +TZOFFSETFROM:+0000 +TZOFFSETTO:+043648 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+043648 +TZOFFSETTO:+0400 +TZNAME:AFT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0400 TZOFFSETTO:+0430 TZNAME:AFT -DTSTART:19700101T000000 +DTSTART:19450101T000000 +RDATE:19450101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Kamchatka.ics b/mozilla/calendar/libical/zoneinfo/Asia/Kamchatka.ics index 08fd8e0e64b..72c85b6a664 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Kamchatka.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Kamchatka.ics @@ -1,22 +1,95 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Kamchatka +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Kamchatka X-LIC-LOCATION:Asia/Kamchatka BEGIN:DAYLIGHT TZOFFSETFROM:+1200 TZOFFSETTO:+1300 TZNAME:PETST -DTSTART:19700329T020000 +DTSTART:19930328T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+1300 TZOFFSETTO:+1200 TZNAME:PETT -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+103436 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+103436 +TZOFFSETTO:+1100 +TZNAME:PETT +DTSTART:19221110T000000 +RDATE:19221110T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+1100 +TZOFFSETTO:+1200 +TZNAME:PETT +DTSTART:19300621T000000 +RDATE:19300621T000000 +RDATE:19920119T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1200 +TZOFFSETTO:+1300 +TZNAME:PETST +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +RDATE:19920328T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1300 +TZOFFSETTO:+1200 +TZNAME:PETT +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19920926T230000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1200 +TZOFFSETTO:+1200 +TZNAME:PETST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1200 +TZOFFSETTO:+1100 +TZNAME:PETT +DTSTART:19910929T030000 +RDATE:19910929T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Karachi.ics b/mozilla/calendar/libical/zoneinfo/Asia/Karachi.ics index 805b01bbf03..c9602402524 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Karachi.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Karachi.ics @@ -1,14 +1,50 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Karachi +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Karachi X-LIC-LOCATION:Asia/Karachi BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+042812 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+042812 +TZOFFSETTO:+0530 +TZNAME:IST +DTSTART:19070101T000000 +RDATE:19070101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0530 +TZOFFSETTO:+0630 +TZNAME:IST +DTSTART:19420901T000000 +RDATE:19420901T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0630 +TZOFFSETTO:+0530 +TZNAME:IST +DTSTART:19451015T000000 +RDATE:19451015T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0530 +TZOFFSETTO:+0500 +TZNAME:KART +DTSTART:19510930T000000 +RDATE:19510930T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+0500 TZOFFSETTO:+0500 TZNAME:PKT -DTSTART:19700101T000000 +DTSTART:19710326T000000 +RDATE:19710326T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Kashgar.ics b/mozilla/calendar/libical/zoneinfo/Asia/Kashgar.ics index 25dc7d37730..4d86e53d7fd 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Kashgar.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Kashgar.ics @@ -1,14 +1,60 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Kashgar +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Kashgar X-LIC-LOCATION:Asia/Kashgar BEGIN:STANDARD -TZOFFSETFROM:+0800 +TZOFFSETFROM:+0000 +TZOFFSETTO:+050356 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+050356 +TZOFFSETTO:+0530 +TZNAME:KAST +DTSTART:19280101T000000 +RDATE:19280101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0530 +TZOFFSETTO:+0500 +TZNAME:KAST +DTSTART:19400101T000000 +RDATE:19400101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0500 TZOFFSETTO:+0800 TZNAME:CST -DTSTART:19700101T000000 +DTSTART:19800501T000000 +RDATE:19800501T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0800 +TZOFFSETTO:+0900 +TZNAME:CDT +DTSTART:19860504T000000 +RDATE:19860504T000000 +RDATE:19870412T000000 +RDATE:19880410T000000 +RDATE:19890416T000000 +RDATE:19900415T000000 +RDATE:19910414T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0800 +TZNAME:CST +DTSTART:19860914T000000 +RDATE:19860914T000000 +RDATE:19870913T000000 +RDATE:19880911T000000 +RDATE:19890917T000000 +RDATE:19900916T000000 +RDATE:19910915T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Katmandu.ics b/mozilla/calendar/libical/zoneinfo/Asia/Katmandu.ics index c233d408413..6e5813e6c1f 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Katmandu.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Katmandu.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Katmandu +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Katmandu X-LIC-LOCATION:Asia/Katmandu BEGIN:STANDARD -TZOFFSETFROM:+0545 +TZOFFSETFROM:+0000 +TZOFFSETTO:+054116 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+054116 +TZOFFSETTO:+0530 +TZNAME:IST +DTSTART:19200101T000000 +RDATE:19200101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0530 TZOFFSETTO:+0545 TZNAME:NPT -DTSTART:19700101T000000 +DTSTART:19860101T000000 +RDATE:19860101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Krasnoyarsk.ics b/mozilla/calendar/libical/zoneinfo/Asia/Krasnoyarsk.ics index 50d129555e3..44c32337377 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Krasnoyarsk.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Krasnoyarsk.ics @@ -1,22 +1,95 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Krasnoyarsk +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Krasnoyarsk X-LIC-LOCATION:Asia/Krasnoyarsk BEGIN:DAYLIGHT TZOFFSETFROM:+0700 TZOFFSETTO:+0800 TZNAME:KRAST -DTSTART:19700329T020000 +DTSTART:19930328T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0800 TZOFFSETTO:+0700 TZNAME:KRAT -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+061120 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+061120 +TZOFFSETTO:+0600 +TZNAME:KRAT +DTSTART:19200106T000000 +RDATE:19200106T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0600 +TZOFFSETTO:+0700 +TZNAME:KRAT +DTSTART:19300621T000000 +RDATE:19300621T000000 +RDATE:19920119T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0700 +TZOFFSETTO:+0800 +TZNAME:KRAST +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +RDATE:19920328T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0800 +TZOFFSETTO:+0700 +TZNAME:KRAT +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19920926T230000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0700 +TZOFFSETTO:+0700 +TZNAME:KRAST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0700 +TZOFFSETTO:+0600 +TZNAME:KRAT +DTSTART:19910929T030000 +RDATE:19910929T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Kuala_Lumpur.ics b/mozilla/calendar/libical/zoneinfo/Asia/Kuala_Lumpur.ics index c38477d7db1..e9538d14828 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Kuala_Lumpur.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Kuala_Lumpur.ics @@ -1,14 +1,64 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Kuala_Lumpur +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Kuala_Lumpur X-LIC-LOCATION:Asia/Kuala_Lumpur BEGIN:STANDARD -TZOFFSETFROM:+0800 +TZOFFSETFROM:+0000 +TZOFFSETTO:+064648 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+064648 +TZOFFSETTO:+065524 +TZNAME:SMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+065524 +TZOFFSETTO:+0700 +TZNAME:MALT +DTSTART:19050601T000000 +RDATE:19050601T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0700 +TZOFFSETTO:+0720 +TZNAME:MALT +DTSTART:19330101T000000 +RDATE:19330101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0720 +TZOFFSETTO:+0900 +TZNAME:JST +DTSTART:19420215T000000 +RDATE:19420215T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0720 +TZNAME:MALT +DTSTART:19450902T000000 +RDATE:19450902T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0720 +TZOFFSETTO:+0730 +TZNAME:MALT +DTSTART:19500101T000000 +RDATE:19500101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0730 TZOFFSETTO:+0800 TZNAME:MYT -DTSTART:19700101T000000 +DTSTART:19820501T000000 +RDATE:19820501T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Kuching.ics b/mozilla/calendar/libical/zoneinfo/Asia/Kuching.ics index b00ca2a5a0f..abaae564cae 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Kuching.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Kuching.ics @@ -1,14 +1,76 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Kuching +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Kuching X-LIC-LOCATION:Asia/Kuching BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+072120 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+072120 +TZOFFSETTO:+0730 +TZNAME:BORT +DTSTART:19260301T000000 +RDATE:19260301T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0730 +TZOFFSETTO:+0800 +TZNAME:BORT +DTSTART:19330101T000000 +RDATE:19330101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0800 +TZOFFSETTO:+0820 +TZNAME:BORTST +DTSTART:19350914T000000 +RDATE:19350914T000000 +RDATE:19360914T000000 +RDATE:19370914T000000 +RDATE:19380914T000000 +RDATE:19390914T000000 +RDATE:19400914T000000 +RDATE:19410914T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0820 +TZOFFSETTO:+0800 +TZNAME:BORT +DTSTART:19351214T000000 +RDATE:19351214T000000 +RDATE:19361214T000000 +RDATE:19371214T000000 +RDATE:19381214T000000 +RDATE:19391214T000000 +RDATE:19401214T000000 +RDATE:19411214T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0800 +TZOFFSETTO:+0900 +TZNAME:JST +DTSTART:19420101T000000 +RDATE:19420101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0800 +TZNAME:BORT +DTSTART:19450902T000000 +RDATE:19450902T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+0800 TZOFFSETTO:+0800 TZNAME:MYT -DTSTART:19700101T000000 +DTSTART:19820501T000000 +RDATE:19820501T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Kuwait.ics b/mozilla/calendar/libical/zoneinfo/Asia/Kuwait.ics index 4768a289b13..b9939e52f43 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Kuwait.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Kuwait.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Kuwait +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Kuwait X-LIC-LOCATION:Asia/Kuwait BEGIN:STANDARD -TZOFFSETFROM:+0300 +TZOFFSETFROM:+0000 +TZOFFSETTO:+031156 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+031156 TZOFFSETTO:+0300 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:19500101T000000 +RDATE:19500101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Macau.ics b/mozilla/calendar/libical/zoneinfo/Asia/Macau.ics deleted file mode 100644 index da232269b6d..00000000000 --- a/mozilla/calendar/libical/zoneinfo/Asia/Macau.ics +++ /dev/null @@ -1,14 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Macau -X-LIC-LOCATION:Asia/Macau -BEGIN:STANDARD -TZOFFSETFROM:+0800 -TZOFFSETTO:+0800 -TZNAME:CST -DTSTART:19700101T000000 -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Magadan.ics b/mozilla/calendar/libical/zoneinfo/Asia/Magadan.ics index e5ed6317d91..33e2d5f6b39 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Magadan.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Magadan.ics @@ -1,22 +1,95 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Magadan +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Magadan X-LIC-LOCATION:Asia/Magadan BEGIN:DAYLIGHT TZOFFSETFROM:+1100 TZOFFSETTO:+1200 TZNAME:MAGST -DTSTART:19700329T020000 +DTSTART:19930328T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+1200 TZOFFSETTO:+1100 TZNAME:MAGT -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+100312 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+100312 +TZOFFSETTO:+1000 +TZNAME:MAGT +DTSTART:19240502T000000 +RDATE:19240502T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+1000 +TZOFFSETTO:+1100 +TZNAME:MAGT +DTSTART:19300621T000000 +RDATE:19300621T000000 +RDATE:19920119T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1100 +TZOFFSETTO:+1200 +TZNAME:MAGST +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +RDATE:19920328T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1200 +TZOFFSETTO:+1100 +TZNAME:MAGT +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19920926T230000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1100 +TZOFFSETTO:+1100 +TZNAME:MAGST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1100 +TZOFFSETTO:+1000 +TZNAME:MAGT +DTSTART:19910929T030000 +RDATE:19910929T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Makassar.ics b/mozilla/calendar/libical/zoneinfo/Asia/Makassar.ics deleted file mode 100644 index 5d04549f322..00000000000 --- a/mozilla/calendar/libical/zoneinfo/Asia/Makassar.ics +++ /dev/null @@ -1,14 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Makassar -X-LIC-LOCATION:Asia/Makassar -BEGIN:STANDARD -TZOFFSETFROM:+0800 -TZOFFSETTO:+0800 -TZNAME:CIT -DTSTART:19700101T000000 -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Manila.ics b/mozilla/calendar/libical/zoneinfo/Asia/Manila.ics index 048208a248c..a6f73dbc8d8 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Manila.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Manila.ics @@ -1,14 +1,55 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Manila +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Manila X-LIC-LOCATION:Asia/Manila BEGIN:STANDARD -TZOFFSETFROM:+0800 +TZOFFSETFROM:+0000 +TZOFFSETTO:-1556 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-1556 +TZOFFSETTO:+0804 +TZNAME:LMT +DTSTART:18441231T000000 +RDATE:18441231T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0804 TZOFFSETTO:+0800 TZNAME:PHT -DTSTART:19700101T000000 +DTSTART:18990511T000000 +RDATE:18990511T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0800 +TZOFFSETTO:+0900 +TZNAME:PHST +DTSTART:19361101T000000 +RDATE:19361101T000000 +RDATE:19540412T000000 +RDATE:19780322T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0800 +TZNAME:PHT +DTSTART:19370201T000000 +RDATE:19370201T000000 +RDATE:19441101T000000 +RDATE:19540701T000000 +RDATE:19780921T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0800 +TZOFFSETTO:+0900 +TZNAME:JST +DTSTART:19420501T000000 +RDATE:19420501T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Muscat.ics b/mozilla/calendar/libical/zoneinfo/Asia/Muscat.ics index 8b32fe2d0d7..f739fc2c11a 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Muscat.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Muscat.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Muscat +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Muscat X-LIC-LOCATION:Asia/Muscat BEGIN:STANDARD -TZOFFSETFROM:+0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:+035420 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+035420 TZOFFSETTO:+0400 TZNAME:GST -DTSTART:19700101T000000 +DTSTART:19200101T000000 +RDATE:19200101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Nicosia.ics b/mozilla/calendar/libical/zoneinfo/Asia/Nicosia.ics index ab9bf56a4dd..c707221fb19 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Nicosia.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Nicosia.ics @@ -1,22 +1,103 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Nicosia +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Nicosia X-LIC-LOCATION:Asia/Nicosia +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19990328T030000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701025T040000 +DTSTART:19991031T040000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+021328 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+021328 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19211114T000000 +RDATE:19211114T000000 +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700329T030000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +DTSTART:19750413T000000 +RDATE:19750413T000000 +RDATE:19760515T000000 +RDATE:19770403T000000 +RDATE:19780402T000000 +RDATE:19790401T000000 +RDATE:19800406T000000 +RDATE:19810329T000000 +RDATE:19820328T000000 +RDATE:19830327T000000 +RDATE:19840325T000000 +RDATE:19850331T000000 +RDATE:19860330T000000 +RDATE:19870329T000000 +RDATE:19880327T000000 +RDATE:19890326T000000 +RDATE:19900325T000000 +RDATE:19910331T000000 +RDATE:19920329T000000 +RDATE:19930328T000000 +RDATE:19940327T000000 +RDATE:19950326T000000 +RDATE:19960331T000000 +RDATE:19970330T000000 +RDATE:19980329T000000 END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19751012T000000 +RDATE:19751012T000000 +RDATE:19761011T000000 +RDATE:19770925T000000 +RDATE:19781002T000000 +RDATE:19790930T000000 +RDATE:19800928T000000 +RDATE:19810927T000000 +RDATE:19820926T000000 +RDATE:19830925T000000 +RDATE:19840930T000000 +RDATE:19850929T000000 +RDATE:19860928T000000 +RDATE:19870927T000000 +RDATE:19880925T000000 +RDATE:19890924T000000 +RDATE:19900930T000000 +RDATE:19910929T000000 +RDATE:19920927T000000 +RDATE:19930926T000000 +RDATE:19940925T000000 +RDATE:19950924T000000 +RDATE:19960929T000000 +RDATE:19970928T000000 +RDATE:19980901T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19981025T030000 +RDATE:19981025T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Novosibirsk.ics b/mozilla/calendar/libical/zoneinfo/Asia/Novosibirsk.ics index d0336db07f6..dc08d6eea5b 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Novosibirsk.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Novosibirsk.ics @@ -1,22 +1,109 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Novosibirsk +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Novosibirsk X-LIC-LOCATION:Asia/Novosibirsk BEGIN:DAYLIGHT TZOFFSETFROM:+0600 TZOFFSETTO:+0700 TZNAME:NOVST -DTSTART:19700329T020000 +DTSTART:19940327T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0700 TZOFFSETTO:+0600 TZNAME:NOVT -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+053140 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+053140 +TZOFFSETTO:+0600 +TZNAME:NOVT +DTSTART:19191214T060000 +RDATE:19191214T060000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0600 +TZOFFSETTO:+0700 +TZNAME:NOVT +DTSTART:19300621T000000 +RDATE:19300621T000000 +RDATE:19920119T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0700 +TZOFFSETTO:+0800 +TZNAME:NOVST +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +RDATE:19920328T230000 +RDATE:19930328T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0800 +TZOFFSETTO:+0700 +TZNAME:NOVT +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19920926T230000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0700 +TZOFFSETTO:+0700 +TZNAME:NOVST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0700 +TZOFFSETTO:+0600 +TZNAME:NOVT +DTSTART:19910929T030000 +RDATE:19910929T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0800 +TZOFFSETTO:+0600 +TZNAME:NOVT +DTSTART:19930523T000000 +RDATE:19930523T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0600 +TZOFFSETTO:+0600 +TZNAME:NOVT +DTSTART:19930926T020000 +RDATE:19930926T020000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Omsk.ics b/mozilla/calendar/libical/zoneinfo/Asia/Omsk.ics index 740b9a0f869..cef8ad7d75d 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Omsk.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Omsk.ics @@ -1,22 +1,95 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Omsk +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Omsk X-LIC-LOCATION:Asia/Omsk BEGIN:DAYLIGHT TZOFFSETFROM:+0600 TZOFFSETTO:+0700 TZNAME:OMSST -DTSTART:19700329T020000 +DTSTART:19930328T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0700 TZOFFSETTO:+0600 TZNAME:OMST -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+045336 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+045336 +TZOFFSETTO:+0500 +TZNAME:OMST +DTSTART:19191114T000000 +RDATE:19191114T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0500 +TZOFFSETTO:+0600 +TZNAME:OMST +DTSTART:19300621T000000 +RDATE:19300621T000000 +RDATE:19920119T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0600 +TZOFFSETTO:+0700 +TZNAME:OMSST +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +RDATE:19920328T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0700 +TZOFFSETTO:+0600 +TZNAME:OMST +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19920926T230000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0600 +TZOFFSETTO:+0600 +TZNAME:OMSST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0600 +TZOFFSETTO:+0500 +TZNAME:OMST +DTSTART:19910929T030000 +RDATE:19910929T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Oral.ics b/mozilla/calendar/libical/zoneinfo/Asia/Oral.ics deleted file mode 100644 index 07d0bc8dbe4..00000000000 --- a/mozilla/calendar/libical/zoneinfo/Asia/Oral.ics +++ /dev/null @@ -1,14 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Oral -X-LIC-LOCATION:Asia/Oral -BEGIN:STANDARD -TZOFFSETFROM:+0500 -TZOFFSETTO:+0500 -TZNAME:ORAT -DTSTART:19700101T000000 -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Phnom_Penh.ics b/mozilla/calendar/libical/zoneinfo/Asia/Phnom_Penh.ics index 41ea6a051bb..961d2d7591f 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Phnom_Penh.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Phnom_Penh.ics @@ -1,14 +1,43 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Phnom_Penh +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Phnom_Penh X-LIC-LOCATION:Asia/Phnom_Penh BEGIN:STANDARD -TZOFFSETFROM:+0700 +TZOFFSETFROM:+0000 +TZOFFSETTO:+065940 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+065940 +TZOFFSETTO:+070620 +TZNAME:SMT +DTSTART:19060609T000000 +RDATE:19060609T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+070620 TZOFFSETTO:+0700 TZNAME:ICT -DTSTART:19700101T000000 +DTSTART:19110311T000100 +RDATE:19110311T000100 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0700 +TZOFFSETTO:+0800 +TZNAME:ICT +DTSTART:19120501T000000 +RDATE:19120501T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0800 +TZOFFSETTO:+0700 +TZNAME:ICT +DTSTART:19310501T000000 +RDATE:19310501T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Pontianak.ics b/mozilla/calendar/libical/zoneinfo/Asia/Pontianak.ics index 74276b9983a..961ea325652 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Pontianak.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Pontianak.ics @@ -1,14 +1,71 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Pontianak +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Pontianak X-LIC-LOCATION:Asia/Pontianak BEGIN:STANDARD -TZOFFSETFROM:+0700 +TZOFFSETFROM:+0000 +TZOFFSETTO:+071720 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+071720 +TZOFFSETTO:+071720 +TZNAME:PMT +DTSTART:19080501T000000 +RDATE:19080501T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+071720 +TZOFFSETTO:+0730 +TZNAME:WIT +DTSTART:19321101T000000 +RDATE:19321101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0730 +TZOFFSETTO:+0900 +TZNAME:JST +DTSTART:19420129T000000 +RDATE:19420129T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0730 +TZNAME:WIT +DTSTART:19450801T000000 +RDATE:19450801T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0730 +TZOFFSETTO:+0800 +TZNAME:WIT +DTSTART:19480501T000000 +RDATE:19480501T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0800 +TZOFFSETTO:+0730 +TZNAME:WIT +DTSTART:19500501T000000 +RDATE:19500501T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0730 +TZOFFSETTO:+0800 +TZNAME:CIT +DTSTART:19640101T000000 +RDATE:19640101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0800 TZOFFSETTO:+0700 TZNAME:WIT -DTSTART:19700101T000000 +DTSTART:19880101T000000 +RDATE:19880101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Pyongyang.ics b/mozilla/calendar/libical/zoneinfo/Asia/Pyongyang.ics index f98f4987ba6..5dc01308c3e 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Pyongyang.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Pyongyang.ics @@ -1,14 +1,51 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Pyongyang +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Pyongyang X-LIC-LOCATION:Asia/Pyongyang BEGIN:STANDARD -TZOFFSETFROM:+0900 +TZOFFSETFROM:+0000 +TZOFFSETTO:+0823 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0823 +TZOFFSETTO:+0830 +TZNAME:KST +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0830 TZOFFSETTO:+0900 TZNAME:KST -DTSTART:19700101T000000 +DTSTART:19041201T000000 +RDATE:19041201T000000 +RDATE:19320101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0830 +TZNAME:KST +DTSTART:19280101T000000 +RDATE:19280101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0800 +TZNAME:KST +DTSTART:19540321T000000 +RDATE:19540321T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0800 +TZOFFSETTO:+0900 +TZNAME:KST +DTSTART:19610810T000000 +RDATE:19610810T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Qatar.ics b/mozilla/calendar/libical/zoneinfo/Asia/Qatar.ics index d3b94953ad2..9b9d625d1d1 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Qatar.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Qatar.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Qatar +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Qatar X-LIC-LOCATION:Asia/Qatar BEGIN:STANDARD -TZOFFSETFROM:+0300 +TZOFFSETFROM:+0000 +TZOFFSETTO:+032608 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+032608 +TZOFFSETTO:+0400 +TZNAME:GST +DTSTART:19200101T000000 +RDATE:19200101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0400 TZOFFSETTO:+0300 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:19720601T000000 +RDATE:19720601T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Qyzylorda.ics b/mozilla/calendar/libical/zoneinfo/Asia/Qyzylorda.ics deleted file mode 100644 index 833abd8c65e..00000000000 --- a/mozilla/calendar/libical/zoneinfo/Asia/Qyzylorda.ics +++ /dev/null @@ -1,14 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Qyzylorda -X-LIC-LOCATION:Asia/Qyzylorda -BEGIN:STANDARD -TZOFFSETFROM:+0600 -TZOFFSETTO:+0600 -TZNAME:QYZT -DTSTART:19700101T000000 -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Rangoon.ics b/mozilla/calendar/libical/zoneinfo/Asia/Rangoon.ics index 454bec46495..081a2b541e2 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Rangoon.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Rangoon.ics @@ -1,14 +1,43 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Rangoon +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Rangoon X-LIC-LOCATION:Asia/Rangoon BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+062440 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+062440 +TZOFFSETTO:+062436 +TZNAME:RMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+062436 +TZOFFSETTO:+0630 +TZNAME:BURT +DTSTART:19200101T000000 +RDATE:19200101T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+0630 +TZOFFSETTO:+0900 +TZNAME:JST +DTSTART:19420501T000000 +RDATE:19420501T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0900 TZOFFSETTO:+0630 TZNAME:MMT -DTSTART:19700101T000000 +DTSTART:19450503T000000 +RDATE:19450503T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Riyadh.ics b/mozilla/calendar/libical/zoneinfo/Asia/Riyadh.ics index 09bf03ab209..123b053a4d8 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Riyadh.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Riyadh.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Riyadh +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Riyadh X-LIC-LOCATION:Asia/Riyadh BEGIN:STANDARD -TZOFFSETFROM:+0300 +TZOFFSETFROM:+0000 +TZOFFSETTO:+030652 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+030652 TZOFFSETTO:+0300 TZNAME:AST -DTSTART:19700101T000000 +DTSTART:19500101T000000 +RDATE:19500101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Saigon.ics b/mozilla/calendar/libical/zoneinfo/Asia/Saigon.ics index 18b094a9f6c..c7f65ce3989 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Saigon.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Saigon.ics @@ -1,14 +1,43 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Saigon +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Saigon X-LIC-LOCATION:Asia/Saigon BEGIN:STANDARD -TZOFFSETFROM:+0700 +TZOFFSETFROM:+0000 +TZOFFSETTO:+070640 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+070640 +TZOFFSETTO:+070620 +TZNAME:SMT +DTSTART:19060609T000000 +RDATE:19060609T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+070620 TZOFFSETTO:+0700 TZNAME:ICT -DTSTART:19700101T000000 +DTSTART:19110311T000100 +RDATE:19110311T000100 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0700 +TZOFFSETTO:+0800 +TZNAME:ICT +DTSTART:19120501T000000 +RDATE:19120501T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0800 +TZOFFSETTO:+0700 +TZNAME:ICT +DTSTART:19310501T000000 +RDATE:19310501T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Sakhalin.ics b/mozilla/calendar/libical/zoneinfo/Asia/Sakhalin.ics deleted file mode 100644 index 0f8b735a7f3..00000000000 --- a/mozilla/calendar/libical/zoneinfo/Asia/Sakhalin.ics +++ /dev/null @@ -1,22 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Sakhalin -X-LIC-LOCATION:Asia/Sakhalin -BEGIN:STANDARD -TZOFFSETFROM:+1100 -TZOFFSETTO:+1000 -TZNAME:SAKT -DTSTART:19701025T030000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU -END:STANDARD -BEGIN:DAYLIGHT -TZOFFSETFROM:+1000 -TZOFFSETTO:+1100 -TZNAME:SAKST -DTSTART:19700329T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:DAYLIGHT -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Samarkand.ics b/mozilla/calendar/libical/zoneinfo/Asia/Samarkand.ics index 13f680935a9..c7594df4525 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Samarkand.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Samarkand.ics @@ -1,14 +1,104 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Samarkand +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Samarkand X-LIC-LOCATION:Asia/Samarkand BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+042712 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+042712 +TZOFFSETTO:+0400 +TZNAME:SAMT +DTSTART:19240502T000000 +RDATE:19240502T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0500 +TZNAME:SAMT +DTSTART:19300621T000000 +RDATE:19300621T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0500 +TZOFFSETTO:+0600 +TZNAME:SAMST +DTSTART:19810401T000000 +RDATE:19810401T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0600 +TZOFFSETTO:+0600 +TZNAME:TAST +DTSTART:19811001T000000 +RDATE:19811001T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0600 +TZOFFSETTO:+0700 +TZNAME:TASST +DTSTART:19820401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0700 +TZOFFSETTO:+0600 +TZNAME:TAST +DTSTART:19821001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0600 +TZOFFSETTO:+0600 +TZNAME:TASST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0600 +TZOFFSETTO:+0500 +TZNAME:UZT +DTSTART:19910901T000000 +RDATE:19910901T000000 +RDATE:19920926T230000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+0500 TZOFFSETTO:+0500 TZNAME:UZT -DTSTART:19700101T000000 +DTSTART:19910929T020000 +RDATE:19910929T020000 +RDATE:19920101T000000 +RDATE:19930101T000000 END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0500 +TZOFFSETTO:+0600 +TZNAME:UZST +DTSTART:19920328T230000 +RDATE:19920328T230000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Seoul.ics b/mozilla/calendar/libical/zoneinfo/Asia/Seoul.ics index 87c85cb8bfd..4ff82d7a2f9 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Seoul.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Seoul.ics @@ -1,14 +1,76 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Seoul +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Seoul X-LIC-LOCATION:Asia/Seoul BEGIN:STANDARD -TZOFFSETFROM:+0900 +TZOFFSETFROM:+0000 +TZOFFSETTO:+082752 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+082752 +TZOFFSETTO:+0830 +TZNAME:KST +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0830 TZOFFSETTO:+0900 TZNAME:KST -DTSTART:19700101T000000 +DTSTART:19041201T000000 +RDATE:19041201T000000 +RDATE:19320101T000000 +RDATE:19681001T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0830 +TZNAME:KST +DTSTART:19280101T000000 +RDATE:19280101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0800 +TZNAME:KST +DTSTART:19540321T000000 +RDATE:19540321T000000 +RDATE:19600913T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0800 +TZOFFSETTO:+0900 +TZNAME:KDT +DTSTART:19600515T000000 +RDATE:19600515T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0800 +TZOFFSETTO:+0830 +TZNAME:KST +DTSTART:19610810T000000 +RDATE:19610810T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0900 +TZOFFSETTO:+1000 +TZNAME:KDT +DTSTART:19870510T000000 +RDATE:19870510T000000 +RDATE:19880508T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1000 +TZOFFSETTO:+0900 +TZNAME:KST +DTSTART:19871011T000000 +RDATE:19871011T000000 +RDATE:19881009T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Shanghai.ics b/mozilla/calendar/libical/zoneinfo/Asia/Shanghai.ics index f8761eb241e..8db361e135e 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Shanghai.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Shanghai.ics @@ -1,14 +1,57 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Shanghai +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Shanghai X-LIC-LOCATION:Asia/Shanghai BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+080552 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+080552 +TZOFFSETTO:+0800 +TZNAME:CST +DTSTART:19280101T000000 +RDATE:19280101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0800 +TZOFFSETTO:+0900 +TZNAME:CDT +DTSTART:19400603T000000 +RDATE:19400603T000000 +RDATE:19410316T000000 +RDATE:19860504T000000 +RDATE:19870412T000000 +RDATE:19880410T000000 +RDATE:19890416T000000 +RDATE:19900415T000000 +RDATE:19910414T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0800 +TZNAME:CST +DTSTART:19401001T000000 +RDATE:19401001T000000 +RDATE:19411001T000000 +RDATE:19860914T000000 +RDATE:19870913T000000 +RDATE:19880911T000000 +RDATE:19890917T000000 +RDATE:19900916T000000 +RDATE:19910915T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+0800 TZOFFSETTO:+0800 TZNAME:CST -DTSTART:19700101T000000 +DTSTART:19490101T000000 +RDATE:19490101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Singapore.ics b/mozilla/calendar/libical/zoneinfo/Asia/Singapore.ics index 0ce1d9baedb..ba31913ff52 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Singapore.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Singapore.ics @@ -1,14 +1,71 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Singapore +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Singapore X-LIC-LOCATION:Asia/Singapore BEGIN:STANDARD -TZOFFSETFROM:+0800 +TZOFFSETFROM:+0000 +TZOFFSETTO:+065524 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+065524 +TZOFFSETTO:+065524 +TZNAME:SMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+065524 +TZOFFSETTO:+0700 +TZNAME:MALT +DTSTART:19050601T000000 +RDATE:19050601T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0700 +TZOFFSETTO:+0720 +TZNAME:MALT +DTSTART:19330101T000000 +RDATE:19330101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0720 +TZOFFSETTO:+0900 +TZNAME:JST +DTSTART:19420215T000000 +RDATE:19420215T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0720 +TZNAME:MALT +DTSTART:19450902T000000 +RDATE:19450902T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0720 +TZOFFSETTO:+0730 +TZNAME:MALT +DTSTART:19500101T000000 +RDATE:19500101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0730 +TZOFFSETTO:+0730 +TZNAME:SGT +DTSTART:19650809T000000 +RDATE:19650809T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0730 TZOFFSETTO:+0800 TZNAME:SGT -DTSTART:19700101T000000 +DTSTART:19820501T000000 +RDATE:19820501T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Taipei.ics b/mozilla/calendar/libical/zoneinfo/Asia/Taipei.ics index 21988553c33..1b62a61acfb 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Taipei.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Taipei.ics @@ -1,14 +1,74 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Taipei +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Taipei X-LIC-LOCATION:Asia/Taipei BEGIN:STANDARD -TZOFFSETFROM:+0800 +TZOFFSETFROM:+0000 +TZOFFSETTO:+0806 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0806 TZOFFSETTO:+0800 TZNAME:CST -DTSTART:19700101T000000 +DTSTART:18960101T000000 +RDATE:18960101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0800 +TZOFFSETTO:+0900 +TZNAME:CDT +DTSTART:19450501T000000 +RDATE:19450501T000000 +RDATE:19460501T000000 +RDATE:19470501T000000 +RDATE:19480501T000000 +RDATE:19490501T000000 +RDATE:19500501T000000 +RDATE:19510501T000000 +RDATE:19520301T000000 +RDATE:19530401T000000 +RDATE:19540401T000000 +RDATE:19550401T000000 +RDATE:19560401T000000 +RDATE:19570401T000000 +RDATE:19580401T000000 +RDATE:19590401T000000 +RDATE:19600601T000000 +RDATE:19610601T000000 +RDATE:19740401T000000 +RDATE:19750401T000000 +RDATE:19800630T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0800 +TZNAME:CST +DTSTART:19451001T000000 +RDATE:19451001T000000 +RDATE:19461001T000000 +RDATE:19471001T000000 +RDATE:19481001T000000 +RDATE:19491001T000000 +RDATE:19501001T000000 +RDATE:19511001T000000 +RDATE:19521101T000000 +RDATE:19531101T000000 +RDATE:19541101T000000 +RDATE:19551001T000000 +RDATE:19561001T000000 +RDATE:19571001T000000 +RDATE:19581001T000000 +RDATE:19591001T000000 +RDATE:19601001T000000 +RDATE:19611001T000000 +RDATE:19741001T000000 +RDATE:19751001T000000 +RDATE:19800930T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Tashkent.ics b/mozilla/calendar/libical/zoneinfo/Asia/Tashkent.ics index 671865c2391..5fa6e3c507b 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Tashkent.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Tashkent.ics @@ -1,14 +1,92 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Tashkent +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Tashkent X-LIC-LOCATION:Asia/Tashkent BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+043712 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+043712 +TZOFFSETTO:+0500 +TZNAME:TAST +DTSTART:19240502T000000 +RDATE:19240502T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0500 +TZOFFSETTO:+0600 +TZNAME:TAST +DTSTART:19300621T000000 +RDATE:19300621T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0600 +TZOFFSETTO:+0700 +TZNAME:TASST +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0700 +TZOFFSETTO:+0600 +TZNAME:TAST +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0600 +TZOFFSETTO:+0600 +TZNAME:TASST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0600 +TZOFFSETTO:+0500 +TZNAME:UZT +DTSTART:19910901T000000 +RDATE:19910901T000000 +RDATE:19920926T230000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+0500 TZOFFSETTO:+0500 TZNAME:UZT -DTSTART:19700101T000000 +DTSTART:19910929T020000 +RDATE:19910929T020000 +RDATE:19920101T000000 +RDATE:19930101T000000 END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0500 +TZOFFSETTO:+0600 +TZNAME:UZST +DTSTART:19920328T230000 +RDATE:19920328T230000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Tbilisi.ics b/mozilla/calendar/libical/zoneinfo/Asia/Tbilisi.ics index bf7cbd9f540..c3309c6d341 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Tbilisi.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Tbilisi.ics @@ -1,14 +1,145 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Tbilisi +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Tbilisi X-LIC-LOCATION:Asia/Tbilisi BEGIN:STANDARD +TZOFFSETFROM:+0500 +TZOFFSETTO:+0400 +TZNAME:GET +DTSTART:19971026T000000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0400 +TZOFFSETTO:+0500 +TZNAME:GEST +DTSTART:19980329T000000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+025916 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+025916 +TZOFFSETTO:+025916 +TZNAME:TBMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+025916 +TZOFFSETTO:+0300 +TZNAME:TBIT +DTSTART:19240502T000000 +RDATE:19240502T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:TBIT +DTSTART:19570301T000000 +RDATE:19570301T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0400 +TZOFFSETTO:+0500 +TZNAME:TBIST +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0500 +TZOFFSETTO:+0400 +TZNAME:TBIT +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0400 +TZOFFSETTO:+0400 +TZNAME:TBIST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0300 +TZNAME:GET +DTSTART:19910409T000000 +RDATE:19910409T000000 +RDATE:19920927T000000 +RDATE:19930926T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0300 +TZNAME:GET +DTSTART:19910929T020000 +RDATE:19910929T020000 +RDATE:19920101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:GEST +DTSTART:19920329T000000 +RDATE:19920329T000000 +RDATE:19930328T000000 +RDATE:19940327T000000 +END:DAYLIGHT +BEGIN:STANDARD TZOFFSETFROM:+0400 TZOFFSETTO:+0400 TZNAME:GET -DTSTART:19700101T000000 +DTSTART:19940925T000000 +RDATE:19940925T000000 END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0400 +TZOFFSETTO:+0500 +TZNAME:GEST +DTSTART:19950326T000000 +RDATE:19950326T000000 +RDATE:19960331T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0500 +TZOFFSETTO:+0400 +TZNAME:GET +DTSTART:19950924T000000 +RDATE:19950924T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0500 +TZOFFSETTO:+0500 +TZNAME:GEST +DTSTART:19961027T000000 +RDATE:19961027T000000 +RDATE:19970330T000000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Tehran.ics b/mozilla/calendar/libical/zoneinfo/Asia/Tehran.ics index ba86b920961..1eaae29f859 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Tehran.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Tehran.ics @@ -1,14 +1,167 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Tehran +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Tehran X-LIC-LOCATION:Asia/Tehran BEGIN:STANDARD -TZOFFSETFROM:+0330 +TZOFFSETFROM:+0000 +TZOFFSETTO:+032544 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+032544 +TZOFFSETTO:+032544 +TZNAME:TMT +DTSTART:19160101T000000 +RDATE:19160101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+032544 TZOFFSETTO:+0330 +TZNAME:IRT +DTSTART:19460101T000000 +RDATE:19460101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0330 +TZOFFSETTO:+0400 +TZNAME:IRT +DTSTART:19771101T000000 +RDATE:19771101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0400 +TZOFFSETTO:+0500 TZNAME:IRST -DTSTART:19700101T000000 +DTSTART:19780321T000000 +RDATE:19780321T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0500 +TZOFFSETTO:+0400 +TZNAME:IRT +DTSTART:19781021T000000 +RDATE:19781021T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0330 +TZNAME:IRT +DTSTART:19790101T000000 +RDATE:19790101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0330 +TZOFFSETTO:+0430 +TZNAME:IRST +DTSTART:19790321T000000 +RDATE:19790321T000000 +RDATE:19800321T000000 +RDATE:19910503T000000 +RDATE:19920321T000000 +RDATE:19930321T000000 +RDATE:19940321T000000 +RDATE:19950321T000000 +RDATE:19960320T000000 +RDATE:19970321T000000 +RDATE:19980321T000000 +RDATE:19990321T000000 +RDATE:20000320T000000 +RDATE:20010321T000000 +RDATE:20020321T000000 +RDATE:20030321T000000 +RDATE:20040320T000000 +RDATE:20050321T000000 +RDATE:20060321T000000 +RDATE:20070321T000000 +RDATE:20080320T000000 +RDATE:20090321T000000 +RDATE:20100321T000000 +RDATE:20110321T000000 +RDATE:20120320T000000 +RDATE:20130321T000000 +RDATE:20140321T000000 +RDATE:20150321T000000 +RDATE:20160320T000000 +RDATE:20170321T000000 +RDATE:20180321T000000 +RDATE:20190321T000000 +RDATE:20200320T000000 +RDATE:20210321T000000 +RDATE:20220321T000000 +RDATE:20230321T000000 +RDATE:20240320T000000 +RDATE:20250320T000000 +RDATE:20260321T000000 +RDATE:20270321T000000 +RDATE:20280320T000000 +RDATE:20290320T000000 +RDATE:20300321T000000 +RDATE:20310321T000000 +RDATE:20320320T000000 +RDATE:20330320T000000 +RDATE:20340321T000000 +RDATE:20350321T000000 +RDATE:20360320T000000 +RDATE:20370320T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0430 +TZOFFSETTO:+0330 +TZNAME:IRT +DTSTART:19790919T000000 +RDATE:19790919T000000 +RDATE:19800923T000000 +RDATE:19910920T010000 +RDATE:19920923T000000 +RDATE:19930923T000000 +RDATE:19940923T000000 +RDATE:19950923T000000 +RDATE:19960922T000000 +RDATE:19970923T000000 +RDATE:19980923T000000 +RDATE:19990923T000000 +RDATE:20000922T000000 +RDATE:20010923T000000 +RDATE:20020923T000000 +RDATE:20030923T000000 +RDATE:20040922T000000 +RDATE:20050923T000000 +RDATE:20060923T000000 +RDATE:20070923T000000 +RDATE:20080922T000000 +RDATE:20090923T000000 +RDATE:20100923T000000 +RDATE:20110923T000000 +RDATE:20120922T000000 +RDATE:20130923T000000 +RDATE:20140923T000000 +RDATE:20150923T000000 +RDATE:20160922T000000 +RDATE:20170923T000000 +RDATE:20180923T000000 +RDATE:20190923T000000 +RDATE:20200922T000000 +RDATE:20210923T000000 +RDATE:20220923T000000 +RDATE:20230923T000000 +RDATE:20240922T000000 +RDATE:20250922T000000 +RDATE:20260923T000000 +RDATE:20270923T000000 +RDATE:20280922T000000 +RDATE:20290922T000000 +RDATE:20300923T000000 +RDATE:20310923T000000 +RDATE:20320922T000000 +RDATE:20330922T000000 +RDATE:20340923T000000 +RDATE:20350923T000000 +RDATE:20360922T000000 +RDATE:20370922T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Thimphu.ics b/mozilla/calendar/libical/zoneinfo/Asia/Thimphu.ics index f0b06daea0e..995413296b0 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Thimphu.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Thimphu.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Thimphu +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Thimphu X-LIC-LOCATION:Asia/Thimphu BEGIN:STANDARD -TZOFFSETFROM:+0600 +TZOFFSETFROM:+0000 +TZOFFSETTO:+055836 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+055836 +TZOFFSETTO:+0530 +TZNAME:IST +DTSTART:19470815T000000 +RDATE:19470815T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0530 TZOFFSETTO:+0600 TZNAME:BTT -DTSTART:19700101T000000 +DTSTART:19871001T000000 +RDATE:19871001T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Tokyo.ics b/mozilla/calendar/libical/zoneinfo/Asia/Tokyo.ics index c62fc37a34f..ede1cce75ab 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Tokyo.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Tokyo.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Tokyo +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Tokyo X-LIC-LOCATION:Asia/Tokyo BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+091859 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+091859 +TZOFFSETTO:+0900 +TZNAME:JST +DTSTART:18880101T001859 +RDATE:18880101T001859 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0900 +TZNAME:CJT +DTSTART:18960101T000000 +RDATE:18960101T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+0900 TZOFFSETTO:+0900 TZNAME:JST -DTSTART:19700101T000000 +DTSTART:19380101T000000 +RDATE:19380101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Ulaanbaatar.ics b/mozilla/calendar/libical/zoneinfo/Asia/Ulaanbaatar.ics index f0d9c044999..ecd9a71fdb1 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Ulaanbaatar.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Ulaanbaatar.ics @@ -1,22 +1,75 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Ulaanbaatar +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Ulaanbaatar X-LIC-LOCATION:Asia/Ulaanbaatar BEGIN:STANDARD -TZOFFSETFROM:+0900 +TZOFFSETFROM:+0000 +TZOFFSETTO:+070732 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+070732 +TZOFFSETTO:+0700 +TZNAME:ULAT +DTSTART:19050801T000000 +RDATE:19050801T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0700 TZOFFSETTO:+0800 TZNAME:ULAT -DTSTART:19700926T020000 -RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA +DTSTART:19780101T000000 +RDATE:19780101T000000 END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+0800 TZOFFSETTO:+0900 TZNAME:ULAST -DTSTART:19700328T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA +DTSTART:19830401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +RDATE:19910331T020000 +RDATE:19920329T020000 +RDATE:19930328T020000 +RDATE:19940327T020000 +RDATE:19950326T020000 +RDATE:19960331T020000 +RDATE:19970330T020000 +RDATE:19980329T020000 +RDATE:20010427T020000 END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0800 +TZNAME:ULAT +DTSTART:19831001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +RDATE:19960929T030000 +RDATE:19970928T030000 +RDATE:19980927T030000 +RDATE:20010928T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Urumqi.ics b/mozilla/calendar/libical/zoneinfo/Asia/Urumqi.ics index 6c377f154b3..71ace07055a 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Urumqi.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Urumqi.ics @@ -1,14 +1,53 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Urumqi +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Urumqi X-LIC-LOCATION:Asia/Urumqi BEGIN:STANDARD -TZOFFSETFROM:+0800 +TZOFFSETFROM:+0000 +TZOFFSETTO:+055020 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+055020 +TZOFFSETTO:+0600 +TZNAME:URUT +DTSTART:19280101T000000 +RDATE:19280101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0600 TZOFFSETTO:+0800 TZNAME:CST -DTSTART:19700101T000000 +DTSTART:19800501T000000 +RDATE:19800501T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0800 +TZOFFSETTO:+0900 +TZNAME:CDT +DTSTART:19860504T000000 +RDATE:19860504T000000 +RDATE:19870412T000000 +RDATE:19880410T000000 +RDATE:19890416T000000 +RDATE:19900415T000000 +RDATE:19910414T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0800 +TZNAME:CST +DTSTART:19860914T000000 +RDATE:19860914T000000 +RDATE:19870913T000000 +RDATE:19880911T000000 +RDATE:19890917T000000 +RDATE:19900916T000000 +RDATE:19910915T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Vientiane.ics b/mozilla/calendar/libical/zoneinfo/Asia/Vientiane.ics index b31523aafb4..e36f4b1f801 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Vientiane.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Vientiane.ics @@ -1,14 +1,43 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Vientiane +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Vientiane X-LIC-LOCATION:Asia/Vientiane BEGIN:STANDARD -TZOFFSETFROM:+0700 +TZOFFSETFROM:+0000 +TZOFFSETTO:+065024 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+065024 +TZOFFSETTO:+070620 +TZNAME:SMT +DTSTART:19060609T000000 +RDATE:19060609T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+070620 TZOFFSETTO:+0700 TZNAME:ICT -DTSTART:19700101T000000 +DTSTART:19110311T000100 +RDATE:19110311T000100 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0700 +TZOFFSETTO:+0800 +TZNAME:ICT +DTSTART:19120501T000000 +RDATE:19120501T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0800 +TZOFFSETTO:+0700 +TZNAME:ICT +DTSTART:19310501T000000 +RDATE:19310501T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Vladivostok.ics b/mozilla/calendar/libical/zoneinfo/Asia/Vladivostok.ics index f5d3b96dcba..c63d6063983 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Vladivostok.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Vladivostok.ics @@ -1,22 +1,95 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Vladivostok +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Vladivostok X-LIC-LOCATION:Asia/Vladivostok BEGIN:DAYLIGHT TZOFFSETFROM:+1000 TZOFFSETTO:+1100 TZNAME:VLAST -DTSTART:19700329T020000 +DTSTART:19930328T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+1100 TZOFFSETTO:+1000 TZNAME:VLAT -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+084744 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+084744 +TZOFFSETTO:+0900 +TZNAME:VLAT +DTSTART:19221115T000000 +RDATE:19221115T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+1000 +TZNAME:VLAT +DTSTART:19300621T000000 +RDATE:19300621T000000 +RDATE:19920119T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1000 +TZOFFSETTO:+1100 +TZNAME:VLAST +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +RDATE:19920328T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1100 +TZOFFSETTO:+1000 +TZNAME:VLAT +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19920926T230000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1000 +TZOFFSETTO:+1000 +TZNAME:VLASST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1000 +TZOFFSETTO:+0900 +TZNAME:VLAST +DTSTART:19910929T030000 +RDATE:19910929T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Yakutsk.ics b/mozilla/calendar/libical/zoneinfo/Asia/Yakutsk.ics index 57796125563..849a866f619 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Yakutsk.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Yakutsk.ics @@ -1,22 +1,95 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Yakutsk +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Yakutsk X-LIC-LOCATION:Asia/Yakutsk BEGIN:DAYLIGHT TZOFFSETFROM:+0900 TZOFFSETTO:+1000 TZNAME:YAKST -DTSTART:19700329T020000 +DTSTART:19930328T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+1000 TZOFFSETTO:+0900 TZNAME:YAKT -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+083840 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+083840 +TZOFFSETTO:+0800 +TZNAME:YAKT +DTSTART:19191215T000000 +RDATE:19191215T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0800 +TZOFFSETTO:+0900 +TZNAME:YAKT +DTSTART:19300621T000000 +RDATE:19300621T000000 +RDATE:19920119T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0900 +TZOFFSETTO:+1000 +TZNAME:YAKST +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +RDATE:19920328T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1000 +TZOFFSETTO:+0900 +TZNAME:YAKT +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19920926T230000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0900 +TZOFFSETTO:+0900 +TZNAME:YAKST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0800 +TZNAME:YAKT +DTSTART:19910929T030000 +RDATE:19910929T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Yekaterinburg.ics b/mozilla/calendar/libical/zoneinfo/Asia/Yekaterinburg.ics index 6f3ba8c2c3f..b2c76000958 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Yekaterinburg.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Yekaterinburg.ics @@ -1,22 +1,113 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Yekaterinburg +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Yekaterinburg X-LIC-LOCATION:Asia/Yekaterinburg BEGIN:DAYLIGHT TZOFFSETFROM:+0500 TZOFFSETTO:+0600 TZNAME:YEKST -DTSTART:19700329T020000 +DTSTART:19930328T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0600 TZOFFSETTO:+0500 TZNAME:YEKT -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+040224 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+040224 +TZOFFSETTO:+0400 +TZNAME:SVET +DTSTART:19190715T040000 +RDATE:19190715T040000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0500 +TZNAME:SVET +DTSTART:19300621T000000 +RDATE:19300621T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0500 +TZOFFSETTO:+0600 +TZNAME:SVEST +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0600 +TZOFFSETTO:+0500 +TZNAME:SVET +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0500 +TZOFFSETTO:+0500 +TZNAME:SVEST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0500 +TZOFFSETTO:+0400 +TZNAME:SVET +DTSTART:19910929T030000 +RDATE:19910929T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0500 +TZNAME:YEKT +DTSTART:19920119T020000 +RDATE:19920119T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0500 +TZOFFSETTO:+0600 +TZNAME:YEKST +DTSTART:19920328T230000 +RDATE:19920328T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0600 +TZOFFSETTO:+0500 +TZNAME:YEKT +DTSTART:19920926T230000 +RDATE:19920926T230000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Asia/Yerevan.ics b/mozilla/calendar/libical/zoneinfo/Asia/Yerevan.ics index 33b37c3c414..036f51c8d42 100644 --- a/mozilla/calendar/libical/zoneinfo/Asia/Yerevan.ics +++ b/mozilla/calendar/libical/zoneinfo/Asia/Yerevan.ics @@ -1,22 +1,117 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Asia/Yerevan +TZID:/softwarestudio.org/Olson_20010626_2/Asia/Yerevan X-LIC-LOCATION:Asia/Yerevan BEGIN:DAYLIGHT TZOFFSETFROM:+0400 TZOFFSETTO:+0500 TZNAME:AMST -DTSTART:19700329T020000 +DTSTART:19970330T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0500 TZOFFSETTO:+0400 TZNAME:AMT -DTSTART:19701025T030000 +DTSTART:19971026T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0258 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0258 +TZOFFSETTO:+0300 +TZNAME:YERT +DTSTART:19240502T000000 +RDATE:19240502T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:YERT +DTSTART:19570301T000000 +RDATE:19570301T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0400 +TZOFFSETTO:+0500 +TZNAME:YERST +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0500 +TZOFFSETTO:+0400 +TZNAME:YERT +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0400 +TZOFFSETTO:+0400 +TZNAME:YERST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0300 +TZNAME:AMT +DTSTART:19910923T000000 +RDATE:19910923T000000 +RDATE:19920926T230000 +RDATE:19930926T030000 +RDATE:19940925T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0300 +TZNAME:AMT +DTSTART:19910929T020000 +RDATE:19910929T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:AMST +DTSTART:19920328T230000 +RDATE:19920328T230000 +RDATE:19930328T020000 +RDATE:19940327T020000 +RDATE:19950326T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0400 +TZNAME:AMT +DTSTART:19950924T030000 +RDATE:19950924T030000 +RDATE:19970101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Atlantic/Azores.ics b/mozilla/calendar/libical/zoneinfo/Atlantic/Azores.ics index 2467c824425..597fc8dab7f 100644 --- a/mozilla/calendar/libical/zoneinfo/Atlantic/Azores.ics +++ b/mozilla/calendar/libical/zoneinfo/Atlantic/Azores.ics @@ -1,22 +1,230 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Atlantic/Azores +TZID:/softwarestudio.org/Olson_20010626_2/Atlantic/Azores X-LIC-LOCATION:Atlantic/Azores BEGIN:DAYLIGHT TZOFFSETFROM:-0100 TZOFFSETTO:+0000 TZNAME:AZOST -DTSTART:19700329T000000 +DTSTART:19940327T000000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0000 TZOFFSETTO:-0100 TZNAME:AZOT -DTSTART:19701025T010000 +DTSTART:19961027T010000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-014240 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-014240 +TZOFFSETTO:-0155 +TZNAME:HMT +DTSTART:18840101T000000 +RDATE:18840101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0155 +TZOFFSETTO:-0200 +TZNAME:AZOT +DTSTART:19110524T000000 +RDATE:19110524T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0200 +TZOFFSETTO:-0100 +TZNAME:AZOST +DTSTART:19160617T230000 +RDATE:19160617T230000 +RDATE:19170228T230000 +RDATE:19180301T230000 +RDATE:19190228T230000 +RDATE:19200229T230000 +RDATE:19210228T230000 +RDATE:19240416T230000 +RDATE:19260417T230000 +RDATE:19270409T230000 +RDATE:19280414T230000 +RDATE:19290420T230000 +RDATE:19310418T230000 +RDATE:19320402T230000 +RDATE:19340407T230000 +RDATE:19350330T230000 +RDATE:19360418T230000 +RDATE:19370403T230000 +RDATE:19380326T230000 +RDATE:19390415T230000 +RDATE:19400224T230000 +RDATE:19410405T230000 +RDATE:19420314T230000 +RDATE:19430313T230000 +RDATE:19440311T230000 +RDATE:19450310T230000 +RDATE:19460406T230000 +RDATE:19470406T020000 +RDATE:19480404T020000 +RDATE:19490403T020000 +RDATE:19510401T020000 +RDATE:19520406T020000 +RDATE:19530405T020000 +RDATE:19540404T020000 +RDATE:19550403T020000 +RDATE:19560401T020000 +RDATE:19570407T020000 +RDATE:19580406T020000 +RDATE:19590405T020000 +RDATE:19600403T020000 +RDATE:19610402T020000 +RDATE:19620401T020000 +RDATE:19630407T020000 +RDATE:19640405T020000 +RDATE:19650404T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0100 +TZOFFSETTO:-0200 +TZNAME:AZOT +DTSTART:19161101T010000 +RDATE:19161101T010000 +RDATE:19171015T000000 +RDATE:19181015T000000 +RDATE:19191015T000000 +RDATE:19201015T000000 +RDATE:19211015T000000 +RDATE:19241015T000000 +RDATE:19261003T000000 +RDATE:19271002T000000 +RDATE:19281007T000000 +RDATE:19291006T000000 +RDATE:19311004T000000 +RDATE:19321002T000000 +RDATE:19341007T000000 +RDATE:19351006T000000 +RDATE:19361004T000000 +RDATE:19371003T000000 +RDATE:19381002T000000 +RDATE:19391119T000000 +RDATE:19401006T000000 +RDATE:19411006T000000 +RDATE:19421025T000000 +RDATE:19431031T000000 +RDATE:19441029T000000 +RDATE:19451028T000000 +RDATE:19461006T000000 +RDATE:19471005T030000 +RDATE:19481003T030000 +RDATE:19491002T030000 +RDATE:19511007T030000 +RDATE:19521005T030000 +RDATE:19531004T030000 +RDATE:19541003T030000 +RDATE:19551002T030000 +RDATE:19561007T030000 +RDATE:19571006T030000 +RDATE:19581005T030000 +RDATE:19591004T030000 +RDATE:19601002T030000 +RDATE:19611001T030000 +RDATE:19621007T030000 +RDATE:19631006T030000 +RDATE:19641004T030000 +RDATE:19651003T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0100 +TZOFFSETTO:+0000 +TZNAME:AZOMT +DTSTART:19420425T230000 +RDATE:19420425T230000 +RDATE:19430417T230000 +RDATE:19440422T230000 +RDATE:19450421T230000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:+0000 +TZOFFSETTO:-0100 +TZNAME:AZOST +DTSTART:19420816T000000 +RDATE:19420816T000000 +RDATE:19430829T000000 +RDATE:19440827T000000 +RDATE:19450826T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0200 +TZOFFSETTO:-0100 +TZNAME:AZOT +DTSTART:19660403T020000 +RDATE:19660403T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0100 +TZOFFSETTO:+0000 +TZNAME:AZOST +DTSTART:19770327T000000 +RDATE:19770327T000000 +RDATE:19780402T000000 +RDATE:19790401T000000 +RDATE:19800330T000000 +RDATE:19810329T010000 +RDATE:19820328T010000 +RDATE:19830327T020000 +RDATE:19840325T010000 +RDATE:19850331T010000 +RDATE:19860330T010000 +RDATE:19870329T010000 +RDATE:19880327T010000 +RDATE:19890326T010000 +RDATE:19900325T010000 +RDATE:19910331T010000 +RDATE:19920329T010000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-0100 +TZNAME:AZOT +DTSTART:19770925T010000 +RDATE:19770925T010000 +RDATE:19781001T010000 +RDATE:19790930T020000 +RDATE:19800928T020000 +RDATE:19810927T020000 +RDATE:19820926T020000 +RDATE:19830925T020000 +RDATE:19840930T020000 +RDATE:19850929T020000 +RDATE:19860928T020000 +RDATE:19870927T020000 +RDATE:19880925T020000 +RDATE:19890924T020000 +RDATE:19900930T020000 +RDATE:19910929T020000 +RDATE:19930328T010000 +RDATE:19940925T010000 +RDATE:19950924T010000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19920927T020000 +RDATE:19920927T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0100 +TZOFFSETTO:-0100 +TZNAME:AZOT +DTSTART:19930926T000000 +RDATE:19930926T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Atlantic/Bermuda.ics b/mozilla/calendar/libical/zoneinfo/Atlantic/Bermuda.ics index a6d1b7e3e31..ef9e7702fb3 100644 --- a/mozilla/calendar/libical/zoneinfo/Atlantic/Bermuda.ics +++ b/mozilla/calendar/libical/zoneinfo/Atlantic/Bermuda.ics @@ -1,22 +1,55 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Atlantic/Bermuda +TZID:/softwarestudio.org/Olson_20010626_2/Atlantic/Bermuda X-LIC-LOCATION:Atlantic/Bermuda -BEGIN:DAYLIGHT -TZOFFSETFROM:-0400 -TZOFFSETTO:-0300 -TZNAME:ADT -DTSTART:19700308T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU -END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0300 TZOFFSETTO:-0400 TZNAME:AST -DTSTART:19701101T020000 -RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +DTSTART:19741027T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:ADT +DTSTART:19870405T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-041904 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-041904 +TZOFFSETTO:-0400 +TZNAME:AST +DTSTART:19300101T020000 +RDATE:19300101T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:ADT +DTSTART:19740428T020000 +RDATE:19740428T020000 +RDATE:19750427T020000 +RDATE:19760425T020000 +RDATE:19770424T020000 +RDATE:19780430T020000 +RDATE:19790429T020000 +RDATE:19800427T020000 +RDATE:19810426T020000 +RDATE:19820425T020000 +RDATE:19830424T020000 +RDATE:19840429T020000 +RDATE:19850428T020000 +RDATE:19860427T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Atlantic/Canary.ics b/mozilla/calendar/libical/zoneinfo/Atlantic/Canary.ics index 3d6073e9205..2cfe8c5d408 100644 --- a/mozilla/calendar/libical/zoneinfo/Atlantic/Canary.ics +++ b/mozilla/calendar/libical/zoneinfo/Atlantic/Canary.ics @@ -1,22 +1,72 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Atlantic/Canary +TZID:/softwarestudio.org/Olson_20010626_2/Atlantic/Canary X-LIC-LOCATION:Atlantic/Canary BEGIN:DAYLIGHT TZOFFSETFROM:+0000 TZOFFSETTO:+0100 TZNAME:WEST -DTSTART:19700329T010000 +DTSTART:19810329T010000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0100 TZOFFSETTO:+0000 TZNAME:WET -DTSTART:19701025T020000 +DTSTART:19961027T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-010136 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-010136 +TZOFFSETTO:-0100 +TZNAME:CANT +DTSTART:19220301T000000 +RDATE:19220301T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0100 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19460930T010000 +RDATE:19460930T010000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:WEST +DTSTART:19800406T000000 +RDATE:19800406T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19800928T020000 +RDATE:19800928T020000 +RDATE:19810927T020000 +RDATE:19820926T020000 +RDATE:19830925T020000 +RDATE:19840930T020000 +RDATE:19850929T020000 +RDATE:19860928T020000 +RDATE:19870927T020000 +RDATE:19880925T020000 +RDATE:19890924T020000 +RDATE:19900930T020000 +RDATE:19910929T020000 +RDATE:19920927T020000 +RDATE:19930926T020000 +RDATE:19940925T020000 +RDATE:19950924T020000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Atlantic/Cape_Verde.ics b/mozilla/calendar/libical/zoneinfo/Atlantic/Cape_Verde.ics index 36ebb00cee9..46bbe3ff7dd 100644 --- a/mozilla/calendar/libical/zoneinfo/Atlantic/Cape_Verde.ics +++ b/mozilla/calendar/libical/zoneinfo/Atlantic/Cape_Verde.ics @@ -1,14 +1,43 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Atlantic/Cape_Verde +TZID:/softwarestudio.org/Olson_20010626_2/Atlantic/Cape_Verde X-LIC-LOCATION:Atlantic/Cape_Verde BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-013404 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-013404 +TZOFFSETTO:-0200 +TZNAME:CVT +DTSTART:19070101T000000 +RDATE:19070101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0200 +TZOFFSETTO:-0100 +TZNAME:CVST +DTSTART:19420901T000000 +RDATE:19420901T000000 +END:DAYLIGHT +BEGIN:STANDARD TZOFFSETFROM:-0100 +TZOFFSETTO:-0200 +TZNAME:CVT +DTSTART:19451015T000000 +RDATE:19451015T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0200 TZOFFSETTO:-0100 TZNAME:CVT -DTSTART:19700101T000000 +DTSTART:19751125T020000 +RDATE:19751125T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Atlantic/Faroe.ics b/mozilla/calendar/libical/zoneinfo/Atlantic/Faroe.ics deleted file mode 100644 index 60aaee22550..00000000000 --- a/mozilla/calendar/libical/zoneinfo/Atlantic/Faroe.ics +++ /dev/null @@ -1,22 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Atlantic/Faroe -X-LIC-LOCATION:Atlantic/Faroe -BEGIN:DAYLIGHT -TZOFFSETFROM:+0000 -TZOFFSETTO:+0100 -TZNAME:WEST -DTSTART:19700329T010000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:DAYLIGHT -BEGIN:STANDARD -TZOFFSETFROM:+0100 -TZOFFSETTO:+0000 -TZNAME:WET -DTSTART:19701025T020000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Atlantic/Jan_Mayen.ics b/mozilla/calendar/libical/zoneinfo/Atlantic/Jan_Mayen.ics index 7cd829b9d87..dfae8458327 100644 --- a/mozilla/calendar/libical/zoneinfo/Atlantic/Jan_Mayen.ics +++ b/mozilla/calendar/libical/zoneinfo/Atlantic/Jan_Mayen.ics @@ -1,22 +1,96 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Atlantic/Jan_Mayen +TZID:/softwarestudio.org/Olson_20010626_2/Atlantic/Jan_Mayen X-LIC-LOCATION:Atlantic/Jan_Mayen BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19810329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0043 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0043 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:18950101T000000 +RDATE:18950101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19160522T010000 +RDATE:19160522T010000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19450402T020000 +RDATE:19590315T020000 +RDATE:19600320T020000 +RDATE:19610319T020000 +RDATE:19620318T020000 +RDATE:19630317T020000 +RDATE:19640315T020000 +RDATE:19650425T020000 +RDATE:19800406T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19160930T000000 +RDATE:19160930T000000 +RDATE:19431004T030000 +RDATE:19441002T030000 +RDATE:19451001T030000 +RDATE:19590920T030000 +RDATE:19600918T030000 +RDATE:19610917T030000 +RDATE:19620916T030000 +RDATE:19630915T030000 +RDATE:19640920T030000 +RDATE:19650919T030000 +RDATE:19800928T030000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19400810T230000 +RDATE:19400810T230000 +RDATE:19421102T020000 +RDATE:19800101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Atlantic/Madeira.ics b/mozilla/calendar/libical/zoneinfo/Atlantic/Madeira.ics index 9a261289738..8e54096499d 100644 --- a/mozilla/calendar/libical/zoneinfo/Atlantic/Madeira.ics +++ b/mozilla/calendar/libical/zoneinfo/Atlantic/Madeira.ics @@ -1,22 +1,208 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Atlantic/Madeira +TZID:/softwarestudio.org/Olson_20010626_2/Atlantic/Madeira X-LIC-LOCATION:Atlantic/Madeira BEGIN:DAYLIGHT TZOFFSETFROM:+0000 TZOFFSETTO:+0100 TZNAME:WEST -DTSTART:19700329T010000 +DTSTART:19840325T010000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0100 TZOFFSETTO:+0000 TZNAME:WET -DTSTART:19701025T020000 +DTSTART:19961027T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-010736 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-010736 +TZOFFSETTO:-0108 +TZNAME:FMT +DTSTART:18840101T000000 +RDATE:18840101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0108 +TZOFFSETTO:-0100 +TZNAME:MADT +DTSTART:19110524T000000 +RDATE:19110524T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0100 +TZOFFSETTO:+0000 +TZNAME:MADST +DTSTART:19160617T230000 +RDATE:19160617T230000 +RDATE:19170228T230000 +RDATE:19180301T230000 +RDATE:19190228T230000 +RDATE:19200229T230000 +RDATE:19210228T230000 +RDATE:19240416T230000 +RDATE:19260417T230000 +RDATE:19270409T230000 +RDATE:19280414T230000 +RDATE:19290420T230000 +RDATE:19310418T230000 +RDATE:19320402T230000 +RDATE:19340407T230000 +RDATE:19350330T230000 +RDATE:19360418T230000 +RDATE:19370403T230000 +RDATE:19380326T230000 +RDATE:19390415T230000 +RDATE:19400224T230000 +RDATE:19410405T230000 +RDATE:19420314T230000 +RDATE:19430313T230000 +RDATE:19440311T230000 +RDATE:19450310T230000 +RDATE:19460406T230000 +RDATE:19470406T020000 +RDATE:19480404T020000 +RDATE:19490403T020000 +RDATE:19510401T020000 +RDATE:19520406T020000 +RDATE:19530405T020000 +RDATE:19540404T020000 +RDATE:19550403T020000 +RDATE:19560401T020000 +RDATE:19570407T020000 +RDATE:19580406T020000 +RDATE:19590405T020000 +RDATE:19600403T020000 +RDATE:19610402T020000 +RDATE:19620401T020000 +RDATE:19630407T020000 +RDATE:19640405T020000 +RDATE:19650404T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-0100 +TZNAME:MADT +DTSTART:19161101T010000 +RDATE:19161101T010000 +RDATE:19171015T000000 +RDATE:19181015T000000 +RDATE:19191015T000000 +RDATE:19201015T000000 +RDATE:19211015T000000 +RDATE:19241015T000000 +RDATE:19261003T000000 +RDATE:19271002T000000 +RDATE:19281007T000000 +RDATE:19291006T000000 +RDATE:19311004T000000 +RDATE:19321002T000000 +RDATE:19341007T000000 +RDATE:19351006T000000 +RDATE:19361004T000000 +RDATE:19371003T000000 +RDATE:19381002T000000 +RDATE:19391119T000000 +RDATE:19401006T000000 +RDATE:19411006T000000 +RDATE:19421025T000000 +RDATE:19431031T000000 +RDATE:19441029T000000 +RDATE:19451028T000000 +RDATE:19461006T000000 +RDATE:19471005T030000 +RDATE:19481003T030000 +RDATE:19491002T030000 +RDATE:19511007T030000 +RDATE:19521005T030000 +RDATE:19531004T030000 +RDATE:19541003T030000 +RDATE:19551002T030000 +RDATE:19561007T030000 +RDATE:19571006T030000 +RDATE:19581005T030000 +RDATE:19591004T030000 +RDATE:19601002T030000 +RDATE:19611001T030000 +RDATE:19621007T030000 +RDATE:19631006T030000 +RDATE:19641004T030000 +RDATE:19651003T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:MADMT +DTSTART:19420425T230000 +RDATE:19420425T230000 +RDATE:19430417T230000 +RDATE:19440422T230000 +RDATE:19450421T230000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0000 +TZNAME:MADST +DTSTART:19420816T000000 +RDATE:19420816T000000 +RDATE:19430829T000000 +RDATE:19440827T000000 +RDATE:19450826T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0100 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19660403T020000 +RDATE:19660403T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:WEST +DTSTART:19770327T000000 +RDATE:19770327T000000 +RDATE:19780402T000000 +RDATE:19790401T000000 +RDATE:19800330T000000 +RDATE:19810329T010000 +RDATE:19820328T010000 +RDATE:19830327T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19770925T010000 +RDATE:19770925T010000 +RDATE:19781001T010000 +RDATE:19790930T020000 +RDATE:19800928T020000 +RDATE:19810927T020000 +RDATE:19820926T020000 +RDATE:19830925T020000 +RDATE:19840930T020000 +RDATE:19850929T020000 +RDATE:19860928T020000 +RDATE:19870927T020000 +RDATE:19880925T020000 +RDATE:19890924T020000 +RDATE:19900930T020000 +RDATE:19910929T020000 +RDATE:19920927T020000 +RDATE:19930926T020000 +RDATE:19940925T020000 +RDATE:19950924T020000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Atlantic/Reykjavik.ics b/mozilla/calendar/libical/zoneinfo/Atlantic/Reykjavik.ics index fd5fd056bc6..985c72c5de9 100644 --- a/mozilla/calendar/libical/zoneinfo/Atlantic/Reykjavik.ics +++ b/mozilla/calendar/libical/zoneinfo/Atlantic/Reykjavik.ics @@ -1,14 +1,110 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Atlantic/Reykjavik +TZID:/softwarestudio.org/Olson_20010626_2/Atlantic/Reykjavik X-LIC-LOCATION:Atlantic/Reykjavik BEGIN:STANDARD TZOFFSETFROM:+0000 +TZOFFSETTO:-012724 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-012724 +TZOFFSETTO:-012748 +TZNAME:RMT +DTSTART:18370101T000000 +RDATE:18370101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-012748 +TZOFFSETTO:-0100 +TZNAME:IST +DTSTART:19080101T000000 +RDATE:19080101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0100 +TZOFFSETTO:+0000 +TZNAME:ISST +DTSTART:19170219T230000 +RDATE:19170219T230000 +RDATE:19180219T230000 +RDATE:19390429T230000 +RDATE:19400225T020000 +RDATE:19410302T010000 +RDATE:19420308T010000 +RDATE:19430307T010000 +RDATE:19440305T010000 +RDATE:19450304T010000 +RDATE:19460303T010000 +RDATE:19470406T010000 +RDATE:19480404T010000 +RDATE:19490403T010000 +RDATE:19500402T010000 +RDATE:19510401T010000 +RDATE:19520406T010000 +RDATE:19530405T010000 +RDATE:19540404T010000 +RDATE:19550403T010000 +RDATE:19560401T010000 +RDATE:19570407T010000 +RDATE:19580406T010000 +RDATE:19590405T010000 +RDATE:19600403T010000 +RDATE:19610402T010000 +RDATE:19620401T010000 +RDATE:19630407T010000 +RDATE:19640405T010000 +RDATE:19650404T010000 +RDATE:19660403T010000 +RDATE:19670402T010000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-0100 +TZNAME:IST +DTSTART:19171021T010000 +RDATE:19171021T010000 +RDATE:19181116T010000 +RDATE:19391129T020000 +RDATE:19401103T020000 +RDATE:19411102T020000 +RDATE:19421025T020000 +RDATE:19431024T020000 +RDATE:19441022T020000 +RDATE:19451028T020000 +RDATE:19461027T020000 +RDATE:19471026T020000 +RDATE:19481024T020000 +RDATE:19491030T020000 +RDATE:19501022T020000 +RDATE:19511028T020000 +RDATE:19521026T020000 +RDATE:19531025T020000 +RDATE:19541024T020000 +RDATE:19551023T020000 +RDATE:19561028T020000 +RDATE:19571027T020000 +RDATE:19581026T020000 +RDATE:19591025T020000 +RDATE:19601023T020000 +RDATE:19611022T020000 +RDATE:19621028T020000 +RDATE:19631027T020000 +RDATE:19641025T020000 +RDATE:19651024T020000 +RDATE:19661023T020000 +RDATE:19671029T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0100 TZOFFSETTO:+0000 TZNAME:GMT -DTSTART:19700101T000000 +DTSTART:19680407T010000 +RDATE:19680407T010000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Atlantic/South_Georgia.ics b/mozilla/calendar/libical/zoneinfo/Atlantic/South_Georgia.ics index b43245658ff..41c79f1781f 100644 --- a/mozilla/calendar/libical/zoneinfo/Atlantic/South_Georgia.ics +++ b/mozilla/calendar/libical/zoneinfo/Atlantic/South_Georgia.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Atlantic/South_Georgia +TZID:/softwarestudio.org/Olson_20010626_2/Atlantic/South_Georgia X-LIC-LOCATION:Atlantic/South_Georgia BEGIN:STANDARD -TZOFFSETFROM:-0200 +TZOFFSETFROM:+0000 +TZOFFSETTO:-022608 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-022608 TZOFFSETTO:-0200 TZNAME:GST -DTSTART:19700101T000000 +DTSTART:18900101T000000 +RDATE:18900101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Atlantic/St_Helena.ics b/mozilla/calendar/libical/zoneinfo/Atlantic/St_Helena.ics index c8c0b7dfbb0..084fe4138b3 100644 --- a/mozilla/calendar/libical/zoneinfo/Atlantic/St_Helena.ics +++ b/mozilla/calendar/libical/zoneinfo/Atlantic/St_Helena.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Atlantic/St_Helena +TZID:/softwarestudio.org/Olson_20010626_2/Atlantic/St_Helena X-LIC-LOCATION:Atlantic/St_Helena BEGIN:STANDARD TZOFFSETFROM:+0000 +TZOFFSETTO:-002248 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-002248 +TZOFFSETTO:-002248 +TZNAME:JMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-002248 TZOFFSETTO:+0000 TZNAME:GMT -DTSTART:19700101T000000 +DTSTART:19510101T000000 +RDATE:19510101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Atlantic/Stanley.ics b/mozilla/calendar/libical/zoneinfo/Atlantic/Stanley.ics index a4191fc1162..eb997da4add 100644 --- a/mozilla/calendar/libical/zoneinfo/Atlantic/Stanley.ics +++ b/mozilla/calendar/libical/zoneinfo/Atlantic/Stanley.ics @@ -1,22 +1,127 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Atlantic/Stanley +TZID:/softwarestudio.org/Olson_20010626_2/Atlantic/Stanley X-LIC-LOCATION:Atlantic/Stanley BEGIN:STANDARD TZOFFSETFROM:-0300 TZOFFSETTO:-0400 TZNAME:FKT -DTSTART:19700419T020000 -RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3SU +DTSTART:20010415T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=15,16,17,18,19,20,21;BYDAY=SU END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:-0400 TZOFFSETTO:-0300 TZNAME:FKST -DTSTART:19700906T020000 -RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=1SU +DTSTART:20010902T020000 +RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-035124 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-035124 +TZOFFSETTO:-035124 +TZNAME:SMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-035124 +TZOFFSETTO:-0400 +TZNAME:FKT +DTSTART:19120312T000000 +RDATE:19120312T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:FKST +DTSTART:19370926T000000 +RDATE:19370926T000000 +RDATE:19380925T000000 +RDATE:19391001T000000 +RDATE:19400929T000000 +RDATE:19410928T000000 +RDATE:19420927T000000 +RDATE:19860914T000000 +RDATE:19870913T000000 +RDATE:19880911T000000 +RDATE:19890910T000000 +RDATE:19900909T000000 +RDATE:19910915T000000 +RDATE:19920913T000000 +RDATE:19930912T000000 +RDATE:19940911T000000 +RDATE:19950910T000000 +RDATE:19960915T000000 +RDATE:19970914T000000 +RDATE:19980913T000000 +RDATE:19990912T000000 +RDATE:20000910T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0300 +TZOFFSETTO:-0400 +TZNAME:FKT +DTSTART:19380320T000000 +RDATE:19380320T000000 +RDATE:19390319T000000 +RDATE:19400324T000000 +RDATE:19410323T000000 +RDATE:19420322T000000 +RDATE:19430101T000000 +RDATE:19860420T000000 +RDATE:19870419T000000 +RDATE:19880417T000000 +RDATE:19890416T000000 +RDATE:19900422T000000 +RDATE:19910421T000000 +RDATE:19920419T000000 +RDATE:19930418T000000 +RDATE:19940417T000000 +RDATE:19950416T000000 +RDATE:19960421T000000 +RDATE:19970420T000000 +RDATE:19980419T000000 +RDATE:19990418T000000 +RDATE:20000416T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0400 +TZOFFSETTO:-0300 +TZNAME:FKT +DTSTART:19830501T000000 +RDATE:19830501T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0300 +TZOFFSETTO:-0200 +TZNAME:FKST +DTSTART:19830925T000000 +RDATE:19830925T000000 +RDATE:19840916T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0200 +TZOFFSETTO:-0300 +TZNAME:FKT +DTSTART:19840429T000000 +RDATE:19840429T000000 +RDATE:19850428T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0300 +TZOFFSETTO:-0300 +TZNAME:FKST +DTSTART:19850915T000000 +RDATE:19850915T000000 END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Australia/Adelaide.ics b/mozilla/calendar/libical/zoneinfo/Australia/Adelaide.ics index ffb80904ef2..1faed54543c 100644 --- a/mozilla/calendar/libical/zoneinfo/Australia/Adelaide.ics +++ b/mozilla/calendar/libical/zoneinfo/Australia/Adelaide.ics @@ -1,22 +1,109 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Australia/Adelaide +TZID:/softwarestudio.org/Olson_20010626_2/Australia/Adelaide X-LIC-LOCATION:Australia/Adelaide BEGIN:DAYLIGHT TZOFFSETFROM:+0930 TZOFFSETTO:+1030 TZNAME:CST -DTSTART:19701025T020000 +DTSTART:19871025T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD +TZOFFSETFROM:+1030 +TZOFFSETTO:+0930 +TZNAME:CST +DTSTART:19950326T030000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+091420 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+091420 +TZOFFSETTO:+0900 +TZNAME:CST +DTSTART:18950201T000000 +RDATE:18950201T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0930 +TZNAME:CST +DTSTART:18990501T000000 +RDATE:18990501T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0930 +TZOFFSETTO:+1030 +TZNAME:CST +DTSTART:19170101T000100 +RDATE:19170101T000100 +RDATE:19420101T020000 +RDATE:19420927T020000 +RDATE:19431003T020000 +RDATE:19711031T020000 +RDATE:19721029T020000 +RDATE:19731028T020000 +RDATE:19741027T020000 +RDATE:19751026T020000 +RDATE:19761031T020000 +RDATE:19771030T020000 +RDATE:19781029T020000 +RDATE:19791028T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +RDATE:19831030T020000 +RDATE:19841028T020000 +RDATE:19851027T020000 +RDATE:19861019T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1030 +TZOFFSETTO:+0930 +TZNAME:CST +DTSTART:19170325T020000 +RDATE:19170325T020000 +RDATE:19420329T020000 +RDATE:19430328T020000 +RDATE:19440326T020000 +RDATE:19720227T030000 +RDATE:19730304T030000 +RDATE:19740303T030000 +RDATE:19750302T030000 +RDATE:19760307T030000 +RDATE:19770306T030000 +RDATE:19780305T030000 +RDATE:19790304T030000 +RDATE:19800302T030000 +RDATE:19810301T030000 +RDATE:19820307T030000 +RDATE:19830306T030000 +RDATE:19840304T030000 +RDATE:19850303T030000 +RDATE:19860316T030000 +RDATE:19870315T030000 +RDATE:19880320T030000 +RDATE:19890319T030000 +RDATE:19900318T030000 +RDATE:19910303T030000 +RDATE:19920322T030000 +RDATE:19930307T030000 +RDATE:19940320T030000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+0930 TZOFFSETTO:+0930 TZNAME:CST -DTSTART:19700329T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +DTSTART:19710101T000000 +RDATE:19710101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Australia/Brisbane.ics b/mozilla/calendar/libical/zoneinfo/Australia/Brisbane.ics index 1acdc744d11..7cbc9ca9aed 100644 --- a/mozilla/calendar/libical/zoneinfo/Australia/Brisbane.ics +++ b/mozilla/calendar/libical/zoneinfo/Australia/Brisbane.ics @@ -1,14 +1,57 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Australia/Brisbane +TZID:/softwarestudio.org/Olson_20010626_2/Australia/Brisbane X-LIC-LOCATION:Australia/Brisbane BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+101208 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+101208 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:18950101T000000 +RDATE:18950101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1000 +TZOFFSETTO:+1100 +TZNAME:EST +DTSTART:19170101T000100 +RDATE:19170101T000100 +RDATE:19420101T020000 +RDATE:19420927T020000 +RDATE:19431003T020000 +RDATE:19711031T020000 +RDATE:19891029T020000 +RDATE:19901028T020000 +RDATE:19911027T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1100 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:19170325T020000 +RDATE:19170325T020000 +RDATE:19420329T020000 +RDATE:19430328T020000 +RDATE:19440326T020000 +RDATE:19720227T030000 +RDATE:19900304T030000 +RDATE:19910303T030000 +RDATE:19920301T030000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+1000 TZOFFSETTO:+1000 TZNAME:EST -DTSTART:19700101T000000 +DTSTART:19710101T000000 +RDATE:19710101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Australia/Broken_Hill.ics b/mozilla/calendar/libical/zoneinfo/Australia/Broken_Hill.ics index c09f7d9d917..ad7b12f1e74 100644 --- a/mozilla/calendar/libical/zoneinfo/Australia/Broken_Hill.ics +++ b/mozilla/calendar/libical/zoneinfo/Australia/Broken_Hill.ics @@ -1,22 +1,123 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Australia/Broken_Hill +TZID:/softwarestudio.org/Olson_20010626_2/Australia/Broken_Hill X-LIC-LOCATION:Australia/Broken_Hill BEGIN:DAYLIGHT TZOFFSETFROM:+0930 TZOFFSETTO:+1030 TZNAME:CST -DTSTART:19701025T020000 +DTSTART:19871025T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD +TZOFFSETFROM:+1030 +TZOFFSETTO:+0930 +TZNAME:CST +DTSTART:20010325T030000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+092548 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+092548 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:18950201T000000 +RDATE:18950201T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+1000 +TZOFFSETTO:+0900 +TZNAME:CST +DTSTART:18960823T000000 +RDATE:18960823T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0930 +TZNAME:CST +DTSTART:18990501T000000 +RDATE:18990501T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0930 +TZOFFSETTO:+1030 +TZNAME:CST +DTSTART:19170101T000100 +RDATE:19170101T000100 +RDATE:19420101T020000 +RDATE:19420927T020000 +RDATE:19431003T020000 +RDATE:19711031T020000 +RDATE:19721029T020000 +RDATE:19731028T020000 +RDATE:19741027T020000 +RDATE:19751026T020000 +RDATE:19761031T020000 +RDATE:19771030T020000 +RDATE:19781029T020000 +RDATE:19791028T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +RDATE:19831030T020000 +RDATE:19841028T020000 +RDATE:19851027T020000 +RDATE:19861019T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1030 +TZOFFSETTO:+0930 +TZNAME:CST +DTSTART:19170325T020000 +RDATE:19170325T020000 +RDATE:19420329T020000 +RDATE:19430328T020000 +RDATE:19440326T020000 +RDATE:19720227T030000 +RDATE:19730304T030000 +RDATE:19740303T030000 +RDATE:19750302T030000 +RDATE:19760307T030000 +RDATE:19770306T030000 +RDATE:19780305T030000 +RDATE:19790304T030000 +RDATE:19800302T030000 +RDATE:19810301T030000 +RDATE:19820404T030000 +RDATE:19830306T030000 +RDATE:19840304T030000 +RDATE:19850303T030000 +RDATE:19860316T030000 +RDATE:19870315T030000 +RDATE:19880320T030000 +RDATE:19890319T030000 +RDATE:19900304T030000 +RDATE:19910303T030000 +RDATE:19920301T030000 +RDATE:19930307T030000 +RDATE:19940306T030000 +RDATE:19950305T030000 +RDATE:19960331T030000 +RDATE:19970330T030000 +RDATE:19980329T030000 +RDATE:19990328T030000 +RDATE:20000101T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+0930 TZOFFSETTO:+0930 TZNAME:CST -DTSTART:19700329T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +DTSTART:19710101T000000 +RDATE:19710101T000000 +RDATE:20000326T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Australia/Currie.ics b/mozilla/calendar/libical/zoneinfo/Australia/Currie.ics deleted file mode 100644 index bdf9cca4455..00000000000 --- a/mozilla/calendar/libical/zoneinfo/Australia/Currie.ics +++ /dev/null @@ -1,22 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Australia/Currie -X-LIC-LOCATION:Australia/Currie -BEGIN:DAYLIGHT -TZOFFSETFROM:+1000 -TZOFFSETTO:+1100 -TZNAME:EST -DTSTART:19701004T020000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU -END:DAYLIGHT -BEGIN:STANDARD -TZOFFSETFROM:+1000 -TZOFFSETTO:+1000 -TZNAME:EST -DTSTART:19700329T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Australia/Darwin.ics b/mozilla/calendar/libical/zoneinfo/Australia/Darwin.ics index 2279b5d5dfa..95b3d8e3f5d 100644 --- a/mozilla/calendar/libical/zoneinfo/Australia/Darwin.ics +++ b/mozilla/calendar/libical/zoneinfo/Australia/Darwin.ics @@ -1,14 +1,49 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Australia/Darwin +TZID:/softwarestudio.org/Olson_20010626_2/Australia/Darwin X-LIC-LOCATION:Australia/Darwin BEGIN:STANDARD -TZOFFSETFROM:+0930 +TZOFFSETFROM:+0000 +TZOFFSETTO:+084320 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+084320 +TZOFFSETTO:+0900 +TZNAME:CST +DTSTART:18950201T000000 +RDATE:18950201T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0900 TZOFFSETTO:+0930 TZNAME:CST -DTSTART:19700101T000000 +DTSTART:18990501T000000 +RDATE:18990501T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0930 +TZOFFSETTO:+1030 +TZNAME:CST +DTSTART:19170101T000100 +RDATE:19170101T000100 +RDATE:19420101T020000 +RDATE:19420927T020000 +RDATE:19431003T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1030 +TZOFFSETTO:+0930 +TZNAME:CST +DTSTART:19170325T020000 +RDATE:19170325T020000 +RDATE:19420329T020000 +RDATE:19430328T020000 +RDATE:19440326T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Australia/Eucla.ics b/mozilla/calendar/libical/zoneinfo/Australia/Eucla.ics deleted file mode 100644 index 67629627678..00000000000 --- a/mozilla/calendar/libical/zoneinfo/Australia/Eucla.ics +++ /dev/null @@ -1,14 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Australia/Eucla -X-LIC-LOCATION:Australia/Eucla -BEGIN:STANDARD -TZOFFSETFROM:+0845 -TZOFFSETTO:+0845 -TZNAME:CWST -DTSTART:19700101T000000 -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Australia/Hobart.ics b/mozilla/calendar/libical/zoneinfo/Australia/Hobart.ics index 830234724a8..8fea60afab3 100644 --- a/mozilla/calendar/libical/zoneinfo/Australia/Hobart.ics +++ b/mozilla/calendar/libical/zoneinfo/Australia/Hobart.ics @@ -1,22 +1,121 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Australia/Hobart +TZID:/softwarestudio.org/Olson_20010626_2/Australia/Hobart X-LIC-LOCATION:Australia/Hobart +BEGIN:STANDARD +TZOFFSETFROM:+1100 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:19910331T030000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+1000 TZOFFSETTO:+1100 TZNAME:EST -DTSTART:19701004T020000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU +DTSTART:20011007T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+094916 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+094916 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:18950901T000000 +RDATE:18950901T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1000 +TZOFFSETTO:+1100 +TZNAME:EST +DTSTART:19161001T020000 +RDATE:19161001T020000 +RDATE:19420101T020000 +RDATE:19420927T020000 +RDATE:19431003T020000 +RDATE:19671001T020000 +RDATE:19681027T020000 +RDATE:19691026T020000 +RDATE:19701025T020000 +RDATE:19711031T020000 +RDATE:19721029T020000 +RDATE:19731028T020000 +RDATE:19741027T020000 +RDATE:19751026T020000 +RDATE:19761031T020000 +RDATE:19771030T020000 +RDATE:19781029T020000 +RDATE:19791028T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +RDATE:19831030T020000 +RDATE:19841028T020000 +RDATE:19851027T020000 +RDATE:19861019T020000 +RDATE:19871025T020000 +RDATE:19881030T020000 +RDATE:19891029T020000 +RDATE:19901028T020000 +RDATE:19911006T020000 +RDATE:19921004T020000 +RDATE:19931003T020000 +RDATE:19941002T020000 +RDATE:19951001T020000 +RDATE:19961006T020000 +RDATE:19971005T020000 +RDATE:19981004T020000 +RDATE:19991003T020000 +RDATE:20000827T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1100 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:19170201T000000 +RDATE:19170201T000000 +RDATE:19420329T020000 +RDATE:19430328T020000 +RDATE:19440326T020000 +RDATE:19680331T030000 +RDATE:19690309T030000 +RDATE:19700308T030000 +RDATE:19710314T030000 +RDATE:19720227T030000 +RDATE:19730304T030000 +RDATE:19740303T030000 +RDATE:19750302T030000 +RDATE:19760307T030000 +RDATE:19770306T030000 +RDATE:19780305T030000 +RDATE:19790304T030000 +RDATE:19800302T030000 +RDATE:19810301T030000 +RDATE:19820328T030000 +RDATE:19830327T030000 +RDATE:19840304T030000 +RDATE:19850303T030000 +RDATE:19860302T030000 +RDATE:19870315T030000 +RDATE:19880320T030000 +RDATE:19890319T030000 +RDATE:19900318T030000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+1000 TZOFFSETTO:+1000 TZNAME:EST -DTSTART:19700329T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +DTSTART:19170325T020000 +RDATE:19170325T020000 +RDATE:19670101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Australia/Lindeman.ics b/mozilla/calendar/libical/zoneinfo/Australia/Lindeman.ics index ffb6a64cb37..d9f7623376a 100644 --- a/mozilla/calendar/libical/zoneinfo/Australia/Lindeman.ics +++ b/mozilla/calendar/libical/zoneinfo/Australia/Lindeman.ics @@ -1,14 +1,62 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Australia/Lindeman +TZID:/softwarestudio.org/Olson_20010626_2/Australia/Lindeman X-LIC-LOCATION:Australia/Lindeman BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+095556 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+095556 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:18950101T000000 +RDATE:18950101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1000 +TZOFFSETTO:+1100 +TZNAME:EST +DTSTART:19170101T000100 +RDATE:19170101T000100 +RDATE:19420101T020000 +RDATE:19420927T020000 +RDATE:19431003T020000 +RDATE:19711031T020000 +RDATE:19891029T020000 +RDATE:19901028T020000 +RDATE:19911027T020000 +RDATE:19921025T020000 +RDATE:19931031T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1100 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:19170325T020000 +RDATE:19170325T020000 +RDATE:19420329T020000 +RDATE:19430328T020000 +RDATE:19440326T020000 +RDATE:19720227T030000 +RDATE:19900304T030000 +RDATE:19910303T030000 +RDATE:19920301T030000 +RDATE:19930307T030000 +RDATE:19940306T030000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+1000 TZOFFSETTO:+1000 TZNAME:EST -DTSTART:19700101T000000 +DTSTART:19710101T000000 +RDATE:19710101T000000 +RDATE:19920701T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Australia/Lord_Howe.ics b/mozilla/calendar/libical/zoneinfo/Australia/Lord_Howe.ics index f84ce35f995..d812f9c8abc 100644 --- a/mozilla/calendar/libical/zoneinfo/Australia/Lord_Howe.ics +++ b/mozilla/calendar/libical/zoneinfo/Australia/Lord_Howe.ics @@ -1,22 +1,101 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Australia/Lord_Howe +TZID:/softwarestudio.org/Olson_20010626_2/Australia/Lord_Howe X-LIC-LOCATION:Australia/Lord_Howe +BEGIN:STANDARD +TZOFFSETFROM:+1100 +TZOFFSETTO:+1030 +TZNAME:LHST +DTSTART:19960331T020000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+1030 TZOFFSETTO:+1100 TZNAME:LHST -DTSTART:19701025T020000 +DTSTART:20011028T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD -TZOFFSETFROM:+1030 +TZOFFSETFROM:+0000 +TZOFFSETTO:+103620 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+103620 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:18950201T000000 +RDATE:18950201T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+1000 TZOFFSETTO:+1030 TZNAME:LHST -DTSTART:19700329T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +DTSTART:19810301T000000 +RDATE:19810301T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1030 +TZOFFSETTO:+1130 +TZNAME:LHST +DTSTART:19811025T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +RDATE:19831030T020000 +RDATE:19841028T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1130 +TZOFFSETTO:+1030 +TZNAME:LHST +DTSTART:19820307T020000 +RDATE:19820307T020000 +RDATE:19830306T020000 +RDATE:19840304T020000 +RDATE:19850303T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1030 +TZOFFSETTO:+1100 +TZNAME:LHST +DTSTART:19851027T020000 +RDATE:19851027T020000 +RDATE:19861019T020000 +RDATE:19871025T020000 +RDATE:19881030T020000 +RDATE:19891029T020000 +RDATE:19901028T020000 +RDATE:19911027T020000 +RDATE:19921025T020000 +RDATE:19931031T020000 +RDATE:19941030T020000 +RDATE:19951029T020000 +RDATE:19961027T020000 +RDATE:19971026T020000 +RDATE:19981025T020000 +RDATE:19991031T020000 +RDATE:20000827T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1100 +TZOFFSETTO:+1030 +TZNAME:LHST +DTSTART:19860316T020000 +RDATE:19860316T020000 +RDATE:19870315T020000 +RDATE:19880320T020000 +RDATE:19890319T020000 +RDATE:19900304T020000 +RDATE:19910303T020000 +RDATE:19920301T020000 +RDATE:19930307T020000 +RDATE:19940306T020000 +RDATE:19950305T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Australia/Melbourne.ics b/mozilla/calendar/libical/zoneinfo/Australia/Melbourne.ics index cfe94145e35..cf826755689 100644 --- a/mozilla/calendar/libical/zoneinfo/Australia/Melbourne.ics +++ b/mozilla/calendar/libical/zoneinfo/Australia/Melbourne.ics @@ -1,22 +1,116 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Australia/Melbourne +TZID:/softwarestudio.org/Olson_20010626_2/Australia/Melbourne X-LIC-LOCATION:Australia/Melbourne +BEGIN:STANDARD +TZOFFSETFROM:+1100 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:19950326T030000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+1000 TZOFFSETTO:+1100 TZNAME:EST -DTSTART:19701025T020000 +DTSTART:20011028T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+093952 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+093952 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:18950201T000000 +RDATE:18950201T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1000 +TZOFFSETTO:+1100 +TZNAME:EST +DTSTART:19170101T000100 +RDATE:19170101T000100 +RDATE:19420101T020000 +RDATE:19420927T020000 +RDATE:19431003T020000 +RDATE:19711031T020000 +RDATE:19721029T020000 +RDATE:19731028T020000 +RDATE:19741027T020000 +RDATE:19751026T020000 +RDATE:19761031T020000 +RDATE:19771030T020000 +RDATE:19781029T020000 +RDATE:19791028T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +RDATE:19831030T020000 +RDATE:19841028T020000 +RDATE:19851027T020000 +RDATE:19861019T020000 +RDATE:19871018T020000 +RDATE:19881030T020000 +RDATE:19891029T020000 +RDATE:19901028T020000 +RDATE:19911027T020000 +RDATE:19921025T020000 +RDATE:19931031T020000 +RDATE:19941030T020000 +RDATE:19951029T020000 +RDATE:19961027T020000 +RDATE:19971026T020000 +RDATE:19981025T020000 +RDATE:19991031T020000 +RDATE:20000827T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1100 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:19170325T020000 +RDATE:19170325T020000 +RDATE:19420329T020000 +RDATE:19430328T020000 +RDATE:19440326T020000 +RDATE:19720227T030000 +RDATE:19730304T030000 +RDATE:19740303T030000 +RDATE:19750302T030000 +RDATE:19760307T030000 +RDATE:19770306T030000 +RDATE:19780305T030000 +RDATE:19790304T030000 +RDATE:19800302T030000 +RDATE:19810301T030000 +RDATE:19820307T030000 +RDATE:19830306T030000 +RDATE:19840304T030000 +RDATE:19850303T030000 +RDATE:19860316T030000 +RDATE:19870315T030000 +RDATE:19880320T030000 +RDATE:19890319T030000 +RDATE:19900318T030000 +RDATE:19910303T030000 +RDATE:19920301T030000 +RDATE:19930307T030000 +RDATE:19940306T030000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+1000 TZOFFSETTO:+1000 TZNAME:EST -DTSTART:19700329T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +DTSTART:19710101T000000 +RDATE:19710101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Australia/Perth.ics b/mozilla/calendar/libical/zoneinfo/Australia/Perth.ics index c01ad48f406..7ba692d11a6 100644 --- a/mozilla/calendar/libical/zoneinfo/Australia/Perth.ics +++ b/mozilla/calendar/libical/zoneinfo/Australia/Perth.ics @@ -1,14 +1,53 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Australia/Perth +TZID:/softwarestudio.org/Olson_20010626_2/Australia/Perth X-LIC-LOCATION:Australia/Perth BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+074324 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+074324 +TZOFFSETTO:+0800 +TZNAME:WST +DTSTART:18951201T000000 +RDATE:18951201T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0800 +TZOFFSETTO:+0900 +TZNAME:WST +DTSTART:19170101T000100 +RDATE:19170101T000100 +RDATE:19420101T020000 +RDATE:19420927T020000 +RDATE:19741027T020000 +RDATE:19831030T020000 +RDATE:19911117T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+0800 +TZNAME:WST +DTSTART:19170325T020000 +RDATE:19170325T020000 +RDATE:19420329T020000 +RDATE:19430328T020000 +RDATE:19750302T030000 +RDATE:19840304T030000 +RDATE:19920301T030000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+0800 TZOFFSETTO:+0800 TZNAME:WST -DTSTART:19700101T000000 +DTSTART:19430701T000000 +RDATE:19430701T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Australia/Sydney.ics b/mozilla/calendar/libical/zoneinfo/Australia/Sydney.ics index d69b02fd5dc..f39c11ed350 100644 --- a/mozilla/calendar/libical/zoneinfo/Australia/Sydney.ics +++ b/mozilla/calendar/libical/zoneinfo/Australia/Sydney.ics @@ -1,22 +1,117 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Australia/Sydney +TZID:/softwarestudio.org/Olson_20010626_2/Australia/Sydney X-LIC-LOCATION:Australia/Sydney +BEGIN:STANDARD +TZOFFSETFROM:+1100 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:19960331T030000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+1000 TZOFFSETTO:+1100 TZNAME:EST -DTSTART:19701025T020000 +DTSTART:20011028T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+100452 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+100452 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:18950201T000000 +RDATE:18950201T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1000 +TZOFFSETTO:+1100 +TZNAME:EST +DTSTART:19170101T000100 +RDATE:19170101T000100 +RDATE:19420101T020000 +RDATE:19420927T020000 +RDATE:19431003T020000 +RDATE:19711031T020000 +RDATE:19721029T020000 +RDATE:19731028T020000 +RDATE:19741027T020000 +RDATE:19751026T020000 +RDATE:19761031T020000 +RDATE:19771030T020000 +RDATE:19781029T020000 +RDATE:19791028T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +RDATE:19831030T020000 +RDATE:19841028T020000 +RDATE:19851027T020000 +RDATE:19861019T020000 +RDATE:19871025T020000 +RDATE:19881030T020000 +RDATE:19891029T020000 +RDATE:19901028T020000 +RDATE:19911027T020000 +RDATE:19921025T020000 +RDATE:19931031T020000 +RDATE:19941030T020000 +RDATE:19951029T020000 +RDATE:19961027T020000 +RDATE:19971026T020000 +RDATE:19981025T020000 +RDATE:19991031T020000 +RDATE:20000827T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1100 +TZOFFSETTO:+1000 +TZNAME:EST +DTSTART:19170325T020000 +RDATE:19170325T020000 +RDATE:19420329T020000 +RDATE:19430328T020000 +RDATE:19440326T020000 +RDATE:19720227T030000 +RDATE:19730304T030000 +RDATE:19740303T030000 +RDATE:19750302T030000 +RDATE:19760307T030000 +RDATE:19770306T030000 +RDATE:19780305T030000 +RDATE:19790304T030000 +RDATE:19800302T030000 +RDATE:19810301T030000 +RDATE:19820404T030000 +RDATE:19830306T030000 +RDATE:19840304T030000 +RDATE:19850303T030000 +RDATE:19860316T030000 +RDATE:19870315T030000 +RDATE:19880320T030000 +RDATE:19890319T030000 +RDATE:19900304T030000 +RDATE:19910303T030000 +RDATE:19920301T030000 +RDATE:19930307T030000 +RDATE:19940306T030000 +RDATE:19950305T030000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+1000 TZOFFSETTO:+1000 TZNAME:EST -DTSTART:19700329T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +DTSTART:19710101T000000 +RDATE:19710101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Amsterdam.ics b/mozilla/calendar/libical/zoneinfo/Europe/Amsterdam.ics index 359ce06c43f..9d493197cc4 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Amsterdam.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Amsterdam.ics @@ -1,22 +1,171 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Amsterdam +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Amsterdam X-LIC-LOCATION:Europe/Amsterdam BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19810329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+001932 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+001932 +TZOFFSETTO:+001932 +TZNAME:AMT +DTSTART:18350101T000000 +RDATE:18350101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+001932 +TZOFFSETTO:+011932 +TZNAME:NST +DTSTART:19160501T000000 +RDATE:19160501T000000 +RDATE:19170416T020000 +RDATE:19180401T020000 +RDATE:19190407T020000 +RDATE:19200405T020000 +RDATE:19210404T020000 +RDATE:19220326T020000 +RDATE:19230601T020000 +RDATE:19240330T020000 +RDATE:19250605T020000 +RDATE:19260515T020000 +RDATE:19270515T020000 +RDATE:19280515T020000 +RDATE:19290515T020000 +RDATE:19300515T020000 +RDATE:19310515T020000 +RDATE:19320522T020000 +RDATE:19330515T020000 +RDATE:19340515T020000 +RDATE:19350515T020000 +RDATE:19360515T020000 +RDATE:19370522T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+011932 +TZOFFSETTO:+001932 +TZNAME:AMT +DTSTART:19161001T000000 +RDATE:19161001T000000 +RDATE:19170917T030000 +RDATE:19180930T030000 +RDATE:19190929T030000 +RDATE:19200927T030000 +RDATE:19210926T030000 +RDATE:19221008T030000 +RDATE:19231007T030000 +RDATE:19241005T030000 +RDATE:19251004T030000 +RDATE:19261003T030000 +RDATE:19271002T030000 +RDATE:19281007T030000 +RDATE:19291006T030000 +RDATE:19301005T030000 +RDATE:19311004T030000 +RDATE:19321002T030000 +RDATE:19331008T030000 +RDATE:19341007T030000 +RDATE:19351006T030000 +RDATE:19361004T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+011932 +TZOFFSETTO:+0120 +TZNAME:NEST +DTSTART:19370701T000000 +RDATE:19370701T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0120 +TZOFFSETTO:+0020 +TZNAME:NET +DTSTART:19371003T030000 +RDATE:19371003T030000 +RDATE:19381002T030000 +RDATE:19391008T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0020 +TZOFFSETTO:+0120 +TZNAME:NEST +DTSTART:19380515T020000 +RDATE:19380515T020000 +RDATE:19390515T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0020 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19400517T000000 +RDATE:19400517T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19421102T020000 +RDATE:19421102T020000 +RDATE:19770101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19430329T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19450402T020000 +RDATE:19770403T020000 +RDATE:19780402T020000 +RDATE:19790401T020000 +RDATE:19800406T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19431004T030000 +RDATE:19431004T030000 +RDATE:19441002T030000 +RDATE:19450916T030000 +RDATE:19770925T030000 +RDATE:19781001T030000 +RDATE:19790930T030000 +RDATE:19800928T030000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Andorra.ics b/mozilla/calendar/libical/zoneinfo/Europe/Andorra.ics index 9f4327d3f38..6a6723c6bcb 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Andorra.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Andorra.ics @@ -1,22 +1,60 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Andorra +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Andorra X-LIC-LOCATION:Europe/Andorra BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19850331T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+000604 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+000604 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19010101T000000 +RDATE:19010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19460930T000000 +RDATE:19460930T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19850929T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Athens.ics b/mozilla/calendar/libical/zoneinfo/Europe/Athens.ics index 3e4a332f4af..bd011f469bc 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Athens.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Athens.ics @@ -1,22 +1,129 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Athens +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Athens X-LIC-LOCATION:Europe/Athens BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700329T030000 +DTSTART:19810329T030000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701025T040000 +DTSTART:19961027T040000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+013452 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+013452 +TZOFFSETTO:+013452 +TZNAME:AMT +DTSTART:18950914T000000 +RDATE:18950914T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+013452 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19160728T000100 +RDATE:19160728T000100 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19320707T000000 +RDATE:19320707T000000 +RDATE:19410407T000000 +RDATE:19520701T000000 +RDATE:19750412T000000 +RDATE:19760411T020000 +RDATE:19770403T020000 +RDATE:19780402T020000 +RDATE:19790401T090000 +RDATE:19800401T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19320901T000000 +RDATE:19320901T000000 +RDATE:19521102T000000 +RDATE:19751126T010000 +RDATE:19761010T030000 +RDATE:19770926T030000 +RDATE:19780924T040000 +RDATE:19790929T020000 +RDATE:19800928T000000 +RDATE:19810927T040000 +RDATE:19820926T040000 +RDATE:19830925T040000 +RDATE:19840930T040000 +RDATE:19850929T040000 +RDATE:19860928T040000 +RDATE:19870927T040000 +RDATE:19880925T040000 +RDATE:19890924T040000 +RDATE:19900930T040000 +RDATE:19910929T040000 +RDATE:19920927T040000 +RDATE:19930926T040000 +RDATE:19940925T040000 +RDATE:19950924T040000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19410430T000000 +RDATE:19410430T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19421102T030000 +RDATE:19421102T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19430330T000000 +RDATE:19430330T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19431004T000000 +RDATE:19431004T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19440404T000000 +RDATE:19440404T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19810101T000000 +RDATE:19810101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Belgrade.ics b/mozilla/calendar/libical/zoneinfo/Europe/Belgrade.ics index a6ff2cc740c..424e9c80b86 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Belgrade.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Belgrade.ics @@ -1,22 +1,76 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Belgrade +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Belgrade X-LIC-LOCATION:Europe/Belgrade BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19830327T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0122 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0122 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:18840101T000000 +RDATE:18840101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19410418T230000 +RDATE:19410418T230000 +RDATE:19421102T020000 +RDATE:19821127T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19430329T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19450508T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19431004T030000 +RDATE:19431004T030000 +RDATE:19441002T030000 +RDATE:19450916T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Berlin.ics b/mozilla/calendar/libical/zoneinfo/Europe/Berlin.ics index 53290a95113..ab248fa9e23 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Berlin.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Berlin.ics @@ -1,22 +1,110 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Berlin +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Berlin X-LIC-LOCATION:Europe/Berlin BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19810329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+005328 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+005328 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:18930401T000000 +RDATE:18930401T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19160430T230000 +RDATE:19160430T230000 +RDATE:19170416T020000 +RDATE:19180415T020000 +RDATE:19400401T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19450402T020000 +RDATE:19460414T020000 +RDATE:19470406T020000 +RDATE:19480418T020000 +RDATE:19490410T020000 +RDATE:19800406T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19161001T010000 +RDATE:19161001T010000 +RDATE:19170917T030000 +RDATE:19180916T030000 +RDATE:19421102T030000 +RDATE:19431004T030000 +RDATE:19441002T030000 +RDATE:19451118T030000 +RDATE:19461007T030000 +RDATE:19471005T030000 +RDATE:19481003T030000 +RDATE:19491002T030000 +RDATE:19800928T030000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:CEMT +DTSTART:19450531T030000 +RDATE:19450531T030000 +RDATE:19470511T030000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19450923T030000 +RDATE:19450923T030000 +RDATE:19470629T030000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19800101T000000 +RDATE:19800101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Bratislava.ics b/mozilla/calendar/libical/zoneinfo/Europe/Bratislava.ics index ba4d37c6e25..bc80103dc0f 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Bratislava.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Bratislava.ics @@ -1,22 +1,103 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Bratislava +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Bratislava X-LIC-LOCATION:Europe/Bratislava BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19810329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+005744 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+005744 +TZOFFSETTO:+005744 +TZNAME:PMT +DTSTART:18500101T000000 +RDATE:18500101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+005744 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:18911001T000000 +RDATE:18911001T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19160430T230000 +RDATE:19160430T230000 +RDATE:19170416T020000 +RDATE:19180415T020000 +RDATE:19400401T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19450408T020000 +RDATE:19460506T020000 +RDATE:19470420T020000 +RDATE:19480418T020000 +RDATE:19490409T020000 +RDATE:19790401T020000 +RDATE:19800406T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19161001T010000 +RDATE:19161001T010000 +RDATE:19170917T030000 +RDATE:19180916T030000 +RDATE:19421102T030000 +RDATE:19431004T030000 +RDATE:19440917T030000 +RDATE:19451118T030000 +RDATE:19461006T030000 +RDATE:19471005T030000 +RDATE:19481003T030000 +RDATE:19491002T030000 +RDATE:19790930T030000 +RDATE:19800928T030000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19790101T000000 +RDATE:19790101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Brussels.ics b/mozilla/calendar/libical/zoneinfo/Europe/Brussels.ics index 9f314c07511..3f5c4b23b8c 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Brussels.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Brussels.ics @@ -1,22 +1,165 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Brussels +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Brussels X-LIC-LOCATION:Europe/Brussels BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19810329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+001730 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+001730 +TZOFFSETTO:+001730 +TZNAME:BMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+001730 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:18920501T120000 +RDATE:18920501T120000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19141108T000000 +RDATE:19141108T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19160501T000000 +RDATE:19160501T000000 +RDATE:19161001T010000 +RDATE:19400520T030000 +RDATE:19421102T020000 +RDATE:19440917T020000 +RDATE:19770101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19170416T020000 +RDATE:19170416T020000 +RDATE:19180415T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19450402T020000 +RDATE:19460519T020000 +RDATE:19770403T020000 +RDATE:19780402T020000 +RDATE:19790401T020000 +RDATE:19800406T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19170917T030000 +RDATE:19170917T030000 +RDATE:19180916T030000 +RDATE:19431004T030000 +RDATE:19440903T000000 +RDATE:19450916T030000 +RDATE:19461007T030000 +RDATE:19770925T030000 +RDATE:19781001T030000 +RDATE:19790930T030000 +RDATE:19800928T030000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19181111T120000 +RDATE:19181111T120000 +RDATE:19191005T000000 +RDATE:19201024T000000 +RDATE:19211026T000000 +RDATE:19221008T000000 +RDATE:19231007T000000 +RDATE:19241005T000000 +RDATE:19251004T000000 +RDATE:19261003T000000 +RDATE:19271002T000000 +RDATE:19281007T030000 +RDATE:19291006T030000 +RDATE:19301005T030000 +RDATE:19311004T030000 +RDATE:19321002T030000 +RDATE:19331008T030000 +RDATE:19341007T030000 +RDATE:19351006T030000 +RDATE:19361004T030000 +RDATE:19371003T030000 +RDATE:19381002T030000 +RDATE:19391119T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:WEST +DTSTART:19190301T230000 +RDATE:19190301T230000 +RDATE:19200214T230000 +RDATE:19210314T230000 +RDATE:19220325T230000 +RDATE:19230421T230000 +RDATE:19240329T230000 +RDATE:19250404T230000 +RDATE:19260417T230000 +RDATE:19270409T230000 +RDATE:19280414T230000 +RDATE:19290421T020000 +RDATE:19300413T020000 +RDATE:19310419T020000 +RDATE:19320403T020000 +RDATE:19330326T020000 +RDATE:19340408T020000 +RDATE:19350331T020000 +RDATE:19360419T020000 +RDATE:19370404T020000 +RDATE:19380327T020000 +RDATE:19390416T020000 +RDATE:19400225T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Bucharest.ics b/mozilla/calendar/libical/zoneinfo/Europe/Bucharest.ics index f9629562e93..942fab9ce36 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Bucharest.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Bucharest.ics @@ -1,22 +1,116 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Bucharest +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Bucharest X-LIC-LOCATION:Europe/Bucharest BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700329T030000 +DTSTART:19970330T030000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701025T040000 +DTSTART:19971026T040000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+014424 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+014424 +TZOFFSETTO:+014424 +TZNAME:BMT +DTSTART:18911001T000000 +RDATE:18911001T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+014424 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19310724T000000 +RDATE:19310724T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19320521T000000 +RDATE:19320521T000000 +RDATE:19330402T000000 +RDATE:19340408T000000 +RDATE:19350407T000000 +RDATE:19360405T000000 +RDATE:19370404T000000 +RDATE:19380403T000000 +RDATE:19390402T000000 +RDATE:19790527T000000 +RDATE:19800405T230000 +RDATE:19810329T020000 +RDATE:19820328T020000 +RDATE:19830327T020000 +RDATE:19840325T020000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +RDATE:19910331T000000 +RDATE:19920329T000000 +RDATE:19930328T000000 +RDATE:19940327T000000 +RDATE:19950326T000000 +RDATE:19960331T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19321002T010000 +RDATE:19321002T010000 +RDATE:19331001T010000 +RDATE:19341007T010000 +RDATE:19351006T010000 +RDATE:19361004T010000 +RDATE:19371003T010000 +RDATE:19381002T010000 +RDATE:19391001T010000 +RDATE:19790930T000000 +RDATE:19800928T010000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T010000 +RDATE:19920927T010000 +RDATE:19930926T010000 +RDATE:19940925T000000 +RDATE:19950924T000000 +RDATE:19961027T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19910101T000000 +RDATE:19910101T000000 +RDATE:19940101T000000 +RDATE:19970101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Budapest.ics b/mozilla/calendar/libical/zoneinfo/Europe/Budapest.ics index 2241cd05ba8..3a72403996f 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Budapest.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Budapest.ics @@ -1,22 +1,108 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Budapest +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Budapest X-LIC-LOCATION:Europe/Budapest BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19810329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+011620 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+011620 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:18901001T000000 +RDATE:18901001T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19160430T230000 +RDATE:19160430T230000 +RDATE:19170416T020000 +RDATE:19180401T030000 +RDATE:19190415T030000 +RDATE:19200405T030000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19450501T230000 +RDATE:19460331T020000 +RDATE:19470406T020000 +RDATE:19480404T020000 +RDATE:19490410T020000 +RDATE:19500417T020000 +RDATE:19540523T000000 +RDATE:19550523T000000 +RDATE:19560603T000000 +RDATE:19570602T010000 +RDATE:19800406T010000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19161001T010000 +RDATE:19161001T010000 +RDATE:19170917T030000 +RDATE:19180929T030000 +RDATE:19190915T030000 +RDATE:19200930T030000 +RDATE:19431004T030000 +RDATE:19441002T030000 +RDATE:19451103T000000 +RDATE:19461006T030000 +RDATE:19471005T030000 +RDATE:19481003T030000 +RDATE:19491002T030000 +RDATE:19501023T030000 +RDATE:19541003T000000 +RDATE:19551003T000000 +RDATE:19560930T000000 +RDATE:19570929T030000 +RDATE:19800928T030000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19180101T000000 +RDATE:19180101T000000 +RDATE:19410406T020000 +RDATE:19421102T020000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Chisinau.ics b/mozilla/calendar/libical/zoneinfo/Europe/Chisinau.ics index f525ee5eed2..d2e16f81abc 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Chisinau.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Chisinau.ics @@ -1,22 +1,174 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Chisinau +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Chisinau X-LIC-LOCATION:Europe/Chisinau BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700329T030000 +DTSTART:19970330T030000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701025T040000 +DTSTART:19971026T040000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+015520 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+015520 +TZOFFSETTO:+0155 +TZNAME:CMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0155 +TZOFFSETTO:+014424 +TZNAME:BMT +DTSTART:19180215T000000 +RDATE:19180215T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+014424 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19310724T000000 +RDATE:19310724T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19320521T000000 +RDATE:19320521T000000 +RDATE:19330402T000000 +RDATE:19340408T000000 +RDATE:19350407T000000 +RDATE:19360405T000000 +RDATE:19370404T000000 +RDATE:19380403T000000 +RDATE:19390402T000000 +RDATE:19400815T000000 +RDATE:19910331T020000 +RDATE:19920329T000000 +RDATE:19930328T000000 +RDATE:19940327T000000 +RDATE:19950326T000000 +RDATE:19960331T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19321002T010000 +RDATE:19321002T010000 +RDATE:19331001T010000 +RDATE:19341007T010000 +RDATE:19351006T010000 +RDATE:19361004T010000 +RDATE:19371003T010000 +RDATE:19381002T010000 +RDATE:19391001T010000 +RDATE:19900506T000000 +RDATE:19910929T030000 +RDATE:19920927T000000 +RDATE:19930926T000000 +RDATE:19940925T000000 +RDATE:19950924T000000 +RDATE:19961027T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19410717T000000 +RDATE:19410717T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19421102T020000 +RDATE:19421102T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19430329T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19431004T030000 +RDATE:19431004T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19440824T000000 +RDATE:19440824T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:MSD +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19900101T000000 +RDATE:19900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19910101T000000 +RDATE:19910101T000000 +RDATE:19920101T000000 +RDATE:19970101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Copenhagen.ics b/mozilla/calendar/libical/zoneinfo/Europe/Copenhagen.ics index a0b5f339a94..e8cde97d162 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Copenhagen.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Copenhagen.ics @@ -1,22 +1,95 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Copenhagen +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Copenhagen X-LIC-LOCATION:Europe/Copenhagen BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19810329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+005020 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+005020 +TZOFFSETTO:+005020 +TZNAME:CMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+005020 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:18940401T000000 +RDATE:18940401T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19160514T230000 +RDATE:19160514T230000 +RDATE:19400515T000000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19450402T020000 +RDATE:19460501T020000 +RDATE:19470504T020000 +RDATE:19480509T020000 +RDATE:19800406T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19160930T230000 +RDATE:19160930T230000 +RDATE:19421102T030000 +RDATE:19431004T030000 +RDATE:19441002T030000 +RDATE:19450815T030000 +RDATE:19460901T030000 +RDATE:19470810T030000 +RDATE:19480808T030000 +RDATE:19800928T030000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19800101T000000 +RDATE:19800101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Dublin.ics b/mozilla/calendar/libical/zoneinfo/Europe/Dublin.ics index fa59a5d7b11..48d116cdb7c 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Dublin.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Dublin.ics @@ -1,22 +1,208 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Dublin +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Dublin X-LIC-LOCATION:Europe/Dublin BEGIN:DAYLIGHT TZOFFSETFROM:+0000 TZOFFSETTO:+0100 TZNAME:IST -DTSTART:19700329T010000 +DTSTART:19810329T010000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0100 TZOFFSETTO:+0000 TZNAME:GMT -DTSTART:19701025T020000 +DTSTART:19961027T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-002521 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-002521 +TZOFFSETTO:-002521 +TZNAME:DMT +DTSTART:18800802T000000 +RDATE:18800802T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-002521 +TZOFFSETTO:+003439 +TZNAME:IST +DTSTART:19160521T020000 +RDATE:19160521T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+003439 +TZOFFSETTO:+0000 +TZNAME:GMT +DTSTART:19161001T030000 +RDATE:19161001T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:BST +DTSTART:19170408T020000 +RDATE:19170408T020000 +RDATE:19180324T020000 +RDATE:19190330T020000 +RDATE:19200328T020000 +RDATE:19210403T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0000 +TZNAME:GMT +DTSTART:19170917T030000 +RDATE:19170917T030000 +RDATE:19180930T030000 +RDATE:19190929T030000 +RDATE:19201025T030000 +RDATE:19211003T030000 +RDATE:19221008T030000 +RDATE:19230916T030000 +RDATE:19240921T030000 +RDATE:19251004T030000 +RDATE:19261003T030000 +RDATE:19271002T030000 +RDATE:19281007T030000 +RDATE:19291006T030000 +RDATE:19301005T030000 +RDATE:19311004T030000 +RDATE:19321002T030000 +RDATE:19331008T030000 +RDATE:19341007T030000 +RDATE:19351006T030000 +RDATE:19361004T030000 +RDATE:19371003T030000 +RDATE:19381002T030000 +RDATE:19391119T030000 +RDATE:19461006T020000 +RDATE:19471102T020000 +RDATE:19491030T030000 +RDATE:19501022T030000 +RDATE:19511021T030000 +RDATE:19521026T030000 +RDATE:19531004T030000 +RDATE:19541003T030000 +RDATE:19551002T030000 +RDATE:19561007T030000 +RDATE:19571006T030000 +RDATE:19581005T030000 +RDATE:19591004T030000 +RDATE:19601002T030000 +RDATE:19611029T030000 +RDATE:19621028T030000 +RDATE:19631027T030000 +RDATE:19641025T030000 +RDATE:19651024T030000 +RDATE:19661023T030000 +RDATE:19671029T030000 +RDATE:19711031T030000 +RDATE:19721029T030000 +RDATE:19731028T030000 +RDATE:19741027T030000 +RDATE:19751026T030000 +RDATE:19761024T030000 +RDATE:19771023T030000 +RDATE:19781029T030000 +RDATE:19791028T030000 +RDATE:19801026T030000 +RDATE:19811025T020000 +RDATE:19821024T020000 +RDATE:19831023T020000 +RDATE:19841028T020000 +RDATE:19851027T020000 +RDATE:19861026T020000 +RDATE:19871025T020000 +RDATE:19881023T020000 +RDATE:19891029T020000 +RDATE:19901028T020000 +RDATE:19911027T020000 +RDATE:19921025T020000 +RDATE:19931024T020000 +RDATE:19941023T020000 +RDATE:19951022T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0000 +TZNAME:GMT +DTSTART:19211206T000000 +RDATE:19211206T000000 +RDATE:19480418T020000 +RDATE:19481031T020000 +RDATE:19960101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:IST +DTSTART:19220326T020000 +RDATE:19220326T020000 +RDATE:19230422T020000 +RDATE:19240413T020000 +RDATE:19250419T020000 +RDATE:19260418T020000 +RDATE:19270410T020000 +RDATE:19280422T020000 +RDATE:19290421T020000 +RDATE:19300413T020000 +RDATE:19310419T020000 +RDATE:19320417T020000 +RDATE:19330409T020000 +RDATE:19340422T020000 +RDATE:19350414T020000 +RDATE:19360419T020000 +RDATE:19370418T020000 +RDATE:19380410T020000 +RDATE:19390416T020000 +RDATE:19400225T020000 +RDATE:19470316T020000 +RDATE:19490403T020000 +RDATE:19500416T020000 +RDATE:19510415T020000 +RDATE:19520420T020000 +RDATE:19530419T020000 +RDATE:19540411T020000 +RDATE:19550417T020000 +RDATE:19560422T020000 +RDATE:19570414T020000 +RDATE:19580420T020000 +RDATE:19590419T020000 +RDATE:19600410T020000 +RDATE:19610326T020000 +RDATE:19620325T020000 +RDATE:19630331T020000 +RDATE:19640322T020000 +RDATE:19650321T020000 +RDATE:19660320T020000 +RDATE:19670319T020000 +RDATE:19680218T020000 +RDATE:19720319T020000 +RDATE:19730318T020000 +RDATE:19740317T020000 +RDATE:19750316T020000 +RDATE:19760321T020000 +RDATE:19770320T020000 +RDATE:19780319T020000 +RDATE:19790318T020000 +RDATE:19800316T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:IST +DTSTART:19681027T000000 +RDATE:19681027T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Gibraltar.ics b/mozilla/calendar/libical/zoneinfo/Europe/Gibraltar.ics index b291844adcb..9330fd03530 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Gibraltar.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Gibraltar.ics @@ -1,22 +1,178 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Gibraltar +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Gibraltar X-LIC-LOCATION:Europe/Gibraltar BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19820328T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-002124 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-002124 +TZOFFSETTO:+0000 +TZNAME:GMT +DTSTART:18800802T000000 +RDATE:18800802T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:BST +DTSTART:19160521T020000 +RDATE:19160521T020000 +RDATE:19170408T020000 +RDATE:19180324T020000 +RDATE:19190330T020000 +RDATE:19200328T020000 +RDATE:19210403T020000 +RDATE:19220326T020000 +RDATE:19230422T020000 +RDATE:19240413T020000 +RDATE:19250419T020000 +RDATE:19260418T020000 +RDATE:19270410T020000 +RDATE:19280422T020000 +RDATE:19290421T020000 +RDATE:19300413T020000 +RDATE:19310419T020000 +RDATE:19320417T020000 +RDATE:19330409T020000 +RDATE:19340422T020000 +RDATE:19350414T020000 +RDATE:19360419T020000 +RDATE:19370418T020000 +RDATE:19380410T020000 +RDATE:19390416T020000 +RDATE:19400225T020000 +RDATE:19460414T020000 +RDATE:19470316T020000 +RDATE:19480314T020000 +RDATE:19490403T020000 +RDATE:19500416T020000 +RDATE:19510415T020000 +RDATE:19520420T020000 +RDATE:19530419T020000 +RDATE:19540411T020000 +RDATE:19550417T020000 +RDATE:19560422T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0000 +TZNAME:GMT +DTSTART:19161001T030000 +RDATE:19161001T030000 +RDATE:19170917T030000 +RDATE:19180930T030000 +RDATE:19190929T030000 +RDATE:19201025T030000 +RDATE:19211003T030000 +RDATE:19221008T030000 +RDATE:19230916T030000 +RDATE:19240921T030000 +RDATE:19251004T030000 +RDATE:19261003T030000 +RDATE:19271002T030000 +RDATE:19281007T030000 +RDATE:19291006T030000 +RDATE:19301005T030000 +RDATE:19311004T030000 +RDATE:19321002T030000 +RDATE:19331008T030000 +RDATE:19341007T030000 +RDATE:19351006T030000 +RDATE:19361004T030000 +RDATE:19371003T030000 +RDATE:19381002T030000 +RDATE:19391119T030000 +RDATE:19451007T030000 +RDATE:19461006T030000 +RDATE:19471102T030000 +RDATE:19481031T030000 +RDATE:19491030T030000 +RDATE:19501022T030000 +RDATE:19511021T030000 +RDATE:19521026T030000 +RDATE:19531004T030000 +RDATE:19541003T030000 +RDATE:19551002T030000 +RDATE:19561007T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:BDST +DTSTART:19410504T020000 +RDATE:19410504T020000 +RDATE:19420405T020000 +RDATE:19430404T020000 +RDATE:19440402T020000 +RDATE:19450402T020000 +RDATE:19470413T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:BST +DTSTART:19410810T030000 +RDATE:19410810T030000 +RDATE:19420809T030000 +RDATE:19430815T030000 +RDATE:19440917T030000 +RDATE:19450715T030000 +RDATE:19470810T030000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19570414T020000 +RDATE:19570414T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19820101T000000 +RDATE:19820101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19820926T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Guernsey.ics b/mozilla/calendar/libical/zoneinfo/Europe/Guernsey.ics deleted file mode 100644 index 1556bcfbd1e..00000000000 --- a/mozilla/calendar/libical/zoneinfo/Europe/Guernsey.ics +++ /dev/null @@ -1,22 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Guernsey -X-LIC-LOCATION:Europe/Guernsey -BEGIN:DAYLIGHT -TZOFFSETFROM:+0000 -TZOFFSETTO:+0100 -TZNAME:BST -DTSTART:19700329T010000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:DAYLIGHT -BEGIN:STANDARD -TZOFFSETFROM:+0100 -TZOFFSETTO:+0000 -TZNAME:GMT -DTSTART:19701025T020000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Helsinki.ics b/mozilla/calendar/libical/zoneinfo/Europe/Helsinki.ics index 43adc9aed59..6e30d326fc8 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Helsinki.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Helsinki.ics @@ -1,22 +1,79 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Helsinki +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Helsinki X-LIC-LOCATION:Europe/Helsinki BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700329T030000 +DTSTART:19810329T030000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701025T040000 +DTSTART:19961027T040000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+013952 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+013952 +TZOFFSETTO:+013952 +TZNAME:HMT +DTSTART:18780531T000000 +RDATE:18780531T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+013952 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19210501T000000 +RDATE:19210501T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19420403T000000 +RDATE:19420403T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19421003T000000 +RDATE:19421003T000000 +RDATE:19810927T040000 +RDATE:19820926T040000 +RDATE:19830925T040000 +RDATE:19840930T040000 +RDATE:19850929T040000 +RDATE:19860928T040000 +RDATE:19870927T040000 +RDATE:19880925T040000 +RDATE:19890924T040000 +RDATE:19900930T040000 +RDATE:19910929T040000 +RDATE:19920927T040000 +RDATE:19930926T040000 +RDATE:19940925T040000 +RDATE:19950924T040000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19810329T020000 +RDATE:19810329T020000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Isle_of_Man.ics b/mozilla/calendar/libical/zoneinfo/Europe/Isle_of_Man.ics deleted file mode 100644 index 4ff051a312d..00000000000 --- a/mozilla/calendar/libical/zoneinfo/Europe/Isle_of_Man.ics +++ /dev/null @@ -1,22 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Isle_of_Man -X-LIC-LOCATION:Europe/Isle_of_Man -BEGIN:DAYLIGHT -TZOFFSETFROM:+0000 -TZOFFSETTO:+0100 -TZNAME:BST -DTSTART:19700329T010000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:DAYLIGHT -BEGIN:STANDARD -TZOFFSETFROM:+0100 -TZOFFSETTO:+0000 -TZNAME:GMT -DTSTART:19701025T020000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Istanbul.ics b/mozilla/calendar/libical/zoneinfo/Europe/Istanbul.ics index 6aebc6f78b6..ca7bec10c40 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Istanbul.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Istanbul.ics @@ -1,22 +1,168 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Istanbul +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Istanbul X-LIC-LOCATION:Europe/Istanbul BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700329T010000 +DTSTART:19910331T030000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701025T020000 +DTSTART:19961027T040000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+015552 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+015552 +TZOFFSETTO:+015656 +TZNAME:IMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+015656 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19101001T000000 +RDATE:19101001T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19160501T000000 +RDATE:19160501T000000 +RDATE:19200328T000000 +RDATE:19210403T000000 +RDATE:19220326T000000 +RDATE:19240513T000000 +RDATE:19250501T000000 +RDATE:19400630T000000 +RDATE:19401201T000000 +RDATE:19420401T000000 +RDATE:19450402T000000 +RDATE:19460601T000000 +RDATE:19470420T000000 +RDATE:19480418T000000 +RDATE:19490410T000000 +RDATE:19500419T000000 +RDATE:19510422T000000 +RDATE:19620715T000000 +RDATE:19640515T000000 +RDATE:19700503T000000 +RDATE:19710502T000000 +RDATE:19720507T000000 +RDATE:19730603T010000 +RDATE:19740331T020000 +RDATE:19750330T000000 +RDATE:19760601T000000 +RDATE:19770403T000000 +RDATE:19780402T000000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19161001T000000 +RDATE:19161001T000000 +RDATE:19201025T000000 +RDATE:19211003T000000 +RDATE:19221008T000000 +RDATE:19241001T000000 +RDATE:19251001T000000 +RDATE:19401005T000000 +RDATE:19410921T000000 +RDATE:19421101T000000 +RDATE:19451008T000000 +RDATE:19461001T000000 +RDATE:19471005T000000 +RDATE:19481003T000000 +RDATE:19491002T000000 +RDATE:19501008T000000 +RDATE:19511008T000000 +RDATE:19621008T000000 +RDATE:19641001T000000 +RDATE:19701004T000000 +RDATE:19711003T000000 +RDATE:19721008T000000 +RDATE:19731104T030000 +RDATE:19741103T050000 +RDATE:19751026T000000 +RDATE:19761031T000000 +RDATE:19771016T000000 +RDATE:19850928T000000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T040000 +RDATE:19920927T040000 +RDATE:19930926T040000 +RDATE:19940925T040000 +RDATE:19950924T040000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0300 +TZNAME:TRT +DTSTART:19781015T000000 +RDATE:19781015T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:TRST +DTSTART:19790401T030000 +RDATE:19790401T030000 +RDATE:19800406T030000 +RDATE:19810329T030000 +RDATE:19820328T030000 +RDATE:19830731T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0300 +TZNAME:TRT +DTSTART:19791015T000000 +RDATE:19791015T000000 +RDATE:19801013T000000 +RDATE:19811012T000000 +RDATE:19821011T000000 +RDATE:19831002T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19850420T000000 +RDATE:19850420T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19860101T000000 +RDATE:19860101T000000 +RDATE:19910101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Jersey.ics b/mozilla/calendar/libical/zoneinfo/Europe/Jersey.ics deleted file mode 100644 index 5e31d055763..00000000000 --- a/mozilla/calendar/libical/zoneinfo/Europe/Jersey.ics +++ /dev/null @@ -1,22 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Jersey -X-LIC-LOCATION:Europe/Jersey -BEGIN:DAYLIGHT -TZOFFSETFROM:+0000 -TZOFFSETTO:+0100 -TZNAME:BST -DTSTART:19700329T010000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:DAYLIGHT -BEGIN:STANDARD -TZOFFSETFROM:+0100 -TZOFFSETTO:+0000 -TZNAME:GMT -DTSTART:19701025T020000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Kaliningrad.ics b/mozilla/calendar/libical/zoneinfo/Europe/Kaliningrad.ics index 33ac019f5af..e83fde1128f 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Kaliningrad.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Kaliningrad.ics @@ -1,22 +1,145 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Kaliningrad +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Kaliningrad X-LIC-LOCATION:Europe/Kaliningrad BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700329T020000 +DTSTART:19930328T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0122 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0122 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:18930401T000000 +RDATE:18930401T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19160430T230000 +RDATE:19160430T230000 +RDATE:19170416T020000 +RDATE:19180415T020000 +RDATE:19400401T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19161001T010000 +RDATE:19161001T010000 +RDATE:19170917T030000 +RDATE:19180916T030000 +RDATE:19421102T030000 +RDATE:19431004T030000 +RDATE:19441002T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CET +DTSTART:19450101T000000 +RDATE:19450101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:CEST +DTSTART:19450429T000000 +RDATE:19450429T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:CET +DTSTART:19451101T000000 +RDATE:19451101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19460101T000000 +RDATE:19460101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:MSD +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19910929T030000 +RDATE:19910929T030000 +RDATE:19920926T230000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19920328T230000 +RDATE:19920328T230000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Kiev.ics b/mozilla/calendar/libical/zoneinfo/Europe/Kiev.ics index 305014428f4..e8cc1635eae 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Kiev.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Kiev.ics @@ -1,22 +1,150 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Kiev +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Kiev X-LIC-LOCATION:Europe/Kiev BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700329T030000 +DTSTART:19950326T030000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701025T040000 +DTSTART:19961027T040000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+020204 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+020204 +TZOFFSETTO:+020204 +TZNAME:KMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+020204 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19240502T000000 +RDATE:19240502T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19300621T000000 +RDATE:19300621T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19410920T000000 +RDATE:19410920T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19421102T020000 +RDATE:19421102T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19430329T020000 +RDATE:19430329T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19431004T030000 +RDATE:19431004T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19431106T000000 +RDATE:19431106T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:MSD +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19900101T000000 +RDATE:19900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19900701T020000 +RDATE:19900701T020000 +RDATE:19920927T000000 +RDATE:19930926T000000 +RDATE:19940925T000000 +RDATE:19950924T040000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19920101T000000 +RDATE:19920101T000000 +RDATE:19950101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19920329T000000 +RDATE:19920329T000000 +RDATE:19930328T000000 +RDATE:19940327T000000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Lisbon.ics b/mozilla/calendar/libical/zoneinfo/Europe/Lisbon.ics index 8f647cdfa07..cd30d2b36b6 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Lisbon.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Lisbon.ics @@ -1,22 +1,235 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Lisbon +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Lisbon X-LIC-LOCATION:Europe/Lisbon +BEGIN:DAYLIGHT +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:WEST +DTSTART:19970330T010000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0100 TZOFFSETTO:+0000 TZNAME:WET -DTSTART:19701025T020000 +DTSTART:19971026T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-003632 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-003632 +TZOFFSETTO:-003632 +TZNAME:LMT +DTSTART:18840101T000000 +RDATE:18840101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-003632 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19110524T000000 +RDATE:19110524T000000 +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+0000 TZOFFSETTO:+0100 TZNAME:WEST -DTSTART:19700329T010000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +DTSTART:19160617T230000 +RDATE:19160617T230000 +RDATE:19170228T230000 +RDATE:19180301T230000 +RDATE:19190228T230000 +RDATE:19200229T230000 +RDATE:19210228T230000 +RDATE:19240416T230000 +RDATE:19260417T230000 +RDATE:19270409T230000 +RDATE:19280414T230000 +RDATE:19290420T230000 +RDATE:19310418T230000 +RDATE:19320402T230000 +RDATE:19340407T230000 +RDATE:19350330T230000 +RDATE:19360418T230000 +RDATE:19370403T230000 +RDATE:19380326T230000 +RDATE:19390415T230000 +RDATE:19400224T230000 +RDATE:19410405T230000 +RDATE:19420314T230000 +RDATE:19430313T230000 +RDATE:19440311T230000 +RDATE:19450310T230000 +RDATE:19460406T230000 +RDATE:19470406T020000 +RDATE:19480404T020000 +RDATE:19490403T020000 +RDATE:19510401T020000 +RDATE:19520406T020000 +RDATE:19530405T020000 +RDATE:19540404T020000 +RDATE:19550403T020000 +RDATE:19560401T020000 +RDATE:19570407T020000 +RDATE:19580406T020000 +RDATE:19590405T020000 +RDATE:19600403T020000 +RDATE:19610402T020000 +RDATE:19620401T020000 +RDATE:19630407T020000 +RDATE:19640405T020000 +RDATE:19650404T020000 +RDATE:19770327T000000 +RDATE:19780402T000000 +RDATE:19790401T000000 +RDATE:19800330T000000 +RDATE:19810329T010000 +RDATE:19820328T010000 +RDATE:19830327T020000 +RDATE:19840325T010000 +RDATE:19850331T010000 +RDATE:19860330T010000 +RDATE:19870329T010000 +RDATE:19880327T010000 +RDATE:19890326T010000 +RDATE:19900325T010000 +RDATE:19910331T010000 +RDATE:19920329T010000 END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19161101T010000 +RDATE:19161101T010000 +RDATE:19171015T000000 +RDATE:19181015T000000 +RDATE:19191015T000000 +RDATE:19201015T000000 +RDATE:19211015T000000 +RDATE:19241015T000000 +RDATE:19261003T000000 +RDATE:19271002T000000 +RDATE:19281007T000000 +RDATE:19291006T000000 +RDATE:19311004T000000 +RDATE:19321002T000000 +RDATE:19341007T000000 +RDATE:19351006T000000 +RDATE:19361004T000000 +RDATE:19371003T000000 +RDATE:19381002T000000 +RDATE:19391119T000000 +RDATE:19401006T000000 +RDATE:19411006T000000 +RDATE:19421025T000000 +RDATE:19431031T000000 +RDATE:19441029T000000 +RDATE:19451028T000000 +RDATE:19461006T000000 +RDATE:19471005T030000 +RDATE:19481003T030000 +RDATE:19491002T030000 +RDATE:19511007T030000 +RDATE:19521005T030000 +RDATE:19531004T030000 +RDATE:19541003T030000 +RDATE:19551002T030000 +RDATE:19561007T030000 +RDATE:19571006T030000 +RDATE:19581005T030000 +RDATE:19591004T030000 +RDATE:19601002T030000 +RDATE:19611001T030000 +RDATE:19621007T030000 +RDATE:19631006T030000 +RDATE:19641004T030000 +RDATE:19651003T030000 +RDATE:19760926T010000 +RDATE:19770925T010000 +RDATE:19781001T010000 +RDATE:19790930T020000 +RDATE:19800928T020000 +RDATE:19810927T020000 +RDATE:19820926T020000 +RDATE:19830925T020000 +RDATE:19840930T020000 +RDATE:19850929T020000 +RDATE:19860928T020000 +RDATE:19870927T020000 +RDATE:19880925T020000 +RDATE:19890924T020000 +RDATE:19900930T020000 +RDATE:19910929T020000 +RDATE:19960331T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:WEMT +DTSTART:19420425T230000 +RDATE:19420425T230000 +RDATE:19430417T230000 +RDATE:19440422T230000 +RDATE:19450421T230000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:WEST +DTSTART:19420816T000000 +RDATE:19420816T000000 +RDATE:19430829T000000 +RDATE:19440827T000000 +RDATE:19450826T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19660403T020000 +RDATE:19660403T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19920927T020000 +RDATE:19920927T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19930328T020000 +RDATE:19930328T020000 +RDATE:19940327T020000 +RDATE:19950326T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19930926T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19961027T010000 +RDATE:19961027T010000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Ljubljana.ics b/mozilla/calendar/libical/zoneinfo/Europe/Ljubljana.ics index df21bb0bbda..3941a350e70 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Ljubljana.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Ljubljana.ics @@ -1,22 +1,76 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Ljubljana +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Ljubljana X-LIC-LOCATION:Europe/Ljubljana BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19830327T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0122 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0122 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:18840101T000000 +RDATE:18840101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19410418T230000 +RDATE:19410418T230000 +RDATE:19421102T020000 +RDATE:19821127T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19430329T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19450508T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19431004T030000 +RDATE:19431004T030000 +RDATE:19441002T030000 +RDATE:19450916T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/London.ics b/mozilla/calendar/libical/zoneinfo/Europe/London.ics index 5394d4e22ea..fcc8dc9dfcf 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/London.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/London.ics @@ -1,22 +1,215 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/London +TZID:/softwarestudio.org/Olson_20010626_2/Europe/London X-LIC-LOCATION:Europe/London BEGIN:DAYLIGHT TZOFFSETFROM:+0000 TZOFFSETTO:+0100 TZNAME:BST -DTSTART:19700329T010000 +DTSTART:19810329T010000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0100 TZOFFSETTO:+0000 TZNAME:GMT -DTSTART:19701025T020000 +DTSTART:19961027T020000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-000115 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-000115 +TZOFFSETTO:+0000 +TZNAME:GMT +DTSTART:18471201T000000 +RDATE:18471201T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:BST +DTSTART:19160521T020000 +RDATE:19160521T020000 +RDATE:19170408T020000 +RDATE:19180324T020000 +RDATE:19190330T020000 +RDATE:19200328T020000 +RDATE:19210403T020000 +RDATE:19220326T020000 +RDATE:19230422T020000 +RDATE:19240413T020000 +RDATE:19250419T020000 +RDATE:19260418T020000 +RDATE:19270410T020000 +RDATE:19280422T020000 +RDATE:19290421T020000 +RDATE:19300413T020000 +RDATE:19310419T020000 +RDATE:19320417T020000 +RDATE:19330409T020000 +RDATE:19340422T020000 +RDATE:19350414T020000 +RDATE:19360419T020000 +RDATE:19370418T020000 +RDATE:19380410T020000 +RDATE:19390416T020000 +RDATE:19400225T020000 +RDATE:19460414T020000 +RDATE:19470316T020000 +RDATE:19480314T020000 +RDATE:19490403T020000 +RDATE:19500416T020000 +RDATE:19510415T020000 +RDATE:19520420T020000 +RDATE:19530419T020000 +RDATE:19540411T020000 +RDATE:19550417T020000 +RDATE:19560422T020000 +RDATE:19570414T020000 +RDATE:19580420T020000 +RDATE:19590419T020000 +RDATE:19600410T020000 +RDATE:19610326T020000 +RDATE:19620325T020000 +RDATE:19630331T020000 +RDATE:19640322T020000 +RDATE:19650321T020000 +RDATE:19660320T020000 +RDATE:19670319T020000 +RDATE:19680218T020000 +RDATE:19720319T020000 +RDATE:19730318T020000 +RDATE:19740317T020000 +RDATE:19750316T020000 +RDATE:19760321T020000 +RDATE:19770320T020000 +RDATE:19780319T020000 +RDATE:19790318T020000 +RDATE:19800316T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0000 +TZNAME:GMT +DTSTART:19161001T030000 +RDATE:19161001T030000 +RDATE:19170917T030000 +RDATE:19180930T030000 +RDATE:19190929T030000 +RDATE:19201025T030000 +RDATE:19211003T030000 +RDATE:19221008T030000 +RDATE:19230916T030000 +RDATE:19240921T030000 +RDATE:19251004T030000 +RDATE:19261003T030000 +RDATE:19271002T030000 +RDATE:19281007T030000 +RDATE:19291006T030000 +RDATE:19301005T030000 +RDATE:19311004T030000 +RDATE:19321002T030000 +RDATE:19331008T030000 +RDATE:19341007T030000 +RDATE:19351006T030000 +RDATE:19361004T030000 +RDATE:19371003T030000 +RDATE:19381002T030000 +RDATE:19391119T030000 +RDATE:19451007T030000 +RDATE:19461006T030000 +RDATE:19471102T030000 +RDATE:19481031T030000 +RDATE:19491030T030000 +RDATE:19501022T030000 +RDATE:19511021T030000 +RDATE:19521026T030000 +RDATE:19531004T030000 +RDATE:19541003T030000 +RDATE:19551002T030000 +RDATE:19561007T030000 +RDATE:19571006T030000 +RDATE:19581005T030000 +RDATE:19591004T030000 +RDATE:19601002T030000 +RDATE:19611029T030000 +RDATE:19621028T030000 +RDATE:19631027T030000 +RDATE:19641025T030000 +RDATE:19651024T030000 +RDATE:19661023T030000 +RDATE:19671029T030000 +RDATE:19711031T030000 +RDATE:19721029T030000 +RDATE:19731028T030000 +RDATE:19741027T030000 +RDATE:19751026T030000 +RDATE:19761024T030000 +RDATE:19771023T030000 +RDATE:19781029T030000 +RDATE:19791028T030000 +RDATE:19801026T030000 +RDATE:19811025T020000 +RDATE:19821024T020000 +RDATE:19831023T020000 +RDATE:19841028T020000 +RDATE:19851027T020000 +RDATE:19861026T020000 +RDATE:19871025T020000 +RDATE:19881023T020000 +RDATE:19891029T020000 +RDATE:19901028T020000 +RDATE:19911027T020000 +RDATE:19921025T020000 +RDATE:19931024T020000 +RDATE:19941023T020000 +RDATE:19951022T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:BDST +DTSTART:19410504T020000 +RDATE:19410504T020000 +RDATE:19420405T020000 +RDATE:19430404T020000 +RDATE:19440402T020000 +RDATE:19450402T020000 +RDATE:19470413T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:BST +DTSTART:19410810T030000 +RDATE:19410810T030000 +RDATE:19420809T030000 +RDATE:19430815T030000 +RDATE:19440917T030000 +RDATE:19450715T030000 +RDATE:19470810T030000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:BST +DTSTART:19681027T000000 +RDATE:19681027T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0000 +TZNAME:GMT +DTSTART:19960101T000000 +RDATE:19960101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Luxembourg.ics b/mozilla/calendar/libical/zoneinfo/Europe/Luxembourg.ics index 57440a58a42..eeea81fddd1 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Luxembourg.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Luxembourg.ics @@ -1,22 +1,168 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Luxembourg +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Luxembourg X-LIC-LOCATION:Europe/Luxembourg BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19810329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+002436 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+002436 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19040601T000000 +RDATE:19040601T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19160514T230000 +RDATE:19160514T230000 +RDATE:19170428T230000 +RDATE:19180415T020000 +RDATE:19450402T020000 +RDATE:19460519T020000 +RDATE:19770403T020000 +RDATE:19780402T020000 +RDATE:19790401T020000 +RDATE:19800406T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19161001T010000 +RDATE:19161001T010000 +RDATE:19170917T010000 +RDATE:19180916T030000 +RDATE:19440918T030000 +RDATE:19450916T030000 +RDATE:19461007T030000 +RDATE:19770925T030000 +RDATE:19781001T030000 +RDATE:19790930T030000 +RDATE:19800928T030000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19181125T000000 +RDATE:19181125T000000 +RDATE:19191005T030000 +RDATE:19201024T020000 +RDATE:19211026T020000 +RDATE:19221008T010000 +RDATE:19231007T020000 +RDATE:19241005T010000 +RDATE:19251004T010000 +RDATE:19261003T010000 +RDATE:19271002T010000 +RDATE:19281007T010000 +RDATE:19291006T030000 +RDATE:19301005T030000 +RDATE:19311004T030000 +RDATE:19321002T030000 +RDATE:19331008T030000 +RDATE:19341007T030000 +RDATE:19351006T030000 +RDATE:19361004T030000 +RDATE:19371003T030000 +RDATE:19381002T030000 +RDATE:19391119T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:WEST +DTSTART:19190301T230000 +RDATE:19190301T230000 +RDATE:19200214T230000 +RDATE:19210314T230000 +RDATE:19220325T230000 +RDATE:19230421T230000 +RDATE:19240329T230000 +RDATE:19250405T230000 +RDATE:19260417T230000 +RDATE:19270409T230000 +RDATE:19280414T230000 +RDATE:19290420T230000 +RDATE:19300413T020000 +RDATE:19310419T020000 +RDATE:19320403T020000 +RDATE:19330326T020000 +RDATE:19340408T020000 +RDATE:19350331T020000 +RDATE:19360419T020000 +RDATE:19370404T020000 +RDATE:19380327T020000 +RDATE:19390416T020000 +RDATE:19400225T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:WET +DTSTART:19400514T030000 +RDATE:19400514T030000 +RDATE:19421102T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:WEST +DTSTART:19430329T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:WET +DTSTART:19431004T030000 +RDATE:19431004T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19770101T000000 +RDATE:19770101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Madrid.ics b/mozilla/calendar/libical/zoneinfo/Europe/Madrid.ics index 2e34240b257..1c48c5b0a9f 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Madrid.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Madrid.ics @@ -1,22 +1,143 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Madrid +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Madrid X-LIC-LOCATION:Europe/Madrid BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19810329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-001444 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-001444 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19010101T000000 +RDATE:19010101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:WEST +DTSTART:19170505T230000 +RDATE:19170505T230000 +RDATE:19180415T230000 +RDATE:19190405T230000 +RDATE:19240416T230000 +RDATE:19260417T230000 +RDATE:19270409T230000 +RDATE:19280414T230000 +RDATE:19290420T230000 +RDATE:19370522T230000 +RDATE:19380322T230000 +RDATE:19390415T230000 +RDATE:19400316T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19171007T000000 +RDATE:19171007T000000 +RDATE:19181007T000000 +RDATE:19191007T000000 +RDATE:19241005T000000 +RDATE:19261003T000000 +RDATE:19271002T000000 +RDATE:19281007T000000 +RDATE:19291006T000000 +RDATE:19371003T000000 +RDATE:19381002T000000 +RDATE:19391008T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:WEMT +DTSTART:19420502T230000 +RDATE:19420502T230000 +RDATE:19430417T230000 +RDATE:19440415T230000 +RDATE:19450414T230000 +RDATE:19460413T230000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:WEST +DTSTART:19420902T000000 +RDATE:19420902T000000 +RDATE:19431004T000000 +RDATE:19441011T000000 +RDATE:19450930T010000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19460930T000000 +RDATE:19460930T000000 +RDATE:19490930T010000 +RDATE:19741006T010000 +RDATE:19751005T010000 +RDATE:19760926T010000 +RDATE:19770925T010000 +RDATE:19781001T010000 +RDATE:19790930T030000 +RDATE:19800928T030000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19490430T230000 +RDATE:19490430T230000 +RDATE:19740413T230000 +RDATE:19750419T230000 +RDATE:19760327T230000 +RDATE:19770402T230000 +RDATE:19780402T230000 +RDATE:19790401T020000 +RDATE:19800406T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19790101T000000 +RDATE:19790101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Malta.ics b/mozilla/calendar/libical/zoneinfo/Europe/Malta.ics index 753f45eb131..c13a8f45f8a 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Malta.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Malta.ics @@ -1,22 +1,124 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Malta +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Malta X-LIC-LOCATION:Europe/Malta BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19810329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+005804 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+005804 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:18931102T000000 +RDATE:18931102T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19160603T000000 +RDATE:19160603T000000 +RDATE:19170401T000000 +RDATE:19180310T000000 +RDATE:19190302T000000 +RDATE:19200321T000000 +RDATE:19400615T000000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19450402T020000 +RDATE:19460317T020000 +RDATE:19470316T000000 +RDATE:19480229T020000 +RDATE:19660522T000000 +RDATE:19670528T000000 +RDATE:19680526T000000 +RDATE:19690601T000000 +RDATE:19700531T000000 +RDATE:19710523T000000 +RDATE:19720528T000000 +RDATE:19730331T000000 +RDATE:19740421T000000 +RDATE:19750420T020000 +RDATE:19760418T020000 +RDATE:19770417T020000 +RDATE:19780416T020000 +RDATE:19790415T020000 +RDATE:19800331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19161001T010000 +RDATE:19161001T010000 +RDATE:19170930T010000 +RDATE:19181006T010000 +RDATE:19191005T010000 +RDATE:19200919T010000 +RDATE:19421102T030000 +RDATE:19431004T030000 +RDATE:19441002T030000 +RDATE:19450915T010000 +RDATE:19461006T030000 +RDATE:19471005T010000 +RDATE:19481003T030000 +RDATE:19660925T000000 +RDATE:19670924T000000 +RDATE:19680922T000000 +RDATE:19690928T000000 +RDATE:19700927T000000 +RDATE:19710926T010000 +RDATE:19721001T000000 +RDATE:19730929T010000 +RDATE:19740916T010000 +RDATE:19750921T020000 +RDATE:19760919T020000 +RDATE:19770918T020000 +RDATE:19780917T020000 +RDATE:19790916T020000 +RDATE:19800921T020000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19810101T000000 +RDATE:19810101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Mariehamn.ics b/mozilla/calendar/libical/zoneinfo/Europe/Mariehamn.ics deleted file mode 100644 index ead46604050..00000000000 --- a/mozilla/calendar/libical/zoneinfo/Europe/Mariehamn.ics +++ /dev/null @@ -1,22 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Mariehamn -X-LIC-LOCATION:Europe/Mariehamn -BEGIN:DAYLIGHT -TZOFFSETFROM:+0200 -TZOFFSETTO:+0300 -TZNAME:EEST -DTSTART:19700329T030000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:DAYLIGHT -BEGIN:STANDARD -TZOFFSETFROM:+0300 -TZOFFSETTO:+0200 -TZNAME:EET -DTSTART:19701025T040000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Minsk.ics b/mozilla/calendar/libical/zoneinfo/Europe/Minsk.ics index cf693975125..f025ace2042 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Minsk.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Minsk.ics @@ -1,22 +1,142 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Minsk +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Minsk X-LIC-LOCATION:Europe/Minsk BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700329T020000 +DTSTART:19930328T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+015016 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+015016 +TZOFFSETTO:+0150 +TZNAME:MMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0150 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19240502T000000 +RDATE:19240502T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19300621T000000 +RDATE:19300621T000000 +RDATE:19440703T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19410628T000000 +RDATE:19410628T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19421102T020000 +RDATE:19421102T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19430329T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19431004T030000 +RDATE:19431004T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:MSD +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19900101T000000 +RDATE:19900101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19910929T030000 +RDATE:19910929T030000 +RDATE:19920927T010000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19920329T000000 +RDATE:19920329T000000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Monaco.ics b/mozilla/calendar/libical/zoneinfo/Europe/Monaco.ics index 6e49e35be12..0b8051ea8d2 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Monaco.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Monaco.ics @@ -1,22 +1,170 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Monaco +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Monaco X-LIC-LOCATION:Europe/Monaco BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19810329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+002932 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+002932 +TZOFFSETTO:+000921 +TZNAME:PMT +DTSTART:18910315T000000 +RDATE:18910315T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+000921 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19110311T000000 +RDATE:19110311T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:WEST +DTSTART:19160614T230000 +RDATE:19160614T230000 +RDATE:19170324T230000 +RDATE:19180309T230000 +RDATE:19190301T230000 +RDATE:19200214T230000 +RDATE:19210314T230000 +RDATE:19220325T230000 +RDATE:19230526T230000 +RDATE:19240329T230000 +RDATE:19250404T230000 +RDATE:19260417T230000 +RDATE:19270409T230000 +RDATE:19280414T230000 +RDATE:19290420T230000 +RDATE:19300412T230000 +RDATE:19310418T230000 +RDATE:19320402T230000 +RDATE:19330325T230000 +RDATE:19340407T230000 +RDATE:19350330T230000 +RDATE:19360418T230000 +RDATE:19370403T230000 +RDATE:19380326T230000 +RDATE:19390415T230000 +RDATE:19400225T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19161002T000000 +RDATE:19161002T000000 +RDATE:19171008T000000 +RDATE:19181007T000000 +RDATE:19191006T000000 +RDATE:19201024T000000 +RDATE:19211026T000000 +RDATE:19221008T000000 +RDATE:19231007T000000 +RDATE:19241005T000000 +RDATE:19251004T000000 +RDATE:19261003T000000 +RDATE:19271002T000000 +RDATE:19281007T000000 +RDATE:19291006T000000 +RDATE:19301005T000000 +RDATE:19311004T000000 +RDATE:19321002T000000 +RDATE:19331008T000000 +RDATE:19341007T000000 +RDATE:19351006T000000 +RDATE:19361004T000000 +RDATE:19371003T000000 +RDATE:19381002T000000 +RDATE:19391119T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:WEMT +DTSTART:19410505T000000 +RDATE:19410505T000000 +RDATE:19420309T000000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19450402T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:WEST +DTSTART:19411006T000000 +RDATE:19411006T000000 +RDATE:19421102T030000 +RDATE:19431004T030000 +RDATE:19441008T010000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19450916T030000 +RDATE:19450916T030000 +RDATE:19760926T010000 +RDATE:19770925T030000 +RDATE:19781001T030000 +RDATE:19790930T030000 +RDATE:19800928T030000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19760328T010000 +RDATE:19760328T010000 +RDATE:19770403T020000 +RDATE:19780402T020000 +RDATE:19790401T020000 +RDATE:19800406T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19770101T000000 +RDATE:19770101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Moscow.ics b/mozilla/calendar/libical/zoneinfo/Europe/Moscow.ics index 6a43a345c34..512c4aedc5c 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Moscow.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Moscow.ics @@ -1,22 +1,162 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Moscow +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Moscow X-LIC-LOCATION:Europe/Moscow BEGIN:DAYLIGHT TZOFFSETFROM:+0300 TZOFFSETTO:+0400 TZNAME:MSD -DTSTART:19700329T020000 +DTSTART:19930328T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0400 TZOFFSETTO:+0300 TZNAME:MSK -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+023020 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+023020 +TZOFFSETTO:+0230 +TZNAME:MMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0230 +TZOFFSETTO:+023048 +TZNAME:MMT +DTSTART:19160703T000000 +RDATE:19160703T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+023048 +TZOFFSETTO:+033048 +TZNAME:MST +DTSTART:19170701T230000 +RDATE:19170701T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+033048 +TZOFFSETTO:+023048 +TZNAME:MMT +DTSTART:19171228T000000 +RDATE:19171228T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+023048 +TZOFFSETTO:+043048 +TZNAME:MDST +DTSTART:19180531T220000 +RDATE:19180531T220000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:+043048 +TZOFFSETTO:+033048 +TZNAME:MST +DTSTART:19180916T010000 +RDATE:19180916T010000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:+033048 +TZOFFSETTO:+043048 +TZNAME:MDST +DTSTART:19190531T230000 +RDATE:19190531T230000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:+043048 +TZOFFSETTO:+0400 +TZNAME:MSD +DTSTART:19190701T020000 +RDATE:19190701T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19190816T000000 +RDATE:19190816T000000 +RDATE:19211001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19920926T230000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:MSD +DTSTART:19210214T230000 +RDATE:19210214T230000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +RDATE:19920328T230000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:+0400 +TZOFFSETTO:+0500 +TZNAME:MSD +DTSTART:19210320T230000 +RDATE:19210320T230000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:+0500 +TZOFFSETTO:+0400 +TZNAME:MSD +DTSTART:19210901T000000 +RDATE:19210901T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19221001T000000 +RDATE:19221001T000000 +RDATE:19910929T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19300621T000000 +RDATE:19300621T000000 +RDATE:19920119T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Nicosia.ics b/mozilla/calendar/libical/zoneinfo/Europe/Nicosia.ics index c41eef93b3a..58673071241 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Nicosia.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Nicosia.ics @@ -1,22 +1,103 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Nicosia +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Nicosia X-LIC-LOCATION:Europe/Nicosia +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19990328T030000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701025T040000 +DTSTART:19991031T040000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+021328 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+021328 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19211114T000000 +RDATE:19211114T000000 +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700329T030000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +DTSTART:19750413T000000 +RDATE:19750413T000000 +RDATE:19760515T000000 +RDATE:19770403T000000 +RDATE:19780402T000000 +RDATE:19790401T000000 +RDATE:19800406T000000 +RDATE:19810329T000000 +RDATE:19820328T000000 +RDATE:19830327T000000 +RDATE:19840325T000000 +RDATE:19850331T000000 +RDATE:19860330T000000 +RDATE:19870329T000000 +RDATE:19880327T000000 +RDATE:19890326T000000 +RDATE:19900325T000000 +RDATE:19910331T000000 +RDATE:19920329T000000 +RDATE:19930328T000000 +RDATE:19940327T000000 +RDATE:19950326T000000 +RDATE:19960331T000000 +RDATE:19970330T000000 +RDATE:19980329T000000 END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19751012T000000 +RDATE:19751012T000000 +RDATE:19761011T000000 +RDATE:19770925T000000 +RDATE:19781002T000000 +RDATE:19790930T000000 +RDATE:19800928T000000 +RDATE:19810927T000000 +RDATE:19820926T000000 +RDATE:19830925T000000 +RDATE:19840930T000000 +RDATE:19850929T000000 +RDATE:19860928T000000 +RDATE:19870927T000000 +RDATE:19880925T000000 +RDATE:19890924T000000 +RDATE:19900930T000000 +RDATE:19910929T000000 +RDATE:19920927T000000 +RDATE:19930926T000000 +RDATE:19940925T000000 +RDATE:19950924T000000 +RDATE:19960929T000000 +RDATE:19970928T000000 +RDATE:19980901T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19981025T030000 +RDATE:19981025T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Oslo.ics b/mozilla/calendar/libical/zoneinfo/Europe/Oslo.ics index ff09377c7c2..8c94de65ac5 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Oslo.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Oslo.ics @@ -1,22 +1,96 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Oslo +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Oslo X-LIC-LOCATION:Europe/Oslo BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19810329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0043 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0043 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:18950101T000000 +RDATE:18950101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19160522T010000 +RDATE:19160522T010000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19450402T020000 +RDATE:19590315T020000 +RDATE:19600320T020000 +RDATE:19610319T020000 +RDATE:19620318T020000 +RDATE:19630317T020000 +RDATE:19640315T020000 +RDATE:19650425T020000 +RDATE:19800406T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19160930T000000 +RDATE:19160930T000000 +RDATE:19431004T030000 +RDATE:19441002T030000 +RDATE:19451001T030000 +RDATE:19590920T030000 +RDATE:19600918T030000 +RDATE:19610917T030000 +RDATE:19620916T030000 +RDATE:19630915T030000 +RDATE:19640920T030000 +RDATE:19650919T030000 +RDATE:19800928T030000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19400810T230000 +RDATE:19400810T230000 +RDATE:19421102T020000 +RDATE:19800101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Paris.ics b/mozilla/calendar/libical/zoneinfo/Europe/Paris.ics index 69f341b78fb..d644971f6a6 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Paris.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Paris.ics @@ -1,22 +1,169 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Paris +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Paris X-LIC-LOCATION:Europe/Paris BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19810329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+000921 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+000921 +TZOFFSETTO:+000921 +TZNAME:PMT +DTSTART:18910315T000100 +RDATE:18910315T000100 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+000921 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19110311T000100 +RDATE:19110311T000100 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0000 +TZOFFSETTO:+0100 +TZNAME:WEST +DTSTART:19160614T230000 +RDATE:19160614T230000 +RDATE:19170324T230000 +RDATE:19180309T230000 +RDATE:19190301T230000 +RDATE:19200214T230000 +RDATE:19210314T230000 +RDATE:19220325T230000 +RDATE:19230526T230000 +RDATE:19240329T230000 +RDATE:19250404T230000 +RDATE:19260417T230000 +RDATE:19270409T230000 +RDATE:19280414T230000 +RDATE:19290420T230000 +RDATE:19300412T230000 +RDATE:19310418T230000 +RDATE:19320402T230000 +RDATE:19330325T230000 +RDATE:19340407T230000 +RDATE:19350330T230000 +RDATE:19360418T230000 +RDATE:19370403T230000 +RDATE:19380326T230000 +RDATE:19390415T230000 +RDATE:19400225T020000 +RDATE:19441008T010000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19161002T000000 +RDATE:19161002T000000 +RDATE:19171008T000000 +RDATE:19181007T000000 +RDATE:19191006T000000 +RDATE:19201024T000000 +RDATE:19211026T000000 +RDATE:19221008T000000 +RDATE:19231007T000000 +RDATE:19241005T000000 +RDATE:19251004T000000 +RDATE:19261003T000000 +RDATE:19271002T000000 +RDATE:19281007T000000 +RDATE:19291006T000000 +RDATE:19301005T000000 +RDATE:19311004T000000 +RDATE:19321002T000000 +RDATE:19331008T000000 +RDATE:19341007T000000 +RDATE:19351006T000000 +RDATE:19361004T000000 +RDATE:19371003T000000 +RDATE:19381002T000000 +RDATE:19391119T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19400614T230000 +RDATE:19400614T230000 +RDATE:19421102T020000 +RDATE:19770101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19430329T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19760328T010000 +RDATE:19770403T020000 +RDATE:19780402T020000 +RDATE:19790401T020000 +RDATE:19800406T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19431004T030000 +RDATE:19431004T030000 +RDATE:19450916T030000 +RDATE:19760926T010000 +RDATE:19770925T030000 +RDATE:19781001T030000 +RDATE:19790930T030000 +RDATE:19800928T030000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0000 +TZNAME:WET +DTSTART:19440825T000000 +RDATE:19440825T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:WEMT +DTSTART:19450402T020000 +RDATE:19450402T020000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Podgorica.ics b/mozilla/calendar/libical/zoneinfo/Europe/Podgorica.ics deleted file mode 100644 index 9a99154e4ec..00000000000 --- a/mozilla/calendar/libical/zoneinfo/Europe/Podgorica.ics +++ /dev/null @@ -1,22 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Podgorica -X-LIC-LOCATION:Europe/Podgorica -BEGIN:DAYLIGHT -TZOFFSETFROM:+0100 -TZOFFSETTO:+0200 -TZNAME:CEST -DTSTART:19700329T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:DAYLIGHT -BEGIN:STANDARD -TZOFFSETFROM:+0200 -TZOFFSETTO:+0100 -TZNAME:CET -DTSTART:19701025T030000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Prague.ics b/mozilla/calendar/libical/zoneinfo/Europe/Prague.ics index d3e5df40b23..2f414a1094e 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Prague.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Prague.ics @@ -1,22 +1,103 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Prague +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Prague X-LIC-LOCATION:Europe/Prague BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19810329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+005744 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+005744 +TZOFFSETTO:+005744 +TZNAME:PMT +DTSTART:18500101T000000 +RDATE:18500101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+005744 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:18911001T000000 +RDATE:18911001T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19160430T230000 +RDATE:19160430T230000 +RDATE:19170416T020000 +RDATE:19180415T020000 +RDATE:19400401T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19450408T020000 +RDATE:19460506T020000 +RDATE:19470420T020000 +RDATE:19480418T020000 +RDATE:19490409T020000 +RDATE:19790401T020000 +RDATE:19800406T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19161001T010000 +RDATE:19161001T010000 +RDATE:19170917T030000 +RDATE:19180916T030000 +RDATE:19421102T030000 +RDATE:19431004T030000 +RDATE:19440917T030000 +RDATE:19451118T030000 +RDATE:19461006T030000 +RDATE:19471005T030000 +RDATE:19481003T030000 +RDATE:19491002T030000 +RDATE:19790930T030000 +RDATE:19800928T030000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19790101T000000 +RDATE:19790101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Riga.ics b/mozilla/calendar/libical/zoneinfo/Europe/Riga.ics index 192cac0414a..17f03aab846 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Riga.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Riga.ics @@ -1,22 +1,180 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Riga +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Riga X-LIC-LOCATION:Europe/Riga BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700329T030000 +DTSTART:20010325T030000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701025T040000 +DTSTART:20011028T040000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+013624 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+013624 +TZOFFSETTO:+013624 +TZNAME:RMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+013624 +TZOFFSETTO:+023624 +TZNAME:LST +DTSTART:19180415T020000 +RDATE:19180415T020000 +RDATE:19190401T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+023624 +TZOFFSETTO:+013624 +TZNAME:RMT +DTSTART:19180916T030000 +RDATE:19180916T030000 +RDATE:19190522T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+013624 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19260511T000000 +RDATE:19260511T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19400805T000000 +RDATE:19400805T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19410701T000000 +RDATE:19410701T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19421102T020000 +RDATE:19421102T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19430329T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19431004T030000 +RDATE:19431004T030000 +RDATE:19441002T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19441013T000000 +RDATE:19441013T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:MSD +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19890326T020000 +RDATE:19890326T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19890924T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +RDATE:19960929T030000 +RDATE:19971026T040000 +RDATE:19981025T040000 +RDATE:19991031T040000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19900325T020000 +RDATE:19900325T020000 +RDATE:19910331T020000 +RDATE:19920329T020000 +RDATE:19930328T020000 +RDATE:19940327T020000 +RDATE:19950326T020000 +RDATE:19960331T020000 +RDATE:19970330T030000 +RDATE:19980329T030000 +RDATE:19990328T030000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19970121T000000 +RDATE:19970121T000000 +RDATE:20000229T000000 +RDATE:20010101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Rome.ics b/mozilla/calendar/libical/zoneinfo/Europe/Rome.ics index 91f51dfb2f5..dcb4dc72ee1 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Rome.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Rome.ics @@ -1,22 +1,132 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Rome +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Rome X-LIC-LOCATION:Europe/Rome BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19810329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+004956 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+004956 +TZOFFSETTO:+004956 +TZNAME:RMT +DTSTART:18660922T000000 +RDATE:18660922T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+004956 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:18931101T000000 +RDATE:18931101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19160603T000000 +RDATE:19160603T000000 +RDATE:19170401T000000 +RDATE:19180310T000000 +RDATE:19190302T000000 +RDATE:19200321T000000 +RDATE:19400615T000000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19450402T020000 +RDATE:19460317T020000 +RDATE:19470316T000000 +RDATE:19480229T020000 +RDATE:19660522T000000 +RDATE:19670528T000000 +RDATE:19680526T000000 +RDATE:19690601T000000 +RDATE:19700531T000000 +RDATE:19710523T000000 +RDATE:19720528T000000 +RDATE:19730603T000000 +RDATE:19740526T000000 +RDATE:19750601T000000 +RDATE:19760530T000000 +RDATE:19770522T000000 +RDATE:19780528T000000 +RDATE:19790527T000000 +RDATE:19800406T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19161001T010000 +RDATE:19161001T010000 +RDATE:19170930T010000 +RDATE:19181006T010000 +RDATE:19191005T010000 +RDATE:19200919T010000 +RDATE:19421102T030000 +RDATE:19431004T030000 +RDATE:19440701T000000 +RDATE:19450915T010000 +RDATE:19461006T030000 +RDATE:19471005T010000 +RDATE:19481003T030000 +RDATE:19660925T000000 +RDATE:19670924T000000 +RDATE:19680922T000000 +RDATE:19690928T000000 +RDATE:19700927T000000 +RDATE:19710926T010000 +RDATE:19721001T000000 +RDATE:19730930T000000 +RDATE:19740929T000000 +RDATE:19750928T010000 +RDATE:19760926T010000 +RDATE:19770925T010000 +RDATE:19781001T010000 +RDATE:19790930T010000 +RDATE:19800928T030000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19440917T000000 +RDATE:19440917T000000 +RDATE:19800101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Samara.ics b/mozilla/calendar/libical/zoneinfo/Europe/Samara.ics index a61413aff29..90a8558eb1d 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Samara.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Samara.ics @@ -1,22 +1,131 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Samara +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Samara X-LIC-LOCATION:Europe/Samara BEGIN:DAYLIGHT TZOFFSETFROM:+0400 TZOFFSETTO:+0500 TZNAME:SAMST -DTSTART:19700329T020000 +DTSTART:19930328T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0500 TZOFFSETTO:+0400 TZNAME:SAMT -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+032036 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+032036 +TZOFFSETTO:+0300 +TZNAME:KUYT +DTSTART:19190701T020000 +RDATE:19190701T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:KUYT +DTSTART:19300621T000000 +RDATE:19300621T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0400 +TZOFFSETTO:+0500 +TZNAME:KUYST +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0500 +TZOFFSETTO:+0400 +TZNAME:KUYT +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0400 +TZOFFSETTO:+0400 +TZNAME:KUYST +DTSTART:19890326T020000 +RDATE:19890326T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0300 +TZNAME:KUYT +DTSTART:19890924T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:KUYST +DTSTART:19900325T020000 +RDATE:19900325T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0300 +TZNAME:KUYST +DTSTART:19910331T020000 +RDATE:19910331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0300 +TZNAME:KUYT +DTSTART:19910929T030000 +RDATE:19910929T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:SAMT +DTSTART:19911020T030000 +RDATE:19911020T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0400 +TZOFFSETTO:+0500 +TZNAME:SAMST +DTSTART:19920328T230000 +RDATE:19920328T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0500 +TZOFFSETTO:+0400 +TZNAME:SAMT +DTSTART:19920926T230000 +RDATE:19920926T230000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/San_Marino.ics b/mozilla/calendar/libical/zoneinfo/Europe/San_Marino.ics index c01b6d37c05..a5ef740bf3a 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/San_Marino.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/San_Marino.ics @@ -1,22 +1,132 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/San_Marino +TZID:/softwarestudio.org/Olson_20010626_2/Europe/San_Marino X-LIC-LOCATION:Europe/San_Marino BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19810329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+004956 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+004956 +TZOFFSETTO:+004956 +TZNAME:RMT +DTSTART:18660922T000000 +RDATE:18660922T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+004956 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:18931101T000000 +RDATE:18931101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19160603T000000 +RDATE:19160603T000000 +RDATE:19170401T000000 +RDATE:19180310T000000 +RDATE:19190302T000000 +RDATE:19200321T000000 +RDATE:19400615T000000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19450402T020000 +RDATE:19460317T020000 +RDATE:19470316T000000 +RDATE:19480229T020000 +RDATE:19660522T000000 +RDATE:19670528T000000 +RDATE:19680526T000000 +RDATE:19690601T000000 +RDATE:19700531T000000 +RDATE:19710523T000000 +RDATE:19720528T000000 +RDATE:19730603T000000 +RDATE:19740526T000000 +RDATE:19750601T000000 +RDATE:19760530T000000 +RDATE:19770522T000000 +RDATE:19780528T000000 +RDATE:19790527T000000 +RDATE:19800406T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19161001T010000 +RDATE:19161001T010000 +RDATE:19170930T010000 +RDATE:19181006T010000 +RDATE:19191005T010000 +RDATE:19200919T010000 +RDATE:19421102T030000 +RDATE:19431004T030000 +RDATE:19440701T000000 +RDATE:19450915T010000 +RDATE:19461006T030000 +RDATE:19471005T010000 +RDATE:19481003T030000 +RDATE:19660925T000000 +RDATE:19670924T000000 +RDATE:19680922T000000 +RDATE:19690928T000000 +RDATE:19700927T000000 +RDATE:19710926T010000 +RDATE:19721001T000000 +RDATE:19730930T000000 +RDATE:19740929T000000 +RDATE:19750928T010000 +RDATE:19760926T010000 +RDATE:19770925T010000 +RDATE:19781001T010000 +RDATE:19790930T010000 +RDATE:19800928T030000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19440917T000000 +RDATE:19440917T000000 +RDATE:19800101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Sarajevo.ics b/mozilla/calendar/libical/zoneinfo/Europe/Sarajevo.ics index 63aa23347ec..bc722a6d300 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Sarajevo.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Sarajevo.ics @@ -1,22 +1,76 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Sarajevo +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Sarajevo X-LIC-LOCATION:Europe/Sarajevo BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19830327T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0122 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0122 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:18840101T000000 +RDATE:18840101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19410418T230000 +RDATE:19410418T230000 +RDATE:19421102T020000 +RDATE:19821127T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19430329T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19450508T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19431004T030000 +RDATE:19431004T030000 +RDATE:19441002T030000 +RDATE:19450916T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Simferopol.ics b/mozilla/calendar/libical/zoneinfo/Europe/Simferopol.ics index 611bfdaec05..725c0c3671c 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Simferopol.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Simferopol.ics @@ -1,22 +1,158 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Simferopol +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Simferopol X-LIC-LOCATION:Europe/Simferopol +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19980329T030000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701025T040000 +DTSTART:19981025T040000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+021624 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+021624 +TZOFFSETTO:+0216 +TZNAME:SMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0216 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19240502T000000 +RDATE:19240502T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19300621T000000 +RDATE:19300621T000000 +RDATE:19440413T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19411101T000000 +RDATE:19411101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19421102T020000 +RDATE:19421102T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19430329T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19431004T030000 +RDATE:19431004T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:MSD +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19950326T000000 +RDATE:19960331T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19950924T000000 +RDATE:19961027T040000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19900101T000000 +RDATE:19900101T000000 +RDATE:19940501T000000 +RDATE:19940925T000000 +RDATE:19970101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19900701T020000 +RDATE:19900701T020000 +RDATE:19920927T000000 +RDATE:19930926T000000 +RDATE:19970330T040000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19920101T000000 +RDATE:19920101T000000 +RDATE:19971026T030000 +END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700329T030000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +DTSTART:19920329T000000 +RDATE:19920329T000000 +RDATE:19930328T000000 +RDATE:19940327T000000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:+0400 +TZOFFSETTO:+0400 +TZNAME:MSD +DTSTART:19960331T040000 +RDATE:19960331T040000 END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Skopje.ics b/mozilla/calendar/libical/zoneinfo/Europe/Skopje.ics index b9b3c366279..e00bb19243b 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Skopje.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Skopje.ics @@ -1,22 +1,76 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Skopje +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Skopje X-LIC-LOCATION:Europe/Skopje BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19830327T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0122 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0122 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:18840101T000000 +RDATE:18840101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19410418T230000 +RDATE:19410418T230000 +RDATE:19421102T020000 +RDATE:19821127T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19430329T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19450508T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19431004T030000 +RDATE:19431004T030000 +RDATE:19441002T030000 +RDATE:19450916T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Sofia.ics b/mozilla/calendar/libical/zoneinfo/Europe/Sofia.ics index 29ea72174ec..8eb1bffea46 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Sofia.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Sofia.ics @@ -1,22 +1,123 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Sofia +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Sofia X-LIC-LOCATION:Europe/Sofia BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700329T030000 +DTSTART:19970330T030000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701025T040000 +DTSTART:19971026T040000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+013316 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+013316 +TZOFFSETTO:+015656 +TZNAME:IMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+015656 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:18941130T000000 +RDATE:18941130T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19421102T030000 +RDATE:19421102T030000 +RDATE:19431004T030000 +RDATE:19441002T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19430329T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19450402T030000 +RDATE:19450402T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19790331T230000 +RDATE:19790331T230000 +RDATE:19800405T230000 +RDATE:19810404T230000 +RDATE:19820403T230000 +RDATE:19830327T020000 +RDATE:19840325T020000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +RDATE:19910331T000000 +RDATE:19920329T000000 +RDATE:19930328T000000 +RDATE:19940327T000000 +RDATE:19950326T000000 +RDATE:19960331T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19791001T010000 +RDATE:19791001T010000 +RDATE:19800929T010000 +RDATE:19810927T020000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T000000 +RDATE:19920927T000000 +RDATE:19930926T000000 +RDATE:19940925T000000 +RDATE:19950924T000000 +RDATE:19961027T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19910101T000000 +RDATE:19910101T000000 +RDATE:19970101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Stockholm.ics b/mozilla/calendar/libical/zoneinfo/Europe/Stockholm.ics index 63bdf6a9ac8..4ff76ff7d70 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Stockholm.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Stockholm.ics @@ -1,22 +1,81 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Stockholm +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Stockholm X-LIC-LOCATION:Europe/Stockholm BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19810329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+011212 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+011212 +TZOFFSETTO:+010014 +TZNAME:SET +DTSTART:18790101T000000 +RDATE:18790101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+010014 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19000101T000000 +RDATE:19000101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19160514T230000 +RDATE:19160514T230000 +RDATE:19800406T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19161001T010000 +RDATE:19161001T010000 +RDATE:19800928T030000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19800101T000000 +RDATE:19800101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Tallinn.ics b/mozilla/calendar/libical/zoneinfo/Europe/Tallinn.ics index 356c7d190c7..d7e270f585b 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Tallinn.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Tallinn.ics @@ -1,22 +1,158 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Tallinn +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Tallinn X-LIC-LOCATION:Europe/Tallinn +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0139 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0139 +TZOFFSETTO:+0139 +TZNAME:TMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0139 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19180201T000000 +RDATE:19180201T000000 +END:STANDARD BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19180415T020000 +RDATE:19180415T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19180916T030000 +RDATE:19180916T030000 +RDATE:19431004T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0139 +TZNAME:TMT +DTSTART:19190701T000000 +RDATE:19190701T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0139 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19210501T000000 +RDATE:19210501T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19400806T000000 +RDATE:19400806T000000 +RDATE:19440922T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19410915T000000 +RDATE:19410915T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19421102T020000 +RDATE:19421102T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:MSD +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700329T030000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +DTSTART:19890326T020000 +RDATE:19890326T020000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701025T040000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +DTSTART:19890924T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +RDATE:19961027T030000 +RDATE:19971026T030000 +RDATE:19980922T000000 +RDATE:19991031T040000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19900325T020000 +RDATE:19900325T020000 +RDATE:19910331T020000 +RDATE:19920329T020000 +RDATE:19930328T020000 +RDATE:19940327T020000 +RDATE:19950326T020000 +RDATE:19960331T020000 +RDATE:19970330T020000 +RDATE:19980329T020000 +RDATE:19990328T030000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19981025T030000 +RDATE:19981025T030000 +RDATE:19991101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Tirane.ics b/mozilla/calendar/libical/zoneinfo/Europe/Tirane.ics index d6a60344c88..8ccb54f58ce 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Tirane.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Tirane.ics @@ -1,22 +1,92 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Tirane +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Tirane X-LIC-LOCATION:Europe/Tirane BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19850331T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+011920 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+011920 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19140101T000000 +RDATE:19140101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19400616T000000 +RDATE:19400616T000000 +RDATE:19430329T020000 +RDATE:19740504T000000 +RDATE:19750501T000000 +RDATE:19760502T000000 +RDATE:19770508T000000 +RDATE:19780506T000000 +RDATE:19790505T000000 +RDATE:19800503T000000 +RDATE:19810426T000000 +RDATE:19820502T000000 +RDATE:19830418T000000 +RDATE:19840401T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19421102T030000 +RDATE:19421102T030000 +RDATE:19430410T030000 +RDATE:19741002T000000 +RDATE:19751002T000000 +RDATE:19761003T000000 +RDATE:19771002T000000 +RDATE:19781001T000000 +RDATE:19790930T000000 +RDATE:19801004T000000 +RDATE:19810927T000000 +RDATE:19821003T000000 +RDATE:19831001T000000 +RDATE:19840701T000000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19840930T020000 +RDATE:19840930T020000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Uzhgorod.ics b/mozilla/calendar/libical/zoneinfo/Europe/Uzhgorod.ics index b093b9094f2..eae3a7a8f23 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Uzhgorod.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Uzhgorod.ics @@ -1,22 +1,153 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Uzhgorod +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Uzhgorod X-LIC-LOCATION:Europe/Uzhgorod BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700329T030000 +DTSTART:19950326T030000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701025T040000 +DTSTART:19961027T040000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+012912 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+012912 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:18901001T000000 +RDATE:18901001T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19400101T000000 +RDATE:19400101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19400401T020000 +RDATE:19400401T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19421102T030000 +RDATE:19421102T030000 +RDATE:19431004T030000 +RDATE:19441026T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19441001T000000 +RDATE:19441001T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19450629T000000 +RDATE:19450629T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:MSD +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19900101T000000 +RDATE:19900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19900701T020000 +RDATE:19900701T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19910331T030000 +RDATE:19910331T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19920101T000000 +RDATE:19920101T000000 +RDATE:19950101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19920329T000000 +RDATE:19920329T000000 +RDATE:19930328T000000 +RDATE:19940327T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19920927T000000 +RDATE:19920927T000000 +RDATE:19930926T000000 +RDATE:19940925T000000 +RDATE:19950924T040000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Vaduz.ics b/mozilla/calendar/libical/zoneinfo/Europe/Vaduz.ics index 50657b529b1..c7f759e474e 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Vaduz.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Vaduz.ics @@ -1,22 +1,64 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Vaduz +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Vaduz X-LIC-LOCATION:Europe/Vaduz BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19810329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+003804 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+003804 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:18940601T000000 +RDATE:18940601T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19810101T000000 +RDATE:19810101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19810927T030000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Vatican.ics b/mozilla/calendar/libical/zoneinfo/Europe/Vatican.ics index 91c480df628..ab82faca3c4 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Vatican.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Vatican.ics @@ -1,22 +1,132 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Vatican +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Vatican X-LIC-LOCATION:Europe/Vatican BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19810329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+004956 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+004956 +TZOFFSETTO:+004956 +TZNAME:RMT +DTSTART:18660922T000000 +RDATE:18660922T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+004956 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:18931101T000000 +RDATE:18931101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19160603T000000 +RDATE:19160603T000000 +RDATE:19170401T000000 +RDATE:19180310T000000 +RDATE:19190302T000000 +RDATE:19200321T000000 +RDATE:19400615T000000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19450402T020000 +RDATE:19460317T020000 +RDATE:19470316T000000 +RDATE:19480229T020000 +RDATE:19660522T000000 +RDATE:19670528T000000 +RDATE:19680526T000000 +RDATE:19690601T000000 +RDATE:19700531T000000 +RDATE:19710523T000000 +RDATE:19720528T000000 +RDATE:19730603T000000 +RDATE:19740526T000000 +RDATE:19750601T000000 +RDATE:19760530T000000 +RDATE:19770522T000000 +RDATE:19780528T000000 +RDATE:19790527T000000 +RDATE:19800406T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19161001T010000 +RDATE:19161001T010000 +RDATE:19170930T010000 +RDATE:19181006T010000 +RDATE:19191005T010000 +RDATE:19200919T010000 +RDATE:19421102T030000 +RDATE:19431004T030000 +RDATE:19440701T000000 +RDATE:19450915T010000 +RDATE:19461006T030000 +RDATE:19471005T010000 +RDATE:19481003T030000 +RDATE:19660925T000000 +RDATE:19670924T000000 +RDATE:19680922T000000 +RDATE:19690928T000000 +RDATE:19700927T000000 +RDATE:19710926T010000 +RDATE:19721001T000000 +RDATE:19730930T000000 +RDATE:19740929T000000 +RDATE:19750928T010000 +RDATE:19760926T010000 +RDATE:19770925T010000 +RDATE:19781001T010000 +RDATE:19790930T010000 +RDATE:19800928T030000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19440917T000000 +RDATE:19440917T000000 +RDATE:19800101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Vienna.ics b/mozilla/calendar/libical/zoneinfo/Europe/Vienna.ics index b246f0f2a0f..c52ea2abc90 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Vienna.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Vienna.ics @@ -1,22 +1,92 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Vienna +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Vienna X-LIC-LOCATION:Europe/Vienna BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19810329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+010520 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+010520 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:18930401T000000 +RDATE:18930401T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19160430T230000 +RDATE:19160430T230000 +RDATE:19170416T020000 +RDATE:19180415T020000 +RDATE:19200405T020000 +RDATE:19400401T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19450402T020000 +RDATE:19460414T020000 +RDATE:19470406T020000 +RDATE:19480418T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19161001T010000 +RDATE:19161001T010000 +RDATE:19170917T030000 +RDATE:19180616T030000 +RDATE:19200913T030000 +RDATE:19421102T030000 +RDATE:19431004T030000 +RDATE:19441002T030000 +RDATE:19451118T030000 +RDATE:19461006T030000 +RDATE:19471005T030000 +RDATE:19481003T030000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19810101T000000 +RDATE:19810101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Vilnius.ics b/mozilla/calendar/libical/zoneinfo/Europe/Vilnius.ics index cf6dbb7e976..0dcaa8c20be 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Vilnius.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Vilnius.ics @@ -1,22 +1,162 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Vilnius +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Vilnius X-LIC-LOCATION:Europe/Vilnius +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+014116 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+014116 +TZOFFSETTO:+0124 +TZNAME:WMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0124 +TZOFFSETTO:+013536 +TZNAME:KMT +DTSTART:19170101T000000 +RDATE:19170101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+013536 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19191010T000000 +RDATE:19191010T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19200712T000000 +RDATE:19200712T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19201009T000000 +RDATE:19201009T000000 +RDATE:19431004T030000 +RDATE:19980329T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19400803T000000 +RDATE:19400803T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19410624T000000 +RDATE:19410624T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19421102T020000 +RDATE:19421102T020000 +RDATE:19981025T020000 +END:STANDARD BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19430329T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19990328T020000 +END:DAYLIGHT +BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19440801T000000 +RDATE:19440801T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:MSD +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700329T030000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +DTSTART:19910331T020000 +RDATE:19910331T020000 END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701025T040000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +DTSTART:19910929T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +RDATE:19961027T030000 +RDATE:19971026T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19920329T020000 +RDATE:19920329T020000 +RDATE:19930328T020000 +RDATE:19940327T020000 +RDATE:19950326T020000 +RDATE:19960331T020000 +RDATE:19970330T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19980101T000000 +RDATE:19980101T000000 +RDATE:19991031T030000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Volgograd.ics b/mozilla/calendar/libical/zoneinfo/Europe/Volgograd.ics deleted file mode 100644 index 8831807042c..00000000000 --- a/mozilla/calendar/libical/zoneinfo/Europe/Volgograd.ics +++ /dev/null @@ -1,22 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN -VERSION:2.0 -BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Volgograd -X-LIC-LOCATION:Europe/Volgograd -BEGIN:DAYLIGHT -TZOFFSETFROM:+0300 -TZOFFSETTO:+0400 -TZNAME:VOLST -DTSTART:19700329T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:DAYLIGHT -BEGIN:STANDARD -TZOFFSETFROM:+0400 -TZOFFSETTO:+0300 -TZNAME:VOLT -DTSTART:19701025T030000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU -END:STANDARD -END:VTIMEZONE -END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Warsaw.ics b/mozilla/calendar/libical/zoneinfo/Europe/Warsaw.ics index 97df8de62f9..f8c0b987a34 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Warsaw.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Warsaw.ics @@ -1,22 +1,164 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Warsaw +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Warsaw X-LIC-LOCATION:Europe/Warsaw BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19990328T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19991031T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0124 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0124 +TZOFFSETTO:+0124 +TZNAME:WMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0124 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19150805T000000 +RDATE:19150805T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19160430T230000 +RDATE:19160430T230000 +RDATE:19170416T020000 +RDATE:19180415T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19450429T000000 +RDATE:19460414T000000 +RDATE:19470504T000000 +RDATE:19480418T000000 +RDATE:19570602T010000 +RDATE:19580330T010000 +RDATE:19590531T010000 +RDATE:19600403T010000 +RDATE:19610528T010000 +RDATE:19620527T010000 +RDATE:19630526T010000 +RDATE:19640531T010000 +RDATE:19770403T010000 +RDATE:19780402T010000 +RDATE:19790401T010000 +RDATE:19800406T010000 +RDATE:19810329T010000 +RDATE:19820328T010000 +RDATE:19830327T010000 +RDATE:19840325T010000 +RDATE:19850331T010000 +RDATE:19860330T010000 +RDATE:19870329T010000 +RDATE:19880327T010000 +RDATE:19890326T010000 +RDATE:19900325T010000 +RDATE:19910331T010000 +RDATE:19920329T010000 +RDATE:19930328T010000 +RDATE:19940327T010000 +RDATE:19950326T010000 +RDATE:19960331T010000 +RDATE:19970330T010000 +RDATE:19980329T010000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19161001T010000 +RDATE:19161001T010000 +RDATE:19170917T030000 +RDATE:19220601T000000 +RDATE:19431004T030000 +RDATE:19441001T000000 +RDATE:19451101T000000 +RDATE:19460907T000000 +RDATE:19471005T000000 +RDATE:19481003T000000 +RDATE:19570929T020000 +RDATE:19580928T020000 +RDATE:19591004T020000 +RDATE:19601002T020000 +RDATE:19611001T020000 +RDATE:19620930T020000 +RDATE:19630929T020000 +RDATE:19640927T020000 +RDATE:19770925T020000 +RDATE:19781001T020000 +RDATE:19790930T020000 +RDATE:19800928T020000 +RDATE:19810927T020000 +RDATE:19820926T020000 +RDATE:19830925T020000 +RDATE:19840930T020000 +RDATE:19850929T020000 +RDATE:19860928T020000 +RDATE:19870927T020000 +RDATE:19880925T020000 +RDATE:19890924T020000 +RDATE:19900930T020000 +RDATE:19910929T020000 +RDATE:19920927T020000 +RDATE:19930926T020000 +RDATE:19940925T020000 +RDATE:19950924T020000 +RDATE:19961027T020000 +RDATE:19971026T020000 +RDATE:19981025T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19180916T030000 +RDATE:19180916T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19190415T020000 +RDATE:19190415T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19190916T030000 +RDATE:19190916T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19400623T020000 +RDATE:19400623T020000 +RDATE:19421102T020000 +RDATE:19441004T020000 +RDATE:19990101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Zagreb.ics b/mozilla/calendar/libical/zoneinfo/Europe/Zagreb.ics index c10bcc9d60e..da8c0290f65 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Zagreb.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Zagreb.ics @@ -1,22 +1,76 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Zagreb +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Zagreb X-LIC-LOCATION:Europe/Zagreb BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19830327T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+0122 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0122 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:18840101T000000 +RDATE:18840101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19410418T230000 +RDATE:19410418T230000 +RDATE:19421102T020000 +RDATE:19821127T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19430329T020000 +RDATE:19430329T020000 +RDATE:19440403T020000 +RDATE:19450508T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19431004T030000 +RDATE:19431004T030000 +RDATE:19441002T030000 +RDATE:19450916T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Zaporozhye.ics b/mozilla/calendar/libical/zoneinfo/Europe/Zaporozhye.ics index 78896428c5e..767cef42fc3 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Zaporozhye.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Zaporozhye.ics @@ -1,22 +1,145 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Zaporozhye +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Zaporozhye X-LIC-LOCATION:Europe/Zaporozhye BEGIN:DAYLIGHT TZOFFSETFROM:+0200 TZOFFSETTO:+0300 TZNAME:EEST -DTSTART:19700329T030000 +DTSTART:19950326T030000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0300 TZOFFSETTO:+0200 TZNAME:EET -DTSTART:19701025T040000 +DTSTART:19961027T040000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+022040 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+022040 +TZOFFSETTO:+0220 +TZNAME:CUT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0220 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19240502T000000 +RDATE:19240502T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19300621T000000 +RDATE:19300621T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19410825T000000 +RDATE:19410825T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19421102T020000 +RDATE:19421102T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19430329T020000 +RDATE:19430329T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19431004T030000 +RDATE:19431004T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19431025T000000 +RDATE:19431025T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:MSD +DTSTART:19810401T000000 +RDATE:19810401T000000 +RDATE:19820401T000000 +RDATE:19830401T000000 +RDATE:19840401T000000 +RDATE:19850331T020000 +RDATE:19860330T020000 +RDATE:19870329T020000 +RDATE:19880327T020000 +RDATE:19890326T020000 +RDATE:19900325T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0300 +TZNAME:MSK +DTSTART:19811001T000000 +RDATE:19811001T000000 +RDATE:19821001T000000 +RDATE:19831001T000000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0300 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19910331T020000 +RDATE:19910331T020000 +RDATE:19920927T000000 +RDATE:19930926T000000 +RDATE:19940925T000000 +RDATE:19950924T040000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0200 +TZNAME:EET +DTSTART:19910929T000000 +RDATE:19910929T000000 +RDATE:19950101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0200 +TZOFFSETTO:+0300 +TZNAME:EEST +DTSTART:19920329T000000 +RDATE:19920329T000000 +RDATE:19930328T000000 +RDATE:19940327T000000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Europe/Zurich.ics b/mozilla/calendar/libical/zoneinfo/Europe/Zurich.ics index a3926d3c37a..8bf1d163603 100644 --- a/mozilla/calendar/libical/zoneinfo/Europe/Zurich.ics +++ b/mozilla/calendar/libical/zoneinfo/Europe/Zurich.ics @@ -1,22 +1,83 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Europe/Zurich +TZID:/softwarestudio.org/Olson_20010626_2/Europe/Zurich X-LIC-LOCATION:Europe/Zurich BEGIN:DAYLIGHT TZOFFSETFROM:+0100 TZOFFSETTO:+0200 TZNAME:CEST -DTSTART:19700329T020000 +DTSTART:19810329T020000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:+0200 TZOFFSETTO:+0100 TZNAME:CET -DTSTART:19701025T030000 +DTSTART:19961027T030000 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+003408 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+003408 +TZOFFSETTO:+002944 +TZNAME:BMT +DTSTART:18480912T000000 +RDATE:18480912T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+002944 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:18940601T000000 +RDATE:18940601T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19401102T000000 +RDATE:19401102T000000 +RDATE:19410504T020000 +RDATE:19420503T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19401231T000000 +RDATE:19401231T000000 +RDATE:19411005T000000 +RDATE:19421004T000000 +RDATE:19810927T030000 +RDATE:19820926T030000 +RDATE:19830925T030000 +RDATE:19840930T030000 +RDATE:19850929T030000 +RDATE:19860928T030000 +RDATE:19870927T030000 +RDATE:19880925T030000 +RDATE:19890924T030000 +RDATE:19900930T030000 +RDATE:19910929T030000 +RDATE:19920927T030000 +RDATE:19930926T030000 +RDATE:19940925T030000 +RDATE:19950924T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0100 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19810101T000000 +RDATE:19810101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Indian/Antananarivo.ics b/mozilla/calendar/libical/zoneinfo/Indian/Antananarivo.ics index 2a6328ddfbd..13f62cacef6 100644 --- a/mozilla/calendar/libical/zoneinfo/Indian/Antananarivo.ics +++ b/mozilla/calendar/libical/zoneinfo/Indian/Antananarivo.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Indian/Antananarivo +TZID:/softwarestudio.org/Olson_20010626_2/Indian/Antananarivo X-LIC-LOCATION:Indian/Antananarivo BEGIN:STANDARD -TZOFFSETFROM:+0300 +TZOFFSETFROM:+0000 +TZOFFSETTO:+031004 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+031004 TZOFFSETTO:+0300 TZNAME:EAT -DTSTART:19700101T000000 +DTSTART:19110701T000000 +RDATE:19110701T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+0300 +TZOFFSETTO:+0400 +TZNAME:EAST +DTSTART:19540227T230000 +RDATE:19540227T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0400 +TZOFFSETTO:+0300 +TZNAME:EAT +DTSTART:19540530T000000 +RDATE:19540530T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Indian/Chagos.ics b/mozilla/calendar/libical/zoneinfo/Indian/Chagos.ics index 63cfe23d695..fcadb8ba926 100644 --- a/mozilla/calendar/libical/zoneinfo/Indian/Chagos.ics +++ b/mozilla/calendar/libical/zoneinfo/Indian/Chagos.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Indian/Chagos +TZID:/softwarestudio.org/Olson_20010626_2/Indian/Chagos X-LIC-LOCATION:Indian/Chagos BEGIN:STANDARD -TZOFFSETFROM:+0600 +TZOFFSETFROM:+0000 +TZOFFSETTO:+0500 +TZNAME:IOT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0500 TZOFFSETTO:+0600 TZNAME:IOT -DTSTART:19700101T000000 +DTSTART:19960101T000000 +RDATE:19960101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Indian/Christmas.ics b/mozilla/calendar/libical/zoneinfo/Indian/Christmas.ics index 35855daae58..ef2d7d30a4c 100644 --- a/mozilla/calendar/libical/zoneinfo/Indian/Christmas.ics +++ b/mozilla/calendar/libical/zoneinfo/Indian/Christmas.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Indian/Christmas +TZID:/softwarestudio.org/Olson_20010626_2/Indian/Christmas X-LIC-LOCATION:Indian/Christmas BEGIN:STANDARD -TZOFFSETFROM:+0700 +TZOFFSETFROM:+0000 +TZOFFSETTO:+070252 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+070252 TZOFFSETTO:+0700 TZNAME:CXT -DTSTART:19700101T000000 +DTSTART:18950201T000000 +RDATE:18950201T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Indian/Cocos.ics b/mozilla/calendar/libical/zoneinfo/Indian/Cocos.ics index cf5b079c4f3..0a2ba4786b1 100644 --- a/mozilla/calendar/libical/zoneinfo/Indian/Cocos.ics +++ b/mozilla/calendar/libical/zoneinfo/Indian/Cocos.ics @@ -1,14 +1,15 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Indian/Cocos +TZID:/softwarestudio.org/Olson_20010626_2/Indian/Cocos X-LIC-LOCATION:Indian/Cocos BEGIN:STANDARD -TZOFFSETFROM:+0630 +TZOFFSETFROM:+0000 TZOFFSETTO:+0630 TZNAME:CCT -DTSTART:19700101T000000 +DTSTART:00010101T000000 +RDATE:00010101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Indian/Comoro.ics b/mozilla/calendar/libical/zoneinfo/Indian/Comoro.ics index 3f642fe9c36..085a725468d 100644 --- a/mozilla/calendar/libical/zoneinfo/Indian/Comoro.ics +++ b/mozilla/calendar/libical/zoneinfo/Indian/Comoro.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Indian/Comoro +TZID:/softwarestudio.org/Olson_20010626_2/Indian/Comoro X-LIC-LOCATION:Indian/Comoro BEGIN:STANDARD -TZOFFSETFROM:+0300 +TZOFFSETFROM:+0000 +TZOFFSETTO:+025304 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+025304 TZOFFSETTO:+0300 TZNAME:EAT -DTSTART:19700101T000000 +DTSTART:19110701T000000 +RDATE:19110701T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Indian/Kerguelen.ics b/mozilla/calendar/libical/zoneinfo/Indian/Kerguelen.ics index 6f38c0c9834..0443e82c569 100644 --- a/mozilla/calendar/libical/zoneinfo/Indian/Kerguelen.ics +++ b/mozilla/calendar/libical/zoneinfo/Indian/Kerguelen.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Indian/Kerguelen +TZID:/softwarestudio.org/Olson_20010626_2/Indian/Kerguelen X-LIC-LOCATION:Indian/Kerguelen BEGIN:STANDARD -TZOFFSETFROM:+0500 +TZOFFSETFROM:+0000 +TZOFFSETTO:+0000 +TZNAME:zzz +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 TZOFFSETTO:+0500 TZNAME:TFT -DTSTART:19700101T000000 +DTSTART:19500101T000000 +RDATE:19500101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Indian/Mahe.ics b/mozilla/calendar/libical/zoneinfo/Indian/Mahe.ics index 0448100bad6..c4f77ca9044 100644 --- a/mozilla/calendar/libical/zoneinfo/Indian/Mahe.ics +++ b/mozilla/calendar/libical/zoneinfo/Indian/Mahe.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Indian/Mahe +TZID:/softwarestudio.org/Olson_20010626_2/Indian/Mahe X-LIC-LOCATION:Indian/Mahe BEGIN:STANDARD -TZOFFSETFROM:+0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:+034148 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+034148 TZOFFSETTO:+0400 TZNAME:SCT -DTSTART:19700101T000000 +DTSTART:19060601T000000 +RDATE:19060601T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Indian/Maldives.ics b/mozilla/calendar/libical/zoneinfo/Indian/Maldives.ics index d58e0afbf9b..241cda1462f 100644 --- a/mozilla/calendar/libical/zoneinfo/Indian/Maldives.ics +++ b/mozilla/calendar/libical/zoneinfo/Indian/Maldives.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Indian/Maldives +TZID:/softwarestudio.org/Olson_20010626_2/Indian/Maldives X-LIC-LOCATION:Indian/Maldives BEGIN:STANDARD -TZOFFSETFROM:+0500 +TZOFFSETFROM:+0000 +TZOFFSETTO:+0454 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0454 +TZOFFSETTO:+0454 +TZNAME:MMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0454 TZOFFSETTO:+0500 TZNAME:MVT -DTSTART:19700101T000000 +DTSTART:19600101T000000 +RDATE:19600101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Indian/Mauritius.ics b/mozilla/calendar/libical/zoneinfo/Indian/Mauritius.ics index 5ad5a11a5a9..906e4448cfd 100644 --- a/mozilla/calendar/libical/zoneinfo/Indian/Mauritius.ics +++ b/mozilla/calendar/libical/zoneinfo/Indian/Mauritius.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Indian/Mauritius +TZID:/softwarestudio.org/Olson_20010626_2/Indian/Mauritius X-LIC-LOCATION:Indian/Mauritius BEGIN:STANDARD -TZOFFSETFROM:+0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:+0350 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0350 TZOFFSETTO:+0400 TZNAME:MUT -DTSTART:19700101T000000 +DTSTART:19070101T000000 +RDATE:19070101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Indian/Mayotte.ics b/mozilla/calendar/libical/zoneinfo/Indian/Mayotte.ics index 31c9823010b..5720e21734f 100644 --- a/mozilla/calendar/libical/zoneinfo/Indian/Mayotte.ics +++ b/mozilla/calendar/libical/zoneinfo/Indian/Mayotte.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Indian/Mayotte +TZID:/softwarestudio.org/Olson_20010626_2/Indian/Mayotte X-LIC-LOCATION:Indian/Mayotte BEGIN:STANDARD -TZOFFSETFROM:+0300 +TZOFFSETFROM:+0000 +TZOFFSETTO:+030056 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+030056 TZOFFSETTO:+0300 TZNAME:EAT -DTSTART:19700101T000000 +DTSTART:19110701T000000 +RDATE:19110701T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Indian/Reunion.ics b/mozilla/calendar/libical/zoneinfo/Indian/Reunion.ics index 1c61631807d..0f0b72ee98b 100644 --- a/mozilla/calendar/libical/zoneinfo/Indian/Reunion.ics +++ b/mozilla/calendar/libical/zoneinfo/Indian/Reunion.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Indian/Reunion +TZID:/softwarestudio.org/Olson_20010626_2/Indian/Reunion X-LIC-LOCATION:Indian/Reunion BEGIN:STANDARD -TZOFFSETFROM:+0400 +TZOFFSETFROM:+0000 +TZOFFSETTO:+034152 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+034152 TZOFFSETTO:+0400 TZNAME:RET -DTSTART:19700101T000000 +DTSTART:19110601T000000 +RDATE:19110601T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Makefile.am b/mozilla/calendar/libical/zoneinfo/Makefile.am index 34fa2f2cd97..662a0b9f4e9 100644 --- a/mozilla/calendar/libical/zoneinfo/Makefile.am +++ b/mozilla/calendar/libical/zoneinfo/Makefile.am @@ -6,10 +6,8 @@ zoneinfodata_DATA = zones.tab DIRS = \ Africa \ America \ - America/North_Dakota \ America/Indiana \ America/Kentucky \ - America/Argentina \ Antarctica \ Arctic \ Asia \ diff --git a/mozilla/calendar/libical/zoneinfo/Makefile.in b/mozilla/calendar/libical/zoneinfo/Makefile.in index 83e8e42e3ee..26bb8db8e6d 100644 --- a/mozilla/calendar/libical/zoneinfo/Makefile.in +++ b/mozilla/calendar/libical/zoneinfo/Makefile.in @@ -1,8 +1,7 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ +# Makefile.in generated automatically by automake 1.5 from Makefile.am. -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,58 +13,57 @@ @SET_MAKE@ +SHELL = @SHELL@ + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) +transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_alias = @build_alias@ build_triplet = @build@ +host_alias = @host_alias@ host_triplet = @host@ +target_alias = @target_alias@ target_triplet = @target@ -subdir = zoneinfo -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(zoneinfodatadir)" -zoneinfodataDATA_INSTALL = $(INSTALL_DATA) -DATA = $(zoneinfodata_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ +AS = @AS@ AWK = @AWK@ BDB_DIR = @BDB_DIR@ BDB_DIR_INCLUDE = @BDB_DIR_INCLUDE@ @@ -73,127 +71,49 @@ BDB_DIR_LIB = @BDB_DIR_LIB@ BDB_LIB = @BDB_LIB@ BDB_VERSION = @BDB_VERSION@ CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DEV_FALSE = @DEV_FALSE@ -DEV_TRUE = @DEV_TRUE@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -HAVE_PTHREAD_FALSE = @HAVE_PTHREAD_FALSE@ -HAVE_PTHREAD_TRUE = @HAVE_PTHREAD_TRUE@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ +JAR = @JAR@ +JAVA = @JAVA@ +JAVAC = @JAVAC@ +JAVAH = @JAVAH@ +JAVA_PLATFORM = @JAVA_PLATFORM@ LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ PTHREAD_LIBS = @PTHREAD_LIBS@ +PY_CFLAGS = @PY_CFLAGS@ +PY_EXTRA_LIBS = @PY_EXTRA_LIBS@ +PY_LIBS = @PY_LIBS@ +PY_LIB_LOC = @PY_LIB_LOC@ RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ +RRCAP_CFLAGS = @RRCAP_CFLAGS@ +RRCAP_LIBS = @RRCAP_LIBS@ VERSION = @VERSION@ -WITH_BDB4_FALSE = @WITH_BDB4_FALSE@ -WITH_BDB4_TRUE = @WITH_BDB4_TRUE@ YACC = @YACC@ -YFLAGS = @YFLAGS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ -am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ +python_val = @python_val@ + zoneinfodatadir = $(datadir)/$(PACKAGE)/zoneinfo + zoneinfodata_DATA = zones.tab + DIRS = \ Africa \ America \ - America/North_Dakota \ America/Indiana \ America/Kentucky \ - America/Argentina \ Antarctica \ Arctic \ Asia \ @@ -203,39 +123,19 @@ DIRS = \ Indian \ Pacific + EXTRA_DIST = $(zoneinfodata_DATA) +subdir = zoneinfo +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +DIST_SOURCES = +DATA = $(zoneinfodata_DATA) + +DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu zoneinfo/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu zoneinfo/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: -rm -f *.lo @@ -245,52 +145,50 @@ clean-libtool: distclean-libtool: -rm -f libtool +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu zoneinfo/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status uninstall-info-am: install-zoneinfodataDATA: $(zoneinfodata_DATA) @$(NORMAL_INSTALL) - test -z "$(zoneinfodatadir)" || $(mkdir_p) "$(DESTDIR)$(zoneinfodatadir)" + $(mkinstalldirs) $(DESTDIR)$(zoneinfodatadir) @list='$(zoneinfodata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(zoneinfodataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(zoneinfodatadir)/$$f'"; \ - $(zoneinfodataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(zoneinfodatadir)/$$f"; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(zoneinfodatadir)/$$f"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(zoneinfodatadir)/$$f; \ done uninstall-zoneinfodataDATA: @$(NORMAL_UNINSTALL) @list='$(zoneinfodata_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(zoneinfodatadir)/$$f'"; \ - rm -f "$(DESTDIR)$(zoneinfodatadir)/$$f"; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(zoneinfodatadir)/$$f"; \ + rm -f $(DESTDIR)$(zoneinfodatadir)/$$f; \ done tags: TAGS TAGS: -ctags: CTAGS -CTAGS: +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = .. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + @for file in $(DISTFILES); do \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ fi; \ if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -298,15 +196,15 @@ distdir: $(DISTFILES) fi; \ done $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ + top_distdir="${top_distdir}" distdir="$(distdir)" \ dist-hook check-am: all-am check: check-am all-am: Makefile $(DATA) + installdirs: - for dir in "$(DESTDIR)$(zoneinfodatadir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done + $(mkinstalldirs) $(DESTDIR)$(zoneinfodatadir) + install: install-am install-exec: install-exec-am install-data: install-data-am @@ -318,7 +216,6 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -326,7 +223,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -336,15 +233,13 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - -rm -f Makefile + distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am dvi-am: -html: html-am - info: info-am info-am: @@ -360,33 +255,24 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - uninstall-am: uninstall-info-am uninstall-zoneinfodataDATA .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - dist-hook distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-data-local \ - install-exec install-exec-am install-info install-info-am \ - install-man install-strip install-zoneinfodataDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am uninstall-zoneinfodataDATA + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am info info-am install install-am install-data \ + install-data-am install-data-local install-exec install-exec-am \ + install-info install-info-am install-man install-strip \ + install-zoneinfodataDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool uninstall \ + uninstall-am uninstall-info-am uninstall-zoneinfodataDATA install-data-local: diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Apia.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Apia.ics index acb2a6b2ab4..16cd181ad8a 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Apia.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Apia.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Apia +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Apia X-LIC-LOCATION:Pacific/Apia BEGIN:STANDARD -TZOFFSETFROM:-1100 +TZOFFSETFROM:+0000 +TZOFFSETTO:+123304 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+123304 +TZOFFSETTO:-112656 +TZNAME:LMT +DTSTART:18790705T000000 +RDATE:18790705T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-112656 +TZOFFSETTO:-1130 +TZNAME:SAMT +DTSTART:19110101T000000 +RDATE:19110101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-1130 TZOFFSETTO:-1100 TZNAME:WST -DTSTART:19700101T000000 +DTSTART:19500101T000000 +RDATE:19500101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Auckland.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Auckland.ics index beb59748ec3..0e74e28aa0e 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Auckland.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Auckland.ics @@ -1,22 +1,124 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Auckland +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Auckland X-LIC-LOCATION:Pacific/Auckland BEGIN:STANDARD TZOFFSETFROM:+1300 TZOFFSETTO:+1200 TZNAME:NZST -DTSTART:19700315T030000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU +DTSTART:19900318T030000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=15,16,17,18,19,20,21;BYDAY=SU END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+1200 TZOFFSETTO:+1300 TZNAME:NZDT -DTSTART:19701004T020000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU +DTSTART:19901007T020000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+113904 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+113904 +TZOFFSETTO:+1130 +TZNAME:NZST +DTSTART:18680101T000000 +RDATE:18680101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1130 +TZOFFSETTO:+1200 +TZNAME:NZHDT +DTSTART:19271126T020000 +RDATE:19271126T020000 +RDATE:19281104T020000 +RDATE:19291030T020000 +RDATE:19301012T020000 +RDATE:19311011T020000 +RDATE:19321009T020000 +RDATE:19331008T020000 +RDATE:19340930T020000 +RDATE:19350929T020000 +RDATE:19360927T020000 +RDATE:19370926T020000 +RDATE:19380925T020000 +RDATE:19390924T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1200 +TZOFFSETTO:+1130 +TZNAME:NZST +DTSTART:19280304T020000 +RDATE:19280304T020000 +RDATE:19290303T020000 +RDATE:19300316T020000 +RDATE:19310315T020000 +RDATE:19320320T020000 +RDATE:19330319T020000 +RDATE:19340429T020000 +RDATE:19350428T020000 +RDATE:19360426T020000 +RDATE:19370425T020000 +RDATE:19380424T020000 +RDATE:19390430T020000 +RDATE:19400428T020000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+1130 +TZOFFSETTO:+1200 +TZNAME:NZST +DTSTART:19400929T020000 +RDATE:19400929T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1200 +TZOFFSETTO:+1300 +TZNAME:NZDT +DTSTART:19741103T020000 +RDATE:19741103T020000 +RDATE:19751026T020000 +RDATE:19761031T020000 +RDATE:19771030T020000 +RDATE:19781029T020000 +RDATE:19791028T020000 +RDATE:19801026T020000 +RDATE:19811025T020000 +RDATE:19821031T020000 +RDATE:19831030T020000 +RDATE:19841028T020000 +RDATE:19851027T020000 +RDATE:19861026T020000 +RDATE:19871025T020000 +RDATE:19881030T020000 +RDATE:19891008T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1300 +TZOFFSETTO:+1200 +TZNAME:NZST +DTSTART:19750223T030000 +RDATE:19750223T030000 +RDATE:19760307T030000 +RDATE:19770306T030000 +RDATE:19780305T030000 +RDATE:19790304T030000 +RDATE:19800302T030000 +RDATE:19810301T030000 +RDATE:19820307T030000 +RDATE:19830306T030000 +RDATE:19840304T030000 +RDATE:19850303T030000 +RDATE:19860302T030000 +RDATE:19870301T030000 +RDATE:19880306T030000 +RDATE:19890305T030000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Chatham.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Chatham.ics index e7fd31c8c1a..99f0672b904 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Chatham.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Chatham.ics @@ -1,22 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Chatham +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Chatham X-LIC-LOCATION:Pacific/Chatham -BEGIN:STANDARD -TZOFFSETFROM:+1345 -TZOFFSETTO:+1245 -TZNAME:CHAST -DTSTART:19700315T034500 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU -END:STANDARD BEGIN:DAYLIGHT TZOFFSETFROM:+1245 TZOFFSETTO:+1345 TZNAME:CHADT -DTSTART:19701004T024500 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU +DTSTART:19901007T024500 +RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=1,2,3,4,5,6,7;BYDAY=SU END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1345 +TZOFFSETTO:+1245 +TZNAME:CHAST +DTSTART:19910317T034500 +RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=15,16,17,18,19,20,21;BYDAY=SU +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+1245 +TZNAME:CHAST +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Easter.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Easter.ics index bb751fe2520..a1823930ce3 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Easter.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Easter.ics @@ -1,22 +1,140 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Easter +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Easter X-LIC-LOCATION:Pacific/Easter BEGIN:DAYLIGHT TZOFFSETFROM:-0600 TZOFFSETTO:-0500 TZNAME:EASST -DTSTART:19701010T220000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SA +DTSTART:19991009T220000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=8,9,10,11,12,13,14;BYDAY=SA END:DAYLIGHT BEGIN:STANDARD TZOFFSETFROM:-0500 TZOFFSETTO:-0600 TZNAME:EAST -DTSTART:19700314T220000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA +DTSTART:20000311T220000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=8,9,10,11,12,13,14;BYDAY=SA +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-071728 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-071728 +TZOFFSETTO:-071728 +TZNAME:MMT +DTSTART:18900101T000000 +RDATE:18900101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-071728 +TZOFFSETTO:-0700 +TZNAME:EAST +DTSTART:19320901T000000 +RDATE:19320901T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:EASST +DTSTART:19661008T210000 +RDATE:19661008T210000 +RDATE:19671014T210000 +RDATE:19681012T210000 +RDATE:19691011T210000 +RDATE:19701010T210000 +RDATE:19711009T210000 +RDATE:19721014T210000 +RDATE:19731013T210000 +RDATE:19741012T210000 +RDATE:19751011T210000 +RDATE:19761009T210000 +RDATE:19771008T210000 +RDATE:19781014T210000 +RDATE:19791013T210000 +RDATE:19801011T210000 +RDATE:19811010T210000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0600 +TZOFFSETTO:-0700 +TZNAME:EAST +DTSTART:19670311T210000 +RDATE:19670311T210000 +RDATE:19680309T210000 +RDATE:19690308T210000 +RDATE:19700314T210000 +RDATE:19710313T210000 +RDATE:19720311T210000 +RDATE:19730310T210000 +RDATE:19740309T210000 +RDATE:19750308T210000 +RDATE:19760313T210000 +RDATE:19770312T210000 +RDATE:19780311T210000 +RDATE:19790310T210000 +RDATE:19800308T210000 +RDATE:19810314T210000 +RDATE:19820313T210000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +TZNAME:EAST +DTSTART:19820314T000000 +RDATE:19820314T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-0600 +TZOFFSETTO:-0500 +TZNAME:EASST +DTSTART:19821009T220000 +RDATE:19821009T220000 +RDATE:19831008T220000 +RDATE:19841013T220000 +RDATE:19851012T220000 +RDATE:19861011T220000 +RDATE:19871010T220000 +RDATE:19881008T220000 +RDATE:19891014T220000 +RDATE:19901013T220000 +RDATE:19911012T220000 +RDATE:19921010T220000 +RDATE:19931009T220000 +RDATE:19941008T220000 +RDATE:19951014T220000 +RDATE:19961012T220000 +RDATE:19971011T220000 +RDATE:19980926T220000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0500 +TZOFFSETTO:-0600 +TZNAME:EAST +DTSTART:19830312T220000 +RDATE:19830312T220000 +RDATE:19840310T220000 +RDATE:19850309T220000 +RDATE:19860308T220000 +RDATE:19870314T220000 +RDATE:19880312T220000 +RDATE:19890311T220000 +RDATE:19900310T220000 +RDATE:19910309T220000 +RDATE:19920314T220000 +RDATE:19930313T220000 +RDATE:19940312T220000 +RDATE:19950311T220000 +RDATE:19960309T220000 +RDATE:19970308T220000 +RDATE:19980314T220000 +RDATE:19990403T220000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Efate.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Efate.ics index da01700bc0c..33e06fc8bd1 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Efate.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Efate.ics @@ -1,14 +1,54 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Efate +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Efate X-LIC-LOCATION:Pacific/Efate BEGIN:STANDARD -TZOFFSETFROM:+1100 +TZOFFSETFROM:+0000 +TZOFFSETTO:+111316 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+111316 TZOFFSETTO:+1100 TZNAME:VUT -DTSTART:19700101T000000 +DTSTART:19120113T000000 +RDATE:19120113T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1100 +TZOFFSETTO:+1200 +TZNAME:VUST +DTSTART:19830925T000000 +RDATE:19830925T000000 +RDATE:19841023T000000 +RDATE:19850929T000000 +RDATE:19860928T000000 +RDATE:19870927T000000 +RDATE:19880925T000000 +RDATE:19890924T000000 +RDATE:19900923T000000 +RDATE:19910929T000000 +RDATE:19921025T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1200 +TZOFFSETTO:+1100 +TZNAME:VUT +DTSTART:19840325T000000 +RDATE:19840325T000000 +RDATE:19850324T000000 +RDATE:19860323T000000 +RDATE:19870329T000000 +RDATE:19880327T000000 +RDATE:19890326T000000 +RDATE:19900325T000000 +RDATE:19910324T000000 +RDATE:19920126T000000 +RDATE:19930124T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Enderbury.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Enderbury.ics index c3b6303f66b..4049f7c83b8 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Enderbury.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Enderbury.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Enderbury +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Enderbury X-LIC-LOCATION:Pacific/Enderbury BEGIN:STANDARD -TZOFFSETFROM:+1300 +TZOFFSETFROM:+0000 +TZOFFSETTO:-112420 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-112420 +TZOFFSETTO:-1200 +TZNAME:PHOT +DTSTART:19010101T000000 +RDATE:19010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-1200 +TZOFFSETTO:-1100 +TZNAME:PHOT +DTSTART:19791001T000000 +RDATE:19791001T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-1100 TZOFFSETTO:+1300 TZNAME:PHOT -DTSTART:19700101T000000 +DTSTART:19950101T000000 +RDATE:19950101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Fakaofo.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Fakaofo.ics index 3044529a681..a37d70e4d57 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Fakaofo.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Fakaofo.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Fakaofo +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Fakaofo X-LIC-LOCATION:Pacific/Fakaofo BEGIN:STANDARD -TZOFFSETFROM:-1000 +TZOFFSETFROM:+0000 +TZOFFSETTO:-112456 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-112456 TZOFFSETTO:-1000 TZNAME:TKT -DTSTART:19700101T000000 +DTSTART:19010101T000000 +RDATE:19010101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Fiji.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Fiji.ics index 4ec1f7bf929..8eaa299dc57 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Fiji.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Fiji.ics @@ -1,14 +1,38 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Fiji +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Fiji X-LIC-LOCATION:Pacific/Fiji BEGIN:STANDARD -TZOFFSETFROM:+1200 +TZOFFSETFROM:+0000 +TZOFFSETTO:+115340 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+115340 TZOFFSETTO:+1200 TZNAME:FJT -DTSTART:19700101T000000 +DTSTART:19151026T000000 +RDATE:19151026T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1200 +TZOFFSETTO:+1300 +TZNAME:FJST +DTSTART:19981101T020000 +RDATE:19981101T020000 +RDATE:19991107T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1300 +TZOFFSETTO:+1200 +TZNAME:FJT +DTSTART:19990228T030000 +RDATE:19990228T030000 +RDATE:20000227T030000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Funafuti.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Funafuti.ics index 93d512283d5..6f5fe65ae7b 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Funafuti.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Funafuti.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Funafuti +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Funafuti X-LIC-LOCATION:Pacific/Funafuti BEGIN:STANDARD -TZOFFSETFROM:+1200 +TZOFFSETFROM:+0000 +TZOFFSETTO:+115652 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+115652 TZOFFSETTO:+1200 TZNAME:TVT -DTSTART:19700101T000000 +DTSTART:19010101T000000 +RDATE:19010101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Galapagos.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Galapagos.ics index 30b331ae28f..18e93aa761c 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Galapagos.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Galapagos.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Galapagos +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Galapagos X-LIC-LOCATION:Pacific/Galapagos BEGIN:STANDARD -TZOFFSETFROM:-0600 +TZOFFSETFROM:+0000 +TZOFFSETTO:-055824 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-055824 +TZOFFSETTO:-0500 +TZNAME:ECT +DTSTART:19310101T000000 +RDATE:19310101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0500 TZOFFSETTO:-0600 TZNAME:GALT -DTSTART:19700101T000000 +DTSTART:19860101T000000 +RDATE:19860101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Gambier.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Gambier.ics index 9215edf5edf..02c583168d0 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Gambier.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Gambier.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Gambier +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Gambier X-LIC-LOCATION:Pacific/Gambier BEGIN:STANDARD -TZOFFSETFROM:-0900 +TZOFFSETFROM:+0000 +TZOFFSETTO:-085948 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-085948 TZOFFSETTO:-0900 TZNAME:GAMT -DTSTART:19700101T000000 +DTSTART:19121001T000000 +RDATE:19121001T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Guadalcanal.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Guadalcanal.ics index a12820430d5..8f8b9198c6c 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Guadalcanal.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Guadalcanal.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Guadalcanal +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Guadalcanal X-LIC-LOCATION:Pacific/Guadalcanal BEGIN:STANDARD -TZOFFSETFROM:+1100 +TZOFFSETFROM:+0000 +TZOFFSETTO:+103948 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+103948 TZOFFSETTO:+1100 TZNAME:SBT -DTSTART:19700101T000000 +DTSTART:19121001T000000 +RDATE:19121001T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Guam.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Guam.ics index 98814fd8098..02b080b65f1 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Guam.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Guam.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Guam +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Guam X-LIC-LOCATION:Pacific/Guam BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-1421 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-1421 +TZOFFSETTO:+0939 +TZNAME:LMT +DTSTART:18441231T000000 +RDATE:18441231T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0939 +TZOFFSETTO:+1000 +TZNAME:GST +DTSTART:19010101T000000 +RDATE:19010101T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+1000 TZOFFSETTO:+1000 TZNAME:ChST -DTSTART:19700101T000000 +DTSTART:20001223T000000 +RDATE:20001223T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Honolulu.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Honolulu.ics index 119f35e3f89..16c124d1ae3 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Honolulu.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Honolulu.ics @@ -1,14 +1,58 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Honolulu +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Honolulu X-LIC-LOCATION:Pacific/Honolulu BEGIN:STANDARD -TZOFFSETFROM:-1000 +TZOFFSETFROM:+0000 +TZOFFSETTO:-103126 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-103126 +TZOFFSETTO:-1030 +TZNAME:HST +DTSTART:19000101T120000 +RDATE:19000101T120000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-1030 +TZOFFSETTO:-0930 +TZNAME:HDT +DTSTART:19330430T020000 +RDATE:19330430T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0930 +TZOFFSETTO:-1030 +TZNAME:HST +DTSTART:19330521T020000 +RDATE:19330521T020000 +RDATE:19450930T020000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-1030 +TZOFFSETTO:-0930 +TZNAME:HWT +DTSTART:19420209T020000 +RDATE:19420209T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETFROM:-0930 +TZOFFSETTO:-0930 +TZNAME:HPT +DTSTART:19450814T133000 +RDATE:19450814T133000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-1030 TZOFFSETTO:-1000 TZNAME:HST -DTSTART:19700101T000000 +DTSTART:19470608T020000 +RDATE:19470608T020000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Johnston.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Johnston.ics index 34610e31f10..1ba7640633c 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Johnston.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Johnston.ics @@ -1,14 +1,15 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Johnston +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Johnston X-LIC-LOCATION:Pacific/Johnston BEGIN:STANDARD -TZOFFSETFROM:-1000 +TZOFFSETFROM:+0000 TZOFFSETTO:-1000 TZNAME:HST -DTSTART:19700101T000000 +DTSTART:00010101T000000 +RDATE:00010101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Kiritimati.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Kiritimati.ics index 2e29bd99c45..8cdc601482b 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Kiritimati.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Kiritimati.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Kiritimati +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Kiritimati X-LIC-LOCATION:Pacific/Kiritimati BEGIN:STANDARD -TZOFFSETFROM:+1400 +TZOFFSETFROM:+0000 +TZOFFSETTO:-102920 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-102920 +TZOFFSETTO:-1040 +TZNAME:LINT +DTSTART:19010101T000000 +RDATE:19010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-1040 +TZOFFSETTO:-1000 +TZNAME:LINT +DTSTART:19791001T000000 +RDATE:19791001T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-1000 TZOFFSETTO:+1400 TZNAME:LINT -DTSTART:19700101T000000 +DTSTART:19950101T000000 +RDATE:19950101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Kosrae.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Kosrae.ics index 8062045d588..078ab1f8348 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Kosrae.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Kosrae.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Kosrae +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Kosrae X-LIC-LOCATION:Pacific/Kosrae BEGIN:STANDARD -TZOFFSETFROM:+1100 +TZOFFSETFROM:+0000 +TZOFFSETTO:+105156 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+105156 TZOFFSETTO:+1100 TZNAME:KOST -DTSTART:19700101T000000 +DTSTART:19010101T000000 +RDATE:19010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+1100 +TZOFFSETTO:+1200 +TZNAME:KOST +DTSTART:19691001T000000 +RDATE:19691001T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+1200 +TZOFFSETTO:+1100 +TZNAME:KOST +DTSTART:19990101T000000 +RDATE:19990101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Kwajalein.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Kwajalein.ics index c326a504b24..0ad857b8a37 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Kwajalein.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Kwajalein.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Kwajalein +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Kwajalein X-LIC-LOCATION:Pacific/Kwajalein BEGIN:STANDARD -TZOFFSETFROM:+1200 +TZOFFSETFROM:+0000 +TZOFFSETTO:+110920 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+110920 +TZOFFSETTO:+1100 +TZNAME:MHT +DTSTART:19010101T000000 +RDATE:19010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+1100 +TZOFFSETTO:-1200 +TZNAME:KWAT +DTSTART:19691001T000000 +RDATE:19691001T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-1200 TZOFFSETTO:+1200 TZNAME:MHT -DTSTART:19700101T000000 +DTSTART:19930820T000000 +RDATE:19930820T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Majuro.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Majuro.ics index bf85ddc1550..18b5e2da2d1 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Majuro.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Majuro.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Majuro +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Majuro X-LIC-LOCATION:Pacific/Majuro BEGIN:STANDARD -TZOFFSETFROM:+1200 +TZOFFSETFROM:+0000 +TZOFFSETTO:+112448 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+112448 +TZOFFSETTO:+1100 +TZNAME:MHT +DTSTART:19010101T000000 +RDATE:19010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+1100 TZOFFSETTO:+1200 TZNAME:MHT -DTSTART:19700101T000000 +DTSTART:19691001T000000 +RDATE:19691001T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Marquesas.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Marquesas.ics index 646a970b096..82ac55cd5e6 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Marquesas.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Marquesas.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Marquesas +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Marquesas X-LIC-LOCATION:Pacific/Marquesas BEGIN:STANDARD -TZOFFSETFROM:-0930 +TZOFFSETFROM:+0000 +TZOFFSETTO:-0918 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0918 TZOFFSETTO:-0930 TZNAME:MART -DTSTART:19700101T000000 +DTSTART:19121001T000000 +RDATE:19121001T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Midway.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Midway.ics index 1d1e8bd22b0..4edda6c918b 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Midway.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Midway.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Midway +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Midway X-LIC-LOCATION:Pacific/Midway BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-114928 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-114928 +TZOFFSETTO:-1100 +TZNAME:NST +DTSTART:19010101T000000 +RDATE:19010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-1100 +TZOFFSETTO:-1100 +TZNAME:BST +DTSTART:19670401T000000 +RDATE:19670401T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:-1100 TZOFFSETTO:-1100 TZNAME:SST -DTSTART:19700101T000000 +DTSTART:19831130T000000 +RDATE:19831130T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Nauru.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Nauru.ics index ac8ad2037cc..02a970fee80 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Nauru.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Nauru.ics @@ -1,14 +1,43 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Nauru +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Nauru X-LIC-LOCATION:Pacific/Nauru BEGIN:STANDARD -TZOFFSETFROM:+1200 +TZOFFSETFROM:+0000 +TZOFFSETTO:+110740 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+110740 +TZOFFSETTO:+1130 +TZNAME:NRT +DTSTART:19210115T000000 +RDATE:19210115T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+1130 +TZOFFSETTO:+0900 +TZNAME:JST +DTSTART:19420315T000000 +RDATE:19420315T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+1130 +TZNAME:NRT +DTSTART:19440815T000000 +RDATE:19440815T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+1130 TZOFFSETTO:+1200 TZNAME:NRT -DTSTART:19700101T000000 +DTSTART:19790501T000000 +RDATE:19790501T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Niue.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Niue.ics index 3a7398d5714..3d1bf8a413e 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Niue.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Niue.ics @@ -1,14 +1,36 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Niue +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Niue X-LIC-LOCATION:Pacific/Niue BEGIN:STANDARD -TZOFFSETFROM:-1100 +TZOFFSETFROM:+0000 +TZOFFSETTO:-111940 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-111940 +TZOFFSETTO:-1120 +TZNAME:NUT +DTSTART:19010101T000000 +RDATE:19010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-1120 +TZOFFSETTO:-1130 +TZNAME:NUT +DTSTART:19510101T000000 +RDATE:19510101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-1130 TZOFFSETTO:-1100 TZNAME:NUT -DTSTART:19700101T000000 +DTSTART:19781001T000000 +RDATE:19781001T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Norfolk.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Norfolk.ics index 4c6c17b80ad..211b2cbd6b6 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Norfolk.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Norfolk.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Norfolk +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Norfolk X-LIC-LOCATION:Pacific/Norfolk BEGIN:STANDARD -TZOFFSETFROM:+1130 +TZOFFSETFROM:+0000 +TZOFFSETTO:+111152 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+111152 +TZOFFSETTO:+1112 +TZNAME:NMT +DTSTART:19010101T000000 +RDATE:19010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+1112 TZOFFSETTO:+1130 TZNAME:NFT -DTSTART:19700101T000000 +DTSTART:19510101T000000 +RDATE:19510101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Noumea.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Noumea.ics index f71aa34d06f..a51b2498c26 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Noumea.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Noumea.ics @@ -1,14 +1,40 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Noumea +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Noumea X-LIC-LOCATION:Pacific/Noumea BEGIN:STANDARD -TZOFFSETFROM:+1100 +TZOFFSETFROM:+0000 +TZOFFSETTO:+110548 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+110548 TZOFFSETTO:+1100 TZNAME:NCT -DTSTART:19700101T000000 +DTSTART:19120113T000000 +RDATE:19120113T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1100 +TZOFFSETTO:+1200 +TZNAME:NCST +DTSTART:19771204T000000 +RDATE:19771204T000000 +RDATE:19781203T000000 +RDATE:19961201T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1200 +TZOFFSETTO:+1100 +TZNAME:NCT +DTSTART:19780227T000000 +RDATE:19780227T000000 +RDATE:19790227T000000 +RDATE:19970302T030000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Pago_Pago.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Pago_Pago.ics index e21e962f092..ea01f5fa87b 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Pago_Pago.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Pago_Pago.ics @@ -1,14 +1,50 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Pago_Pago +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Pago_Pago X-LIC-LOCATION:Pacific/Pago_Pago BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+123712 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+123712 +TZOFFSETTO:-112248 +TZNAME:LMT +DTSTART:18790705T000000 +RDATE:18790705T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-112248 +TZOFFSETTO:-1130 +TZNAME:SAMT +DTSTART:19110101T000000 +RDATE:19110101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-1130 +TZOFFSETTO:-1100 +TZNAME:NST +DTSTART:19500101T000000 +RDATE:19500101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-1100 +TZOFFSETTO:-1100 +TZNAME:BST +DTSTART:19670401T000000 +RDATE:19670401T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:-1100 TZOFFSETTO:-1100 TZNAME:SST -DTSTART:19700101T000000 +DTSTART:19831130T000000 +RDATE:19831130T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Palau.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Palau.ics index 3da1be780d5..8e27f0b433a 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Palau.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Palau.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Palau +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Palau X-LIC-LOCATION:Pacific/Palau BEGIN:STANDARD -TZOFFSETFROM:+0900 +TZOFFSETFROM:+0000 +TZOFFSETTO:+085756 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+085756 TZOFFSETTO:+0900 TZNAME:PWT -DTSTART:19700101T000000 +DTSTART:19010101T000000 +RDATE:19010101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Pitcairn.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Pitcairn.ics index a3539a1c58c..bc4e3096ac5 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Pitcairn.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Pitcairn.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Pitcairn +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Pitcairn X-LIC-LOCATION:Pacific/Pitcairn BEGIN:STANDARD -TZOFFSETFROM:-0800 +TZOFFSETFROM:+0000 +TZOFFSETTO:-084020 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-084020 +TZOFFSETTO:-0830 +TZNAME:PNT +DTSTART:19010101T000000 +RDATE:19010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-0830 TZOFFSETTO:-0800 TZNAME:PST -DTSTART:19700101T000000 +DTSTART:19980427T000000 +RDATE:19980427T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Ponape.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Ponape.ics index d25235ff875..784a63afc30 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Ponape.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Ponape.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Ponape +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Ponape X-LIC-LOCATION:Pacific/Ponape BEGIN:STANDARD -TZOFFSETFROM:+1100 +TZOFFSETFROM:+0000 +TZOFFSETTO:+103252 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+103252 TZOFFSETTO:+1100 TZNAME:PONT -DTSTART:19700101T000000 +DTSTART:19010101T000000 +RDATE:19010101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Port_Moresby.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Port_Moresby.ics index 30f97c870ba..1d57091443f 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Port_Moresby.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Port_Moresby.ics @@ -1,14 +1,29 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Port_Moresby +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Port_Moresby X-LIC-LOCATION:Pacific/Port_Moresby BEGIN:STANDARD -TZOFFSETFROM:+1000 +TZOFFSETFROM:+0000 +TZOFFSETTO:+094840 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+094840 +TZOFFSETTO:+094840 +TZNAME:PMMT +DTSTART:18800101T000000 +RDATE:18800101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+094840 TZOFFSETTO:+1000 TZNAME:PGT -DTSTART:19700101T000000 +DTSTART:18950101T000000 +RDATE:18950101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Rarotonga.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Rarotonga.ics index b71a679983e..a32b4def67c 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Rarotonga.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Rarotonga.ics @@ -1,14 +1,66 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Rarotonga +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Rarotonga X-LIC-LOCATION:Pacific/Rarotonga BEGIN:STANDARD -TZOFFSETFROM:-1000 +TZOFFSETFROM:+0000 +TZOFFSETTO:-103904 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-103904 +TZOFFSETTO:-1030 +TZNAME:CKT +DTSTART:19010101T000000 +RDATE:19010101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-1030 +TZOFFSETTO:-0930 +TZNAME:CKHST +DTSTART:19781112T000000 +RDATE:19781112T000000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:-0930 TZOFFSETTO:-1000 TZNAME:CKT -DTSTART:19700101T000000 +DTSTART:19790304T000000 +RDATE:19790304T000000 +RDATE:19800302T000000 +RDATE:19810301T000000 +RDATE:19820307T000000 +RDATE:19830306T000000 +RDATE:19840304T000000 +RDATE:19850303T000000 +RDATE:19860302T000000 +RDATE:19870301T000000 +RDATE:19880306T000000 +RDATE:19890305T000000 +RDATE:19900304T000000 +RDATE:19910303T000000 END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:-1000 +TZOFFSETTO:-0930 +TZNAME:CKHST +DTSTART:19791028T000000 +RDATE:19791028T000000 +RDATE:19801026T000000 +RDATE:19811025T000000 +RDATE:19821031T000000 +RDATE:19831030T000000 +RDATE:19841028T000000 +RDATE:19851027T000000 +RDATE:19861026T000000 +RDATE:19871025T000000 +RDATE:19881030T000000 +RDATE:19891029T000000 +RDATE:19901028T000000 +END:DAYLIGHT END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Saipan.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Saipan.ics index bd75cdfbc86..8a91f7d1faf 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Saipan.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Saipan.ics @@ -1,14 +1,43 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Saipan +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Saipan X-LIC-LOCATION:Pacific/Saipan BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:-1417 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-1417 +TZOFFSETTO:+0943 +TZNAME:LMT +DTSTART:18441231T000000 +RDATE:18441231T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0943 +TZOFFSETTO:+0900 +TZNAME:MPT +DTSTART:19010101T000000 +RDATE:19010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+0900 +TZOFFSETTO:+1000 +TZNAME:MPT +DTSTART:19691001T000000 +RDATE:19691001T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+1000 TZOFFSETTO:+1000 TZNAME:ChST -DTSTART:19700101T000000 +DTSTART:20001223T000000 +RDATE:20001223T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Tahiti.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Tahiti.ics index a675dff3e06..c6a152432d9 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Tahiti.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Tahiti.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Tahiti +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Tahiti X-LIC-LOCATION:Pacific/Tahiti BEGIN:STANDARD -TZOFFSETFROM:-1000 +TZOFFSETFROM:+0000 +TZOFFSETTO:-095816 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:-095816 TZOFFSETTO:-1000 TZNAME:TAHT -DTSTART:19700101T000000 +DTSTART:19121001T000000 +RDATE:19121001T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Tarawa.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Tarawa.ics index c33fe28c7a7..27c9bc7da89 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Tarawa.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Tarawa.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Tarawa +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Tarawa X-LIC-LOCATION:Pacific/Tarawa BEGIN:STANDARD -TZOFFSETFROM:+1200 +TZOFFSETFROM:+0000 +TZOFFSETTO:+113204 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+113204 TZOFFSETTO:+1200 TZNAME:GILT -DTSTART:19700101T000000 +DTSTART:19010101T000000 +RDATE:19010101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Tongatapu.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Tongatapu.ics index 522e37ecaad..daa104617b7 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Tongatapu.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Tongatapu.ics @@ -1,14 +1,52 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Tongatapu +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Tongatapu X-LIC-LOCATION:Pacific/Tongatapu BEGIN:STANDARD +TZOFFSETFROM:+0000 +TZOFFSETTO:+121920 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+121920 +TZOFFSETTO:+1220 +TZNAME:TOT +DTSTART:19010101T000000 +RDATE:19010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+1220 +TZOFFSETTO:+1300 +TZNAME:TOT +DTSTART:19410101T000000 +RDATE:19410101T000000 +END:STANDARD +BEGIN:STANDARD TZOFFSETFROM:+1300 TZOFFSETTO:+1300 TZNAME:TOT -DTSTART:19700101T000000 +DTSTART:19990101T000000 +RDATE:19990101T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1300 +TZOFFSETTO:+1400 +TZNAME:TOST +DTSTART:19991007T020000 +RDATE:19991007T020000 +RDATE:20001104T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1400 +TZOFFSETTO:+1300 +TZNAME:TOT +DTSTART:20000319T030000 +RDATE:20000319T030000 +RDATE:20010127T030000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Truk.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Truk.ics index 11b64e4c77f..d243253f5ff 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Truk.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Truk.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Truk +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Truk X-LIC-LOCATION:Pacific/Truk BEGIN:STANDARD -TZOFFSETFROM:+1000 +TZOFFSETFROM:+0000 +TZOFFSETTO:+100708 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+100708 TZOFFSETTO:+1000 TZNAME:TRUT -DTSTART:19700101T000000 +DTSTART:19010101T000000 +RDATE:19010101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Wake.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Wake.ics index bf17f56a7d5..d36c2f5f7ff 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Wake.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Wake.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Wake +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Wake X-LIC-LOCATION:Pacific/Wake BEGIN:STANDARD -TZOFFSETFROM:+1200 +TZOFFSETFROM:+0000 +TZOFFSETTO:+110628 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+110628 TZOFFSETTO:+1200 TZNAME:WAKT -DTSTART:19700101T000000 +DTSTART:19010101T000000 +RDATE:19010101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/Pacific/Wallis.ics b/mozilla/calendar/libical/zoneinfo/Pacific/Wallis.ics index 63a4b5899fb..f0f5b04d844 100644 --- a/mozilla/calendar/libical/zoneinfo/Pacific/Wallis.ics +++ b/mozilla/calendar/libical/zoneinfo/Pacific/Wallis.ics @@ -1,14 +1,22 @@ BEGIN:VCALENDAR -PRODID:-//citadel.org//NONSGML Citadel calendar//EN +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN VERSION:2.0 BEGIN:VTIMEZONE -TZID:/citadel.org/20070227_1/Pacific/Wallis +TZID:/softwarestudio.org/Olson_20010626_2/Pacific/Wallis X-LIC-LOCATION:Pacific/Wallis BEGIN:STANDARD -TZOFFSETFROM:+1200 +TZOFFSETFROM:+0000 +TZOFFSETTO:+121520 +TZNAME:LMT +DTSTART:00010101T000000 +RDATE:00010101T000000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETFROM:+121520 TZOFFSETTO:+1200 TZNAME:WFT -DTSTART:19700101T000000 +DTSTART:19010101T000000 +RDATE:19010101T000000 END:STANDARD END:VTIMEZONE END:VCALENDAR diff --git a/mozilla/calendar/libical/zoneinfo/zones.h b/mozilla/calendar/libical/zoneinfo/zones.h deleted file mode 100644 index 47e238037d1..00000000000 --- a/mozilla/calendar/libical/zoneinfo/zones.h +++ /dev/null @@ -1,397 +0,0 @@ -N_("Africa/Abidjan"); -N_("Africa/Accra"); -N_("Africa/Addis_Ababa"); -N_("Africa/Algiers"); -N_("Africa/Asmara"); -N_("Africa/Bamako"); -N_("Africa/Bangui"); -N_("Africa/Banjul"); -N_("Africa/Bissau"); -N_("Africa/Blantyre"); -N_("Africa/Brazzaville"); -N_("Africa/Bujumbura"); -N_("Africa/Cairo"); -N_("Africa/Casablanca"); -N_("Africa/Ceuta"); -N_("Africa/Conakry"); -N_("Africa/Dakar"); -N_("Africa/Dar_es_Salaam"); -N_("Africa/Djibouti"); -N_("Africa/Douala"); -N_("Africa/El_Aaiun"); -N_("Africa/Freetown"); -N_("Africa/Gaborone"); -N_("Africa/Harare"); -N_("Africa/Johannesburg"); -N_("Africa/Kampala"); -N_("Africa/Khartoum"); -N_("Africa/Kigali"); -N_("Africa/Kinshasa"); -N_("Africa/Lagos"); -N_("Africa/Libreville"); -N_("Africa/Lome"); -N_("Africa/Luanda"); -N_("Africa/Lubumbashi"); -N_("Africa/Lusaka"); -N_("Africa/Malabo"); -N_("Africa/Maputo"); -N_("Africa/Maseru"); -N_("Africa/Mbabane"); -N_("Africa/Mogadishu"); -N_("Africa/Monrovia"); -N_("Africa/Nairobi"); -N_("Africa/Ndjamena"); -N_("Africa/Niamey"); -N_("Africa/Nouakchott"); -N_("Africa/Ouagadougou"); -N_("Africa/Porto-Novo"); -N_("Africa/Sao_Tome"); -N_("Africa/Tripoli"); -N_("Africa/Tunis"); -N_("Africa/Windhoek"); -N_("America/Adak"); -N_("America/Anchorage"); -N_("America/Anguilla"); -N_("America/Antigua"); -N_("America/Araguaina"); -N_("America/Argentina/Buenos_Aires"); -N_("America/Argentina/Catamarca"); -N_("America/Argentina/Cordoba"); -N_("America/Argentina/Jujuy"); -N_("America/Argentina/La_Rioja"); -N_("America/Argentina/Mendoza"); -N_("America/Argentina/Rio_Gallegos"); -N_("America/Argentina/San_Juan"); -N_("America/Argentina/Tucuman"); -N_("America/Argentina/Ushuaia"); -N_("America/Aruba"); -N_("America/Asuncion"); -N_("America/Atikokan"); -N_("America/Bahia"); -N_("America/Barbados"); -N_("America/Belem"); -N_("America/Belize"); -N_("America/Blanc-Sablon"); -N_("America/Boa_Vista"); -N_("America/Bogota"); -N_("America/Boise"); -N_("America/Cambridge_Bay"); -N_("America/Campo_Grande"); -N_("America/Cancun"); -N_("America/Caracas"); -N_("America/Cayenne"); -N_("America/Cayman"); -N_("America/Chicago"); -N_("America/Chihuahua"); -N_("America/Costa_Rica"); -N_("America/Cuiaba"); -N_("America/Curacao"); -N_("America/Danmarkshavn"); -N_("America/Dawson"); -N_("America/Dawson_Creek"); -N_("America/Denver"); -N_("America/Detroit"); -N_("America/Dominica"); -N_("America/Edmonton"); -N_("America/Eirunepe"); -N_("America/El_Salvador"); -N_("America/Fortaleza"); -N_("America/Glace_Bay"); -N_("America/Godthab"); -N_("America/Goose_Bay"); -N_("America/Grand_Turk"); -N_("America/Grenada"); -N_("America/Guadeloupe"); -N_("America/Guatemala"); -N_("America/Guayaquil"); -N_("America/Guyana"); -N_("America/Halifax"); -N_("America/Havana"); -N_("America/Hermosillo"); -N_("America/Indiana/Indianapolis"); -N_("America/Indiana/Knox"); -N_("America/Indiana/Marengo"); -N_("America/Indiana/Petersburg"); -N_("America/Indiana/Vevay"); -N_("America/Indiana/Vincennes"); -N_("America/Indiana/Winamac"); -N_("America/Inuvik"); -N_("America/Iqaluit"); -N_("America/Jamaica"); -N_("America/Juneau"); -N_("America/Kentucky/Louisville"); -N_("America/Kentucky/Monticello"); -N_("America/La_Paz"); -N_("America/Lima"); -N_("America/Los_Angeles"); -N_("America/Maceio"); -N_("America/Managua"); -N_("America/Manaus"); -N_("America/Martinique"); -N_("America/Mazatlan"); -N_("America/Menominee"); -N_("America/Merida"); -N_("America/Mexico_City"); -N_("America/Miquelon"); -N_("America/Moncton"); -N_("America/Monterrey"); -N_("America/Montevideo"); -N_("America/Montreal"); -N_("America/Montserrat"); -N_("America/Nassau"); -N_("America/New_York"); -N_("America/Nipigon"); -N_("America/Nome"); -N_("America/Noronha"); -N_("America/North_Dakota/Center"); -N_("America/North_Dakota/New_Salem"); -N_("America/Panama"); -N_("America/Pangnirtung"); -N_("America/Paramaribo"); -N_("America/Phoenix"); -N_("America/Port-au-Prince"); -N_("America/Port_of_Spain"); -N_("America/Porto_Velho"); -N_("America/Puerto_Rico"); -N_("America/Rainy_River"); -N_("America/Rankin_Inlet"); -N_("America/Recife"); -N_("America/Regina"); -N_("America/Rio_Branco"); -N_("America/Santiago"); -N_("America/Santo_Domingo"); -N_("America/Sao_Paulo"); -N_("America/Scoresbysund"); -N_("America/Shiprock"); -N_("America/St_Johns"); -N_("America/St_Kitts"); -N_("America/St_Lucia"); -N_("America/St_Thomas"); -N_("America/St_Vincent"); -N_("America/Swift_Current"); -N_("America/Tegucigalpa"); -N_("America/Thule"); -N_("America/Thunder_Bay"); -N_("America/Tijuana"); -N_("America/Toronto"); -N_("America/Tortola"); -N_("America/Vancouver"); -N_("America/Whitehorse"); -N_("America/Winnipeg"); -N_("America/Yakutat"); -N_("America/Yellowknife"); -N_("Antarctica/Casey"); -N_("Antarctica/Davis"); -N_("Antarctica/DumontDUrville"); -N_("Antarctica/Mawson"); -N_("Antarctica/McMurdo"); -N_("Antarctica/Palmer"); -N_("Antarctica/Rothera"); -N_("Antarctica/South_Pole"); -N_("Antarctica/Syowa"); -N_("Antarctica/Vostok"); -N_("Arctic/Longyearbyen"); -N_("Asia/Aden"); -N_("Asia/Almaty"); -N_("Asia/Amman"); -N_("Asia/Anadyr"); -N_("Asia/Aqtau"); -N_("Asia/Aqtobe"); -N_("Asia/Ashgabat"); -N_("Asia/Baghdad"); -N_("Asia/Bahrain"); -N_("Asia/Baku"); -N_("Asia/Bangkok"); -N_("Asia/Beirut"); -N_("Asia/Bishkek"); -N_("Asia/Brunei"); -N_("Asia/Calcutta"); -N_("Asia/Choibalsan"); -N_("Asia/Chongqing"); -N_("Asia/Colombo"); -N_("Asia/Damascus"); -N_("Asia/Dhaka"); -N_("Asia/Dili"); -N_("Asia/Dubai"); -N_("Asia/Dushanbe"); -N_("Asia/Gaza"); -N_("Asia/Harbin"); -N_("Asia/Hong_Kong"); -N_("Asia/Hovd"); -N_("Asia/Irkutsk"); -N_("Asia/Istanbul"); -N_("Asia/Jakarta"); -N_("Asia/Jayapura"); -N_("Asia/Jerusalem"); -N_("Asia/Kabul"); -N_("Asia/Kamchatka"); -N_("Asia/Karachi"); -N_("Asia/Kashgar"); -N_("Asia/Katmandu"); -N_("Asia/Krasnoyarsk"); -N_("Asia/Kuala_Lumpur"); -N_("Asia/Kuching"); -N_("Asia/Kuwait"); -N_("Asia/Macau"); -N_("Asia/Magadan"); -N_("Asia/Makassar"); -N_("Asia/Manila"); -N_("Asia/Muscat"); -N_("Asia/Nicosia"); -N_("Asia/Novosibirsk"); -N_("Asia/Omsk"); -N_("Asia/Oral"); -N_("Asia/Phnom_Penh"); -N_("Asia/Pontianak"); -N_("Asia/Pyongyang"); -N_("Asia/Qatar"); -N_("Asia/Qyzylorda"); -N_("Asia/Rangoon"); -N_("Asia/Riyadh"); -N_("Asia/Saigon"); -N_("Asia/Sakhalin"); -N_("Asia/Samarkand"); -N_("Asia/Seoul"); -N_("Asia/Shanghai"); -N_("Asia/Singapore"); -N_("Asia/Taipei"); -N_("Asia/Tashkent"); -N_("Asia/Tbilisi"); -N_("Asia/Tehran"); -N_("Asia/Thimphu"); -N_("Asia/Tokyo"); -N_("Asia/Ulaanbaatar"); -N_("Asia/Urumqi"); -N_("Asia/Vientiane"); -N_("Asia/Vladivostok"); -N_("Asia/Yakutsk"); -N_("Asia/Yekaterinburg"); -N_("Asia/Yerevan"); -N_("Atlantic/Azores"); -N_("Atlantic/Bermuda"); -N_("Atlantic/Canary"); -N_("Atlantic/Cape_Verde"); -N_("Atlantic/Faroe"); -N_("Atlantic/Jan_Mayen"); -N_("Atlantic/Madeira"); -N_("Atlantic/Reykjavik"); -N_("Atlantic/South_Georgia"); -N_("Atlantic/St_Helena"); -N_("Atlantic/Stanley"); -N_("Australia/Adelaide"); -N_("Australia/Brisbane"); -N_("Australia/Broken_Hill"); -N_("Australia/Currie"); -N_("Australia/Darwin"); -N_("Australia/Eucla"); -N_("Australia/Hobart"); -N_("Australia/Lindeman"); -N_("Australia/Lord_Howe"); -N_("Australia/Melbourne"); -N_("Australia/Perth"); -N_("Australia/Sydney"); -N_("Europe/Amsterdam"); -N_("Europe/Andorra"); -N_("Europe/Athens"); -N_("Europe/Belgrade"); -N_("Europe/Berlin"); -N_("Europe/Bratislava"); -N_("Europe/Brussels"); -N_("Europe/Bucharest"); -N_("Europe/Budapest"); -N_("Europe/Chisinau"); -N_("Europe/Copenhagen"); -N_("Europe/Dublin"); -N_("Europe/Gibraltar"); -N_("Europe/Guernsey"); -N_("Europe/Helsinki"); -N_("Europe/Isle_of_Man"); -N_("Europe/Istanbul"); -N_("Europe/Jersey"); -N_("Europe/Kaliningrad"); -N_("Europe/Kiev"); -N_("Europe/Lisbon"); -N_("Europe/Ljubljana"); -N_("Europe/London"); -N_("Europe/Luxembourg"); -N_("Europe/Madrid"); -N_("Europe/Malta"); -N_("Europe/Mariehamn"); -N_("Europe/Minsk"); -N_("Europe/Monaco"); -N_("Europe/Moscow"); -N_("Europe/Nicosia"); -N_("Europe/Oslo"); -N_("Europe/Paris"); -N_("Europe/Podgorica"); -N_("Europe/Prague"); -N_("Europe/Riga"); -N_("Europe/Rome"); -N_("Europe/Samara"); -N_("Europe/San_Marino"); -N_("Europe/Sarajevo"); -N_("Europe/Simferopol"); -N_("Europe/Skopje"); -N_("Europe/Sofia"); -N_("Europe/Stockholm"); -N_("Europe/Tallinn"); -N_("Europe/Tirane"); -N_("Europe/Uzhgorod"); -N_("Europe/Vaduz"); -N_("Europe/Vatican"); -N_("Europe/Vienna"); -N_("Europe/Vilnius"); -N_("Europe/Volgograd"); -N_("Europe/Warsaw"); -N_("Europe/Zagreb"); -N_("Europe/Zaporozhye"); -N_("Europe/Zurich"); -N_("Indian/Antananarivo"); -N_("Indian/Chagos"); -N_("Indian/Christmas"); -N_("Indian/Cocos"); -N_("Indian/Comoro"); -N_("Indian/Kerguelen"); -N_("Indian/Mahe"); -N_("Indian/Maldives"); -N_("Indian/Mauritius"); -N_("Indian/Mayotte"); -N_("Indian/Reunion"); -N_("Pacific/Apia"); -N_("Pacific/Auckland"); -N_("Pacific/Chatham"); -N_("Pacific/Easter"); -N_("Pacific/Efate"); -N_("Pacific/Enderbury"); -N_("Pacific/Fakaofo"); -N_("Pacific/Fiji"); -N_("Pacific/Funafuti"); -N_("Pacific/Galapagos"); -N_("Pacific/Gambier"); -N_("Pacific/Guadalcanal"); -N_("Pacific/Guam"); -N_("Pacific/Honolulu"); -N_("Pacific/Johnston"); -N_("Pacific/Kiritimati"); -N_("Pacific/Kosrae"); -N_("Pacific/Kwajalein"); -N_("Pacific/Majuro"); -N_("Pacific/Marquesas"); -N_("Pacific/Midway"); -N_("Pacific/Nauru"); -N_("Pacific/Niue"); -N_("Pacific/Norfolk"); -N_("Pacific/Noumea"); -N_("Pacific/Pago_Pago"); -N_("Pacific/Palau"); -N_("Pacific/Pitcairn"); -N_("Pacific/Ponape"); -N_("Pacific/Port_Moresby"); -N_("Pacific/Rarotonga"); -N_("Pacific/Saipan"); -N_("Pacific/Tahiti"); -N_("Pacific/Tarawa"); -N_("Pacific/Tongatapu"); -N_("Pacific/Truk"); -N_("Pacific/Wake"); -N_("Pacific/Wallis"); diff --git a/mozilla/calendar/libical/zoneinfo/zones.tab b/mozilla/calendar/libical/zoneinfo/zones.tab index 6110c3afd50..5c35c4c06c5 100644 --- a/mozilla/calendar/libical/zoneinfo/zones.tab +++ b/mozilla/calendar/libical/zoneinfo/zones.tab @@ -2,7 +2,7 @@ +0053300 +0001300 Africa/Accra +0090200 +0384200 Africa/Addis_Ababa +0364700 +0030300 Africa/Algiers -+0152000 +0385300 Africa/Asmara ++0152000 +0385300 Africa/Asmera +0123900 -0080000 Africa/Bamako +0042200 +0183500 Africa/Bangui +0132800 -0163900 Africa/Banjul @@ -46,6 +46,7 @@ +0122200 -0013100 Africa/Ouagadougou +0062900 +0023700 Africa/Porto-Novo +0002000 +0064400 Africa/Sao_Tome ++0144600 -0030100 Africa/Timbuktu +0325400 +0131100 Africa/Tripoli +0364800 +0101100 Africa/Tunis -0223400 +0170600 Africa/Windhoek @@ -54,39 +55,27 @@ +0181200 -0630400 America/Anguilla +0170300 -0614800 America/Antigua -0071200 -0481200 America/Araguaina --0343600 -0582700 America/Argentina/Buenos_Aires --0282800 -0654700 America/Argentina/Catamarca --0312400 -0641100 America/Argentina/Cordoba --0241100 -0651800 America/Argentina/Jujuy --0292600 -0665100 America/Argentina/La_Rioja --0325300 -0684900 America/Argentina/Mendoza --0513800 -0691300 America/Argentina/Rio_Gallegos --0313200 -0683100 America/Argentina/San_Juan --0264900 -0651300 America/Argentina/Tucuman --0544800 -0681800 America/Argentina/Ushuaia +0123000 -0685800 America/Aruba -0251600 -0574000 America/Asuncion -+0484531 -0913718 America/Atikokan --0125900 -0383100 America/Bahia +0130600 -0593700 America/Barbados -0012700 -0482900 America/Belem +0173000 -0881200 America/Belize -+0512500 -0570700 America/Blanc-Sablon +0024900 -0604000 America/Boa_Vista +0043600 -0740500 America/Bogota +0433649 -1161209 America/Boise +-0343600 -0582700 America/Buenos_Aires +0690300 -1050500 America/Cambridge_Bay --0202700 -0543700 America/Campo_Grande +0210500 -0864600 America/Cancun +0103000 -0665600 America/Caracas +-0282800 -0654700 America/Catamarca +0045600 -0522000 America/Cayenne +0191800 -0812300 America/Cayman +0415100 -0873900 America/Chicago +0283800 -1060500 America/Chihuahua +-0312400 -0641100 America/Cordoba +0095600 -0840500 America/Costa_Rica -0153500 -0560500 America/Cuiaba +0121100 -0690000 America/Curacao -+0764600 -0184000 America/Danmarkshavn +0640400 -1392500 America/Dawson +0594600 -1201400 America/Dawson_Creek +0394421 -1045903 America/Denver @@ -111,40 +100,38 @@ +0394606 -0860929 America/Indiana/Indianapolis +0411745 -0863730 America/Indiana/Knox +0382232 -0862041 America/Indiana/Marengo -+0382931 -0871643 America/Indiana/Petersburg +0384452 -0850402 America/Indiana/Vevay -+0384038 -0873143 America/Indiana/Vincennes -+0410305 -0863611 America/Indiana/Winamac -+0682059 -1334300 America/Inuvik ++0394606 -0860929 America/Indianapolis ++0682500 -1133000 America/Inuvik +0634400 -0682800 America/Iqaluit +0180000 -0764800 America/Jamaica +-0241100 -0651800 America/Jujuy +0581807 -1342511 America/Juneau +0381515 -0854534 America/Kentucky/Louisville +0364947 -0845057 America/Kentucky/Monticello -0163000 -0680900 America/La_Paz -0120300 -0770300 America/Lima +0340308 -1181434 America/Los_Angeles ++0381515 -0854534 America/Louisville -0094000 -0354300 America/Maceio +0120900 -0861700 America/Managua -0030800 -0600100 America/Manaus +0143600 -0610500 America/Martinique +0231300 -1062500 America/Mazatlan +-0325300 -0684900 America/Mendoza +0450628 -0873651 America/Menominee +0205800 -0893700 America/Merida +0192400 -0990900 America/Mexico_City +0470300 -0562000 America/Miquelon -+0460600 -0644700 America/Moncton +0254000 -1001900 America/Monterrey -0345300 -0561100 America/Montevideo +0453100 -0733400 America/Montreal -+0164300 -0621300 America/Montserrat ++0164400 -0621300 America/Montserrat +0250500 -0772100 America/Nassau +0404251 -0740023 America/New_York +0490100 -0881600 America/Nipigon +0643004 -1652423 America/Nome -0035100 -0322500 America/Noronha -+0470659 -1011757 America/North_Dakota/Center -+0465042 -1012439 America/North_Dakota/New_Salem +0085800 -0793200 America/Panama +0660800 -0654400 America/Pangnirtung +0055000 -0551000 America/Paramaribo @@ -153,15 +140,16 @@ +0103900 -0613100 America/Port_of_Spain -0084600 -0635400 America/Porto_Velho +0182806 -0660622 America/Puerto_Rico -+0484300 -0943400 America/Rainy_River -+0624900 -0920459 America/Rankin_Inlet ++0484300 -0942900 America/Rainy_River ++0624500 -0921000 America/Rankin_Inlet -0080300 -0345400 America/Recife +0502400 -1043900 America/Regina -0095800 -0674800 America/Rio_Branco +-0325700 -0604000 America/Rosario -0332700 -0704000 America/Santiago +0182800 -0695400 America/Santo_Domingo -0233200 -0463700 America/Sao_Paulo -+0702900 -0215800 America/Scoresbysund ++0703000 -0221500 America/Scoresbysund +0364708 -1084111 America/Shiprock +0473400 -0524300 America/St_Johns +0171800 -0624300 America/St_Kitts @@ -173,7 +161,6 @@ +0763400 -0684700 America/Thule +0482300 -0891500 America/Thunder_Bay +0323200 -1170100 America/Tijuana -+0433900 -0792300 America/Toronto +0182700 -0643700 America/Tortola +0491600 -1230700 America/Vancouver +0604300 -1350300 America/Whitehorse @@ -186,7 +173,6 @@ -0673600 +0625300 Antarctica/Mawson -0775000 +1663600 Antarctica/McMurdo -0644800 -0640600 Antarctica/Palmer --0673400 -0680800 Antarctica/Rothera -0900000 +0000000 Antarctica/South_Pole -0690022 +0393524 Antarctica/Syowa -0782400 +1065400 Antarctica/Vostok @@ -206,8 +192,7 @@ +0425400 +0743600 Asia/Bishkek +0045600 +1145500 Asia/Brunei +0223200 +0882200 Asia/Calcutta -+0480400 +1143000 Asia/Choibalsan -+0293400 +1063500 Asia/Chongqing ++0293400 +1063500 Asia/Chungking +0065600 +0795100 Asia/Colombo +0333000 +0361800 Asia/Damascus +0234300 +0902500 Asia/Dhaka @@ -232,24 +217,20 @@ +0031000 +1014200 Asia/Kuala_Lumpur +0013300 +1102000 Asia/Kuching +0292000 +0475900 Asia/Kuwait -+0221400 +1133500 Asia/Macau ++0221400 +1133500 Asia/Macao +0593400 +1504800 Asia/Magadan --0050700 +1192400 Asia/Makassar +0143500 +1210000 Asia/Manila +0233600 +0583500 Asia/Muscat +0351000 +0332200 Asia/Nicosia +0550200 +0825500 Asia/Novosibirsk +0550000 +0732400 Asia/Omsk -+0511300 +0512100 Asia/Oral +0113300 +1045500 Asia/Phnom_Penh +0000200 +1092000 Asia/Pontianak +0390100 +1254500 Asia/Pyongyang +0251700 +0513200 Asia/Qatar -+0444800 +0652800 Asia/Qyzylorda +0164700 +0961000 Asia/Rangoon +0243800 +0464300 Asia/Riyadh +0104500 +1064000 Asia/Saigon -+0465800 +1424200 Asia/Sakhalin +0394000 +0664800 Asia/Samarkand +0373300 +1265800 Asia/Seoul +0311400 +1212800 Asia/Shanghai @@ -260,6 +241,7 @@ +0354000 +0512600 Asia/Tehran +0272800 +0893900 Asia/Thimphu +0353916 +1394441 Asia/Tokyo +-0050700 +1192400 Asia/Ujung_Pandang +0475500 +1065300 Asia/Ulaanbaatar +0434800 +0873500 Asia/Urumqi +0175800 +1023600 Asia/Vientiane @@ -271,7 +253,7 @@ +0321700 -0644600 Atlantic/Bermuda +0280600 -0152400 Atlantic/Canary +0145500 -0233100 Atlantic/Cape_Verde -+0620100 -0064600 Atlantic/Faroe ++0620100 -0064600 Atlantic/Faeroe +0705900 -0080500 Atlantic/Jan_Mayen +0323800 -0165400 Atlantic/Madeira +0640900 -0215100 Atlantic/Reykjavik @@ -281,9 +263,7 @@ -0345500 +1383500 Australia/Adelaide -0272800 +1530200 Australia/Brisbane -0315700 +1412700 Australia/Broken_Hill --0395600 +1435200 Australia/Currie -0122800 +1305000 Australia/Darwin --0314300 +1285200 Australia/Eucla -0425300 +1471900 Australia/Hobart -0201600 +1490000 Australia/Lindeman -0313300 +1590500 Australia/Lord_Howe @@ -293,6 +273,7 @@ +0522200 +0045400 Europe/Amsterdam +0423000 +0013100 Europe/Andorra +0375800 +0234300 Europe/Athens ++0543500 -0055500 Europe/Belfast +0445000 +0203000 Europe/Belgrade +0523000 +0132200 Europe/Berlin +0480900 +0170700 Europe/Bratislava @@ -303,11 +284,8 @@ +0554000 +0123500 Europe/Copenhagen +0532000 -0061500 Europe/Dublin +0360800 -0052100 Europe/Gibraltar -+0492700 -0023200 Europe/Guernsey +0601000 +0245800 Europe/Helsinki -+0540900 -0042800 Europe/Isle_of_Man +0410100 +0285800 Europe/Istanbul -+0491200 -0020700 Europe/Jersey +0544300 +0203000 Europe/Kaliningrad +0502600 +0303100 Europe/Kiev +0384300 -0090800 Europe/Lisbon @@ -316,14 +294,12 @@ +0493600 +0060900 Europe/Luxembourg +0402400 -0034100 Europe/Madrid +0355400 +0143100 Europe/Malta -+0600600 +0195700 Europe/Mariehamn +0535400 +0273400 Europe/Minsk +0434200 +0072300 Europe/Monaco +0554500 +0373500 Europe/Moscow +0351000 +0332200 Europe/Nicosia +0595500 +0104500 Europe/Oslo +0485200 +0022000 Europe/Paris -+0422600 +0191600 Europe/Podgorica +0500500 +0142600 Europe/Prague +0565700 +0240600 Europe/Riga +0415400 +0122900 Europe/Rome @@ -341,7 +317,6 @@ +0415400 +0122700 Europe/Vatican +0481300 +0162000 Europe/Vienna +0544100 +0251900 Europe/Vilnius -+0484400 +0442500 Europe/Volgograd +0521500 +0210000 Europe/Warsaw +0454800 +0155800 Europe/Zagreb +0475000 +0351000 Europe/Zaporozhye @@ -359,8 +334,8 @@ -0205200 +0552800 Indian/Reunion -0135000 -1714400 Pacific/Apia -0365200 +1744600 Pacific/Auckland --0435700 -1763300 Pacific/Chatham --0270900 -1092600 Pacific/Easter +-0435500 -1763000 Pacific/Chatham +-0271000 -1092700 Pacific/Easter -0174000 +1682500 Pacific/Efate -0030800 -1710500 Pacific/Enderbury -0092200 -1711400 Pacific/Fakaofo @@ -395,3 +370,4 @@ +0072500 +1514700 Pacific/Truk +0191700 +1663700 Pacific/Wake -0131800 -1761000 Pacific/Wallis ++0093100 +1380800 Pacific/Yap