--- kompozer-0.8~b3.dfsg.1.orig/debian/copyright +++ kompozer-0.8~b3.dfsg.1/debian/copyright @@ -0,0 +1,1330 @@ +This package was debianized by Anthony Yarusso on +Mon, 27 Aug 2007 01:11:03 -0500. +Giuseppe Iuculano on Sat, 07 Feb 2009 + +It was downloaded from http://sourceforge.net/projects/kompozer + +The original upstream tarball is modified from upstream by removing a set +of sourceless binary and non-free files. You can find a +remove.nonfree.sh script in the debian diff.gz doing this cleanup. + +The contents of the debian directory are licensed like the bulk of +Kompozer, tri-licensed under the GPL/LGPL/MPL. + +If this file is incomplete, which I'm pretty sure is the case, because it's +difficult not to forget anything in this huge amount of data, please file +a bug or contact me. + + +Upstream Author: Fabien Cazenave + +Copyright: 1998-2007, Contributors + +License: MPL 1.1 / GPL 2.0 or subsequent / LGPL 2.1 or subsequent + +This software is 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/ and +as listed below. + +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. + +Alternatively, the contents of this file may be used under the terms of +either the GNU General Public License Version 2 or later (the "GPL"), +or the GNU Lesser General Public License Version 2.1 or later (the +"LGPL"), in which case the provisions of the GPL or the LGPL are applicable +instead of those above. If you wish to allow use of your version of +this file only under the terms of either the GPL or the LGPL, and not to +allow others to use your version of this file under the terms of the +MPL, indicate your decision by deleting the provisions above and replace +them with the notice and other provisions required by the GPL or the +LGPL. If you do not delete the provisions above, a recipient may use +your version of this file under the terms of any one of the MPL, the GPL, +or the LGPL. + +While the Mozilla Project is undergoing a global relicensing so that the +aim is to have a full tree with these tri-license terms, there are at the +moment quite a few exceptions, as listed in the latter portion of this file. + + +On Debian systems, the complete text of the GNU General Public +License can be found in the file `/usr/share/common-licenses/GPL' ; +the complete text of the GNU Lesser General Public License can be +found in the file `/usr/share/common-licenses/LGPL'. + +---------- + +MOZILLA PUBLIC LICENSE Version 1.1 + +1. Definitions. + + 1.0.1. "Commercial Use" means distribution or otherwise making the + Covered Code available to a third party. + + 1.1. "Contributor" means each entity that creates or contributes to + the creation of Modifications. + + 1.2. "Contributor Version" means the combination of the Original + Code, prior Modifications used by a Contributor, and the Modifications + made by that particular Contributor. + + 1.3. "Covered Code" means the Original Code or Modifications or the + combination of the Original Code and Modifications, in each case + including portions thereof. + + 1.4. "Electronic Distribution Mechanism" means a mechanism generally + accepted in the software development community for the electronic + transfer of data. + + 1.5. "Executable" means Covered Code in any form other than Source + Code. + + 1.6. "Initial Developer" means the individual or entity identified + as the Initial Developer in the Source Code notice required by Exhibit + A. + + 1.7. "Larger Work" means a work which combines Covered Code or + portions thereof with code not governed by the terms of this License. + + 1.8. "License" means this document. + + 1.8.1. "Licensable" means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed herein. + + 1.9. "Modifications" means any addition to or deletion from the + substance or structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of files, a + Modification is: + A. Any addition to or deletion from the contents of a file + containing Original Code or previous Modifications. + + B. Any new file that contains any part of the Original Code or + previous Modifications. + + 1.10. "Original Code" means Source Code of computer software code + which is described in the Source Code notice required by Exhibit A as + Original Code, and which, at the time of its release under this + License is not already Covered Code governed by this License. + + 1.10.1. "Patent Claims" means any patent claim(s), now owned or + hereafter acquired, including without limitation, method, process, + and apparatus claims, in any patent Licensable by grantor. + + 1.11. "Source Code" means the preferred form of the Covered Code for + making modifications to it, including all modules it contains, plus + any associated interface definition files, scripts used to control + compilation and installation of an Executable, or source code + differential comparisons against either the Original Code or another + well known, available Covered Code of the Contributor's choice. The + Source Code can be in a compressed or archival form, provided the + appropriate decompression or de-archiving software is widely available + for no charge. + + 1.12. "You" (or "Your") means an individual or a legal entity + exercising rights under, and complying with all of the terms of, this + License or a future version of this License issued under Section 6.1. + For legal entities, "You" includes any entity which controls, is + controlled by, or is under common control with You. For purposes of + this definition, "control" means (a) the power, direct or indirect, + to cause the direction or management of such entity, whether by + contract or otherwise, or (b) ownership of more than fifty percent + (50%) of the outstanding shares or beneficial ownership of such + entity. + +2. Source Code License. + + 2.1. The Initial Developer Grant. + The Initial Developer hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + (a) under intellectual property rights (other than patent or + trademark) Licensable by Initial Developer to use, reproduce, + modify, display, perform, sublicense and distribute the Original + Code (or portions thereof) with or without Modifications, and/or + as part of a Larger Work; and + + (b) under Patents Claims infringed by the making, using or + selling of Original Code, to make, have made, use, practice, + sell, and offer for sale, and/or otherwise dispose of the + Original Code (or portions thereof). + + (c) the licenses granted in this Section 2.1(a) and (b) are + effective on the date Initial Developer first distributes + Original Code under the terms of this License. + + (d) Notwithstanding Section 2.1(b) above, no patent license is + granted: 1) for code that You delete from the Original Code; 2) + separate from the Original Code; or 3) for infringements caused + by: i) the modification of the Original Code or ii) the + combination of the Original Code with other software or devices. + + 2.2. Contributor Grant. + Subject to third party intellectual property claims, each Contributor + hereby grants You a world-wide, royalty-free, non-exclusive license + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Contributor, to use, reproduce, modify, + display, perform, sublicense and distribute the Modifications + created by such Contributor (or portions thereof) either on an + unmodified basis, with other Modifications, as Covered Code + and/or as part of a Larger Work; and + + (b) under Patent Claims infringed by the making, using, or + selling of Modifications made by that Contributor either alone + and/or in combination with its Contributor Version (or portions + of such combination), to make, use, sell, offer for sale, have + made, and/or otherwise dispose of: 1) Modifications made by that + Contributor (or portions thereof); and 2) the combination of + Modifications made by that Contributor with its Contributor + Version (or portions of such combination). + + (c) the licenses granted in Sections 2.2(a) and 2.2(b) are + effective on the date Contributor first makes Commercial Use of + the Covered Code. + + (d) Notwithstanding Section 2.2(b) above, no patent license is + granted: 1) for any code that Contributor has deleted from the + Contributor Version; 2) separate from the Contributor Version; + 3) for infringements caused by: i) third party modifications of + Contributor Version or ii) the combination of Modifications made + by that Contributor with other software (except as part of the + Contributor Version) or other devices; or 4) under Patent Claims + infringed by Covered Code in the absence of Modifications made by + that Contributor. + +3. Distribution Obligations. + + 3.1. Application of License. + The Modifications which You create or to which You contribute are + governed by the terms of this License, including without limitation + Section 2.2. The Source Code version of Covered Code may be + distributed only under the terms of this License or a future version + of this License released under Section 6.1, and You must include a + copy of this License with every copy of the Source Code You + distribute. You may not offer or impose any terms on any Source Code + version that alters or restricts the applicable version of this + License or the recipients' rights hereunder. However, You may include + an additional document offering the additional rights described in + Section 3.5. + + 3.2. Availability of Source Code. + Any Modification which You create or to which You contribute must be + made available in Source Code form under the terms of this License + either on the same media as an Executable version or via an accepted + Electronic Distribution Mechanism to anyone to whom you made an + Executable version available; and if made available via Electronic + Distribution Mechanism, must remain available for at least twelve (12) + months after the date it initially became available, or at least six + (6) months after a subsequent version of that particular Modification + has been made available to such recipients. You are responsible for + ensuring that the Source Code version remains available even if the + Electronic Distribution Mechanism is maintained by a third party. + + 3.3. Description of Modifications. + You must cause all Covered Code to which You contribute to contain a + file documenting the changes You made to create that Covered Code and + the date of any change. You must include a prominent statement that + the Modification is derived, directly or indirectly, from Original + Code provided by the Initial Developer and including the name of the + Initial Developer in (a) the Source Code, and (b) in any notice in an + Executable version or related documentation in which You describe the + origin or ownership of the Covered Code. + + 3.4. Intellectual Property Matters + (a) Third Party Claims. + If Contributor has knowledge that a license under a third party's + intellectual property rights is required to exercise the rights + granted by such Contributor under Sections 2.1 or 2.2, + Contributor must include a text file with the Source Code + distribution titled "LEGAL" which describes the claim and the + party making the claim in sufficient detail that a recipient will + know whom to contact. If Contributor obtains such knowledge after + the Modification is made available as described in Section 3.2, + Contributor shall promptly modify the LEGAL file in all copies + Contributor makes available thereafter and shall take other steps + (such as notifying appropriate mailing lists or newsgroups) + reasonably calculated to inform those who received the Covered + Code that new knowledge has been obtained. + + (b) Contributor APIs. + If Contributor's Modifications include an application programming + interface and Contributor has knowledge of patent licenses which + are reasonably necessary to implement that API, Contributor must + also include this information in the LEGAL file. + + (c) Representations. + Contributor represents that, except as disclosed pursuant to + Section 3.4(a) above, Contributor believes that Contributor's + Modifications are Contributor's original creation(s) and/or + Contributor has sufficient rights to grant the rights conveyed by + this License. + + 3.5. Required Notices. + You must duplicate the notice in Exhibit A in each file of the Source + Code. If it is not possible to put such notice in a particular Source + Code file due to its structure, then You must include such notice in a + location (such as a relevant directory) where a user would be likely + to look for such a notice. If You created one or more Modification(s) + You may add your name as a Contributor to the notice described in + Exhibit A. You must also duplicate this License in any documentation + for the Source Code where You describe recipients' rights or ownership + rights relating to Covered Code. You may choose to offer, and to + charge a fee for, warranty, support, indemnity or liability + obligations to one or more recipients of Covered Code. However, You + may do so only on Your own behalf, and not on behalf of the Initial + Developer or any Contributor. You must make it absolutely clear than + any such warranty, support, indemnity or liability obligation is + offered by You alone, and You hereby agree to indemnify the Initial + Developer and every Contributor for any liability incurred by the + Initial Developer or such Contributor as a result of warranty, + support, indemnity or liability terms You offer. + + 3.6. Distribution of Executable Versions. + You may distribute Covered Code in Executable form only if the + requirements of Section 3.1-3.5 have been met for that Covered Code, + and if You include a notice stating that the Source Code version of + the Covered Code is available under the terms of this License, + including a description of how and where You have fulfilled the + obligations of Section 3.2. The notice must be conspicuously included + in any notice in an Executable version, related documentation or + collateral in which You describe recipients' rights relating to the + Covered Code. You may distribute the Executable version of Covered + Code or ownership rights under a license of Your choice, which may + contain terms different from this License, provided that You are in + compliance with the terms of this License and that the license for the + Executable version does not attempt to limit or alter the recipient's + rights in the Source Code version from the rights set forth in this + License. If You distribute the Executable version under a different + license You must make it absolutely clear that any terms which differ + from this License are offered by You alone, not by the Initial + Developer or any Contributor. You hereby agree to indemnify the + Initial Developer and every Contributor for any liability incurred by + the Initial Developer or such Contributor as a result of any such + terms You offer. + + 3.7. Larger Works. + You may create a Larger Work by combining Covered Code with other code + not governed by the terms of this License and distribute the Larger + Work as a single product. In such a case, You must make sure the + requirements of this License are fulfilled for the Covered Code. + +4. Inability to Comply Due to Statute or Regulation. + + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Code due to + statute, judicial order, or regulation then You must: (a) comply with + the terms of this License to the maximum extent possible; and (b) + describe the limitations and the code they affect. Such description + must be included in the LEGAL file described in Section 3.4 and must + be included with all distributions of the Source Code. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. + +5. Application of this License. + + This License applies to code to which the Initial Developer has + attached the notice in Exhibit A and to related Covered Code. + +6. Versions of the License. + + 6.1. New Versions. + Netscape Communications Corporation ("Netscape") may publish revised + and/or new versions of the License from time to time. Each version + will be given a distinguishing version number. + + 6.2. Effect of New Versions. + Once Covered Code has been published under a particular version of the + License, You may always continue to use it under the terms of that + version. You may also choose to use such Covered Code under the terms + of any subsequent version of the License published by Netscape. No one + other than Netscape has the right to modify the terms applicable to + Covered Code created under this License. + + 6.3. Derivative Works. + If You create or use a modified version of this License (which you may + only do in order to apply it to code which is not already Covered Code + governed by this License), You must (a) rename Your license so that + the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", + "MPL", "NPL" or any confusingly similar phrase do not appear in your + license (except to note that your license differs from this License) + and (b) otherwise make it clear that Your version of the license + contains terms which differ from the Mozilla Public License and + Netscape Public License. (Filling in the name of the Initial + Developer, Original Code or Contributor in the notice described in + Exhibit A shall not of themselves be deemed to be modifications of + this License.) + +7. DISCLAIMER OF WARRANTY. + + COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF + DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. + THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE + IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE + COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +8. TERMINATION. + + 8.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to cure + such breach within 30 days of becoming aware of the breach. All + sublicenses to the Covered Code which are properly granted shall + survive any termination of this License. Provisions which, by their + nature, must remain in effect beyond the termination of this License + shall survive. + + 8.2. If You initiate litigation by asserting a patent infringement + claim (excluding declatory judgment actions) against Initial Developer + or a Contributor (the Initial Developer or Contributor against whom + You file such action is referred to as "Participant") alleging that: + + (a) such Participant's Contributor Version directly or indirectly + infringes any patent, then any and all rights granted by such + Participant to You under Sections 2.1 and/or 2.2 of this License + shall, upon 60 days notice from Participant terminate prospectively, + unless if within 60 days after receipt of notice You either: (i) + agree in writing to pay Participant a mutually agreeable reasonable + royalty for Your past and future use of Modifications made by such + Participant, or (ii) withdraw Your litigation claim with respect to + the Contributor Version against such Participant. If within 60 days + of notice, a reasonable royalty and payment arrangement are not + mutually agreed upon in writing by the parties or the litigation claim + is not withdrawn, the rights granted by Participant to You under + Sections 2.1 and/or 2.2 automatically terminate at the expiration of + the 60 day notice period specified above. + + (b) any software, hardware, or device, other than such Participant's + Contributor Version, directly or indirectly infringes any patent, then + any rights granted to You by such Participant under Sections 2.1(b) + and 2.2(b) are revoked effective as of the date You first made, used, + sold, distributed, or had made, Modifications made by that + Participant. + + 8.3. If You assert a patent infringement claim against Participant + alleging that such Participant's Contributor Version directly or + indirectly infringes any patent where such claim is resolved (such as + by license or settlement) prior to the initiation of patent + infringement litigation, then the reasonable value of the licenses + granted by such Participant under Sections 2.1 or 2.2 shall be taken + into account in determining the amount or value of any payment or + license. + + 8.4. In the event of termination under Sections 8.1 or 8.2 above, + all end user license agreements (excluding distributors and resellers) + which have been validly granted by You or any distributor hereunder + prior to termination shall survive termination. + +9. LIMITATION OF LIABILITY. + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL + DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, + OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR + ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY + CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, + WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER + COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN + INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF + LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY + RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW + PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO + THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +10. U.S. GOVERNMENT END USERS. + + The Covered Code is a "commercial item," as that term is defined in + 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer + software" and "commercial computer software documentation," as such + terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 + C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), + all U.S. Government End Users acquire Covered Code with only those + rights set forth herein. + +11. MISCELLANEOUS. + + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed by + California law provisions (except to the extent applicable law, if + any, provides otherwise), excluding its conflict-of-law provisions. + With respect to disputes in which at least one party is a citizen of, + or an entity chartered or registered to do business in the United + States of America, any litigation relating to this License shall be + subject to the jurisdiction of the Federal Courts of the Northern + District of California, with venue lying in Santa Clara County, + California, with the losing party responsible for costs, including + without limitation, court costs and reasonable attorneys' fees and + expenses. The application of the United Nations Convention on + Contracts for the International Sale of Goods is expressly excluded. + Any law or regulation which provides that the language of a contract + shall be construed against the drafter shall not apply to this + License. + +12. RESPONSIBILITY FOR CLAIMS. + + As between Initial Developer and the Contributors, each party is + responsible for claims and damages arising, directly or indirectly, + out of its utilization of rights under this License and You agree to + work with Initial Developer and Contributors to distribute such + responsibility on an equitable basis. Nothing herein is intended or + shall be deemed to constitute any admission of liability. + +13. MULTIPLE-LICENSED CODE. + + Initial Developer may designate portions of the Covered Code as + "Multiple-Licensed". "Multiple-Licensed" means that the Initial + Developer permits you to utilize portions of the Covered Code under + Your choice of the NPL or the alternative licenses, if any, specified + by the Initial Developer in the file described in Exhibit A. + +EXHIBIT A -Mozilla Public License. + + ``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 ______________________________________. + + The Initial Developer of the Original Code is ________________________. + Portions created by ______________________ are Copyright (C) ______ + _______________________. All Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the terms + of the _____ license (the "[___] License"), in which case the + provisions of [______] 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 [____] 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 [___] License. If you do not delete + the provisions above, a recipient may use your version of this file + under either the MPL or the [___] License." + + [NOTE: The text of this Exhibit A may differ slightly from the text of + the notices in the Source Code files of the Original Code. You should + use the text of this Exhibit A rather than the text found in the + Original Code Source Code for Your Modifications.] + +---------- + +File-specific license terms: + +The following files are dual licensed under the terms of the MPL and of +the GPL: + + all files in directory/c-sdk/config, except the autoconf + sub-directory and + the prmkdir.bat file. + all files in security/nss/lib/ckfw/dbm + + directory/c-sdk/configure.in + directory/c-sdk/gmakefile.win + nsprpub/configure.in + nsprpub/pr/include/md/_beos.cfg + nsprpub/pr/include/md/_netbsd.h + nsprpub/pr/src/linking/prlink.c + nsprpub/pr/src/md/beos/bfile.c + nsprpub/pr/src/md/beos/brng.c + nsprpub/pr/src/md/os2/os2emx.s + nsprpub/pr/src/md/os2/os2vaclegacy.s + nsprpub/pr/src/md/unix/os_AIX.s + nsprpub/pr/src/md/unix/os_BSD_386_2.s + nsprpub/pr/src/md/unix/os_Darwin_ppc.s + nsprpub/pr/src/md/unix/os_Darwin_x86.s + nsprpub/pr/src/md/unix/os_HPUX.s + nsprpub/pr/src/md/unix/os_Irix.s + nsprpub/pr/src/md/unix/os_Linux_ia64.s + nsprpub/pr/src/md/unix/os_Linux_x86.s + nsprpub/pr/src/md/unix/os_Linux_x86_64.s + nsprpub/pr/src/md/unix/os_ReliantUNIX.s + nsprpub/pr/src/md/unix/os_SunOS.s + nsprpub/pr/src/md/unix/os_SunOS_sparcv9.s + nsprpub/pr/src/md/unix/os_SunOS_ultrasparc.s + nsprpub/pr/src/md/unix/os_SunOS_x86.s + nsprpub/pr/src/md/unix/os_SunOS_x86_64.s + nsprpub/pr/src/md/unix/unix.c + nsprpub/pr/tests/testfile.c + nsprpub/pr/tests/tmocon.c + security/nss/cmd/crlutil/crlgen.c + security/nss/lib/freebl/mpi/hpma512.s + security/nss/lib/freebl/mpi/hppa20.s + security/nss/lib/freebl/mpi/montmulf.s + security/nss/lib/freebl/mpi/montmulfv8.s + security/nss/lib/freebl/mpi/montmulfv9.s + security/nss/lib/freebl/mpi/mpi_i86pc.s + security/nss/lib/freebl/mpi/mpi_mips.s + security/nss/lib/freebl/mpi/mpi_x86.s + security/nss/lib/freebl/mpi/mpv_sparcv8.s + security/nss/lib/freebl/mpi/mpv_sparcv9.s + security/nss/lib/util/ret_cr16.s + security/nss/tests/pkcs11/netscape/trivial/configure.in + +The following files are licensed under the terms of the MPL only: + + configure.in + directory/c-sdk/ldap/build/autoconf.mk.in + directory/c-sdk/ldap/build/my_overrides.mk + extensions/xmlterm/scripts/xmlterm.spec + modules/libpr0n/decoders/jpeg/Makefile.in + modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp + modules/libpr0n/decoders/jpeg/nsJPEGDecoder.h + netwerk/streamconv/converters/mozTXTToHTMLConv.cpp + netwerk/streamconv/converters/mozTXTToHTMLConv.h + netwerk/streamconv/public/mozITXTToHTMLConv.idl + security/nss/lib/freebl/mpi/doc/basecvt.pod + security/nss/lib/freebl/mpi/doc/gcd.pod + security/nss/lib/freebl/mpi/doc/invmod.pod + security/nss/lib/freebl/mpi/doc/isprime.pod + security/nss/lib/freebl/mpi/doc/lap.pod + security/nss/lib/freebl/mpi/doc/mpi-test.pod + security/nss/lib/freebl/mpi/doc/prime.txt + security/nss/lib/freebl/mpi/doc/prng.pod + security/nss/lib/freebl/mpi/tests/pi1k.txt + security/nss/lib/freebl/mpi/tests/pi2k.txt + security/nss/lib/freebl/mpi/tests/pi5k.txt + security/nss/lib/freebl/mpi/utils/PRIMES + toolkit/mozapps/preferences/fontscaling.xul + widget/src/windows/nsFilePicker.cpp + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s + + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparcv9_solaris_SUNW.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4 + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparcv9_solaris.s + xpcom/reflect/xptcall/src/md/unix/xptcstubs_mips.cpp + xpcom/typelib/xpidl/xpidl_java.c + +The following files are tri licensed under the terms of the NPL, of the +GPL, and the LGPL: + + all files in accessible/src/atk, except the following: + accessible/src/atk/Makefile.in + accessible/src/atk/nsAccessNodeWrap.cpp + accessible/src/atk/nsAccessNodeWrap.h + accessible/src/atk/nsXULMenuAccessibleWrap.h + all files in extensions/pref, except autoconfig/resources/Makefile.in + all files in modules/libpref, except the following: + modules/libpref/Makefile.in + modules/libpref/public/Makefile.in + modules/libpref/src/Makefile.in + all files in sun-java, except the following: + sun-java/Makefile.in + sun-java/stubs/Makefile.in + sun-java/stubs/include/Makefile.in + sun-java/stubs/include/jni_md.h + sun-java/stubs/jri/Makefile.in + all files in xpcom/typelib/xpidl, except Makefile.in + + accessible/src/mac/nsTextAccessibleWrap.h + accessible/src/msaa/nsTextAccessibleWrap.cpp + accessible/src/msaa/nsTextAccessibleWrap.h + accessible/src/msaa/nsXULTreeAccessibleWrap.cpp + accessible/src/msaa/nsXULTreeAccessibleWrap.h + accessible/src/other/nsTextAccessibleWrap.h + dbm/include/cdefs.h + dbm/include/mcom_db.h + dbm/tests/lots.c + editor/ui/composer/content/editorInlineSpellCheck.js + mailnews/mime/cthandlers/calendar/mimecal.cpp + mailnews/mime/cthandlers/calendar/mimecal.h + mailnews/mime/cthandlers/calendar/nsCalendarFactory.cpp + toolkit/themes/qute/global/preferences.css + toolkit/themes/winstripe/global/preferences.css + widget/src/os2/nsAppShell.h + +The following files are dual licensed under the terms of the NPL and of +the GPL: + + gc/boehm/xSYM/SymFiles.cpp + gc/boehm/leaksoup/Addr2Line.java + gc/boehm/leaksoup/BlameTable.java + gc/boehm/leaksoup/CallTree.java + gc/boehm/leaksoup/FileLocator.java + gc/boehm/leaksoup/FileTable.java + gc/boehm/leaksoup/Histogram.java + gc/boehm/leaksoup/Reference.java + gc/boehm/leaksoup/RevisionTable.java + gc/boehm/leaksoup/StringTable.java + gc/boehm/leaksoup/Type.java + gc/boehm/leaksoup/bloatsoup.java + gc/boehm/leaksoup/leaksoup.java + gc/boehm/leaksoup/tracesoup.java + gc/boehm/xSYM/SymFiles.h + gc/boehm/xSYM/sym_file.h + js/src/lock_SunOS.s + +The following files are licensed under the terms of the NPL only: + + all files in directory/c-sdk/ldap, except the following: + directory/c-sdk/ldap/build/autoconf.mk.in + directory/c-sdk/ldap/build/my_overrides.mk + directory/c-sdk/ldap/examples/win32.mak + directory/c-sdk/ldap/libraries/libssldap/errormap.c + + dbm/Makefile.in + dbm/include/Makefile.in + dbm/include/Makefile.win + dbm/src/Makefile.in + dbm/src/Makefile.win + dbm/tests/Makefile.in + directory/c-sdk/aclocal.m4 + directory/c-sdk/build.mk + directory/c-sdk/component_versions.mk + directory/c-sdk/config/prmkdir.bat + directory/c-sdk/package.mk + extensions/pref/autoconfig/resources/Makefile.in + gc/boehm/Makefile.in + gc/boehm/makefile.win + intl/uconv/ucvibm/864i.uf + intl/uconv/ucvibm/cp850.uf + intl/uconv/ucvibm/cp852.uf + intl/uconv/ucvibm/cp855.uf + intl/uconv/ucvibm/cp857.uf + intl/uconv/ucvibm/cp862.uf + intl/uconv/ucvibm/cp864.uf + intl/uconv/ucvmath/mathematica1.uf + intl/uconv/ucvmath/mathematica2.uf + intl/uconv/ucvmath/mathematica3.uf + intl/uconv/ucvmath/mathematica4.uf + intl/uconv/ucvmath/mathematica5.uf + intl/uconv/ucvmath/mtextra.uf + intl/uconv/ucvmath/texcmex-t1.uf + intl/uconv/ucvmath/texcmex-ttf.uf + intl/uconv/ucvmath/texcmmi-t1.uf + intl/uconv/ucvmath/texcmmi-ttf.uf + intl/uconv/ucvmath/texcmr-ttf.uf + intl/uconv/ucvmath/texcmsy-t1.uf + jpeg/Makefile.in + jpeg/jerror.c + jpeg/jmorecfg.h + jpeg/netscape_mods.doc + mailnews/mime/cthandlers/calendar/Makefile.in + mailnews/mime/cthandlers/calendar/calendar.def + mailnews/mime/cthandlers/calendar/mimect-cal.def + modules/libimg/png/Makefile.in + modules/libpref/Makefile.in + modules/libpref/public/Makefile.in + modules/libpref/src/Makefile.in + modules/libpref/src/nsPref.cpp + modules/zlib/Makefile.in + modules/zlib/src/Makefile.in + modules/zlib/src/objs.mk + modules/zlib/standalone/Makefile.in + sun-java/Makefile.in + sun-java/stubs/Makefile.in + sun-java/stubs/include/Makefile.in + sun-java/stubs/include/jni_md.h + sun-java/stubs/jri/Makefile.in + toolkit/components/cookie/Makefile.in + xpcom/reflect/xptcall/src/md/mac/xptcinvoke_mac.s + xpcom/reflect/xptcall/src/md/mac/xptcstubs_mac.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_openvms_alpha.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_aix.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_ibmobj_aix.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_linux.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_rhapsody.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_bsdos.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_linux.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_netbsd.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_solaris.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_solaris_GCC.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_solaris_GCC3.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_solaris_SUNW.s + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_openvms_alpha.s + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_aix.s + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_linux.s + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc_netbsd.s + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc_solaris.s + xpcom/typelib/xpidl/Makefile.in + +The following files are licensed under the terms of the GPL only: + + build/autoconf/codeset.m4 + build/autoconf/config.guess + build/autoconf/config.sub + directory/c-sdk/config/autoconf/config.guess + directory/c-sdk/config/autoconf/config.sub + nsprpub/build/autoconf/config.guess + nsprpub/build/autoconf/config.sub + +The following files are in the Public Domain: + + aclocal.m4 + build/autoconf/freetype2.m4 + build/autoconf/gtk.m4 + build/autoconf/nspr.m4 + db/mork/src/morkDeque.cpp + db/mork/src/morkDeque.h + +The file db/mork/src/morkQuickSort.cpp is licensed under the following terms: + + Copyright (c) 1992, 1993 + The Regents of the University of California. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +The following files come from X11R5, without any clear licensing terms: + + build/autoconf/install-sh + directory/c-sdk/config/autoconf/install-sh + nsprpub/build/autoconf/install-sh + +The embedding/qa/mozembed/public/nsIQABrowserUIGlue.idl file and the files +under the embedding/tests directory are licensed under the following terms: + + Copyright (c) 2002 Netscape Communications Corporation and + other contributors + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this Mozilla sample 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + +=== sqlite + +The db/sqlite3 directory contains a copy of sqlite with the following +licensing terms: + + The author disclaims copyright to this source code. In place of + a legal notice, here is a blessing: + + May you do good and not evil. + May you find forgiveness for yourself and forgive others. + May you share freely, never taking more than you give. + +=== dbm + +The dbm directory, except the files listed under the iceape section, is +licensed under the following terms: + + Copyright (c) 1991, 1993, 1994 + The Regents of the University of California. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by the University of + California, Berkeley and its contributors. + 4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +=== myspell + +The extensions/spellcheck/myspell directory is licensed under the following +terms: + + Copyright 2002 Kevin B. Hendricks, Stratford, Ontario, Canada + And Contributors. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. All modifications to the source code must be clearly marked as + such. Binary redistributions based on modified source code + must be clearly marked as modified versions in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY KEVIN B. HENDRICKS AND CONTRIBUTORS + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + KEVIN B. HENDRICKS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +=== boehm + +The gc/boehm directory, except the files listed under the iceape section, +is licensed under the following terms: + + Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers + Copyright (c) 1991-1996 by Xerox Corporation. All rights reserved. + Copyright (c) 1996-1998 by Silicon Graphics. All rights reserved. + + THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED + OR IMPLIED. ANY USE IS AT YOUR OWN RISK. + + Permission is hereby granted to use or copy this program + for any purpose, provided the above notices are retained on all copies. + Permission to modify the code and to distribute modified code is granted, + provided the above notices are retained, and a notice that the code was + modified is included with the above copyright notice. + +=== cairo + +The gfx/cairo/cairo directory is licensed under the following terms: + + Copyright (c) 2003 University of Southern California + Copyright (c) 1999 Tom Tromey + Copyright (c) 2002, 2003 University of Southern California + Copyright (c) 2004 Calum Robinson + Copyright (c) 2004 David Reveman + Copyright (c) 2000, 2002, 2004 Keith Packard + Copyright (c) 2004, 2005 Red Hat, Inc + + Cairo is free software and is available to be redistributed and/or + modified under the terms of either the GNU Lesser General Public + License (LGPL) version 2.1 or the Mozilla Public License (MPL) version + 1.1. + +=== libpixman + +The gfx/cairo/libpixman directory is licensed under the following terms: +(from gfx/cairo/libpixman/COPYING) + + libpixregion + + Copyright 1987, 1998 The Open Group + + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation. + + 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 + OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + Except as contained in this notice, the name of The Open Group shall not be + used in advertising or otherwise to promote the sale, use or other dealings + in this Software without prior written authorization from The Open Group. + + + Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. + + All Rights Reserved + + Permission to use, copy, modify, and distribute this software and its + + documentation for any purpose and without fee is hereby granted, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the name of Digital not be + used in advertising or publicity pertaining to distribution of the + software without specific, written prior permission. + + DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING + ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL + DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR + ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + SOFTWARE. + + + ---------------------------------------------------------------------- + libic + + Copyright © 2001 Keith Packard + + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the name of Keith Packard not be used in + advertising or publicity pertaining to distribution of the software without + specific, written prior permission. Keith Packard makes no + representations about the suitability of this software for any purpose. It + is provided "as is" without express or implied warranty. + + KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. + + + ---------------------------------------------------------------------- + slim + + slim is Copyright © 2003 Richard Henderson + + Permission to use, copy, modify, distribute, and sell this software + and its documentation for any purpose is hereby granted without fee, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the name of Richard Henderson not be + used in advertising or publicity pertaining to distribution of the + software without specific, written prior permission. Richard Henderson + makes no representations about the suitability of this software for + any purpose. It is provided "as is" without express or implied + warranty. + + RICHARD HENDERSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + EVENT SHALL RICHARD HENDERSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF + USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. + +=== libjpeg + +The jpeg directory, except the files under the iceape section, are licensed +under the following terms: + + The authors make NO WARRANTY or representation, either express or implied, + with respect to this software, its quality, accuracy, merchantability, or + fitness for a particular purpose. This software is provided "AS IS", and you, + its user, assume the entire risk as to its quality and accuracy. + + This software is copyright (C) 1991-1998, Thomas G. Lane. + All Rights Reserved except as specified below. + + Permission is hereby granted to use, copy, modify, and distribute this + software (or portions thereof) for any purpose, without fee, subject to these + conditions: + (1) If any part of the source code for this software is distributed, then this + README file must be included, with this copyright and no-warranty notice + unaltered; and any additions, deletions, or changes to the original files + must be clearly indicated in accompanying documentation. + (2) If only executable code is distributed, then the accompanying + documentation must state that "this software is based in part on the work of + the Independent JPEG Group". + (3) Permission for use of this software is granted only if the user accepts + full responsibility for any undesirable consequences; the authors accept + NO LIABILITY for damages of any kind. + + These conditions apply to any software derived from or based on the IJG code, + not just to the unmodified library. If you use our work, you ought to + acknowledge us. + + Permission is NOT granted for the use of any IJG author's name or company name + in advertising or publicity relating to this software or products derived from + it. This software may be referred to only as "the Independent JPEG Group's + software". + + We specifically permit and encourage the use of this software as the basis of + commercial products, provided that all warranty or liability claims are + assumed by the product vendor. + +=== bzip2 + +The modules/libbz2/src directory is licensed under the following terms: +(from modules/libbz2/src/LICENSE) + + This program, "bzip2", the associated library "libbzip2", and all + documentation, are copyright (C) 1996-2005 Julian R Seward. All + rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + + 3. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written + + permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + Julian Seward, Cambridge, UK. + jseward@acm.org + bzip2/libbzip2 version 1.0.3 of 15 February 2005 + +=== libpng + +The directory modules/libimg/png is licensed under the following terms: +(from modules/libimg/png/LICENSE) + + This copy of the libpng notices is provided for your convenience. In case of + any discrepancy between this copy and the notices in the file png.h that is + included in the libpng distribution, the latter shall prevail. + + COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: + + If you modify libpng you may insert additional notices immediately following + this sentence. + + libpng version 1.2.6, September 12, 2004, is + Copyright (c) 2004 Glenn Randers-Pehrson, and is + distributed according to the same disclaimer and license as libpng-1.2.5 + with the following individual added to the list of Contributing Authors + + Cosmin Truta + + libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are + Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are + distributed according to the same disclaimer and license as libpng-1.0.6 + with the following individuals added to the list of Contributing Authors + + Simon-Pierre Cadieux + Eric S. Raymond + Gilles Vollant + + and with the following additions to the disclaimer: + + There is no warranty against interference with your enjoyment of the + library or against infringement. There is no warranty that our + efforts or the library will fulfill any of your particular purposes + or needs. This library is provided with all faults, and the entire + risk of satisfactory quality, performance, accuracy, and effort is with + the user. + + libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are + Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are + distributed according to the same disclaimer and license as libpng-0.96, + with the following individuals added to the list of Contributing Authors: + + Tom Lane + Glenn Randers-Pehrson + Willem van Schaik + + libpng versions 0.89, June 1996, through 0.96, May 1997, are + Copyright (c) 1996, 1997 Andreas Dilger + Distributed according to the same disclaimer and license as libpng-0.88, + with the following individuals added to the list of Contributing Authors: + + John Bowler + Kevin Bracey + Sam Bushell + Magnus Holmgren + Greg Roelofs + Tom Tanner + + libpng versions 0.5, May 1995, through 0.88, January 1996, are + Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. + + For the purposes of this copyright and license, "Contributing Authors" + is defined as the following set of individuals: + + Andreas Dilger + Dave Martindale + Guy Eric Schalnat + Paul Schmidt + Tim Wegner + + The PNG Reference Library is supplied "AS IS". The Contributing Authors + and Group 42, Inc. disclaim all warranties, expressed or implied, + including, without limitation, the warranties of merchantability and of + fitness for any purpose. The Contributing Authors and Group 42, Inc. + assume no liability for direct, indirect, incidental, special, exemplary, + or consequential damages, which may result from the use of the PNG + Reference Library, even if advised of the possibility of such damage. + + Permission is hereby granted to use, copy, modify, and distribute this + source code, or portions hereof, for any purpose, without fee, subject + to the following restrictions: + + 1. The origin of this source code must not be misrepresented. + + 2. Altered versions must be plainly marked as such and must not + be misrepresented as being the original source. + + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. + + The Contributing Authors and Group 42, Inc. specifically permit, without + fee, and encourage the use of this source code as a component to + supporting the PNG file format in commercial products. If you use this + source code in a product, acknowledgment is not required but would be + appreciated. + + + A "png_get_copyright" function is available, for convenient use in "about" + boxes and the like: + + printf("%s",png_get_copyright(NULL)); + + Also, the PNG logo (in PNG format, of course) is supplied in the + files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). + + Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a + certification mark of the Open Source Initiative. + + Glenn Randers-Pehrson + glennrp@users.sourceforge.net + September 12, 2004 + +=== zlib + +The directories modules/zlib/src and security/nss/cmd/zlib are licensed under +the following terms: + + (C) 1995-2004 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + + If you use the zlib library in a product, we would appreciate *not* + receiving lengthy legal documents to sign. The sources are provided + for free but without warranty of any kind. The library has been + entirely written by Jean-loup Gailly and Mark Adler; it does not + include third-party code. + + If you redistribute modified sources, we would appreciate that you include + in the file ChangeLog history information documenting your changes. Please + read the FAQ for more information on the distribution of modified source + versions. + +=== expat + +The directory parser/expat is licensed under the following terms: +(from parser/expat/COPYING) + + Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd + and Clark Cooper + Copyright (c) 2001, 2002 Expat maintainers. + + 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +---------- + +The Debian packaging is © 2007, Anthony Yarusso +© 2009 Giuseppe Iuculano +and is tri-licensed under the GPL/LGPL/MPL , see above + --- kompozer-0.8~b3.dfsg.1.orig/debian/kompozer-data.links +++ kompozer-0.8~b3.dfsg.1/debian/kompozer-data.links @@ -0,0 +1,2 @@ +etc/kompozer/pref usr/share/kompozer/defaults/syspref +etc/kompozer/profile usr/share/kompozer/defaults/profile --- kompozer-0.8~b3.dfsg.1.orig/debian/kompozer.desktop +++ kompozer-0.8~b3.dfsg.1/debian/kompozer.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=KompoZer +GenericName=Web Authoring System +Comment=Create Web Pages +Comment[es]=Crea páginas web +Comment[it]=Creare pagine Web +Categories=Development;WebDevelopment;Network; +Exec=kompozer +Icon=kompozer +Terminal=false +MimeType=text/html;text/xml;text/css;text/x-javascript;text/javascript;application/xhtml+xml; +Type=Application --- kompozer-0.8~b3.dfsg.1.orig/debian/changelog +++ kompozer-0.8~b3.dfsg.1/debian/changelog @@ -0,0 +1,220 @@ +kompozer (1:0.8~b3.dfsg.1-0.1ubuntu2) precise; urgency=low + + * Add -Wa,-mimplicit-it=thumb on ARM to work around lack of IT + instructions in inline assembly (LP: #935214). + + -- Colin Watson Tue, 24 Apr 2012 14:37:56 +0100 + +kompozer (1:0.8~b3.dfsg.1-0.1ubuntu1) oneiric; urgency=low + + * Add 25_uninitialized_const.patch to fix FTBFS. (LP: #770836) + (Closes: #624923) + * Refresh 99_configure.patch to handle new multiarch lib path. + + -- Daniel T Chen Tue, 20 Sep 2011 17:16:43 -0400 + +kompozer (1:0.8~b3.dfsg.1-0.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove some files of dubios origin found by Mike Hommey + (Closes: #567922) + + -- Alexander Reichle-Schmehl Fri, 23 Apr 2010 13:35:48 +0200 + +kompozer (1:0.8~b3-2) unstable; urgency=low + + * [1ae27b7] Revert "Support parallel builds" + + -- Giuseppe Iuculano Sun, 07 Mar 2010 10:05:11 +0100 + +kompozer (1:0.8~b3-1) unstable; urgency=low + + * [d96ad32] Imported Upstream version 0.8~b3 + * [b4de246] Bump standard-version, addedd ${misc:Depends} in Depends + * [4424b3a] Updated watch file + * [785a393] Support parallel builds + * [cda0453] Refreshed patches + + -- Giuseppe Iuculano Sat, 06 Mar 2010 14:00:43 +0100 + +kompozer (1:0.8~b1-2) unstable; urgency=medium + + * [99fdf46] Fixed CVE-2009-3720, expat dos + + -- Giuseppe Iuculano Wed, 04 Nov 2009 21:50:22 +0100 + +kompozer (1:0.8~b1-1) unstable; urgency=low + + * [278f67a] Imported Upstream version 0.8~b1 (LP: #453079) + - FTP support now is complete. (Closes: #535549, #538729) (LP: #428125) + * [0199bc6] Removed 90_CVE-2009-0776.patch, it was merged in upstream + * [0a67dcc] Updated 99_configure.patch + * [5bcde30] Updated Standards-Version to 3.8.3 (no changes needed) + * [83515d1] Updated my email address and removed DM-Upload-Allowed + control field + * [44f616b] Do not call dh_desktop in debian/rules, it is deprecated. + + -- Giuseppe Iuculano Tue, 20 Oct 2009 22:24:58 +0200 + +kompozer (1:0.8~alpha4+dfsg+svn163-2) unstable; urgency=low + + * [dde68e3] debian/patches/23_x11-session.patch: Support X11 session + management. + * [d8dc5d5] debian/rules: Added -fPIC in CFLAGS and try to fix FTBFS + on mipsel. + * [65af948] debian/mozconfig.debian: enabled Xinerama support. + + -- Giuseppe Iuculano Sun, 14 Jun 2009 12:06:36 +0200 + +kompozer (1:0.8~alpha4+dfsg+svn163-1) unstable; urgency=low + + * [595ebe6] Imported Upstream version 0.8~alpha4+dfsg+svn163 + - Fix some regressions in css style (LP: #373986) + * [e571e12] Fix a typo in 20_mips64_build.patch + * [a3414fc] Removed patches merged in upstream: 01_r153.patch + 19_gcc4.4.patch 90_CVE-2009-1311.patch + * [6fba093] Refreshde 90_CVE-2009-0776.patch + * [bcf5973] debian/kompozer.desktop: remove php from MimeType, + kompozer currently can't open php files. (LP: #375506) + + -- Giuseppe Iuculano Sat, 16 May 2009 14:48:31 +0200 + +kompozer (1:0.8~alpha3+dfsg+svn152-1) unstable; urgency=low + + * [23957fd] Imported Upstream version 0.8~alpha3+dfsg+svn152 + - Now the help menu works.(Closes: #525891) + * [eee96d0] Updated files in debian/conf/ needed by clean target + * [de5e181] 01_add_lfontocnfig.patch, 02_fix_overflow.patch, + 03_add_lfontconfig.patch, 04_fix_path.patch, + 05_remove_nonfree.patch, 06_syspref_folder_support.patch, + 07_cairo_xlib.patch, 08_security.patch, + 09_add_missing_tab_indentation.patch, 90_CVE-2009-1044.patch, are + now in upstream, deleted. + * [2609c1e] debian/patches/01_r153.patch: Fixed a chrome registration + problem related to the "help" window. + + -- Giuseppe Iuculano Tue, 05 May 2009 18:57:59 +0200 + +kompozer (1:0.8~alpha2+dfsg+svn129-3) UNRELEASED; urgency=low + + * [92f61aa] debian/patches/19_gcc4.4.patch: Fix FTBFS with GCC 4.4. + (no longer allows #elif without an expression) (Closes: #526161) + * [6c824b4] debian/patches/90_CVE-2009-1044.patch: Fix Arbitrary code + execution via XUL tree element (CVE-2009-1044) + * [27275e6] debian/patches/90_CVE-2009-1311.patch: Fix POST data sent + to wrong site when saving web page with embedded frame (CVE-2009-1311) + (MFSA 2009-21) + * [3b1eb19] debian/patches/90_CVE-2009-0776.patch: Updated fix for + CVE-2009-0776, previous fix was incomplete. (MFSA 2009-09) + * [8feadce] debian/patches/20_mips64_build.patch: Patch from Martin + Michlmayr for mips64 builds. bz#330626 + debian/patches/21_mips_xpcom.patch: Patch from Thiemo Seufer to fix + mips. bz#258429 + debian/patches/22_mips_performance.patch: Patch from Thiemo Seufer to + increase stability and performance on mips. + * [e7add6a] debian/rules: Fix get-orig-source target for working also + with epoch in version + + -- Giuseppe Iuculano Mon, 04 May 2009 18:20:21 +0200 + +kompozer (1:0.8~alpha2+dfsg+svn129-2) unstable; urgency=low + + * [5577bd3] Build with "-O2 -fno-strict-aliasing -g", hopefully it + fixes FTBFS in s390 + * [ebcecc1] debian/kompozer.desktop: Added Network in Categories + * [32daadd] debian/patches/13_kbsd.patch: GNU/kFreeBSD support. + bz#356011 + * [db6d79f] debian/patches/14_distclean.patch: Make distclean cleaner. + bz#333308. + * [dd57bbd] debian/patches/15_system_libs.patch: Make sure we won't be + bitten by upstream changing libjpeg, libpng or zlib internal + version, which makes system library not used even though --with- + system-* argument is given to configure. + * [a59f082] debian/patches/16_uname.patch: Use ${host_*} variables + instead of uname in configure.in. This is a minimalist patch to + solve the particular bad assembler choice issue. It would need a + much greater work to actually do something totally clean, but the + current patch should be enough for Linux builds. Also incorporates + fix for bz#363263. + * [c39c0c3] debian/patches/17_locale.patch: use OS locale. bz#331779 + * [f62a517] Refreshed debian/patches/99_configure.patch + * [c2aec04] debian/patches/18_crmf.patch: Put the crmf library before + the NSS libraries. + + -- Giuseppe Iuculano Sun, 26 Apr 2009 11:26:28 +0200 + +kompozer (1:0.8~alpha2+dfsg+svn129-1) unstable; urgency=low + + * New upstream svn version. This fixes a lot of Ubuntu bugs: + (LP: #347779) (LP: #260021) (LP: #276290) (LP: #152516) (LP: #263441) + (LP: #244227) (LP: #365163) + * Bump epoch to avoid delta between Ubuntu and Debian. + * [2b0d5d2] debian/mozconfig.debian: Added --enable-canvas --disable- + elf-dynstr-gc --disable-gtktest --disable-strip --disable-strip-lib + --disable-updater --enable-official-branding + * [58bc5ec] debian/patches/06_syspref_folder_support.patch: Patch to + load preferences from defaults/syspref + * [5db111f] debian/kompozer.desktop: added MimeType + * [88a4ab1] debian/kompozer.desktop: Added the generic name + * [9e38c8e] debian/kompozer.menu: ship debian menu entry + * [17831bb] debian/kompozer.js: ship the Debian specific preferences + file for KompoZer, now with this file and all files present in the + /etc/kompozer/pref directory, user can override any preference that + is present in /usr/share/kompozer/defaults/pref directory. + * [642e966] debian/mozconfig.debian: Remove official branding + * [8b67607] debian/patches/07_cairo_xlib.patch: Properly get cairo lib + dependencies and don't rely on GTK bringing them, which just don't + happen anymore. + * [ea87e1a] debian/patches/99_configure.patch: update configure with + autoconf2.13 + * [0c62141] debian/kompozer.js: Added editor browser pref + * [f0273c2] debian/patches/05_remove_nonfree.patch: do not remove + content/editor/about-footer.png, is free + * [235ef5c] debian/rules: Improved + * [4940a7f] debian/kompozer.menu: Use kompozer.xpm as icon + * [f62877e] debian/kompozer.desktop: Added some common mimetypes for a + web editor. (LP: #175563) + * [d808b87] debian/kompozer.desktop: Moved to Development category in + desktop file. (LP: #148935) + * [5ce3f81] debian/kompozer.desktop: Added Spanish comment + translation, thanks to Surfaz Gemon Meme + * [e1c2a9b] debian/kompozer.desktop: Added Italian comment + translation. + * [d92bc8b] Enabling xpfe components + * [c3c3a6f] debian/control: Add a conflict to support upgrade from old + ubuntu package + * [2adf6d7] Backport some security fix from Seamonkey: + - MFSA 2009-12 XSL Transformation vulnerability (CVE-2009-1169) + - MFSA 2009-10 Upgrade PNG library to fix memory safety hazards + (CVE-2009-0040) + - MFSA 2009-09 XML data theft via RDFXMLDataSource and cross-domain + redirect (CVE-2009-0776) + - MFSA 2009-07 Crashes with evidence of memory corruption (CVE-2009-0771) + - MFSA 2009-05 XMLHttpRequest allows reading HTTPOnly cookies + (CVE-2009-0357) + - MFSA 2009-01 Crashes with evidence of memory corruption (CVE-2009-0352) + * [5f9097d] debian/patches/09_add_missing_tab_indentation.patch: + Makefiles require tabs, otherwise it fails (already committed in + upstream svn r130) + * [1766bbc] debian/kompozer.desktop: Fix a typo + * [0a7846b] Updated to standards version 3.8.1 (No changes needed) + * [4b15157] Add a description in 99_configure.patch and make lintian + happy + * [6e2f116] debian/patches/10_arch-detect.patch: Fix FTBFS in s390, + pass host arch information to configure and trust the supplied + architecture information. Thanks to Bastian Blank. + * [dcf3281] debian/patches/11_arm_xpcom_unused_attribute.patch: Patch + from Steve Langasek to fix unused vs. used gcc attribute on arm. + * [a2409fd] debian/patches/12_arm_xpcom_optim.patch: Patch from Antti + P Miettinen to fix small optimization problem with newer gcc's on + arm. + + -- Giuseppe Iuculano Sat, 25 Apr 2009 17:43:01 +0200 + +kompozer (0.7.10+dfsg+svn117-1) unstable; urgency=low + + * Initial release. (Closes: #406553) + * Packaged based on on work done by Anthony Yarusso + in Ubuntu + + -- Giuseppe Iuculano Sat, 07 Feb 2009 11:59:49 +0100 --- kompozer-0.8~b3.dfsg.1.orig/debian/mozconfig.debian +++ kompozer-0.8~b3.dfsg.1/debian/mozconfig.debian @@ -0,0 +1,79 @@ +# .mozconfig file for Ubuntu +# successfully tested on Dapper Drake (6.06.2) and Hardy Heron (8.04.1) +# +# main dependancies: +# libgtk2.0-dev : installs atk, cairo, pango if needed +# libgnomevfs2-dev : installs avahi, bonobo, idl, gconf, orbit if needed +# autoconf2.13 : other versions will *not* work +# + +# build in a separate directory (optional) +#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj-@CONFIG_GUESS@ + +export MOZILLA_OFFICIAL=1 +export BUILD_OFFICIAL=1 + +export MOZ_STANDALONE_COMPOSER=1 +mk_add_options MOZ_STANDALONE_COMPOSER=1 + +# if you want don't want to use gcc and g or want to use +# a specific version of the compilers, specify it in the +# two following lines and uncomment them +#export CC="gcc-3.0" +#export CXX="g-3.0" + +# Uncomment the 3 following lines on Debian (this includes +# Linspire) +export OS_LIBS="-lc -lpthread" +#export CFLAGS="-DDEBIAN" +#export CXXFLAGS="-DDEBIAN" +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj-kompozer + +# build the standalone composer, obviously +mk_add_options MOZ_CO_PROJECT=composer +ac_add_options --enable-application=composer + +# change these two line to build in debug mode +#ac_add_options --enable-optimize +#ac_add_options --disable-debug + +# adapt the following lines according to your distribution + +ac_add_options --prefix=/usr +ac_add_options --disable-tests +ac_add_options --enable-necko-protocols=http,ftp,file,jar,viewsource,res,data + +ac_add_options --enable-default-toolkit=gtk2 +ac_add_options --enable-xft +ac_add_options --enable-pango +ac_add_options --enable-postscript +ac_add_options --disable-xprint + +ac_add_options --enable-mathml +ac_add_options --enable-svg +ac_add_options --enable-svg-renderer=cairo +ac_add_options --enable-system-cairo +ac_add_options --enable-canvas + +ac_add_options --with-system-png=/usr +ac_add_options --with-system-jpeg=/usr +ac_add_options --with-system-zlib=/usr + +ac_add_options --enable-gnomevfs +ac_add_options --enable-single-profile +ac_add_options --disable-profilesharing +ac_add_options --enable-system-myspell + +ac_add_options --disable-installer +ac_add_options --enable-xpfe-components +ac_add_options --with-default-mozilla-five-home=/usr/lib/kompozer +ac_add_options --with-distribution-id=org.debian +ac_add_options --with-system-nspr +ac_add_options --with-system-nss + +ac_add_options --disable-elf-dynstr-gc +ac_add_options --disable-gtktest +ac_add_options --disable-strip +ac_add_options --disable-strip-lib +ac_add_options --disable-updater +ac_add_options --enable-xinerama --- kompozer-0.8~b3.dfsg.1.orig/debian/kompozer.docs +++ kompozer-0.8~b3.dfsg.1/debian/kompozer.docs @@ -0,0 +1 @@ +mozilla/README.txt --- kompozer-0.8~b3.dfsg.1.orig/debian/kompozer-dev.install +++ kompozer-0.8~b3.dfsg.1/debian/kompozer-dev.install @@ -0,0 +1,4 @@ +debian/install/usr/include/kompozer usr/include +debian/install/usr/share/idl/kompozer usr/share/idl +debian/install/usr/lib/pkgconfig/*.pc usr/lib/pkgconfig +debian/install/usr/bin/*-config usr/bin --- kompozer-0.8~b3.dfsg.1.orig/debian/watch +++ kompozer-0.8~b3.dfsg.1/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts="uversionmangle=s/dfsg//;s/07/0\.7\./,dversionmangle=s/.dfsg.svn...//;s/~//" \ +http://sf.net/kompozer/kompozer-([0-9].*)-src\.tar\.bz2 --- kompozer-0.8~b3.dfsg.1.orig/debian/README.source +++ kompozer-0.8~b3.dfsg.1/debian/README.source @@ -0,0 +1,6 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +See /usr/share/doc/quilt/README.source for a detailed explanation. + --- kompozer-0.8~b3.dfsg.1.orig/debian/kompozer-dev.manpages +++ kompozer-0.8~b3.dfsg.1/debian/kompozer-dev.manpages @@ -0,0 +1 @@ +debian/kompozer-config.1 --- kompozer-0.8~b3.dfsg.1.orig/debian/kompozer-data.install +++ kompozer-0.8~b3.dfsg.1/debian/kompozer-data.install @@ -0,0 +1,8 @@ +debian/install/usr/lib/kompozer/defaults/pref usr/share/kompozer/defaults +debian/install/usr/lib/kompozer/defaults/profile etc/kompozer/ +debian/install/usr/lib/kompozer/greprefs usr/share/kompozer +debian/install/usr/lib/kompozer/icons usr/share/kompozer +debian/install/usr/lib/kompozer/res usr/share/kompozer +debian/install/usr/lib/kompozer/chrome usr/share/kompozer + +debian/kompozer.js etc/kompozer/pref --- kompozer-0.8~b3.dfsg.1.orig/debian/kompozer.js +++ kompozer-0.8~b3.dfsg.1/debian/kompozer.js @@ -0,0 +1,31 @@ +// This is the Debian specific preferences file for KompoZer +// You can make any change in here, it is the purpose of this file. +// You can, with this file and all files present in the +// /etc/kompozer/pref directory, override any preference that is +// present in /usr/share/kompozer/defaults/pref directory. +// While your changes will be kept on upgrade if you modify files in +// /etc/kompozer/pref, please note that they won't be kept if you +// do them in /usr/share/kompozer/defaults/pref. + +pref("extensions.update.enabled", true); + +// Use LANG environment variable to choose locale +pref("intl.locale.matchOS", true); + +pref("network.protocol-handler.app.http", "x-www-browser"); +pref("network.protocol-handler.app.https", "x-www-browser"); +pref("editor.helpers.browser.useSystem", false); + +pref("editor.helpers.browser.path", "/usr/bin/x-www-browser"); +pref("editor.helpers.browser.args", ""); +pref("editor.helpers.file.args", ""); +pref("editor.helpers.file.path", ""); +pref("editor.helpers.ftp.args", ""); +pref("editor.helpers.ftp.path", ""); +pref("editor.helpers.image.args", ""); +pref("editor.helpers.image.path", ""); +pref("editor.helpers.media.args", ""); +pref("editor.helpers.media.path", ""); +pref("editor.helpers.text.args", ""); +pref("editor.helpers.text.path", ""); +pref("editor.nvu.sitemanager.openInNewTab", false); --- kompozer-0.8~b3.dfsg.1.orig/debian/kompozer.1 +++ kompozer-0.8~b3.dfsg.1/debian/kompozer.1 @@ -0,0 +1,112 @@ +.TH KOMPOZER 1 "August 27, 2007" KompoZer "Linux User's Manual" +.SH NAME +KompoZer - an HTML editor for X11 derived from the Mozilla composer + +.SH SYNOPSIS +.B kompozer +[\fIOPTIONS\fR] [\fIURL\fR] + +.B /usr/lib/kompozer/kompozer\-bin +[\fIOPTIONS\fR] [\fIURL\fR] + +.SH DESCRIPTION +\fBKompoZer\fR is an open-source HTML editor, designed for +standards compliance, performance and portability. + +.SH USAGE +\fBkompozer\fR is a simple shell script that will set up the +environment for the actual executable, \fBkompozer\-bin\fR. + +.SH OPTIONS +A summary of the options supported by \fBkompozer\fR is included below. + +.SS "X11 options" +.TP +.BI \-\-display= DISPLAY +X display to use +.TP +.B \-\-sync +Make X calls synchronous +.TP +.B \-\-no\-xshm +Don't use X shared memory extension +.TP +.BI \-\-xim\-preedit= STYLE +.TP +.BI \-\-xim\-status= STYLE +.TP +.B \-\-g\-fatal\-warnings +Make all warnings fatal + +.SS "Mozilla options" +.TP +\fB\-height\fR \fIvalue\fR +Set height of startup window to \fIvalue\fR pixels. +.TP +.B \-h, \-help +Show summary of options. +.TP +\fB\-width\fR \fIvalue\fR +Set width of startup window to \fIvalue\fR pixels. +.TP +.B \-v, \-version +Print KompoZer version. +.TP +.B \-no\-remote +Don't connect to a running KompoZer instance. +.TP +\fB\-CreateProfile\fR \fIprofile\fR +Create \fIprofile\fR. +Implies \fB\-a kompozer\-\-\fR\fIprofile\fR, or \fB\-a default\fR +if \fIprofile\fR is \fBdefault\fR. +.TP +\fB\-P\fR \fIprofile\fR +Start with \fIprofile\fR. +Implies \fB\-a kompozer\-\-\fR\fIprofile\fR, or \fB\-a default\fR +if \fIprofile\fR is \fBdefault\fR. +.TP +.B \-ProfileManager +Start with profile manager. +Implies \fB\-a\fR with a fresh unique \fIapplication\-id\fR. +.TP +\fB\-UILocale\fR \fIlocale\fR +Start with \fIlocale\fR resources as User Interface locale. By default, it is +guessed from environment and available locales for KompoZer. +.TP +\fB\-contentLocale\fR \fIlocale\fR +Start with \fIlocale\fR resources as content locale. By default, it is +guessed from environment and available locales for KompoZer. +.TP +.B \-jsconsole +Start with Javascript Console +.TP +\fB\-chrome\fR \fIurl\fR +Load the specified chrome. +.TP +.B \-safe\-mode +Starts KompoZer in safe mode, that is disabling all extensions and +showing a bit more debugging messages. + +.SS "Debugger options" +.TP +.B \-g, \-debug +Starts KompoZer through a debugger (gdb by default). +.TP +\fB\-\-debugger\fR \fIprogram\fR +Use \fIprogram\fR as a debugger for KompoZer. Implies \fB\-debug\fR. + +.SH FILES +\fI/usr/bin/kompozer\fR - shell script wrapping +\fBkompozer\-bin\fR +.br + +\fI/usr/lib/kompozer/kompozer\-bin\fR - \fBkompozer\fR +executable + +.SH BUGS +To report a bug, please visit \fIhttp://sourceforge.net/tracker/?group_id=170132&atid=853122\fR + +.SH AUTHOR +.TP +.B Fabien Cazenave +.I http://kompozer.sourceforge.net/ --- kompozer-0.8~b3.dfsg.1.orig/debian/kompozer.links +++ kompozer-0.8~b3.dfsg.1/debian/kompozer.links @@ -0,0 +1,11 @@ +usr/share/kompozer/chrome usr/lib/kompozer/chrome +usr/share/kompozer/defaults usr/lib/kompozer/defaults +usr/share/kompozer/greprefs usr/lib/kompozer/greprefs +usr/share/kompozer/icons usr/lib/kompozer/icons +usr/share/kompozer/res usr/lib/kompozer/res + +usr/share/myspell/dicts usr/lib/kompozer/components/myspell + +usr/share/kompozer/icons/mozicon50.xpm usr/share/pixmaps/kompozer.xpm +usr/share/kompozer/icons/mozicon256.png usr/share/pixmaps/kompozer.png + --- kompozer-0.8~b3.dfsg.1.orig/debian/control +++ kompozer-0.8~b3.dfsg.1/debian/control @@ -0,0 +1,58 @@ +Source: kompozer +Section: web +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Giuseppe Iuculano +Build-Depends: debhelper (>= 7.0), zip , libgtk2.0-dev , libidl-dev , libxt-dev , autotools-dev, quilt, libgnomevfs2-dev, libxft-dev, libnspr4-dev, libnss3-dev +Standards-Version: 3.8.4 +Homepage: http://kompozer.sourceforge.net/ +Vcs-git: git://git.debian.org/git/users/derevko-guest/kompozer.git +Vcs-Browser: http://git.debian.org/?p=users/derevko-guest/kompozer.git + +Package: kompozer +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, kompozer-data +Description: complete Web Authoring System + KompoZer is a complete Web Authoring System that + combines web file management and easy-to-use WYSIWYG + (What You See Is What You Get) web page editing. + . + KompoZer is designed to be extremely easy to use, + making it ideal for non-technical computer users + who want to create an attractive, professional-looking + web site without needing to know HTML or web coding. + +Package: kompozer-dev +Section: devel +Architecture: all +Depends: kompozer (>= ${source:Version}), ${misc:Depends} +Conflicts: libnspr-dev +Description: KompoZer development files + KompoZer is a complete Web Authoring System that + combines web file management and easy-to-use WYSIWYG + (What You See Is What You Get) web page editing. + . + KompoZer is designed to be extremely easy to use, + making it ideal for non-technical computer users + who want to create an attractive, professional-looking + web site without needing to know HTML or web coding. + . + This package contains the files needed to build + plugins/add-ons for KompoZer. + +Package: kompozer-data +Architecture: all +Depends: ${misc:Depends} +Recommends: kompozer +Conflicts: kompozer (<= 1:0.7.10) +Description: kompozer data files + KompoZer is a complete Web Authoring System that + combines web file management and easy-to-use WYSIWYG + (What You See Is What You Get) web page editing. + . + KompoZer is designed to be extremely easy to use, + making it ideal for non-technical computer users + who want to create an attractive, professional-looking + web site without needing to know HTML or web coding. + . + This package install kompozer data files. --- kompozer-0.8~b3.dfsg.1.orig/debian/kompozer.manpages +++ kompozer-0.8~b3.dfsg.1/debian/kompozer.manpages @@ -0,0 +1 @@ +debian/kompozer.1 --- kompozer-0.8~b3.dfsg.1.orig/debian/rules +++ kompozer-0.8~b3.dfsg.1/debian/rules @@ -0,0 +1,151 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 +ndir=$(CURDIR)/debian/install + +include /usr/share/quilt/quilt.make + +PACKAGE = kompozer +SRC_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p'| cut -d':' -f2) +SVN_REVISION := $(shell echo $(SRC_VERSION) | awk -F"+" '{ print $$3 }' | sed 's/svn//' ) +TARBALL = $(PACKAGE)_$(SRC_VERSION).orig.tar.gz + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) + +DEBIAN_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\(.*\)$$/\1/ p') +DEBIAN_REV_CODE := $(shell echo $(DEBIAN_VERSION) | sed 's/^.*-\([0-9]*\)[^-]*$$/0\1/ ; s/^.*\(..\)$$/\1/') + +BUILD_DATE=$(shell perl -e '($$s,$$m,$$h,$$d,$$M,$$y) = gmtime((stat("mozilla/client.mk"))[9]); printf "%04d%02d%02d\n",$$y + 1900,$$M + 1,$$d;') +export MOZ_BUILD_DATE=$(BUILD_DATE)$(DEBIAN_REV_CODE) + +CFLAGS += -Wall -pipe -DDEBIAN -fPIC +CXXFLAGS += -DDEBIAN + +CONFIGURE_OPTIONS = ac_add_options --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CONFIGURE_OPTIONS += --disable-optimize +else + CONFIGURE_OPTIONS += --enable-optimize=\"-O2 -fno-strict-aliasing -g\" +endif + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CONFIGURE_OPTIONS += --enable-debug +else + CONFIGURE_OPTIONS += --disable-debug +endif + +ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH))) + CFLAGS += -Wa,-mimplicit-it=thumb + CXXFLAGS += -Wa,-mimplicit-it=thumb +endif + + + +get-orig-source: + rm -rf get-orig-source $(TARBALL) + mkdir get-orig-source + svn export -r $(SVN_REVISION) https://kompozer.svn.sourceforge.net/svnroot/kompozer/trunk get-orig-source/$(PACKAGE)-$(SRC_VERSION).orig + rm -rf get-orig-source/$(PACKAGE)-$(SRC_VERSION).orig/debian + cd get-orig-source/$(PACKAGE)-$(SRC_VERSION).orig/ ; sh ../../debian/remove-nonfree.sh + GZIP=--best tar czf $(TARBALL) -C get-orig-source $(PACKAGE)-$(SRC_VERSION).orig + rm -rf get-orig-source + echo " "$(TARBALL)" created; move it to the right destination to build the package" + + + + +build: $(QUILT_STAMPFN) build-stamp + +build-stamp: + dh_testdir + cp debian/mozconfig.debian mozilla/.mozconfig + echo $(CONFIGURE_OPTIONS) >> mozilla/.mozconfig +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub mozilla/build/autoconf/config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess mozilla/build/autoconf/config.guess +endif + cd mozilla && \ + LDFLAGS="-Wl,--as-needed" \ + CFLAGS="$(CFLAGS)" \ + CXXFLAGS="$(CXXFLAGS)"\ + $(MAKE) -f client.mk build_all + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + rm -rf $(ndir) + rm -f mozilla/config.status + rm -f mozilla/config.log + rm -f mozilla/nsprpub/config.status + rm -f mozilla/nsprpub/config.log + rm -f mozilla/.mozconfig + rm -f mozilla/build/autoconf/config.guess + rm -f mozilla/build/autoconf/config.sub + cp -a debian/conf/.mozconfig.mk debian/conf/.mozconfig.out mozilla/ + rm -rf obj-kompozer + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + cd obj-kompozer/xpfe/components && $(MAKE) + cd obj-kompozer && $(MAKE) install DESTDIR=$(ndir) + # Remove all empty directories. + perl -MFile::Find -e"finddepth(sub{rmdir},'$(ndir)')" + # Remove internal myspell directory and myspell dicts. + # dh_install symlinks it to /usr/share/myspell where all myspell-* dicts place their stuff + rm -rf $(ndir)/usr/lib/kompozer/components/myspell + # Remove exec bit from .js files to prevent lintian warnings. + chmod -x $(ndir)/usr/lib/kompozer/components/*.js + # Copy and symlink files to debian/kompozer. + dh_installdirs + dh_install + dh_link + +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installchangelogs -i + dh_installdocs -i + dh_installman -i + dh_compress -i + dh_fixperms -i + dh_makeshlibs -i + dh_shlibdeps -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -a + dh_testroot -a + dh_installchangelogs -a + dh_installdocs -a + dh_installexamples -a + dh_installmenu -a + dh_installman -a + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a + dh_makeshlibs -a + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:debian/kompozer/usr/lib/kompozer" && dh_shlibdeps -a + dh_installdeb -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- kompozer-0.8~b3.dfsg.1.orig/debian/compat +++ kompozer-0.8~b3.dfsg.1/debian/compat @@ -0,0 +1 @@ +7 --- kompozer-0.8~b3.dfsg.1.orig/debian/kompozer.install +++ kompozer-0.8~b3.dfsg.1/debian/kompozer.install @@ -0,0 +1,12 @@ +debian/install/usr/bin/kompozer usr/bin + +debian/install/usr/lib/kompozer/lib* usr/lib/kompozer +debian/install/usr/lib/kompozer/TestGtkEmbed usr/lib/kompozer +debian/install/usr/lib/kompozer/mozilla* usr/lib/kompozer +debian/install/usr/lib/kompozer/reg* usr/lib/kompozer +debian/install/usr/lib/kompozer/xp* usr/lib/kompozer +debian/install/usr/lib/kompozer/kompozer-bin usr/lib/kompozer +debian/install/usr/lib/kompozer/run-mozilla.sh usr/lib/kompozer +debian/install/usr/lib/kompozer/components usr/lib/kompozer +debian/extensions usr/lib/kompozer +debian/kompozer.desktop usr/share/applications --- kompozer-0.8~b3.dfsg.1.orig/debian/remove-nonfree.sh +++ kompozer-0.8~b3.dfsg.1/debian/remove-nonfree.sh @@ -0,0 +1,165 @@ +#! /bin/sh + +cd mozilla/ +rm -fv ./build/wince/shunt/build/shunt.vcb +rm -fv ./build/wince/shunt/build/shunt.vco +rm -fv ./directory/c-sdk/ldap/examples/macintosh/*.u +rm -fv ./directory/c-sdk/ldap/libraries/macintosh/LDAPClient.mcp +rm -fv ./modules/oji/tests/script/killer.exe +rm -fv ./modules/plugin/samples/default/mac/NullPlugin.rsrc +rm -fv "./modules/plugin/tools/sdk/samples/basic/mac/Basic Plugin.mcp" +rm -fv ./modules/plugin/tools/sdk/samples/basic/mac/Basic.rsrc +rm -fv "./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable Plugin.mcp" +rm -fv "./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable PluginIDL.mcp" +rm -fv ./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable.rsrc +rm -fv ./other-licenses/7zstub/firefox/7zSD.sfx +rm -fv ./toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib +rm -fv ./toolkit/mozapps/update/src/updater/macbuild/Contents/PkgInfo +rm -fv ./extensions/manticore/resources/manticore.psd +rm -fv ./extensions/universalchardet/doc/UniversalCharsetDetection.doc +rm -fv ./config/bin2rc.exe +rm -fv ./config/makedep.exe +rm -fv ./config/mangle.exe +rm -fv ./config/mantomak.exe +rm -fv ./embedding/browser/activex/src/pluginhostctrl/cab/redist/ATL.DLL +rm -fv ./embedding/browser/activex/tests/vbrowse/browser.frx +rm -fv ./embedding/browser/activex/tests/vbrowse/frmToolBar.frx +rm -fv ./embedding/browser/cocoa/res/English.lproj/alert.nib/objects.nib +rm -fv ./embedding/browser/powerplant/resources/cfmAlias.rsrc +rm -fv ./embedding/browser/powerplant/resources/cfmAliasDebug.rsrc +rm -fv ./embedding/minimo/mozconfig +rm -fv ./embedding/qa/testembed/testembed.aps +rm -fv ./embedding/tests/MSDotNETCSEmbed/MSDotNETCSEmbed.suo +rm -fv ./embedding/tests/cocoaEmbed/res/English.lproj/MainMenu.nib/objects.nib +rm -fv ./embedding/wrappers/DotNETEmbed/DotNETEmbed.snk +rm -fv ./intl/unicharutil/tools/data/case.dat +rm -fv ./intl/unicharutil/tools/data/cmbcl.dat +rm -fv ./intl/unicharutil/tools/data/ctype.dat +rm -fv ./intl/unicharutil/tools/data/decomp.dat +rm -fv ./intl/unicharutil/tools/data/num.dat +rm -fv ./js/src/fdlibm/fdlibm.mdp +rm -fv ./js/src/js.mdp +rm -fv ./js/src/liveconnect/jsj_nodl.c +rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin +rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin.jar +rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/Resources/MRJPlugin.rsrc +rm -fv ./plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/MacOS/JavaEmbeddingPlugin +rm -fv ./plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/Resources/Java/JavaEmbeddingPlugin.jar +rm -fv ./plugin/oji/MRJ/plugin/Resources/Dialogs.rsrc +rm -fv ./plugin/oji/MRJ/plugin/Resources/Strings.rsrc +rm -fv ./plugin/oji/MRJ/plugin/Resources/Version.rsrc +rm -fv ./plugin/oji/MRJ/plugin/MRJPlugin.jar +rm -fv ./plugin/oji/MRJ/plugin/netscape.plugin.jar +rm -fv ./plugin/oji/MRJ/plugin/Source/JMURLConnection +rm -fv ./plugin/oji/MRJ/testing/ConsoleApplet/ConsoleApplet.mcp +rm -fv ./plugin/oji/MRJ/testing/JSApplet/JSApplet.mcp +rm -fv ./plugin/oji/MRJ/testing/SwingApplet/TestApplet.mcp +rm -fv ./plugin/oji/MRJ/testing/TrivialApplet/MyApplet.mcp +rm -fv ./plugin/oji/MRJCarbon/MRJSDK/JavaFrameworks/JavaEmbeddingLib +rm -fv ./plugin/oji/MRJCarbon/plugin/MRJPlugin.jar +rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Dialogs.rsrc +rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Strings.rsrc +rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Version.rsrc +rm -fv ./xpcom/reflect/xptcall/tests/eVC4/XPTCInvoke_Testing.cpp +rm -fv ./xpcom/tests/StringFactoringTests/StringTest.mcp +rm -fv ./xpcom/typelib/xpidl/macplugin/compiler.rsrc +rm -fv ./xpcom/typelib/xpidl/macplugin/linker.rsrc +rm -fv ./xpcom/typelib/xpidl/macplugin/panel.rsrc +rm -fv ./xpcom/typelib/xpidl/macplugin/version.rsrc +rm -fv ./xpinstall/packager/mac/ASEncoder/build/ASEncoder.mcp +rm -fv ./xpinstall/packager/mac/ASEncoder/rsrc/ASEncoder.rsrc +rm -fv ./xpinstall/packager/mac/ASEncoder/src/ASEncoderUsage.script +rm -fv ./xpinstall/test/pre_checkin.xpi +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_Core.PPC.Lib +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_ForeignThreads.PPC.Lib +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_MPW.PPC.Lib +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_MSL.PPC.Lib +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_SIOUX.PPC.Lib +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_Sfio.PPC.Lib +rm -fv ./xpinstall/wizard/mac/rsrc/MIWCommon.rsrc +rm -fv ./xpinstall/wizard/mac/rsrc/Mozilla.rsrc +rm -fv ./xpinstall/wizard/os2/setuprsc/box_ch_d.bmp +rm -fv ./xpinstall/wizard/os2/setuprsc/box_chec.bmp +rm -fv ./xpinstall/wizard/os2/setuprsc/box_unch.bmp +rm -fv ./gfx/cairo/libpixman/src/pixman-vc71.lib +rm -fv ./gfx/src/mac/printerplugin/Resources/English.lproj/Localizable.strings +rm -fv ./gfx/src/mac/nsMacGFX.rsrc +rm -fv ./layout/doc/SpaceMgr_BlockReflSt_OD.sda +rm -fv ./layout/doc/object_diagram_template.sda +rm -fv ./layout/html/tests/block/bugs/RealSnow.jar +rm -fv ./webshell/tests/viewer/mac/cfmAlias.rsrc +rm -fv ./webshell/tests/viewer/mac/cfmAliasDebug.rsrc +rm -fv ./webshell/tests/viewer/mac/viewer.ppob +rm -fv ./webshell/tests/viewer/mac/viewer.rsrc +rm -fv ./webshell/tests/viewer/mac/viewercarb.rsrc +rm -fv ./webshell/tests/viewer/viewer-beos.rsrc +rm -fv ./xpfe/bootstrap/appleevents/nsAppleEvents.rsrc +rm -fv ./xpfe/bootstrap/apprunner-beos.rsrc +rm -fv ./mailnews/mapi/old/tests/mapitest/mapitest.ncb +rm -fv ./mailnews/mapi/old/tests/mapitest/mapitest.opt +rm -fv ./toolkit/mozapps/installer/windows/nsis/Processes.dll +rm -fv ./toolkit/mozapps/installer/windows/nsis/ShellLink.dll +rm -fv ./toolkit/mozapps/installer/windows/nsis/nsProcess.dll +rm -fv ./mailnews/addrbook/src/nsAbOSXCard.o +rm -fv ./mailnews/addrbook/src/nsAbOSXDirFactory.o +rm -fv ./mailnews/addrbook/src/nsAbOSXDirectory.o +rm -fv ./mailnews/addrbook/src/nsAbOSXUtils.o + +echo also we need to remove any copyrighted image files from the mozilla src suite, not replaced by the branding process. This includes theme throbbers depending on how you handle that and windows icons, app icons, windows splash etc + +rm -fv ./xpfe/bootstrap/splash.bmp +rm -fv ./xpfe/bootstrap/mozilla.ico +rm -fv ./xpfe/bootstrap/mozos2.ico +rm -fv ./browser/app/mozicon128.png +rm -fv ./browser/app/mozicon16.xpm +rm -fv ./browser/app/mozicon50.xpm + +rm -fvr ./layout/html/tests +rm -fvr ./layout/doc +rm -fvr ./content/xml/tests + +# I'm not sure about the os2 as I can't see them +rm -fv ./xpfe/bootstrap/icons/os2/mozilla.ico + +rm -fv ./xpinstall/wizard/windows/setuprsc/bitmap1.bmp +rm -fv ./xpinstall/wizard/windows/setuprsc/downloadLogo.bmp +rm -fv ./xpinstall/wizard/windows/setuprsc/turbo-systray.bmp + +rm -fv ./xpinstall/wizard/os2/nsinstall/stubinstall.ico +rm -fv ./xpinstall/wizard/os2/setuprsc/downloadLogo.bmp +rm -fv ./xpinstall/wizard/os2/setuprsc/bitmap1.bmp + +rm -fv ./suite/branding/icons/gtk/seamonkey.png # 128x128 +rm -fv ./suite/branding/icons/gtk/default.xpm # 32x32 +rm -fv ./suite/branding/icons/gtk/default16.xpm #16x16 +rm -fv ./suite/branding/content/logo.gif # 200x200 + +# remove the throbbers as they are branded + +rm -fv ./themes/classic/communicator/brand/throbber-single.gif +rm -fv ./themes/classic/communicator/brand/throbber16-single.gif +rm -fv ./themes/classic/communicator/brand/throbber-anim.gif +rm -fv ./themes/classic/communicator/brand/throbber16-anim.gif + +rm -fv ./themes/modern/communicator/brand/throbber-single.gif +rm -fv ./themes/modern/communicator/brand/throbber16-single.gif +rm -fv ./themes/modern/communicator/brand/throbber-anim.gif +rm -fv ./themes/modern/communicator/brand/throbber16-anim.gif + +rm -fv ./xpfe/bootstrap/splash.xpm +rm -fv ./themes/classic/communicator/icons/turbo-systray.gif +rm -fv ./themes/modern/communicator/icons/turbo-systray.gif + + +rm -fvr other-licenses/ +rm -fv README/mozilla/README.os2 + +rm -fv netwerk/protocol/ftp/doc/rfc959.txt +rm -fv directory/c-sdk/ldap/docs/draft-ietf-ldapext-ldap-c-api-05.txt + +# sunbird stuff + +rm -fv calendar/sunbird/app/sunbird.ico +rm -fv calendar/sunbird/app/default.xpm +rm -fv calendar/resources/content/sunbird_small.png + --- kompozer-0.8~b3.dfsg.1.orig/debian/kompozer-config.1 +++ kompozer-0.8~b3.dfsg.1/debian/kompozer-config.1 @@ -0,0 +1,45 @@ +.TH KompoZer 1 "24 February 2009" +.SH NAME +kompozer-config - script to get information about the installed version of KompoZer +.SH SYNOPSIS +.B kompozer-config +[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version] [\-\-libs] [\-\-cflags] +.SH DESCRIPTION +.PP +\fIkompozer-config\fP is a tool that is used to configure to determine +the compiler and linker flags that should be used to compile +and link plugins/add-ons for \fIKompoZer\fP. +. +.SH OPTIONS +\fIkompozer-config\fP accepts the following options: +.TP 8 +.B \-\-version +Print the currently installed version of \fIKompoZer\fP on the standard output. +.TP 8 +.B \-\-libs [libraries] +Print the linker flags that are necessary to link a \fIKompoZer\fP program. +.TP 8 +.B \-\-cflags [components] +Print the compiler flags that are necessary to compile a \fIKompoZer\fP program. +.TP 8 +.B \-\-prefix=PREFIX +If specified, use PREFIX instead of the installation prefix that \fIKompoZer\fP +was built with when computing the output for the \-\-cflags and +\-\-libs options. This option is also used for the exec prefix +if \-\-exec\-prefix was not specified. This option must be specified +before any \-\-libs or \-\-cflags options. +.TP 8 +.B \-\-exec\-prefix=PREFIX +If specified, use PREFIX instead of the installation exec prefix that +\fIKompoZer\fP was built with when computing the output for the \-\-cflags +and \-\-libs options. This option must be specified before any +\-\-libs or \-\-cflags options. +.B \-\-idlflags +Additional flags to be passed to the +idl-compiler. +.SH COPYRIGHT +Upstream Author: Fabien Cazenave + +Copyright: 1998-2007, Contributors + +License: MPL 1.1 / GPL 2.0 or subsequent / LGPL 2.1 or subsequent --- kompozer-0.8~b3.dfsg.1.orig/debian/kompozer.menu +++ kompozer-0.8~b3.dfsg.1/debian/kompozer.menu @@ -0,0 +1,4 @@ +?package(kompozer):needs="x11" section="Applications/Web Development" \ + title="KompoZer" \ + icon="/usr/share/pixmaps/kompozer.xpm" \ + command="/usr/bin/kompozer" --- kompozer-0.8~b3.dfsg.1.orig/debian/extensions/installed-extensions-processed.txt +++ kompozer-0.8~b3.dfsg.1/debian/extensions/installed-extensions-processed.txt @@ -0,0 +1 @@ +theme,{972ce4c6-7e08-4474-a285-3208198ce6fd} --- kompozer-0.8~b3.dfsg.1.orig/debian/extensions/Extensions.rdf +++ kompozer-0.8~b3.dfsg.1/debian/extensions/Extensions.rdf @@ -0,0 +1,9 @@ + + + + + + + + --- kompozer-0.8~b3.dfsg.1.orig/debian/patches/12_arm_xpcom_optim.patch +++ kompozer-0.8~b3.dfsg.1/debian/patches/12_arm_xpcom_optim.patch @@ -0,0 +1,13 @@ +Patch from Antti P Miettinen to fix small optimization problem with +newer gcc's on arm. bz#322806 +--- a/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp ++++ b/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp +@@ -212,7 +212,7 @@ XPTC_InvokeByIndex(nsISupports* that, PR + "add sp, sp, r4 \n\t" /* restore stack pointer */ + "mov %0, r0 \n\t" /* the result... */ + : "=r" (result) +- : "r" (&my_params) ++ : "r" (&my_params), "m" (my_params) + : "r0", "r1", "r2", "r3", "r4", "ip", "lr", "sp" + ); + --- kompozer-0.8~b3.dfsg.1.orig/debian/patches/14_distclean.patch +++ kompozer-0.8~b3.dfsg.1/debian/patches/14_distclean.patch @@ -0,0 +1,126 @@ +Make distclean cleaner. bz#333308. +--- a/mozilla/Makefile.in ++++ b/mozilla/Makefile.in +@@ -448,6 +448,7 @@ GARBAGE_DIRS += dist + DIST_GARBAGE = config.cache config.log config.status config-defs.h \ + dependencies.beos config/autoconf.mk config/myrules.mk config/myconfig.mk \ + unallmakefiles mozilla-config.h \ ++ gfx/gfx-config.h netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \ + $(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out + + # Build pseudo-external modules first when export is explicitly called +--- a/mozilla/build/unix/Makefile.in ++++ b/mozilla/build/unix/Makefile.in +@@ -71,7 +71,7 @@ pkg_config_files=$(MOZ_APP_NAME)-nspr.pc + $(MOZ_APP_NAME)-js.pc $(MOZ_APP_NAME)-gtkmozembed.pc \ + $(MOZ_APP_NAME)-nss.pc $(MOZ_APP_NAME)-plugin.pc + +-GARBAGE = $(pkg_config_files) mozilla-config ++GARBAGE = $(pkg_config_files) $(MOZ_APP_NAME)-config + + $(MOZ_APP_NAME)-config:: mozilla-config.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk + cat $< | sed \ +--- a/mozilla/db/sqlite3/src/Makefile.in ++++ b/mozilla/db/sqlite3/src/Makefile.in +@@ -113,3 +113,5 @@ sqlite-shell.$(OBJ_SUFFIX): shell.c + + # next line allows use of MOZ_OBJDIR in .mozconfig with older gcc on BeOS, maybe others + LOCAL_INCLUDES += -I$(srcdir) ++ ++DIST_GARBAGE += sqlite3.h +--- a/mozilla/directory/c-sdk/Makefile.in ++++ b/mozilla/directory/c-sdk/Makefile.in +@@ -19,3 +19,5 @@ depend: + + FORCE: + ++distclean:: ++ rm -f config/autoconf.mk +--- a/mozilla/directory/c-sdk/ldap/build/Makefile.in ++++ b/mozilla/directory/c-sdk/ldap/build/Makefile.in +@@ -55,3 +55,4 @@ export:: $(PROGRAM) + clean:: + -rm -rf $(filter-out . ..,$(OBJDIR_NAME)) + ++GARBAGE += $(PROGRAM) +--- a/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in ++++ b/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in +@@ -91,7 +91,7 @@ endif + + # variable definitions for exported symbols + ifeq ($(OS_ARCH), WINNT) +- SSLDAP_EXPORT_DEFS= $(win_srcdir)/../msdos/winsock/nsldapssl32.def ++ SSLDAP_EXPORT_DEFS= $(srcdir)/../msdos/winsock/nsldapssl32.def + else + SSLDAP_EXPORT_DEFS= $(SSLOBJDEST)/libldap_ssl.exp + endif +--- a/mozilla/extensions/p3p/Makefile.in ++++ b/mozilla/extensions/p3p/Makefile.in +@@ -51,6 +51,8 @@ PP = $(PERL) -I$(topsrcdir)/config $(top + + include $(topsrcdir)/config/rules.mk + ++GARBAGE += $(CHROME_DEPS) ++ + # Use the XUL preprocessor to adjust the stylesheet template to the slightly + # varying needs of the supported versions of the p3p specification. + +--- a/mozilla/extensions/pref/system-pref/src/gconf/Makefile.in ++++ b/mozilla/extensions/pref/system-pref/src/gconf/Makefile.in +@@ -87,3 +87,5 @@ LOCAL_INCLUDES = -I$(srcdir)/.. + + export:: + $(INSTALL) $(srcdir)/../nsSystemPrefFactory.cpp . ++ ++GARBAGE += nsSystemPrefFactory.cpp +--- a/mozilla/profile/dirserviceprovider/standalone/Makefile.in ++++ b/mozilla/profile/dirserviceprovider/standalone/Makefile.in +@@ -65,3 +65,5 @@ LOCAL_INCLUDES = -I$(srcdir)/../src + + export:: $(MODULES_PROFILEDIRSERVICE_SRC_CSRCS) + $(INSTALL) $^ . ++ ++GARBAGE += $(notdir $(MODULES_PROFILEDIRSERVICE_SRC_CSRCS)) +--- a/mozilla/security/manager/Makefile.in ++++ b/mozilla/security/manager/Makefile.in +@@ -226,6 +226,8 @@ endif + touch $@ + endif + ++GARBAGE += .nss.cleaned ++ + .nss.checkout: + ifndef MOZ_NATIVE_NSS + touch $(srcdir)/$@ +--- a/mozilla/xpcom/build/Makefile.in ++++ b/mozilla/xpcom/build/Makefile.in +@@ -151,7 +151,7 @@ endif + # UNIX98 iconv support + OS_LIBS += $(LIBICONV) + +-GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUENS_SRC_LCSRCS) $(wildcard *.$(OBJ_SUFFIX)) ++GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUE_SRC_LCPPSRCS) $(XPCOM_GLUENS_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX)) + + include $(topsrcdir)/config/rules.mk + +--- a/mozilla/xpcom/glue/standalone/Makefile.in ++++ b/mozilla/xpcom/glue/standalone/Makefile.in +@@ -96,7 +96,7 @@ FORCE_STATIC_LIB = 1 + # Force use of PIC + FORCE_USE_PIC = 1 + +-GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(wildcard *.$(OBJ_SUFFIX)) ++GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUE_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX)) + + SRCS_IN_OBJDIR = 1 + +--- a/mozilla/xpfe/components/filepicker/src/Makefile.in ++++ b/mozilla/xpfe/components/filepicker/src/Makefile.in +@@ -69,6 +69,7 @@ CPPSRCS = \ + $(NULL) + + EXTRA_COMPONENTS = nsFilePicker.js ++GARBAGE += nsFilePicker.js + + include $(topsrcdir)/config/rules.mk + --- kompozer-0.8~b3.dfsg.1.orig/debian/patches/series +++ kompozer-0.8~b3.dfsg.1/debian/patches/series @@ -0,0 +1,15 @@ +10_arch-detect.patch +11_arm_xpcom_unused_attribute.patch +12_arm_xpcom_optim.patch +13_kbsd.patch +14_distclean.patch +15_system_libs.patch +16_uname.patch +17_locale.patch +18_crmf.patch +20_mips64_build.patch +21_mips_xpcom.patch +22_mips_performance.patch +23_x11-session.patch +99_configure.patch +25_uninitialized_const.patch --- kompozer-0.8~b3.dfsg.1.orig/debian/patches/15_system_libs.patch +++ kompozer-0.8~b3.dfsg.1/debian/patches/15_system_libs.patch @@ -0,0 +1,31 @@ +Make sure we won't be bitten by upstream changing libjpeg, libpng, or zlib internal version, which makes system library not used even +though --with-system-* argument is given to configure +--- a/mozilla/configure.in ++++ b/mozilla/configure.in +@@ -3807,7 +3807,7 @@ else + AC_CHECK_LIB(jpeg, jpeg_destroy_compress, [SYSTEM_JPEG=1 JPEG_LIBS="-ljpeg $JPEG_LIBS"], SYSTEM_JPEG=, $JPEG_LIBS) + fi + +-if test "$SYSTEM_JPEG" = 1; then ++if test "$SYSTEM_JPEG" = 0; then + LIBS="$JPEG_LIBS $LIBS" + AC_TRY_RUN( + #include +@@ -3852,7 +3852,7 @@ else + AC_CHECK_LIB(z, gzread, [SYSTEM_ZLIB=1 ZLIB_LIBS="-lz $ZLIB_LIBS"], + [SYSTEM_ZLIB= ZLIB_CFLAGS= ZLIB_LIBS=], $ZLIB_LIBS) + fi +-if test "$SYSTEM_ZLIB" = 1; then ++if test "$SYSTEM_ZLIB" = 0; then + LIBS="$ZLIB_LIBS $LIBS" + AC_TRY_RUN([ + #include +@@ -3905,7 +3905,7 @@ else + AC_CHECK_LIB(png, png_get_valid, [SYSTEM_PNG=1 PNG_LIBS="-lpng $PNG_LIBS"], + SYSTEM_PNG=, $PNG_LIBS) + fi +-if test "$SYSTEM_PNG" = 1; then ++if test "$SYSTEM_PNG" = 0; then + LIBS="$PNG_LIBS $LIBS" + AC_TRY_RUN( + #include --- kompozer-0.8~b3.dfsg.1.orig/debian/patches/25_uninitialized_const.patch +++ kompozer-0.8~b3.dfsg.1/debian/patches/25_uninitialized_const.patch @@ -0,0 +1,14 @@ +Index: kompozer-0.8~b3.dfsg.1/mozilla/layout/style/nsCSSStyleSheet.cpp +=================================================================== +--- kompozer-0.8~b3.dfsg.1.orig/mozilla/layout/style/nsCSSStyleSheet.cpp 2011-09-20 17:36:00.000000000 -0400 ++++ kompozer-0.8~b3.dfsg.1/mozilla/layout/style/nsCSSStyleSheet.cpp 2011-09-20 17:50:59.000000000 -0400 +@@ -2894,7 +2894,8 @@ + { + NS_PRECONDITION(aAttrSelector, "Must have an attribute selector"); + const nsDefaultStringComparator defaultComparator; +- const nsCaseInsensitiveStringComparator ciComparator; ++ const nsCaseInsensitiveStringComparator ciComparator = ++ nsCaseInsensitiveStringComparator(); + const nsStringComparator& comparator = aAttrSelector->mCaseSensitive + ? NS_STATIC_CAST(const nsStringComparator&, defaultComparator) + : NS_STATIC_CAST(const nsStringComparator&, ciComparator); --- kompozer-0.8~b3.dfsg.1.orig/debian/patches/20_mips64_build.patch +++ kompozer-0.8~b3.dfsg.1/debian/patches/20_mips64_build.patch @@ -0,0 +1,22 @@ +Patch from Martin Michlmayr for mips64 builds. bz#330626 +--- a/mozilla/security/coreconf/Linux.mk ++++ b/mozilla/security/coreconf/Linux.mk +@@ -90,6 +90,9 @@ else + ifeq ($(OS_TEST),parisc64) + CPU_ARCH = hppa + else ++ifeq ($(OS_TEST),mips64) ++ CPU_ARCH = mips ++else + ifeq (,$(filter-out i686 i586 i486 i386,$(OS_TEST))) + OS_REL_CFLAGS += -Di386 + CPU_ARCH = x86 +@@ -101,7 +104,7 @@ endif + endif + endif + endif +- ++endif + + LIBC_TAG = _glibc + --- kompozer-0.8~b3.dfsg.1.orig/debian/patches/22_mips_performance.patch +++ kompozer-0.8~b3.dfsg.1/debian/patches/22_mips_performance.patch @@ -0,0 +1,30 @@ +Patch from Thiemo Seufer to increase stability and performance on mips. +--- a/mozilla/config/rules.mk ++++ b/mozilla/config/rules.mk +@@ -456,15 +456,6 @@ endif + endif + endif + +-ifeq ($(OS_ARCH),Linux) +-ifneq (,$(filter mips mipsel,$(OS_TEST))) +-ifeq ($(MODULE),layout) +-OS_CFLAGS += -Wa,-xgot +-OS_CXXFLAGS += -Wa,-xgot +-endif +-endif +-endif +- + # + # HP-UX specific section: for COMPONENTS only, add -Bsymbolic flag + # which uses internal symbols first +--- a/mozilla/configure.in ++++ b/mozilla/configure.in +@@ -1685,8 +1685,6 @@ case "$target" in + MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS=1 + ;; + mips*) +- CFLAGS="$CFLAGS -Wa,-xgot" +- CXXFLAGS="$CXXFLAGS -Wa,-xgot" + ;; + esac + ;; --- kompozer-0.8~b3.dfsg.1.orig/debian/patches/10_arch-detect.patch +++ kompozer-0.8~b3.dfsg.1/debian/patches/10_arch-detect.patch @@ -0,0 +1,26 @@ +Fix FTBFS in s390, pass host arch information to configure and trust the supplied +architecture information. Thanks to Bastian Blank. +--- a/mozilla/configure.in ++++ b/mozilla/configure.in +@@ -892,6 +892,21 @@ else + OS_RELEASE=`uname -r` + OS_TEST=`uname -m` + fi ++ ++if test -n "$FORCE_USE_HOST_OS"; then ++ OS_TARGET="${host_os}" ++ OS_ARCH=`echo $host_os | sed -e 's|/|_|g'` ++ OS_RELEASE= ++ OS_TEST="${host_cpu}" ++ case "${host_os}" in ++ linux*) OS_ARCH=Linux ;; ++ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; ++ mingw*) OS_ARCH=WINNT ;; ++ wince*) OS_ARCH=WINCE ;; ++ darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;; ++ esac ++fi ++ + _COMPILER_PREFIX= + + HOST_OS_ARCH=`echo $host_os | sed -e 's|/|_|g'` --- kompozer-0.8~b3.dfsg.1.orig/debian/patches/13_kbsd.patch +++ kompozer-0.8~b3.dfsg.1/debian/patches/13_kbsd.patch @@ -0,0 +1,518 @@ +GNU/kFreeBSD support. bz#356011 +--- a/mozilla/directory/c-sdk/config/nsinstall.c ++++ b/mozilla/directory/c-sdk/config/nsinstall.c +@@ -109,7 +109,7 @@ my_getcwd (char *buf, size_t size) + } + #endif /* NEXTSTEP */ + +-#ifdef LINUX ++#if defined(LINUX) || defined(__GLIBC__) || defined(__GNU__) + #include + #endif + +--- a/mozilla/configure.in ++++ b/mozilla/configure.in +@@ -881,6 +881,7 @@ if test -n "$CROSS_COMPILE"; then + OS_TEST="${target_cpu}" + case "${target_os}" in + linux*) OS_ARCH=Linux ;; ++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;; + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; + mingw*) OS_ARCH=WINNT ;; + wince*) OS_ARCH=WINCE ;; +@@ -1398,7 +1399,7 @@ case "$host" in + LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(DIST)/bin/XUL -lobjc' + ;; + +-*-linux*) ++*-linux*|*-kfreebsd*-gnu) + HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" + HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"' + HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" +@@ -2365,7 +2366,7 @@ dnl ==================================== + dnl = Flags to strip unused symbols from .so components + dnl ======================================================== + case "$target" in +- *-linux*) ++ *-linux*|*-kfreebsd*-gnu) + MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script' + ;; + *-solaris*) +@@ -2982,7 +2983,7 @@ then + fi + ;; + +- *-*-linux*) ++ *-*-linux*|*-*-kfreebsd*-gnu) + AC_DEFINE(_REENTRANT) + ;; + +--- a/mozilla/directory/c-sdk/configure ++++ b/mozilla/directory/c-sdk/configure +@@ -2753,6 +2753,7 @@ if test -n "$CROSS_COMPILE"; then + OS_TEST="${target_cpu}" + case "${target_os}" in + linux*) OS_ARCH=Linux ;; ++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;; + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; + mingw*) OS_ARCH=WINNT ;; + darwin*) OS_ARCH=Darwin ;; +@@ -3766,7 +3767,7 @@ EOF + esac + ;; + +-*-linux*) ++*-linux*|*-kfreebsd*-gnu) + if test -z "$USE_NSPR_THREADS"; then + USE_PTHREADS=1 + IMPL_STRATEGY=_PTH +@@ -3795,14 +3796,18 @@ EOF + #define HAVE_FCNTL_FILE_LOCKING 1 + EOF + +- cat >> confdefs.h <<\EOF ++ case "${target_os}" in ++ linux*) ++ cat >> confdefs.h <<\EOF + #define LINUX 1 + EOF + +- cat >> confdefs.h <<\EOF ++ cat >> confdefs.h <<\EOF + #define linux 1 + EOF + ++ ;; ++ esac + LD='$(CC)' + CFLAGS="$CFLAGS -ansi -Wall" + CXXFLAGS="$CXXFLAGS -ansi -Wall" +@@ -5281,7 +5286,7 @@ EOF + _PTHREAD_LDFLAGS= + fi + ;; +- *-linux*) ++ *-linux*|*-kfreebsd*-gnu) + cat >> confdefs.h <<\EOF + #define _REENTRANT 1 + EOF +@@ -5404,7 +5409,7 @@ EOF + fi + fi + ;; +-*-linux*) ++*-linux*|*-kfreebsd*-gnu) + if test -n "$USE_NSPR_THREADS"; then + cat >> confdefs.h <<\EOF + #define _PR_LOCAL_THREADS_ONLY 1 +--- a/mozilla/directory/c-sdk/configure.in ++++ b/mozilla/directory/c-sdk/configure.in +@@ -564,6 +564,7 @@ if test -n "$CROSS_COMPILE"; then + OS_TEST="${target_cpu}" + case "${target_os}" in + linux*) OS_ARCH=Linux ;; ++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;; + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; + mingw*) OS_ARCH=WINNT ;; + darwin*) OS_ARCH=Darwin ;; +@@ -1264,7 +1265,7 @@ tools are selected during the Xcode/Deve + esac + ;; + +-*-linux*) ++*-linux*|*-kfreebsd*-gnu) + if test -z "$USE_NSPR_THREADS"; then + USE_PTHREADS=1 + IMPL_STRATEGY=_PTH +@@ -1275,8 +1276,12 @@ tools are selected during the Xcode/Deve + AC_DEFINE(_SVID_SOURCE) + AC_DEFINE(_LARGEFILE64_SOURCE) + AC_DEFINE(HAVE_FCNTL_FILE_LOCKING) +- AC_DEFINE(LINUX) +- AC_DEFINE(linux) ++ case "${target_os}" in ++ linux*) ++ AC_DEFINE(LINUX) ++ AC_DEFINE(linux) ++ ;; ++ esac + LD='$(CC)' + CFLAGS="$CFLAGS -ansi -Wall" + CXXFLAGS="$CXXFLAGS -ansi -Wall" +@@ -2187,7 +2192,7 @@ if test -n "$USE_PTHREADS"; then + _PTHREAD_LDFLAGS= + fi + ;; +- *-linux*) ++ *-linux*|*-kfreebsd*-gnu) + AC_DEFINE(_REENTRANT) + ;; + esac +@@ -2263,7 +2268,7 @@ case "$target" in + fi + fi + ;; +-*-linux*) ++*-linux*|*-kfreebsd*-gnu) + if test -n "$USE_NSPR_THREADS"; then + AC_DEFINE(_PR_LOCAL_THREADS_ONLY) + fi +--- a/mozilla/directory/c-sdk/ldap/include/portable.h ++++ b/mozilla/directory/c-sdk/ldap/include/portable.h +@@ -131,7 +131,7 @@ + * some systems don't have the BSD re_comp and re_exec routines + */ + #ifndef NEED_BSDREGEX +-#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi) ++#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined(__GNU__) || defined(__GLIBC__) || defined( DARWIN )) && !defined(sgi) + #define NEED_BSDREGEX + #endif + #endif +@@ -160,7 +160,7 @@ + * Is snprintf() part of the standard C runtime library? + */ + #if !defined(HAVE_SNPRINTF) +-#if defined(SOLARIS) || defined(LINUX) || defined(HPUX) ++#if defined(SOLARIS) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(HPUX) + #define HAVE_SNPRINTF + #endif + #endif +@@ -180,7 +180,7 @@ + * for select() + */ + #if !defined(WINSOCK) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2) +-#if defined(hpux) || defined(LINUX) || defined(SUNOS4) || defined(XP_BEOS) ++#if defined(hpux) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(SUNOS4) || defined(XP_BEOS) + #include + #else + #include +@@ -267,15 +267,14 @@ + #define HAVE_GETGRNAM_R + #endif + +-#if defined(SNI) || defined(LINUX1_2) ++#if defined(SNI) || defined(LINUX1_2) || defined(__GNU__) || defined(__GLIBC__) + int strcasecmp(const char *, const char *); + #ifdef SNI + int strncasecmp(const char *, const char *, int); +-#endif /* SNI */ +-#ifdef LINUX1_2 ++#else /* SNI */ + int strncasecmp(const char *, const char *, size_t); +-#endif /* LINUX1_2 */ +-#endif /* SNI || LINUX1_2 */ ++#endif ++#endif /* SNI || LINUX1_2 || __GNU__ || __GLIBC__ */ + + #if defined(_WINDOWS) || defined(macintosh) || defined(XP_OS2) || defined(DARWIN) + #define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname( n ) +@@ -291,7 +290,7 @@ int strncasecmp(const char *, const char + defined(UNIXWARE) || defined(SUNOS4) || defined(SNI) || defined(BSDI) || \ + defined(NCR) || defined(OSF1) || defined(NEC) || defined(VMS) || \ + ( defined(HPUX10) && !defined(_REENTRANT)) || defined(HPUX11) || \ +- defined(UnixWare) || defined(LINUX) || defined(NETBSD) || \ ++ defined(UnixWare) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(NETBSD) || \ + defined(FREEBSD) || defined(OPENBSD) || \ + (defined(AIX) && !defined(USE_REENTRANT_LIBC)) + #define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname( n ) +@@ -315,7 +314,7 @@ typedef char GETHOSTBYNAME_buf_t [BUFSIZ + #define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname_r( n, r, b, l, e ) + #endif + #if defined(HPUX9) || defined(LINUX1_2) || defined(LINUX2_0) || \ +- defined(LINUX2_1) || defined(SUNOS4) || defined(SNI) || \ ++ defined(LINUX2_1) || defined(__GNU__) || defined(__GLIBC__) || defined(SUNOS4) || defined(SNI) || \ + defined(SCOOS) || defined(BSDI) || defined(NCR) || \ + defined(NEC) || ( defined(HPUX10) && !defined(_REENTRANT)) || \ + (defined(AIX) && !defined(USE_REENTRANT_LIBC)) +@@ -335,7 +334,7 @@ typedef char GETHOSTBYNAME_buf_t [BUFSIZ + #endif + #if defined(hpux9) || defined(LINUX1_2) || defined(SUNOS4) || defined(SNI) || \ + defined(SCOOS) || defined(BSDI) || defined(NCR) || defined(VMS) || \ +- defined(NEC) || defined(LINUX) || (defined(AIX) && !defined(USE_REENTRANT_LIBC)) ++ defined(NEC) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || (defined(AIX) && !defined(USE_REENTRANT_LIBC)) + #define STRTOK( s1, s2, l ) strtok( s1, s2 ) + #else + #define HAVE_STRTOK_R +--- a/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client ++++ b/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client +@@ -177,7 +177,7 @@ EXTRA_LIBS = -L$(NSCP_DISTDIR)/$(OBJDIR_ + EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib + endif + +-ifeq ($(OS_ARCH), Linux) ++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH))) + EXTRA_LIBS = -L$(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib -l$(LBER_LIBNAME) + EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib + endif +@@ -253,7 +253,7 @@ endif + ifeq ($(OS_ARCH), AIX) + $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a + else +-ifeq ($(OS_ARCH), Linux) ++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH))) + $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a + else + $(LINK_LIB) $(EXTRA_LIBS) +--- a/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in ++++ b/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in +@@ -184,7 +184,7 @@ ifeq ($(OS_ARCH), IRIX) + EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) $(OS_LIBS) -lc + endif + +-ifeq ($(OS_ARCH), Linux) ++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH))) + EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) + endif + +@@ -302,7 +302,7 @@ $(LIBLDAP): $(OBJS) $(LIBDIR) $(LDAP_EXP + ifdef SO_FILES_TO_REMOVE + -$(RM) $(SO_FILES_TO_REMOVE) + endif +-ifneq (,$(filter AIX Linux HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD, $(OS_ARCH))) ++ifneq (,$(filter AIX Linux GNU GNU_% HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD, $(OS_ARCH))) + $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a + else + ifeq ($(OS_ARCH),OS2) +--- a/mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c ++++ b/mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c +@@ -233,7 +233,7 @@ struct prldap_errormap_entry { + + #if defined(__hpux) || defined(_AIX) || defined(OSF1) || defined(DARWIN) || \ + defined(BEOS) || defined(FREEBSD) || defined(BSDI) || defined(VMS) || \ +- defined(OPENBSD) || defined(NETBSD) ++ defined(OPENBSD) || defined(NETBSD) || defined(__FreeBSD_kernel__) + #define EDEADLOCK -1 + #endif + +--- a/mozilla/security/coreconf/Linux.mk ++++ b/mozilla/security/coreconf/Linux.mk +@@ -52,72 +52,46 @@ RANLIB = ranlib + + DEFAULT_COMPILER = gcc + +-ifeq ($(OS_TEST),m68k) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = m68k ++CPU_ARCH = $(OS_TEST) ++ ++ifeq ($(KERNEL),linux) ++ OS_REL_CFLAGS = -D_XOPEN_SOURCE -DLINUX1_2 ++ ARCH = linux + else ++ OS_REL_CFLAGS = -D_XOPEN_SOURCE ++ ARCH = gnu ++endif ++ + ifeq ($(OS_TEST),ppc64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE + CPU_ARCH = ppc + ifeq ($(USE_64),1) + ARCHFLAG = -m64 + endif + else +-ifeq ($(OS_TEST),ppc) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = ppc +-else + ifeq ($(OS_TEST),alpha) +- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = alpha +-else +-ifeq ($(OS_TEST),ia64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = ia64 ++ OS_REL_CFLAGS += -D_ALPHA_ + else + ifeq ($(OS_TEST),x86_64) +-ifeq ($(USE_64),1) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = x86_64 +-else +- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE ++ifneq ($(USE_64),1) ++ OS_REL_CFLAGS += -Di386 + CPU_ARCH = x86 + ARCHFLAG = -m32 + endif + else +-ifeq ($(OS_TEST),sparc) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = sparc +-else + ifeq ($(OS_TEST),sparc64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE + CPU_ARCH = sparc + else + ifeq (,$(filter-out arm% sa110,$(OS_TEST))) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE + CPU_ARCH = arm + else + ifeq ($(OS_TEST),parisc) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE + CPU_ARCH = hppa + else + ifeq ($(OS_TEST),parisc64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE + CPU_ARCH = hppa + else +-ifeq ($(OS_TEST),s390) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = s390 +-else +-ifeq ($(OS_TEST),s390x) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = s390x +-else +-ifeq ($(OS_TEST),mips) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = mips +-else +- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE ++ifeq (,$(filter-out i686 i586 i486 i386,$(OS_TEST))) ++ OS_REL_CFLAGS += -Di386 + CPU_ARCH = x86 + endif + endif +@@ -127,17 +101,11 @@ endif + endif + endif + endif +-endif +-endif +-endif +-endif +-endif +-endif + + + LIBC_TAG = _glibc + +-ifeq ($(OS_RELEASE),2.0) ++ifeq ($(KERNEL)-$(OS_RELEASE),linux-2.0) + OS_REL_CFLAGS += -DLINUX2_0 + MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) + ifdef MAPFILE +@@ -155,21 +123,22 @@ ifeq ($(USE_PTHREADS),1) + OS_PTHREAD = -lpthread + endif + +-OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -ansi -Wall -pipe -DLINUX -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR ++OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -ansi -Wall -pipe -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR ++ifeq ($(KERNEL),linux) ++OS_CFLAGS += -DLINUX -Dlinux ++endif + OS_LIBS = $(OS_PTHREAD) -ldl -lc + + ifdef USE_PTHREADS + DEFINES += -D_REENTRANT + endif + +-ARCH = linux +- + DSO_CFLAGS = -fPIC + DSO_LDOPTS = -shared $(ARCHFLAG) + DSO_LDFLAGS = + LDFLAGS += $(ARCHFLAG) + +-# INCLUDES += -I/usr/include -Y/usr/include/linux ++# INCLUDES += -I/usr/include + G++INCLUDES = -I/usr/include/g++ + + # +--- a/mozilla/security/coreconf/Linux2.6.mk ++++ b/mozilla/security/coreconf/Linux2.6.mk +@@ -39,7 +39,10 @@ include $(CORE_DEPTH)/coreconf/Linux.mk + + DSO_LDOPTS += -Wl,-z,defs + ++ifeq ($(KERNEL), linux) + OS_REL_CFLAGS += -DLINUX2_1 ++endif ++ + MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) + + ifdef MAPFILE +--- a/mozilla/security/coreconf/arch.mk ++++ b/mozilla/security/coreconf/arch.mk +@@ -155,6 +155,14 @@ ifeq ($(OS_ARCH),Linux) + ifneq ($(words $(OS_RELEASE)),1) + OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE)) + endif ++ KERNEL = linux ++endif ++ ++# This check must be last. Since all uses of OS_ARCH that follow affect only ++# userland, we can merge other Glibc systems with Linux here. ++ifneq (, $(filter GNU GNU_%, $(OS_ARCH))) ++OS_ARCH = Linux ++OS_RELEASE = 2.6 + endif + + # +--- a/mozilla/security/coreconf/config.mk ++++ b/mozilla/security/coreconf/config.mk +@@ -63,7 +63,7 @@ endif + ####################################################################### + + TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \ +- OpenVMS AIX ++ OpenVMS AIX GNU GNU_% + + ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET))) + include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk +--- a/mozilla/security/nss/lib/freebl/unix_rand.c ++++ b/mozilla/security/nss/lib/freebl/unix_rand.c +@@ -185,7 +185,8 @@ static SECStatus RNG_kstat(PRUint32* fed + #endif + + #if defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(FREEBSD) \ +- || defined(NETBSD) || defined(NTO) || defined(DARWIN) || defined(OPENBSD) ++ || defined(NETBSD) || defined(NTO) || defined(DARWIN) || defined(OPENBSD) \ ++ || defined(__FreeBSD_kernel__) || defined(__NetBSD_kernel__) + #include + + #define getdtablesize() sysconf(_SC_OPEN_MAX) +--- a/mozilla/security/nss/lib/ssl/sslmutex.c ++++ b/mozilla/security/nss/lib/ssl/sslmutex.c +@@ -89,7 +89,7 @@ static SECStatus single_process_sslMutex + return SECSuccess; + } + +-#if defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) || defined(OPENBSD) ++#if defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) || defined(OPENBSD) || defined(__GLIBC__) + + #include + #include +--- a/mozilla/security/nss/lib/ssl/sslmutex.h ++++ b/mozilla/security/nss/lib/ssl/sslmutex.h +@@ -79,7 +79,7 @@ typedef struct + + typedef int sslPID; + +-#elif defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) || defined(OPENBSD) ++#elif defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) || defined(BSDI) || defined(NETBSD) || defined(OPENBSD) || defined(__GLIBC__) + + #include + #include "prtypes.h" +--- a/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ++++ b/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in +@@ -77,7 +77,7 @@ endif + # New code for Linux, et. al., with gcc + # Migrate other platforms here after testing + # +-ifneq (,$(filter Linux,$(OS_ARCH))) ++ifneq (,$(filter Linux GNU_%,$(OS_ARCH))) + # Linux/x86-64 + ifeq (x86_64,$(OS_TEST)) + CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp +--- a/mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h ++++ b/mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h +@@ -67,7 +67,7 @@ + * + */ + +-#if defined(LINUX) ++#if defined(LINUX) || (defined(__GLIBC__) && defined(__FreeBSD_kernel__)) + + #if (__GNUC__ == 2) && (__GNUC_MINOR__ <= 7) + /* Old gcc 2.7.x.x. What does gcc 2.8.x do?? */ --- kompozer-0.8~b3.dfsg.1.orig/debian/patches/21_mips_xpcom.patch +++ kompozer-0.8~b3.dfsg.1/debian/patches/21_mips_xpcom.patch @@ -0,0 +1,490 @@ +Patch from Thiemo Seufer to fix mips. bz#258429 +--- a/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ++++ b/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in +@@ -260,11 +260,7 @@ ifeq ($(OS_ARCH),Linux) + ifneq (,$(findstring mips, $(OS_TEST))) + CPPSRCS := xptcinvoke_mips.cpp xptcstubs_mips.cpp + ASFILES := xptcinvoke_asm_mips.s xptcstubs_asm_mips.s +-#xptcstubs_mips.cpp +-# xptcstubs_asm_mips.s +-ifdef GNU_CC +-ASFLAGS += $(INCLUDES) -x assembler-with-cpp -D__GNUC__ +-endif ++AS := $(CC) $(CFLAGS) $(INCLUDES) -c -x assembler-with-cpp + endif + endif + +@@ -433,10 +429,8 @@ INCLUDES += -I$(srcdir)/../.. + + ifeq ($(OS_ARCH),Linux) + ifneq (,$(findstring mips, $(OS_TEST))) +-xptcstubs_asm_mips.o: xptcstubs_asm_mips.s.m4 $(PUBLIC)/xptcstubsdef.inc +- m4 $(INCLUDES) $< > ./xptcstubs_asm_mips.s && \ +- $(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) ./xptcstubs_asm_mips.s +- $(RM) -f ./xptcstubs_asm_mips.s ++xptcstubs_asm_mips.o: xptcstubs_asm_mips.s $(PUBLIC)/xptcstubsdef.inc ++ $(AS) -o $@ $< + endif + endif + +--- a/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s ++++ b/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s +@@ -21,6 +21,7 @@ + * Contributor(s): + * Brendan Eich + * Stuart Parmenter ++ * Thiemo Seufer + */ + + /* This code is for MIPS using the O32 ABI. */ +@@ -28,139 +29,123 @@ + #include + #include + +-.text +-.globl invoke_count_words +-.globl invoke_copy_to_stack +- +-# We need a variable number of words allocated from the stack for copies of +-# the params, and this space must come between the high frame (where ra, gp, +-# and s0 are saved) and the low frame (where a0-a3 are saved by the callee +-# functions we invoke). +- +-LOCALSZ=4 # s0, s1, ra, gp +-NARGSAVE=4 # a0, a1, a2, a3 +-HIFRAMESZ=(LOCALSZ*SZREG) +-LOFRAMESZ=(NARGSAVE*SZREG) +-FRAMESZ=(HIFRAMESZ+LOFRAMESZ+ALSZ)&ALMASK +- +-# XXX these 2*SZREG, etc. are very magic -- we *know* that ALSZ&ALMASK cause +-# FRAMESZ to be 0 mod 8, in this case to be 16 and not 12. +-RAOFF=FRAMESZ - (2*SZREG) +-GPOFF=FRAMESZ - (3*SZREG) +-S0OFF=FRAMESZ - (4*SZREG) +-S1OFF=FRAMESZ - (5*SZREG) +- +-# These are not magic -- they are just our argsave slots in the caller frame. +-A0OFF=FRAMESZ +-A1OFF=FRAMESZ + (1*SZREG) +-A2OFF=FRAMESZ + (2*SZREG) +-A3OFF=FRAMESZ + (3*SZREG) +- +- # +- # _XPTC_InvokeByIndex(that, methodIndex, paramCount, params) +- # a0 a1 a2 a3 +- +-NESTED(_XPTC_InvokeByIndex, FRAMESZ, ra) +- +- .set noreorder +- .cpload t9 +- .set reorder +- ++# NARGSAVE is the argument space in the callers frame, including extra ++# 'shadowed' space for the argument registers. The minimum of 4 ++# argument slots is sometimes predefined in the header files. ++#ifndef NARGSAVE ++#define NARGSAVE 4 ++#endif ++ ++#define LOCALSZ 3 /* gp, fp, ra */ ++#define FRAMESZ ((((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK) ++ ++#define RAOFF (FRAMESZ - (1*SZREG)) ++#define FPOFF (FRAMESZ - (2*SZREG)) ++#define GPOFF (FRAMESZ - (3*SZREG)) ++ ++#define A0OFF (FRAMESZ + (0*SZREG)) ++#define A1OFF (FRAMESZ + (1*SZREG)) ++#define A2OFF (FRAMESZ + (2*SZREG)) ++#define A3OFF (FRAMESZ + (3*SZREG)) ++ ++ .text ++ ++# ++# _XPTC_InvokeByIndex(that, methodIndex, paramCount, params) ++# a0 a1 a2 a3 ++ ++ .globl _XPTC_InvokeByIndex ++ .align 2 ++ .type _XPTC_InvokeByIndex,@function ++ .ent _XPTC_InvokeByIndex,0 ++ .frame fp, FRAMESZ, ra ++_XPTC_InvokeByIndex: ++ SETUP_GP + subu sp, FRAMESZ + +- # specify the save register mask -- XXX do we want the a0-a3 here, given +- # our "split" frame where the args are saved below a dynamicly allocated +- # region under the high frame? +- # +- # 10010000000000010000000011110000 +- .mask 0x900100F0, -((NARGSAVE+LOCALSZ)*SZREG) +- +- # thou shalt not use .cprestore if yer frame has variable size... +- # .cprestore GPOFF +- +- REG_S ra, RAOFF(sp) +- +- # this happens automatically with .cprestore, but we cannot use that op... +- REG_S gp, GPOFF(sp) +- REG_S s0, S0OFF(sp) +- REG_S s1, S1OFF(sp) +- +- REG_S a0, A0OFF(sp) +- REG_S a1, A1OFF(sp) +- REG_S a2, A2OFF(sp) +- REG_S a3, A3OFF(sp) ++ # specify the save register mask for gp, fp, ra, a3 - a0 ++ .mask 0xD00000F0, RAOFF-FRAMESZ + +- # invoke_count_words(paramCount, params) +- move a0, a2 +- move a1, a3 ++ sw ra, RAOFF(sp) ++ sw fp, FPOFF(sp) + +- jal invoke_count_words +- lw gp, GPOFF(sp) ++ # we can't use .cprestore in a variable stack frame ++ sw gp, GPOFF(sp) + +- # save the old sp so we can pop the param area and any "low frame" +- # needed as an argsave area below the param block for callees that +- # we invoke. +- move s0, sp +- +- REG_L a1, A2OFF(sp) # a1 = paramCount +- REG_L a2, A3OFF(sp) # a2 = params +- +- # we define a word as 4 bytes, period end of story! +- sll v0, 2 # 4 bytes * result of invoke_copy_words +- subu v0, LOFRAMESZ # but we take back the argsave area built into +- # our stack frame -- SWEET! +- subu sp, sp, v0 # make room +- move a0, sp # a0 = param stack address +- move s1, a0 # save it for later -- it should be safe here +- +- # the old sp is still saved in s0, but we now need another argsave +- # area ("low frame") for the invoke_copy_to_stack call. +- subu sp, sp, LOFRAMESZ ++ sw a0, A0OFF(sp) ++ sw a1, A1OFF(sp) ++ sw a2, A2OFF(sp) ++ sw a3, A3OFF(sp) ++ ++ # save bottom of fixed frame ++ move fp, sp ++ ++ # extern "C" uint32 ++ # invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s); ++ la t9, invoke_count_words ++ move a0, a2 ++ move a1, a3 ++ jalr t9 ++ lw gp, GPOFF(fp) + +- # copy the param into the stack areas ++ # allocate variable stack, with a size of: ++ # wordsize (of 4 bytes) * result (already aligned to dword) ++ # but a minimum of 16 byte ++ sll v0, 2 ++ slt t0, v0, 16 ++ beqz t0, 1f ++ li v0, 16 ++1: subu sp, v0 ++ ++ # let a0 point to the bottom of the variable stack, allocate ++ # another fixed stack for: ++ # extern "C" void + # invoke_copy_to_stack(PRUint32* d, PRUint32 paramCount, +- # nsXPTCVariant* s) +- jal invoke_copy_to_stack +- lw gp, GPOFF(s0) +- +- move sp, s0 # get orig sp back, popping params and argsave +- +- REG_L a0, A0OFF(sp) # a0 = set "that" to be "this" +- REG_L a1, A1OFF(sp) # a1 = methodIndex +- +- # t1 = methodIndex * 4 +- # (use shift instead of mult) +- sll t1, a1, 2 +- +- # calculate the function we need to jump to, +- # which must then be saved in t9 ++ # nsXPTCVariant* s); ++ la t9, invoke_copy_to_stack ++ move a0, sp ++ lw a1, A2OFF(fp) ++ lw a2, A3OFF(fp) ++ subu sp, 16 ++ jalr t9 ++ lw gp, GPOFF(fp) ++ ++ # back to the variable stack frame ++ addu sp, 16 ++ ++ # calculate the function we need to jump to, which must then be ++ # stored in t9 ++ lw a0, A0OFF(fp) # a0 = set "that" to be "this" ++ lw t0, A1OFF(fp) # a1 = methodIndex + lw t9, 0(a0) +- addu t9, t9, t1 +- lw t9, 8(t9) +- +- # a1..a3 and f13..f14 should now be set to what +- # invoke_copy_to_stack told us. skip a0 and f12 +- # because that is the "this" pointer +- +- REG_L a1, 1*SZREG(s1) +- REG_L a2, 2*SZREG(s1) +- REG_L a3, 3*SZREG(s1) +- +- l.d $f13, 8(s1) +- l.d $f14, 16(s1) +- +- # Create the stack pointer for the function, which must have 4 words +- # of space for callee-saved args. invoke_count_words allocated space +- # for a0 starting at s1, so we just move s1 into sp. +- move sp, s1 ++ # t0 = methodIndex << PTRLOG ++ sll t0, t0, PTRLOG ++ addu t9, t0 ++#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ ++ lw t9, (t9) ++#else /* not G++ V3 ABI */ ++ lw t9, 2*PTRSIZE(t9) ++#endif /* G++ V3 ABI */ ++ ++ # Set a1-a3 to what invoke_copy_to_stack told us. a0 is already ++ # the "this" pointer. We don't have to care about floating ++ # point arguments, the non-FP "this" pointer as first argument ++ # means they'll never be used. ++ lw a1, 1*SZREG(sp) ++ lw a2, 2*SZREG(sp) ++ lw a3, 3*SZREG(sp) ++ ++ jalr t9 ++ # Micro-optimization: There's no gp usage below this point, so ++ # we don't reload. ++ # lw gp, GPOFF(fp) + +- jalr ra, t9 +- lw gp, GPOFF(s0) ++ # leave variable stack frame ++ move sp, fp + +- move sp, s0 ++ lw ra, RAOFF(sp) ++ lw fp, FPOFF(sp) + +- REG_L ra, RAOFF(sp) +- REG_L s0, S0OFF(sp) +- addu sp, FRAMESZ ++ addiu sp, FRAMESZ + j ra +-.end _XPTC_InvokeByIndex ++END(_XPTC_InvokeByIndex) +--- a/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp ++++ b/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp +@@ -24,6 +24,7 @@ + * Contributor(s): + * Stuart Parmenter + * Brendan Eich ++ * Thiemo Seufer + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), +@@ -52,10 +53,8 @@ invoke_count_words(PRUint32 paramCount, + // Count a word for a0 even though it's never stored or loaded + // We do this only for alignment of register pairs. + PRUint32 result = 1; +- for (PRUint32 i = 0; i < paramCount; i++, s++) ++ for (PRUint32 i = 0; i < paramCount; i++, result++, s++) + { +- result++; +- + if (s->IsPtrData()) + continue; + +@@ -68,6 +67,9 @@ invoke_count_words(PRUint32 paramCount, + result++; + result++; + break; ++ ++ default: ++ break; + } + } + return (result + 1) & ~(PRUint32)1; +@@ -88,8 +90,6 @@ invoke_copy_to_stack(PRUint32* d, PRUint + continue; + } + +- *((void**)d) = s->val.p; +- + switch(s->type) + { + case nsXPTType::T_I64 : +@@ -104,6 +104,9 @@ invoke_copy_to_stack(PRUint32* d, PRUint + if ((PRWord)d & 4) d++; + *((double*) d) = s->val.d; d++; + break; ++ default: ++ *((void**)d) = s->val.p; ++ break; + } + } + } +@@ -118,5 +121,4 @@ XPTC_InvokeByIndex(nsISupports* that, PR + PRUint32 paramCount, nsXPTCVariant* params) + { + return _XPTC_InvokeByIndex(that, methodIndex, paramCount, params); +-} +- ++} +--- /dev/null ++++ b/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s +@@ -0,0 +1,142 @@ ++/* -*- Mode: asm; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- ++ * Version: MPL 1.1 ++ * ++ * 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 mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is ++ * Netscape Communications Corp, Inc. ++ * Portions created by the Initial Developer are Copyright (C) 2001 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Stuart Parmenter ++ * Chris Waterson ++ * Thiemo Seufer ++ */ ++ ++/* This code is for MIPS using the O32 ABI. */ ++ ++#include ++#include ++ ++# NARGSAVE is the argument space in the callers frame, including extra ++# 'shadowed' space for the argument registers. The minimum of 4 ++# argument slots is sometimes predefined in the header files. ++#ifndef NARGSAVE ++#define NARGSAVE 4 ++#endif ++ ++#define LOCALSZ 2 /* gp, ra */ ++#define FRAMESZ ((((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK) ++ ++#define RAOFF (FRAMESZ - (1*SZREG)) ++#define GPOFF (FRAMESZ - (2*SZREG)) ++ ++#define A0OFF (FRAMESZ + (0*SZREG)) ++#define A1OFF (FRAMESZ + (1*SZREG)) ++#define A2OFF (FRAMESZ + (2*SZREG)) ++#define A3OFF (FRAMESZ + (3*SZREG)) ++ ++ .text ++ ++#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ ++#define STUB_ENTRY(x) \ ++ .if x < 10; \ ++ .globl _ZN14nsXPTCStubBase5Stub ##x ##Ev; \ ++ .type _ZN14nsXPTCStubBase5Stub ##x ##Ev,@function; \ ++ .aent _ZN14nsXPTCStubBase5Stub ##x ##Ev,0; \ ++_ZN14nsXPTCStubBase5Stub ##x ##Ev:; \ ++ SETUP_GP; \ ++ li t0,x; \ ++ b sharedstub; \ ++ .elseif x < 100; \ ++ .globl _ZN14nsXPTCStubBase6Stub ##x ##Ev; \ ++ .type _ZN14nsXPTCStubBase6Stub ##x ##Ev,@function; \ ++ .aent _ZN14nsXPTCStubBase6Stub ##x ##Ev,0; \ ++_ZN14nsXPTCStubBase6Stub ##x ##Ev:; \ ++ SETUP_GP; \ ++ li t0,x; \ ++ b sharedstub; \ ++ .elseif x < 1000; \ ++ .globl _ZN14nsXPTCStubBase7Stub ##x ##Ev; \ ++ .type _ZN14nsXPTCStubBase7Stub ##x ##Ev,@function; \ ++ .aent _ZN14nsXPTCStubBase7Stub ##x ##Ev,0; \ ++_ZN14nsXPTCStubBase7Stub ##x ##Ev:; \ ++ SETUP_GP; \ ++ li t0,x; \ ++ b sharedstub; \ ++ .else; \ ++ .err; \ ++ .endif ++#else /* not G++ V3 ABI */ ++#define STUB_ENTRY(x) \ ++ .globl Stub ##x ##__14nsXPTCStubBase; \ ++ .type Stub ##x ##__14nsXPTCStubBase,@function; \ ++ .aent Stub ##x ##__14nsXPTCStubBase,0; \ ++Stub ##x ##__14nsXPTCStubBase:; \ ++ SETUP_GP; \ ++ li t0,x; \ ++ b sharedstub ++#endif /* G++ V3 ABI */ ++ ++# SENTINEL_ENTRY is handled in the cpp file. ++#define SENTINEL_ENTRY(x) ++ ++# ++# open a dummy frame for the function entries ++# ++ .align 2 ++ .type dummy,@function ++ .ent dummy, 0 ++ .frame sp, FRAMESZ, ra ++dummy: ++ SETUP_GP ++ ++#include "xptcstubsdef.inc" ++ ++sharedstub: ++ subu sp, FRAMESZ ++ ++ # specify the save register mask for gp, ra, a0-a3 ++ .mask 0x900000F0, RAOFF-FRAMESZ ++ ++ sw ra, RAOFF(sp) ++ SAVE_GP(GPOFF) ++ ++ # Micro-optimization: a0 is already loaded, and its slot gets ++ # ignored by PrepareAndDispatch, so no need to save it here. ++ # sw a0, A0OFF(sp) ++ sw a1, A1OFF(sp) ++ sw a2, A2OFF(sp) ++ sw a3, A3OFF(sp) ++ ++ la t9, PrepareAndDispatch ++ ++ # t0 is methodIndex ++ move a1, t0 ++ # have a2 point to the begin of the argument space on stack ++ addiu a2, sp, FRAMESZ ++ ++ # PrepareAndDispatch(that, methodIndex, args) ++ jalr t9 ++ ++ # Micro-optimization: Using jalr explicitly has the side-effect ++ # of not triggering .cprestore. This is ok because we have no ++ # gp reference below this point. It also allows better ++ # instruction sscheduling. ++ # lw gp, GPOFF(fp) ++ ++ lw ra, RAOFF(sp) ++ addiu sp, FRAMESZ ++ j ra ++ END(dummy) --- kompozer-0.8~b3.dfsg.1.orig/debian/patches/99_configure.patch +++ kompozer-0.8~b3.dfsg.1/debian/patches/99_configure.patch @@ -0,0 +1,4279 @@ +update configure with autoconf2.13 +Index: kompozer-0.8~b3.dfsg.1/mozilla/configure +=================================================================== +--- kompozer-0.8~b3.dfsg.1.orig/mozilla/configure 2011-09-20 18:20:18.000000000 -0400 ++++ kompozer-0.8~b3.dfsg.1/mozilla/configure 2011-09-20 18:33:53.000000000 -0400 +@@ -5035,18 +5035,42 @@ + OS_RELEASE= + OS_TEST="${target_cpu}" + case "${target_os}" in +- linux*) OS_ARCH=Linux ;; ++ linux*) OS_ARCH=Linux OS_TARGET=Linux;; ++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;; + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; + mingw*) OS_ARCH=WINNT ;; + wince*) OS_ARCH=WINCE ;; + darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;; + esac + else +- OS_TARGET=`uname -s` +- OS_ARCH=`uname -s | sed -e 's|/|_|g'` ++ OS_TARGET="${host_os}" ++ OS_ARCH=`echo $host_os | sed -e 's|/|_|g'` + OS_RELEASE=`uname -r` +- OS_TEST=`uname -m` ++ OS_TEST="${host_cpu}" ++ case "${host_os}" in ++ linux*) OS_ARCH=Linux OS_TARGET=Linux;; ++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;; ++ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; ++ mingw*) OS_ARCH=WINNT ;; ++ wince*) OS_ARCH=WINCE ;; ++ darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;; ++ esac + fi ++ ++if test -n "$FORCE_USE_HOST_OS"; then ++ OS_TARGET="${host_os}" ++ OS_ARCH=`echo $host_os | sed -e 's|/|_|g'` ++ OS_RELEASE= ++ OS_TEST="${host_cpu}" ++ case "${host_os}" in ++ linux*) OS_ARCH=Linux ;; ++ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; ++ mingw*) OS_ARCH=WINNT ;; ++ wince*) OS_ARCH=WINCE ;; ++ darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;; ++ esac ++fi ++ + _COMPILER_PREFIX= + + HOST_OS_ARCH=`echo $host_os | sed -e 's|/|_|g'` +@@ -5383,7 +5407,7 @@ + if test "$COMPILE_ENVIRONMENT"; then + if test "$GNU_CC"; then + echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6 +-echo "configure:5387: checking whether ld has archive extraction flags" >&5 ++echo "configure:5411: checking whether ld has archive extraction flags" >&5 + if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5400,14 +5424,14 @@ + LDFLAGS=$force + LIBS=$unforce + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_mkshlib_force_and_unforce=$line; break + else +@@ -5440,7 +5464,7 @@ + ' + + echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6 +-echo "configure:5444: checking that static assertion macros used in autoconf tests work" >&5 ++echo "configure:5468: checking that static assertion macros used in autoconf tests work" >&5 + if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5454,14 +5478,14 @@ + + ac_cv_static_assertion_macros_work="yes" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -5471,14 +5495,14 @@ + fi + rm -f conftest* + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_static_assertion_macros_work="no" + else +@@ -5494,14 +5518,14 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -5511,14 +5535,14 @@ + fi + rm -f conftest* + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_static_assertion_macros_work="no" + else +@@ -5553,16 +5577,16 @@ + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 +-echo "configure:5557: checking for 64-bit OS" >&5 ++echo "configure:5581: checking for 64-bit OS" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result="yes" + else +@@ -5641,7 +5665,7 @@ + LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(DIST)/bin/XUL -lobjc' + ;; + +-*-linux*) ++*-linux*|*-kfreebsd*-gnu) + HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" + HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"' + HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" +@@ -5722,9 +5746,9 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for VisualAge C++ compiler version >= 5.0.2.0""... $ac_c" 1>&6 +-echo "configure:5726: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 ++echo "configure:5750: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _BAD_COMPILER= + else +@@ -5771,17 +5795,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:5775: checking for $ac_hdr" >&5 ++echo "configure:5799: 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 < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:5785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:5809: \"$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* +@@ -5823,7 +5847,7 @@ + LIBS="$LIBS -lbe" + if test "$COMPILE_ENVIRONMENT"; then + echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6 +-echo "configure:5827: checking for main in -lbind" >&5 ++echo "configure:5851: checking for main in -lbind" >&5 + ac_lib_var=`echo bind'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -5831,14 +5855,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lbind $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -5859,7 +5883,7 @@ + fi + + echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6 +-echo "configure:5863: checking for main in -lzeta" >&5 ++echo "configure:5887: checking for main in -lzeta" >&5 + ac_lib_var=`echo zeta'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -5867,14 +5891,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lzeta $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -5942,18 +5966,18 @@ + MACOSX=1 + + echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6 +-echo "configure:5946: checking for -dead_strip option to ld" >&5 ++echo "configure:5970: checking for -dead_strip option to ld" >&5 + _SAVE_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-dead_strip" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + _HAVE_DEAD_STRIP=1 + else +@@ -6092,8 +6116,6 @@ + MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS=1 + ;; + mips*) +- CFLAGS="$CFLAGS -Wa,-xgot" +- CXXFLAGS="$CXXFLAGS -Wa,-xgot" + ;; + esac + ;; +@@ -6821,14 +6843,14 @@ + _SAVE_LDFLAGS=$LDFLAGS + LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:6832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + : + else + echo "configure: failed program was:" >&5 +@@ -6856,7 +6878,7 @@ + CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'` + CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'` + echo $ac_n "checking for Forte compiler version >= WS6U2""... $ac_c" 1>&6 +-echo "configure:6860: checking for Forte compiler version >= WS6U2" >&5 ++echo "configure:6882: checking for Forte compiler version >= WS6U2" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -6866,7 +6888,7 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _BAD_COMPILER= + else +@@ -6985,7 +7007,7 @@ + esac + + case "$target" in +- *-linux*) ++ *-linux*|*-kfreebsd*-gnu) + MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script' + ;; + *-solaris*) +@@ -7025,12 +7047,12 @@ + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:7029: checking for ANSI C header files" >&5 ++echo "configure:7051: checking for ANSI C header files" >&5 + if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7038,7 +7060,7 @@ + #include + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:7042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:7064: \"$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* +@@ -7055,7 +7077,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat > conftest.$ac_ext < + EOF +@@ -7073,7 +7095,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat > conftest.$ac_ext < + EOF +@@ -7094,7 +7116,7 @@ + : + else + cat > conftest.$ac_ext < + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +@@ -7105,7 +7127,7 @@ + exit (0); } + + EOF +-if { (eval echo configure:7109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:7131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -7129,12 +7151,12 @@ + fi + + echo $ac_n "checking for working const""... $ac_c" 1>&6 +-echo "configure:7133: checking for working const" >&5 ++echo "configure:7155: checking for working const" >&5 + if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_const=yes + else +@@ -7204,12 +7226,12 @@ + fi + + echo $ac_n "checking for mode_t""... $ac_c" 1>&6 +-echo "configure:7208: checking for mode_t" >&5 ++echo "configure:7230: checking for mode_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -7237,12 +7259,12 @@ + fi + + echo $ac_n "checking for off_t""... $ac_c" 1>&6 +-echo "configure:7241: checking for off_t" >&5 ++echo "configure:7263: checking for off_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -7270,12 +7292,12 @@ + fi + + echo $ac_n "checking for pid_t""... $ac_c" 1>&6 +-echo "configure:7274: checking for pid_t" >&5 ++echo "configure:7296: checking for pid_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -7303,12 +7325,12 @@ + fi + + echo $ac_n "checking for size_t""... $ac_c" 1>&6 +-echo "configure:7307: checking for size_t" >&5 ++echo "configure:7329: checking for size_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -7336,12 +7358,12 @@ + fi + + echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 +-echo "configure:7340: checking for st_blksize in struct stat" >&5 ++echo "configure:7362: checking for st_blksize in struct stat" >&5 + if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7349,7 +7371,7 @@ + struct stat s; s.st_blksize; + ; return 0; } + EOF +-if { (eval echo configure:7353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_struct_st_blksize=yes + else +@@ -7370,12 +7392,12 @@ + fi + + echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 +-echo "configure:7374: checking for siginfo_t" >&5 ++echo "configure:7396: checking for siginfo_t" >&5 + if eval "test \"`echo '$''{'ac_cv_siginfo_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -7383,7 +7405,7 @@ + siginfo_t* info; + ; return 0; } + EOF +-if { (eval echo configure:7387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_siginfo_t=true + else +@@ -7417,12 +7439,12 @@ + fi + + echo $ac_n "checking for int16_t""... $ac_c" 1>&6 +-echo "configure:7421: checking for int16_t" >&5 ++echo "configure:7443: checking for int16_t" >&5 + if eval "test \"`echo '$''{'ac_cv_int16_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7430,7 +7452,7 @@ + int16_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int16_t=true + else +@@ -7452,12 +7474,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for int32_t""... $ac_c" 1>&6 +-echo "configure:7456: checking for int32_t" >&5 ++echo "configure:7478: checking for int32_t" >&5 + if eval "test \"`echo '$''{'ac_cv_int32_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7465,7 +7487,7 @@ + int32_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int32_t=true + else +@@ -7487,12 +7509,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for int64_t""... $ac_c" 1>&6 +-echo "configure:7491: checking for int64_t" >&5 ++echo "configure:7513: checking for int64_t" >&5 + if eval "test \"`echo '$''{'ac_cv_int64_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7500,7 +7522,7 @@ + int64_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int64_t=true + else +@@ -7522,12 +7544,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for int64""... $ac_c" 1>&6 +-echo "configure:7526: checking for int64" >&5 ++echo "configure:7548: checking for int64" >&5 + if eval "test \"`echo '$''{'ac_cv_int64'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7535,7 +7557,7 @@ + int64 foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int64=true + else +@@ -7557,12 +7579,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for uint""... $ac_c" 1>&6 +-echo "configure:7561: checking for uint" >&5 ++echo "configure:7583: checking for uint" >&5 + if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7570,7 +7592,7 @@ + uint foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint=true + else +@@ -7592,12 +7614,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for uint_t""... $ac_c" 1>&6 +-echo "configure:7596: checking for uint_t" >&5 ++echo "configure:7618: checking for uint_t" >&5 + if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7605,7 +7627,7 @@ + uint_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint_t=true + else +@@ -7627,12 +7649,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 +-echo "configure:7631: checking for uint16_t" >&5 ++echo "configure:7653: checking for uint16_t" >&5 + if eval "test \"`echo '$''{'ac_cv_uint16_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7640,7 +7662,7 @@ + uint16_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint16_t=true + else +@@ -7671,12 +7693,12 @@ + + + echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 +-echo "configure:7675: checking for uname.domainname" >&5 ++echo "configure:7697: checking for uname.domainname" >&5 + if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { +@@ -7684,7 +7706,7 @@ + (void)uname(res); if (res != 0) { domain = res->domainname; } + ; return 0; } + EOF +-if { (eval echo configure:7688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_uname_domainname_field=true + else +@@ -7708,12 +7730,12 @@ + fi + + echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 +-echo "configure:7712: checking for uname.__domainname" >&5 ++echo "configure:7734: checking for uname.__domainname" >&5 + if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { +@@ -7721,7 +7743,7 @@ + (void)uname(res); if (res != 0) { domain = res->__domainname; } + ; return 0; } + EOF +-if { (eval echo configure:7725: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_uname_us_domainname_field=true + else +@@ -7754,12 +7776,12 @@ + + + echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6 +-echo "configure:7758: checking for usable wchar_t (2 bytes, unsigned)" >&5 ++echo "configure:7780: checking for usable wchar_t (2 bytes, unsigned)" >&5 + if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_v2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + $configure_static_assert_macros +@@ -7768,7 +7790,7 @@ + CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) + ; return 0; } + EOF +-if { (eval echo configure:7772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_usable_wchar_v2="yes" + else +@@ -7801,12 +7823,12 @@ + CXXFLAGS="$CXXFLAGS -fshort-wchar" + + echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6 +-echo "configure:7805: checking for compiler -fshort-wchar option" >&5 ++echo "configure:7827: checking for compiler -fshort-wchar option" >&5 + if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option_v2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + $configure_static_assert_macros +@@ -7815,7 +7837,7 @@ + CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) + ; return 0; } + EOF +-if { (eval echo configure:7819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_usable_wchar_option_v2="yes" + else +@@ -7849,7 +7871,7 @@ + + if test "$GNU_CC"; then + echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 +-echo "configure:7853: checking for visibility(hidden) attribute" >&5 ++echo "configure:7875: checking for visibility(hidden) attribute" >&5 + if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -7874,7 +7896,7 @@ + + + echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6 +-echo "configure:7878: checking for visibility(default) attribute" >&5 ++echo "configure:7900: checking for visibility(default) attribute" >&5 + if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -7899,7 +7921,7 @@ + + + echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 +-echo "configure:7903: checking for visibility pragma support" >&5 ++echo "configure:7925: checking for visibility pragma support" >&5 + if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -7924,7 +7946,7 @@ + echo "$ac_t""$ac_cv_visibility_pragma" 1>&6 + if test "$ac_cv_visibility_pragma" = "yes"; then + echo $ac_n "checking For gcc visibility bug with class-level attributes (GCC bug 26905)""... $ac_c" 1>&6 +-echo "configure:7928: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 ++echo "configure:7950: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 + if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -7952,7 +7974,7 @@ + echo "$ac_t""$ac_cv_have_visibility_class_bug" 1>&6 + + echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6 +-echo "configure:7956: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 ++echo "configure:7978: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 + if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -8000,12 +8022,12 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 +-echo "configure:8004: checking for $ac_hdr that defines DIR" >&5 ++echo "configure:8026: checking for $ac_hdr that defines DIR" >&5 + if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include <$ac_hdr> +@@ -8013,7 +8035,7 @@ + DIR *dirp = 0; + ; return 0; } + EOF +-if { (eval echo configure:8017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_dirent_$ac_safe=yes" + else +@@ -8038,7 +8060,7 @@ + # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. + if test $ac_header_dirent = dirent.h; then + echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 +-echo "configure:8042: checking for opendir in -ldir" >&5 ++echo "configure:8064: checking for opendir in -ldir" >&5 + ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8046,7 +8068,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldir $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8079,7 +8101,7 @@ + + else + echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 +-echo "configure:8083: checking for opendir in -lx" >&5 ++echo "configure:8105: checking for opendir in -lx" >&5 + ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8087,7 +8109,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lx $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8130,17 +8152,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8134: checking for $ac_hdr" >&5 ++echo "configure:8156: 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 < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8166: \"$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* +@@ -8170,17 +8192,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8174: checking for $ac_hdr" >&5 ++echo "configure:8196: 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 < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8206: \"$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* +@@ -8210,17 +8232,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8214: checking for $ac_hdr" >&5 ++echo "configure:8236: 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 < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8246: \"$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* +@@ -8250,17 +8272,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8254: checking for $ac_hdr" >&5 ++echo "configure:8276: 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 < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8286: \"$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* +@@ -8290,17 +8312,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8294: checking for $ac_hdr" >&5 ++echo "configure:8316: 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 < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8326: \"$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* +@@ -8331,17 +8353,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8335: checking for $ac_hdr" >&5 ++echo "configure:8357: 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 < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8367: \"$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* +@@ -8372,17 +8394,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8376: checking for $ac_hdr" >&5 ++echo "configure:8398: 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 < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8408: \"$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* +@@ -8419,17 +8441,17 @@ + NEW_H=new.h + ac_safe=`echo "new" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for new""... $ac_c" 1>&6 +-echo "configure:8423: checking for new" >&5 ++echo "configure:8445: checking for new" >&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 < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8455: \"$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* +@@ -8470,17 +8492,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8474: checking for $ac_hdr" >&5 ++echo "configure:8496: 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 < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8484: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8506: \"$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* +@@ -8514,7 +8536,7 @@ + ;; + *) + echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 +-echo "configure:8518: checking for gethostbyname_r in -lc_r" >&5 ++echo "configure:8540: checking for gethostbyname_r in -lc_r" >&5 + ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8522,7 +8544,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lc_r $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8563,7 +8585,7 @@ + ;; + esac + echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 +-echo "configure:8567: checking for atan in -lm" >&5 ++echo "configure:8589: checking for atan in -lm" >&5 + ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8571,7 +8593,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lm $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8616,7 +8638,7 @@ + ;; + *) + echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +-echo "configure:8620: checking for dlopen in -ldl" >&5 ++echo "configure:8642: 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 +@@ -8624,7 +8646,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldl $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8652,17 +8674,17 @@ + echo "$ac_t""yes" 1>&6 + ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 +-echo "configure:8656: checking for dlfcn.h" >&5 ++echo "configure:8678: checking for dlfcn.h" >&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 < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8688: \"$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* +@@ -8698,7 +8720,7 @@ + case $target in + *-aix*) + echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 +-echo "configure:8702: checking for demangle in -lC_r" >&5 ++echo "configure:8724: checking for demangle in -lC_r" >&5 + ac_lib_var=`echo C_r'_'demangle | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8706,7 +8728,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lC_r $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8747,7 +8769,7 @@ + ;; + *) + echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 +-echo "configure:8751: checking for demangle in -lC" >&5 ++echo "configure:8773: checking for demangle in -lC" >&5 + ac_lib_var=`echo C'_'demangle | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8755,7 +8777,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lC $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8797,7 +8819,7 @@ + esac + fi + echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 +-echo "configure:8801: checking for socket in -lsocket" >&5 ++echo "configure:8823: checking for socket in -lsocket" >&5 + ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8805,7 +8827,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsocket $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8861,7 +8883,7 @@ + _SAVE_LDFLAGS="$LDFLAGS" + LDFLAGS="$XLDFLAGS $LDFLAGS" + echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 +-echo "configure:8865: checking for XDrawLines in -lX11" >&5 ++echo "configure:8887: checking for XDrawLines in -lX11" >&5 + ac_lib_var=`echo X11'_'XDrawLines | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8869,7 +8891,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lX11 $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8902,7 +8924,7 @@ + fi + + echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 +-echo "configure:8906: checking for XextAddDisplay in -lXext" >&5 ++echo "configure:8928: checking for XextAddDisplay in -lXext" >&5 + ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8910,7 +8932,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXext $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8945,7 +8967,7 @@ + + + echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 +-echo "configure:8949: checking for XtFree in -lXt" >&5 ++echo "configure:8971: checking for XtFree in -lXt" >&5 + ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8953,7 +8975,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXt $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8985,7 +9007,7 @@ + + unset ac_cv_lib_Xt_XtFree + echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 +-echo "configure:8989: checking for IceFlush in -lICE" >&5 ++echo "configure:9011: checking for IceFlush in -lICE" >&5 + ac_lib_var=`echo ICE'_'IceFlush | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8993,7 +9015,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lICE $XT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9025,7 +9047,7 @@ + fi + + echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 +-echo "configure:9029: checking for SmcCloseConnection in -lSM" >&5 ++echo "configure:9051: checking for SmcCloseConnection in -lSM" >&5 + ac_lib_var=`echo SM'_'SmcCloseConnection | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9033,7 +9055,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lSM $XT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9065,7 +9087,7 @@ + fi + + echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 +-echo "configure:9069: checking for XtFree in -lXt" >&5 ++echo "configure:9091: checking for XtFree in -lXt" >&5 + ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9073,7 +9095,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9118,7 +9140,7 @@ + esac + + echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6 +-echo "configure:9122: checking for XineramaIsActive in -lXinerama" >&5 ++echo "configure:9144: checking for XineramaIsActive in -lXinerama" >&5 + ac_lib_var=`echo Xinerama'_'XineramaIsActive | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9126,7 +9148,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXinerama $XLIBS $XEXT_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9159,17 +9181,17 @@ + + ac_safe=`echo "X11/extensions/Xinerama.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for X11/extensions/Xinerama.h""... $ac_c" 1>&6 +-echo "configure:9163: checking for X11/extensions/Xinerama.h" >&5 ++echo "configure:9185: checking for X11/extensions/Xinerama.h" >&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 < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:9173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9195: \"$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* +@@ -9192,7 +9214,7 @@ + + + echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 +-echo "configure:9196: checking for XShmCreateImage in -lXext" >&5 ++echo "configure:9218: checking for XShmCreateImage in -lXext" >&5 + ac_lib_var=`echo Xext'_'XShmCreateImage | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9200,7 +9222,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9233,17 +9255,17 @@ + + ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6 +-echo "configure:9237: checking for X11/extensions/XShm.h" >&5 ++echo "configure:9259: checking for X11/extensions/XShm.h" >&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 < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:9247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9269: \"$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* +@@ -9273,7 +9295,7 @@ + fi + + echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 +-echo "configure:9277: checking for XieFloGeometry in -lXIE" >&5 ++echo "configure:9299: checking for XieFloGeometry in -lXIE" >&5 + ac_lib_var=`echo XIE'_'XieFloGeometry | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9281,7 +9303,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9314,17 +9336,17 @@ + + ac_safe=`echo "X11/extensions/XIElib.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for X11/extensions/XIElib.h""... $ac_c" 1>&6 +-echo "configure:9318: checking for X11/extensions/XIElib.h" >&5 ++echo "configure:9340: checking for X11/extensions/XIElib.h" >&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 < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:9328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9350: \"$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* +@@ -9398,7 +9420,7 @@ + # Extract the first word of "freetype-config", so it can be a program name with args. + set dummy freetype-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:9402: checking for $ac_word" >&5 ++echo "configure:9424: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_FT2_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -9434,7 +9456,7 @@ + + min_ft_version=6.1.0 + echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6 +-echo "configure:9438: checking for FreeType - version >= $min_ft_version" >&5 ++echo "configure:9460: checking for FreeType - version >= $min_ft_version" >&5 + no_ft="" + if test "$FT2_CONFIG" = "no" ; then + no_ft=yes +@@ -9482,7 +9504,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -9508,7 +9530,7 @@ + } + + EOF +-if { (eval echo configure:9512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -9560,7 +9582,7 @@ + + + echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 +-echo "configure:9564: checking for pthread_create in -lpthreads" >&5 ++echo "configure:9586: checking for pthread_create in -lpthreads" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } +@@ -9582,7 +9604,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 +-echo "configure:9586: checking for pthread_create in -lpthread" >&5 ++echo "configure:9608: checking for pthread_create in -lpthread" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } +@@ -9604,7 +9626,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 +-echo "configure:9608: checking for pthread_create in -lc_r" >&5 ++echo "configure:9630: checking for pthread_create in -lc_r" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } +@@ -9626,7 +9648,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 +-echo "configure:9630: checking for pthread_create in -lc" >&5 ++echo "configure:9652: checking for pthread_create in -lc" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } +@@ -9682,7 +9704,7 @@ + rm -f conftest* + ac_cv_have_dash_pthread=no + echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 +-echo "configure:9686: checking whether ${CC-cc} accepts -pthread" >&5 ++echo "configure:9708: checking whether ${CC-cc} accepts -pthread" >&5 + echo 'int main() { return 0; }' | cat > conftest.c + ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 + if test $? -eq 0; then +@@ -9705,7 +9727,7 @@ + ac_cv_have_dash_pthreads=no + if test "$ac_cv_have_dash_pthread" = "no"; then + echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 +-echo "configure:9709: checking whether ${CC-cc} accepts -pthreads" >&5 ++echo "configure:9731: checking whether ${CC-cc} accepts -pthreads" >&5 + echo 'int main() { return 0; }' | cat > conftest.c + ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 + if test $? -eq 0; then +@@ -9751,7 +9773,7 @@ + fi + ;; + +- *-*-linux*) ++ *-*-linux*|*-*-kfreebsd*-gnu) + cat >> confdefs.h <<\EOF + #define _REENTRANT 1 + EOF +@@ -9800,7 +9822,7 @@ + fi + + echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 +-echo "configure:9804: checking whether mmap() sees write()s" >&5 ++echo "configure:9826: checking whether mmap() sees write()s" >&5 + + + mmap_test_prog=' +@@ -9839,11 +9861,11 @@ + result="yes" + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + result="yes" + else +@@ -9868,13 +9890,13 @@ + + if test $ac_cv_prog_gcc = yes; then + echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 +-echo "configure:9872: checking whether ${CC-cc} needs -traditional" >&5 ++echo "configure:9894: checking whether ${CC-cc} needs -traditional" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_pattern="Autoconf.*'x'" + cat > conftest.$ac_ext < + Autoconf TIOCGETP +@@ -9892,7 +9914,7 @@ + + if test $ac_cv_prog_gcc_traditional = no; then + cat > conftest.$ac_ext < + Autoconf TCGETA +@@ -9914,7 +9936,7 @@ + fi + + echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 +-echo "configure:9918: checking for 8-bit clean memcmp" >&5 ++echo "configure:9940: checking for 8-bit clean memcmp" >&5 + if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -9922,7 +9944,7 @@ + ac_cv_func_memcmp_clean=no + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_func_memcmp_clean=yes + else +@@ -9952,12 +9974,12 @@ + for ac_func in random strerror lchown fchmod snprintf statvfs memmove rint stat64 lstat64 + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:9956: checking for $ac_func" >&5 ++echo "configure:9978: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -10007,12 +10029,12 @@ + for ac_func in flockfile getpagesize + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:10011: checking for $ac_func" >&5 ++echo "configure:10033: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -10064,12 +10086,12 @@ + for ac_func in localtime_r strtok_r + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:10068: checking for $ac_func" >&5 ++echo "configure:10090: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -10128,19 +10150,19 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 +-echo "configure:10132: checking for wcrtomb" >&5 ++echo "configure:10154: checking for wcrtomb" >&5 + if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + mbstate_t ps={0};wcrtomb(0,'f',&ps); + ; return 0; } + EOF +-if { (eval echo configure:10144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_have_wcrtomb="yes" + else +@@ -10160,19 +10182,19 @@ + + fi + echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 +-echo "configure:10164: checking for mbrtowc" >&5 ++echo "configure:10186: checking for mbrtowc" >&5 + if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + mbstate_t ps={0};mbrtowc(0,0,0,&ps); + ; return 0; } + EOF +-if { (eval echo configure:10176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_have_mbrtowc="yes" + else +@@ -10201,12 +10223,12 @@ + fi + + echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 +-echo "configure:10205: checking for res_ninit()" >&5 ++echo "configure:10227: checking for res_ninit()" >&5 + if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_res_ninit=yes + else +@@ -10248,12 +10270,12 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 +-echo "configure:10252: checking for gnu_get_libc_version()" >&5 ++echo "configure:10274: checking for gnu_get_libc_version()" >&5 + if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_gnu_get_libc_version=yes + else +@@ -10293,7 +10315,7 @@ + *) + + echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 +-echo "configure:10297: checking for iconv in -lc" >&5 ++echo "configure:10319: checking for iconv in -lc" >&5 + ac_lib_var=`echo c'_'iconv | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10301,7 +10323,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lc $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -10334,7 +10356,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 +-echo "configure:10338: checking for iconv in -liconv" >&5 ++echo "configure:10360: checking for iconv in -liconv" >&5 + ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10342,7 +10364,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-liconv $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -10375,7 +10397,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 +-echo "configure:10379: checking for libiconv in -liconv" >&5 ++echo "configure:10401: checking for libiconv in -liconv" >&5 + ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10383,7 +10405,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-liconv $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -10424,12 +10446,12 @@ + _SAVE_LIBS=$LIBS + LIBS="$LIBS $_ICONV_LIBS" + echo $ac_n "checking for iconv()""... $ac_c" 1>&6 +-echo "configure:10428: checking for iconv()" >&5 ++echo "configure:10450: checking for iconv()" >&5 + if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -10443,7 +10465,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:10447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_iconv=yes + else +@@ -10467,12 +10489,12 @@ + LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS" + LIBICONV="$_ICONV_LIBS" + echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6 +-echo "configure:10471: checking for iconv() with const input" >&5 ++echo "configure:10493: checking for iconv() with const input" >&5 + if eval "test \"`echo '$''{'ac_cv_func_const_iconv'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -10487,7 +10509,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:10491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_func_const_iconv=yes + else +@@ -10516,19 +10538,19 @@ + + + echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 +-echo "configure:10520: checking for nl_langinfo and CODESET" >&5 ++echo "configure:10542: checking for nl_langinfo and CODESET" >&5 + if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + char* cs = nl_langinfo(CODESET); + ; return 0; } + EOF +-if { (eval echo configure:10532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + am_cv_langinfo_codeset=yes + else +@@ -10560,7 +10582,7 @@ + + + echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 +-echo "configure:10564: checking for an implementation of va_copy()" >&5 ++echo "configure:10586: checking for an implementation of va_copy()" >&5 + if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -10570,7 +10592,7 @@ + + else + cat > conftest.$ac_ext < +@@ -10584,7 +10606,7 @@ + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:10588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_va_copy=yes + else +@@ -10601,7 +10623,7 @@ + + echo "$ac_t""$ac_cv_va_copy" 1>&6 + echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6 +-echo "configure:10605: checking for an implementation of __va_copy()" >&5 ++echo "configure:10627: checking for an implementation of __va_copy()" >&5 + if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -10611,7 +10633,7 @@ + + else + cat > conftest.$ac_ext < +@@ -10625,7 +10647,7 @@ + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:10629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv___va_copy=yes + else +@@ -10642,7 +10664,7 @@ + + echo "$ac_t""$ac_cv___va_copy" 1>&6 + echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6 +-echo "configure:10646: checking whether va_lists can be copied by value" >&5 ++echo "configure:10668: checking whether va_lists can be copied by value" >&5 + if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -10652,7 +10674,7 @@ + + else + cat > conftest.$ac_ext < +@@ -10666,7 +10688,7 @@ + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:10670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_va_val_copy=yes + else +@@ -10765,7 +10787,7 @@ + if test "$GNU_CXX"; then + + echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 +-echo "configure:10769: checking for C++ exceptions flag" >&5 ++echo "configure:10791: checking for C++ exceptions flag" >&5 + + if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10800,12 +10822,12 @@ + HAVE_GCC3_ABI= + if test "$GNU_CC"; then + echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6 +-echo "configure:10804: checking for gcc 3.0 ABI" >&5 ++echo "configure:10826: checking for gcc 3.0 ABI" >&5 + if eval "test \"`echo '$''{'ac_cv_gcc_three_abi'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_gcc_three_abi="yes" + else +@@ -10842,12 +10864,12 @@ + + + echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 +-echo "configure:10846: checking for C++ \"explicit\" keyword" >&5 ++echo "configure:10868: checking for C++ \"explicit\" keyword" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_explicit'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_explicit=yes + else +@@ -10878,12 +10900,12 @@ + fi + + echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6 +-echo "configure:10882: checking for C++ \"typename\" keyword" >&5 ++echo "configure:10904: checking for C++ \"typename\" keyword" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_typename'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_typename=yes + else +@@ -10923,12 +10945,12 @@ + fi + + echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 +-echo "configure:10927: checking for modern C++ template specialization syntax support" >&5 ++echo "configure:10949: checking for modern C++ template specialization syntax support" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < struct X { int a; }; + class Y {}; +@@ -10938,7 +10960,7 @@ + X y_x; + ; return 0; } + EOF +-if { (eval echo configure:10942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_modern_specialize_template_syntax=yes + else +@@ -10960,12 +10982,12 @@ + + + echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 +-echo "configure:10964: checking whether partial template specialization works" >&5 ++echo "configure:10986: checking whether partial template specialization works" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < class Foo {}; + template class Foo {}; +@@ -10973,7 +10995,7 @@ + return 0; + ; return 0; } + EOF +-if { (eval echo configure:10977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_partial_specialization=yes + else +@@ -10994,12 +11016,12 @@ + fi + + echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 +-echo "configure:10998: checking whether operators must be re-defined for templates derived from templates" >&5 ++echo "configure:11020: checking whether operators must be re-defined for templates derived from templates" >&5 + if eval "test \"`echo '$''{'ac_cv_need_derived_template_operators'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < class Base { }; + template +@@ -11011,7 +11033,7 @@ + return 0; + ; return 0; } + EOF +-if { (eval echo configure:11015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_need_derived_template_operators=no + else +@@ -11033,12 +11055,12 @@ + + + echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6 +-echo "configure:11037: checking whether we need to cast a derived template to pass as its base class" >&5 ++echo "configure:11059: checking whether we need to cast a derived template to pass as its base class" >&5 + if eval "test \"`echo '$''{'ac_cv_need_cpp_template_cast_to_base'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < class Base { }; + template class Derived : public Base { }; +@@ -11047,7 +11069,7 @@ + Derived bar; return foo(bar); + ; return 0; } + EOF +-if { (eval echo configure:11051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_need_cpp_template_cast_to_base=no + else +@@ -11068,12 +11090,12 @@ + fi + + echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 +-echo "configure:11072: checking whether the compiler can resolve const ambiguities for templates" >&5 ++echo "configure:11094: checking whether the compiler can resolve const ambiguities for templates" >&5 + if eval "test \"`echo '$''{'ac_cv_can_resolve_const_ambiguity'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < class ptrClass { +@@ -11094,7 +11116,7 @@ + a(&i); + ; return 0; } + EOF +-if { (eval echo configure:11098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_can_resolve_const_ambiguity=yes + else +@@ -11116,12 +11138,12 @@ + + + echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 +-echo "configure:11120: checking whether the C++ \"using\" keyword can change access" >&5 ++echo "configure:11142: checking whether the C++ \"using\" keyword can change access" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_access_changing_using2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11166: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_access_changing_using2=no + else +@@ -11168,12 +11190,12 @@ + fi + + echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 +-echo "configure:11172: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 ++echo "configure:11194: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_ambiguity_resolving_using=yes + else +@@ -11210,19 +11232,19 @@ + fi + + echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 +-echo "configure:11214: checking for \"std::\" namespace" >&5 ++echo "configure:11236: checking for \"std::\" namespace" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_namespace_std'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + return std::min(0, 1); + ; return 0; } + EOF +-if { (eval echo configure:11226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_namespace_std=yes + else +@@ -11243,12 +11265,12 @@ + fi + + echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 +-echo "configure:11247: checking whether standard template operator!=() is ambiguous" >&5 ++echo "configure:11269: checking whether standard template operator!=() is ambiguous" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_unambiguous_std_notequal'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + struct T1 {}; +@@ -11258,7 +11280,7 @@ + T1 a,b; return a != b; + ; return 0; } + EOF +-if { (eval echo configure:11262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_unambiguous_std_notequal=unambiguous + else +@@ -11280,12 +11302,12 @@ + + + echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 +-echo "configure:11284: checking for C++ reinterpret_cast" >&5 ++echo "configure:11306: checking for C++ reinterpret_cast" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_reinterpret_cast'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <(z); + ; return 0; } + EOF +-if { (eval echo configure:11297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_reinterpret_cast=yes + else +@@ -11314,7 +11336,7 @@ + fi + + echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 +-echo "configure:11318: checking for C++ dynamic_cast to void*" >&5 ++echo "configure:11340: checking for C++ dynamic_cast to void*" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -11322,7 +11344,7 @@ + ac_cv_cpp_dynamic_cast_void_ptr=no + else + cat > conftest.$ac_ext <(suby)))); + } + EOF +-if { (eval echo configure:11345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_cpp_dynamic_cast_void_ptr=yes + else +@@ -11365,19 +11387,19 @@ + + + echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 +-echo "configure:11369: checking whether C++ requires implementation of unused virtual methods" >&5 ++echo "configure:11391: checking whether C++ requires implementation of unused virtual methods" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_cpp_unused_required=no + else +@@ -11400,12 +11422,12 @@ + + + echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 +-echo "configure:11404: checking for trouble comparing to zero near std::operator!=()" >&5 ++echo "configure:11426: checking for trouble comparing to zero near std::operator!=()" >&5 + if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + template class Foo {}; +@@ -11416,7 +11438,7 @@ + Foo f; return (0 != f); + ; return 0; } + EOF +-if { (eval echo configure:11420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_trouble_comparing_to_zero=no + else +@@ -11448,19 +11470,19 @@ + + + echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 +-echo "configure:11452: checking for LC_MESSAGES" >&5 ++echo "configure:11474: checking for LC_MESSAGES" >&5 + if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + int category = LC_MESSAGES; + ; return 0; } + EOF +-if { (eval echo configure:11464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_i18n_lc_messages=yes + else +@@ -11541,7 +11563,7 @@ + # Extract the first word of "nspr-config", so it can be a program name with args. + set dummy nspr-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:11545: checking for $ac_word" >&5 ++echo "configure:11567: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -11576,7 +11598,7 @@ + + min_nspr_version=4.0.0 + echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6 +-echo "configure:11580: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 ++echo "configure:11602: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 + + no_nspr="" + if test "$NSPR_CONFIG" = "no"; then +@@ -11678,7 +11700,7 @@ + # Extract the first word of "nss-config", so it can be a program name with args. + set dummy nss-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:11682: checking for $ac_word" >&5 ++echo "configure:11704: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -11713,7 +11735,7 @@ + + min_nss_version=3.0.0 + echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6 +-echo "configure:11717: checking for NSS - version >= $min_nss_version (skipping)" >&5 ++echo "configure:11739: checking for NSS - version >= $min_nss_version (skipping)" >&5 + + no_nss="" + if test "$NSS_CONFIG" = "no"; then +@@ -11745,7 +11767,7 @@ + fi + + if test -n "$MOZ_NATIVE_NSS"; then +- NSS_LIBS="$NSS_LIBS -lcrmf" ++ NSS_LIBS="-lcrmf $NSS_LIBS" + else + NSS_CFLAGS='-I$(DIST)/public/nss' + NSS_DEP_LIBS='\\\ +@@ -11786,7 +11808,7 @@ + SYSTEM_JPEG= + else + echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 +-echo "configure:11790: checking for jpeg_destroy_compress in -ljpeg" >&5 ++echo "configure:11812: checking for jpeg_destroy_compress in -ljpeg" >&5 + ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -11794,7 +11816,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ljpeg $JPEG_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -11828,13 +11850,13 @@ + + fi + +-if test "$SYSTEM_JPEG" = 1; then ++if test "$SYSTEM_JPEG" = 0; then + LIBS="$JPEG_LIBS $LIBS" + if test "$cross_compiling" = yes; then + SYSTEM_JPEG= + else + cat > conftest.$ac_ext < + #include +@@ -11848,7 +11870,7 @@ + } + + EOF +-if { (eval echo configure:11852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + SYSTEM_JPEG=1 + else +@@ -11889,7 +11911,7 @@ + SYSTEM_ZLIB= + else + echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 +-echo "configure:11893: checking for gzread in -lz" >&5 ++echo "configure:11915: checking for gzread in -lz" >&5 + ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -11897,7 +11919,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lz $ZLIB_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -11930,13 +11952,13 @@ + fi + + fi +-if test "$SYSTEM_ZLIB" = 1; then ++if test "$SYSTEM_ZLIB" = 0; then + LIBS="$ZLIB_LIBS $LIBS" + if test "$cross_compiling" = yes; then + SYSTEM_ZLIB= + else + cat > conftest.$ac_ext < +@@ -11957,7 +11979,7 @@ + } + + EOF +-if { (eval echo configure:11961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + SYSTEM_ZLIB=1 + else +@@ -12000,7 +12022,7 @@ + SYSTEM_PNG= + else + echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 +-echo "configure:12004: checking for png_get_valid in -lpng" >&5 ++echo "configure:12026: checking for png_get_valid in -lpng" >&5 + ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -12008,7 +12030,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lpng $PNG_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -12041,13 +12063,13 @@ + fi + + fi +-if test "$SYSTEM_PNG" = 1; then ++if test "$SYSTEM_PNG" = 0; then + LIBS="$PNG_LIBS $LIBS" + if test "$cross_compiling" = yes; then + SYSTEM_PNG= + else + cat > conftest.$ac_ext < + #include +@@ -12061,7 +12083,7 @@ + } + + EOF +-if { (eval echo configure:12065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:12087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + SYSTEM_PNG=1 + else +@@ -12311,7 +12333,7 @@ + # Extract the first word of "gtk-config", so it can be a program name with args. + set dummy gtk-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:12315: checking for $ac_word" >&5 ++echo "configure:12337: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -12346,7 +12368,7 @@ + + min_gtk_version=$GTK_VERSION + echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 +-echo "configure:12350: checking for GTK - version >= $min_gtk_version" >&5 ++echo "configure:12372: checking for GTK - version >= $min_gtk_version" >&5 + no_gtk="" + if test "$GTK_CONFIG" = "no" ; then + no_gtk=yes +@@ -12369,7 +12391,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -12447,7 +12469,7 @@ + } + + EOF +-if { (eval echo configure:12451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:12473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -12482,7 +12504,7 @@ + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" + cat > conftest.$ac_ext < +@@ -12492,7 +12514,7 @@ + return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:12496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GTK or finding the wrong" +@@ -12544,7 +12566,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:12548: checking for $ac_word" >&5 ++echo "configure:12570: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -12588,19 +12610,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for gtk+-2.0 >= 1.3.7""... $ac_c" 1>&6 +-echo "configure:12592: checking for gtk+-2.0 >= 1.3.7" >&5 ++echo "configure:12614: checking for gtk+-2.0 >= 1.3.7" >&5 + + if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.7" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 +-echo "configure:12599: checking MOZ_GTK2_CFLAGS" >&5 ++echo "configure:12621: checking MOZ_GTK2_CFLAGS" >&5 + MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"` + echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6 +-echo "configure:12604: checking MOZ_GTK2_LIBS" >&5 ++echo "configure:12626: checking MOZ_GTK2_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_GTK2_LIBS="`$PKG_CONFIG --libs-only-L \"gtk+-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"gtk+-2.0 >= 1.3.7\"`" +@@ -12665,7 +12687,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:12669: checking for $ac_word" >&5 ++echo "configure:12691: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_MOC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -12717,7 +12739,7 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6 +-echo "configure:12721: checking for main in -lqt" >&5 ++echo "configure:12743: checking for main in -lqt" >&5 + ac_lib_var=`echo qt'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -12725,14 +12747,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lqt $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -12751,7 +12773,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6 +-echo "configure:12755: checking for main in -lqt-mt" >&5 ++echo "configure:12777: checking for main in -lqt-mt" >&5 + ac_lib_var=`echo qt-mt'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -12759,14 +12781,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lqt-mt $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -12802,9 +12824,9 @@ + LIBS="$LIBS $QT_LIBS" + + echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6 +-echo "configure:12806: checking Qt - version >= $QT_VERSION" >&5 ++echo "configure:12828: checking Qt - version >= $QT_VERSION" >&5 + cat > conftest.$ac_ext < + int main() { +@@ -12815,7 +12837,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:12819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:12841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result="yes" + else +@@ -13091,7 +13113,7 @@ + MOZ_XUL_APP=1 + MOZ_STANDALONE_COMPOSER=1 + MOZ_COMPOSER=1 +- MOZ_APP_VERSION=`cat $topsrcdir/composer/config/version.txt` ++ MOZ_APP_VERSION="`cat $topsrcdir/composer/config/version.txt`" + NECKO_PROTOCOLS="http,ftp,file,jar,viewsource,res,data" + cat >> confdefs.h <<\EOF + #define MOZ_STANDALONE_COMPOSER 1 +@@ -13412,7 +13434,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13416: checking for $ac_word" >&5 ++echo "configure:13438: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -13456,19 +13478,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for xft""... $ac_c" 1>&6 +-echo "configure:13460: checking for xft" >&5 ++echo "configure:13482: checking for xft" >&5 + + if $PKG_CONFIG --exists "xft" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13467: checking MOZ_XFT_CFLAGS" >&5 ++echo "configure:13489: checking MOZ_XFT_CFLAGS" >&5 + MOZ_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft"` + echo "$ac_t""$MOZ_XFT_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_XFT_LIBS""... $ac_c" 1>&6 +-echo "configure:13472: checking MOZ_XFT_LIBS" >&5 ++echo "configure:13494: checking MOZ_XFT_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_XFT_LIBS="`$PKG_CONFIG --libs-only-L \"xft\"` `$PKG_CONFIG --libs-only-l \"xft\"`" +@@ -13503,7 +13525,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13507: checking for $ac_word" >&5 ++echo "configure:13529: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -13547,19 +13569,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for pango >= 1.1.0""... $ac_c" 1>&6 +-echo "configure:13551: checking for pango >= 1.1.0" >&5 ++echo "configure:13573: checking for pango >= 1.1.0" >&5 + + if $PKG_CONFIG --exists "pango >= 1.1.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13558: checking _PANGOCHK_CFLAGS" >&5 ++echo "configure:13580: checking _PANGOCHK_CFLAGS" >&5 + _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"` + echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6 + + echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6 +-echo "configure:13563: checking _PANGOCHK_LIBS" >&5 ++echo "configure:13585: checking _PANGOCHK_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + _PANGOCHK_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.1.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.1.0\"`" +@@ -13619,7 +13641,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13623: checking for $ac_word" >&5 ++echo "configure:13645: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -13663,19 +13685,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for pango >= 1.6.0 pangoft2 >= 1.6.0""... $ac_c" 1>&6 +-echo "configure:13667: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5 ++echo "configure:13689: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5 + + if $PKG_CONFIG --exists "pango >= 1.6.0 pangoft2 >= 1.6.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13674: checking MOZ_PANGO_CFLAGS" >&5 ++echo "configure:13696: checking MOZ_PANGO_CFLAGS" >&5 + MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.6.0 pangoft2 >= 1.6.0"` + echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 +-echo "configure:13679: checking MOZ_PANGO_LIBS" >&5 ++echo "configure:13701: checking MOZ_PANGO_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.6.0 pangoft2 >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.6.0 pangoft2 >= 1.6.0\"`" +@@ -13743,7 +13765,7 @@ + _SAVE_LDFLAGS="$LDFLAGS" + LDFLAGS="$XLDFLAGS $LDFLAGS" + echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6 +-echo "configure:13747: checking for XpGetPrinterList in -lXp" >&5 ++echo "configure:13769: checking for XpGetPrinterList in -lXp" >&5 + ac_lib_var=`echo Xp'_'XpGetPrinterList | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -13751,7 +13773,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:13788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -13835,7 +13857,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13839: checking for $ac_word" >&5 ++echo "configure:13861: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -13879,19 +13901,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6 +-echo "configure:13883: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 ++echo "configure:13905: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 + + if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13890: checking MOZ_GNOMEVFS_CFLAGS" >&5 ++echo "configure:13912: checking MOZ_GNOMEVFS_CFLAGS" >&5 + MOZ_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"` + echo "$ac_t""$MOZ_GNOMEVFS_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GNOMEVFS_LIBS""... $ac_c" 1>&6 +-echo "configure:13895: checking MOZ_GNOMEVFS_LIBS" >&5 ++echo "configure:13917: checking MOZ_GNOMEVFS_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs-only-L \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"` `$PKG_CONFIG --libs-only-l \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"`" +@@ -13942,7 +13964,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13946: checking for $ac_word" >&5 ++echo "configure:13968: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -13986,19 +14008,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for gconf-2.0 >= $GCONF_VERSION""... $ac_c" 1>&6 +-echo "configure:13990: checking for gconf-2.0 >= $GCONF_VERSION" >&5 ++echo "configure:14012: checking for gconf-2.0 >= $GCONF_VERSION" >&5 + + if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13997: checking MOZ_GCONF_CFLAGS" >&5 ++echo "configure:14019: checking MOZ_GCONF_CFLAGS" >&5 + MOZ_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_VERSION"` + echo "$ac_t""$MOZ_GCONF_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GCONF_LIBS""... $ac_c" 1>&6 +-echo "configure:14002: checking MOZ_GCONF_LIBS" >&5 ++echo "configure:14024: checking MOZ_GCONF_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_GCONF_LIBS="`$PKG_CONFIG --libs-only-L \"gconf-2.0 >= $GCONF_VERSION\"` `$PKG_CONFIG --libs-only-l \"gconf-2.0 >= $GCONF_VERSION\"`" +@@ -14045,7 +14067,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:14049: checking for $ac_word" >&5 ++echo "configure:14071: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -14089,19 +14111,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libgnome-2.0 >= $LIBGNOME_VERSION""... $ac_c" 1>&6 +-echo "configure:14093: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 ++echo "configure:14115: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 + + if $PKG_CONFIG --exists "libgnome-2.0 >= $LIBGNOME_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_LIBGNOME_CFLAGS""... $ac_c" 1>&6 +-echo "configure:14100: checking MOZ_LIBGNOME_CFLAGS" >&5 ++echo "configure:14122: checking MOZ_LIBGNOME_CFLAGS" >&5 + MOZ_LIBGNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_VERSION"` + echo "$ac_t""$MOZ_LIBGNOME_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_LIBGNOME_LIBS""... $ac_c" 1>&6 +-echo "configure:14105: checking MOZ_LIBGNOME_LIBS" >&5 ++echo "configure:14127: checking MOZ_LIBGNOME_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_LIBGNOME_LIBS="`$PKG_CONFIG --libs-only-L \"libgnome-2.0 >= $LIBGNOME_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnome-2.0 >= $LIBGNOME_VERSION\"`" +@@ -14179,7 +14201,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:14183: checking for $ac_word" >&5 ++echo "configure:14205: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -14223,19 +14245,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6 +-echo "configure:14227: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 ++echo "configure:14249: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 + + if $PKG_CONFIG --exists "libgnomeui-2.0 >= $GNOMEUI_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GNOMEUI_CFLAGS""... $ac_c" 1>&6 +-echo "configure:14234: checking MOZ_GNOMEUI_CFLAGS" >&5 ++echo "configure:14256: checking MOZ_GNOMEUI_CFLAGS" >&5 + MOZ_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $GNOMEUI_VERSION"` + echo "$ac_t""$MOZ_GNOMEUI_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GNOMEUI_LIBS""... $ac_c" 1>&6 +-echo "configure:14239: checking MOZ_GNOMEUI_LIBS" >&5 ++echo "configure:14261: checking MOZ_GNOMEUI_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs-only-L \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"`" +@@ -14721,7 +14743,7 @@ + # Extract the first word of "javac", so it can be a program name with args. + set dummy javac; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:14725: checking for $ac_word" >&5 ++echo "configure:14747: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -14757,7 +14779,7 @@ + # Extract the first word of "jar", so it can be a program name with args. + set dummy jar; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:14761: checking for $ac_word" >&5 ++echo "configure:14783: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -15004,7 +15026,7 @@ + gdiplus) + MOZ_SVG_RENDERER_GDIPLUS=1 + echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6 +-echo "configure:15008: checking for Gdiplus.h" >&5 ++echo "configure:15030: checking for Gdiplus.h" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -15014,7 +15036,7 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext < + #include +@@ -15023,7 +15045,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:15027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 + else +@@ -15103,7 +15125,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:15107: checking for $ac_word" >&5 ++echo "configure:15129: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MAKENSIS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -15148,7 +15170,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:15152: checking for $ac_word" >&5 ++echo "configure:15174: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_HOST_ICONV'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -15217,13 +15239,13 @@ + msvc*|mks*|cygwin*|mingw*|wince*) + if test -n "$MOZ_UPDATER"; then + echo $ac_n "checking for iconv""... $ac_c" 1>&6 +-echo "configure:15221: checking for iconv" >&5 ++echo "configure:15243: checking for iconv" >&5 + for ac_prog in $HOST_ICONV "iconv" + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:15227: checking for $ac_word" >&5 ++echo "configure:15249: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_ICONV'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -15569,18 +15591,18 @@ + + if test -n "$MOZ_DEBUG"; then + echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 +-echo "configure:15573: checking for valid debug flags" >&5 ++echo "configure:15595: checking for valid debug flags" >&5 + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:15584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _results=yes + else +@@ -15621,18 +15643,18 @@ + if test "$COMPILE_ENVIRONMENT"; then + if test -n "$MOZ_OPTIMIZE"; then + echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6 +-echo "configure:15625: checking for valid optimization flags" >&5 ++echo "configure:15647: checking for valid optimization flags" >&5 + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:15636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _results=yes + else +@@ -15849,7 +15871,7 @@ + + if test -n "$_ENABLE_EFENCE"; then + echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 +-echo "configure:15853: checking for malloc in -lefence" >&5 ++echo "configure:15875: checking for malloc in -lefence" >&5 + ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -15857,7 +15879,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lefence $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -15969,12 +15991,12 @@ + for ac_func in __builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:15973: checking for $ac_func" >&5 ++echo "configure:15995: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -16243,12 +16265,12 @@ + for ac_func in __cxa_demangle + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:16247: checking for $ac_func" >&5 ++echo "configure:16269: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -16412,7 +16434,7 @@ + # Compiler Options + + echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 +-echo "configure:16416: checking for gcc -pipe support" >&5 ++echo "configure:16438: checking for gcc -pipe support" >&5 + if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then + echo '#include ' > dummy-hello.c + echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c +@@ -16427,14 +16449,14 @@ + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -pipe" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:16438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _res_gcc_pipe="yes" + else +@@ -16476,16 +16498,16 @@ + _SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long" + echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6 +-echo "configure:16480: checking whether compiler supports -Wno-long-long" >&5 ++echo "configure:16502: checking whether compiler supports -Wno-long-long" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" + _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" +@@ -16506,16 +16528,16 @@ + CFLAGS="$CFLAGS -fprofile-generate" + + echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 +-echo "configure:16510: checking whether C compiler supports -fprofile-generate" >&5 ++echo "configure:16532: checking whether C compiler supports -fprofile-generate" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + PROFILE_GEN_CFLAGS="-fprofile-generate" + result="yes" +@@ -16533,16 +16555,16 @@ + else + CFLAGS="$_SAVE_CFLAGS -fprofile-arcs" + echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6 +-echo "configure:16537: checking whether C compiler supports -fprofile-arcs" >&5 ++echo "configure:16559: checking whether C compiler supports -fprofile-arcs" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + PROFILE_GEN_CFLAGS="-fprofile-arcs" + result="yes" +@@ -16588,16 +16610,16 @@ + _SAVE_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic" + echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6 +-echo "configure:16592: checking whether C++ compiler has -pedantic long long bug" >&5 ++echo "configure:16614: checking whether C++ compiler has -pedantic long long bug" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result="no" + else +@@ -16622,12 +16644,12 @@ + fi + + echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6 +-echo "configure:16626: checking for correct temporary object destruction order" >&5 ++echo "configure:16648: checking for correct temporary object destruction order" >&5 + if test "$cross_compiling" = yes; then + result="maybe" + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:16676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + result="yes" + else +@@ -16671,12 +16693,12 @@ + _SAVE_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}" + echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6 +-echo "configure:16675: checking for correct overload resolution with const and templates" >&5 ++echo "configure:16697: checking for correct overload resolution with const and templates" >&5 + if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -16706,7 +16728,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:16710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_nscap_nonconst_opeq_bug="no" + else +@@ -16998,7 +17020,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:17002: checking for $ac_word" >&5 ++echo "configure:17024: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -17042,19 +17064,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 +-echo "configure:17046: checking for libIDL-2.0 >= 0.8.0" >&5 ++echo "configure:17068: checking for libIDL-2.0 >= 0.8.0" >&5 + + if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 +-echo "configure:17053: checking LIBIDL_CFLAGS" >&5 ++echo "configure:17075: checking LIBIDL_CFLAGS" >&5 + LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` + echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 + + echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 +-echo "configure:17058: checking LIBIDL_LIBS" >&5 ++echo "configure:17080: checking LIBIDL_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`" +@@ -17177,7 +17199,7 @@ + # Extract the first word of "glib-config", so it can be a program name with args. + set dummy glib-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:17181: checking for $ac_word" >&5 ++echo "configure:17203: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -17212,7 +17234,7 @@ + + min_glib_version=1.2.0 + echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +-echo "configure:17216: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:17238: checking for GLIB - version >= $min_glib_version" >&5 + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes +@@ -17235,7 +17257,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -17311,7 +17333,7 @@ + } + + EOF +-if { (eval echo configure:17315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -17345,7 +17367,7 @@ + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + cat > conftest.$ac_ext < +@@ -17355,7 +17377,7 @@ + return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:17359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" +@@ -17399,7 +17421,7 @@ + # Extract the first word of "libIDL-config", so it can be a program name with args. + set dummy libIDL-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:17403: checking for $ac_word" >&5 ++echo "configure:17425: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -17434,7 +17456,7 @@ + + min_libIDL_version=$LIBIDL_VERSION + echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 +-echo "configure:17438: checking for libIDL - version >= $min_libIDL_version" >&5 ++echo "configure:17460: checking for libIDL - version >= $min_libIDL_version" >&5 + no_libIDL="" + if test "$LIBIDL_CONFIG" = "no" ; then + no_libIDL=yes +@@ -17461,7 +17483,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -17547,7 +17569,7 @@ + } + + EOF +-if { (eval echo configure:17551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -17581,7 +17603,7 @@ + CFLAGS="$CFLAGS $LIBIDL_CFLAGS" + LIBS="$LIBS $LIBIDL_LIBS" + cat > conftest.$ac_ext < +@@ -17592,7 +17614,7 @@ + return IDL_get_libver_string ? 1 : 0; + ; return 0; } + EOF +-if { (eval echo configure:17596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding libIDL or finding the wrong" +@@ -17720,7 +17742,7 @@ + # Extract the first word of "glib-config", so it can be a program name with args. + set dummy glib-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:17724: checking for $ac_word" >&5 ++echo "configure:17746: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -17755,7 +17777,7 @@ + + min_glib_version=1.2.0 + echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +-echo "configure:17759: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:17781: checking for GLIB - version >= $min_glib_version" >&5 + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes +@@ -17778,7 +17800,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -17854,7 +17876,7 @@ + } + + EOF +-if { (eval echo configure:17858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -17888,7 +17910,7 @@ + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + cat > conftest.$ac_ext < +@@ -17898,7 +17920,7 @@ + return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:17902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" +@@ -17942,7 +17964,7 @@ + # Extract the first word of "libIDL-config", so it can be a program name with args. + set dummy libIDL-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:17946: checking for $ac_word" >&5 ++echo "configure:17968: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -17977,7 +17999,7 @@ + + min_libIDL_version=$LIBIDL_VERSION + echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 +-echo "configure:17981: checking for libIDL - version >= $min_libIDL_version" >&5 ++echo "configure:18003: checking for libIDL - version >= $min_libIDL_version" >&5 + no_libIDL="" + if test "$LIBIDL_CONFIG" = "no" ; then + no_libIDL=yes +@@ -18004,7 +18026,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -18090,7 +18112,7 @@ + } + + EOF +-if { (eval echo configure:18094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -18124,7 +18146,7 @@ + CFLAGS="$CFLAGS $LIBIDL_CFLAGS" + LIBS="$LIBS $LIBIDL_LIBS" + cat > conftest.$ac_ext < +@@ -18135,7 +18157,7 @@ + return IDL_get_libver_string ? 1 : 0; + ; return 0; } + EOF +-if { (eval echo configure:18139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding libIDL or finding the wrong" +@@ -18176,7 +18198,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18180: checking for $ac_word" >&5 ++echo "configure:18202: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -18220,19 +18242,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 +-echo "configure:18224: checking for libIDL-2.0 >= 0.8.0" >&5 ++echo "configure:18246: checking for libIDL-2.0 >= 0.8.0" >&5 + + if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 +-echo "configure:18231: checking LIBIDL_CFLAGS" >&5 ++echo "configure:18253: checking LIBIDL_CFLAGS" >&5 + LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` + echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 + + echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 +-echo "configure:18236: checking LIBIDL_LIBS" >&5 ++echo "configure:18258: checking LIBIDL_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`" +@@ -18268,7 +18290,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18272: checking for $ac_word" >&5 ++echo "configure:18294: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -18305,7 +18327,7 @@ + + if test -n "$ORBIT_CONFIG"; then + echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 +-echo "configure:18309: checking for ORBit libIDL usability" >&5 ++echo "configure:18331: checking for ORBit libIDL usability" >&5 + _ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags` + _ORBIT_LIBS=`${ORBIT_CONFIG} client --libs` + _ORBIT_INC_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-I/); } }' -- ${_ORBIT_CFLAGS}` +@@ -18322,7 +18344,7 @@ + result="maybe" + else + cat > conftest.$ac_ext < +@@ -18337,7 +18359,7 @@ + } + + EOF +-if { (eval echo configure:18341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + _LIBIDL_FOUND=1 + result="yes" +@@ -18394,7 +18416,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18398: checking for $ac_word" >&5 ++echo "configure:18420: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -18438,19 +18460,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for glib-2.0 >= 1.3.7""... $ac_c" 1>&6 +-echo "configure:18442: checking for glib-2.0 >= 1.3.7" >&5 ++echo "configure:18464: checking for glib-2.0 >= 1.3.7" >&5 + + if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6 +-echo "configure:18449: checking GLIB_CFLAGS" >&5 ++echo "configure:18471: checking GLIB_CFLAGS" >&5 + GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7"` + echo "$ac_t""$GLIB_CFLAGS" 1>&6 + + echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6 +-echo "configure:18454: checking GLIB_LIBS" >&5 ++echo "configure:18476: checking GLIB_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + GLIB_LIBS="`$PKG_CONFIG --libs-only-L \"glib-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"glib-2.0 >= 1.3.7\"`" +@@ -18534,7 +18556,7 @@ + # Extract the first word of "glib-config", so it can be a program name with args. + set dummy glib-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18538: checking for $ac_word" >&5 ++echo "configure:18560: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -18569,7 +18591,7 @@ + + min_glib_version=${GLIB_VERSION} + echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +-echo "configure:18573: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:18595: checking for GLIB - version >= $min_glib_version" >&5 + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes +@@ -18592,7 +18614,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -18668,7 +18690,7 @@ + } + + EOF +-if { (eval echo configure:18672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -18702,7 +18724,7 @@ + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + cat > conftest.$ac_ext < +@@ -18712,7 +18734,7 @@ + return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:18716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" +@@ -18792,19 +18814,19 @@ + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! + echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 +-echo "configure:18796: checking for working alloca.h" >&5 ++echo "configure:18818: checking for working alloca.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + char *p = alloca(2 * sizeof(int)); + ; return 0; } + EOF +-if { (eval echo configure:18808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_header_alloca_h=yes + else +@@ -18825,12 +18847,12 @@ + fi + + echo $ac_n "checking for alloca""... $ac_c" 1>&6 +-echo "configure:18829: checking for alloca" >&5 ++echo "configure:18851: checking for alloca" >&5 + if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_alloca_works=yes + else +@@ -18890,12 +18912,12 @@ + + + echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 +-echo "configure:18894: checking whether alloca needs Cray hooks" >&5 ++echo "configure:18916: checking whether alloca needs Cray hooks" >&5 + if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&6 +-echo "configure:18924: checking for $ac_func" >&5 ++echo "configure:18946: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -18975,7 +18997,7 @@ + fi + + echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 +-echo "configure:18979: checking stack direction for C alloca" >&5 ++echo "configure:19001: checking stack direction for C alloca" >&5 + if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -18983,7 +19005,7 @@ + ac_cv_c_stack_direction=0 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_c_stack_direction=1 + else +@@ -19051,17 +19073,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:19055: checking for $ac_hdr" >&5 ++echo "configure:19077: 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 < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:19065: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:19087: \"$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* +@@ -19152,7 +19174,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:19156: checking for $ac_word" >&5 ++echo "configure:19178: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -19196,19 +19218,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6 +-echo "configure:19200: checking for cairo >= $CAIRO_VERSION" >&5 ++echo "configure:19222: checking for cairo >= $CAIRO_VERSION" >&5 + + if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6 +-echo "configure:19207: checking CAIRO_CFLAGS" >&5 ++echo "configure:19229: checking CAIRO_CFLAGS" >&5 + CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"` + echo "$ac_t""$CAIRO_CFLAGS" 1>&6 + + echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6 +-echo "configure:19212: checking CAIRO_LIBS" >&5 ++echo "configure:19234: checking CAIRO_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`" +@@ -19248,7 +19270,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:19252: checking for $ac_word" >&5 ++echo "configure:19274: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -19292,19 +19314,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for cairo-xlib >= $CAIRO_VERSION""... $ac_c" 1>&6 +-echo "configure:19296: checking for cairo-xlib >= $CAIRO_VERSION" >&5 ++echo "configure:19318: checking for cairo-xlib >= $CAIRO_VERSION" >&5 + + if $PKG_CONFIG --exists "cairo-xlib >= $CAIRO_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking CAIRO_XLIB_CFLAGS""... $ac_c" 1>&6 +-echo "configure:19303: checking CAIRO_XLIB_CFLAGS" >&5 ++echo "configure:19325: checking CAIRO_XLIB_CFLAGS" >&5 + CAIRO_XLIB_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib >= $CAIRO_VERSION"` + echo "$ac_t""$CAIRO_XLIB_CFLAGS" 1>&6 + + echo $ac_n "checking CAIRO_XLIB_LIBS""... $ac_c" 1>&6 +-echo "configure:19308: checking CAIRO_XLIB_LIBS" >&5 ++echo "configure:19330: checking CAIRO_XLIB_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + CAIRO_XLIB_LIBS="`$PKG_CONFIG --libs-only-L \"cairo-xlib >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo-xlib >= $CAIRO_VERSION\"`" +@@ -19343,7 +19365,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:19347: checking for $ac_word" >&5 ++echo "configure:19369: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -19387,19 +19409,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for cairo-xlib-xrender >= $CAIRO_VERSION""... $ac_c" 1>&6 +-echo "configure:19391: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5 ++echo "configure:19413: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5 + + if $PKG_CONFIG --exists "cairo-xlib-xrender >= $CAIRO_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking CAIRO_XRENDER_CFLAGS""... $ac_c" 1>&6 +-echo "configure:19398: checking CAIRO_XRENDER_CFLAGS" >&5 ++echo "configure:19420: checking CAIRO_XRENDER_CFLAGS" >&5 + CAIRO_XRENDER_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib-xrender >= $CAIRO_VERSION"` + echo "$ac_t""$CAIRO_XRENDER_CFLAGS" 1>&6 + + echo $ac_n "checking CAIRO_XRENDER_LIBS""... $ac_c" 1>&6 +-echo "configure:19403: checking CAIRO_XRENDER_LIBS" >&5 ++echo "configure:19425: checking CAIRO_XRENDER_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + CAIRO_XRENDER_LIBS="`$PKG_CONFIG --libs-only-L \"cairo-xlib-xrender >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo-xlib-xrender >= $CAIRO_VERSION\"`" +@@ -19470,7 +19492,7 @@ + # Extract the first word of "python", so it can be a program name with args. + set dummy python; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:19474: checking for $ac_word" >&5 ++echo "configure:19496: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -19746,14 +19768,14 @@ + cross_compiling=$ac_cv_prog_cc_cross + + cat > conftest.$ac_ext < + int main() { + int x = 1; x++; + ; return 0; } + EOF +-if { (eval echo configure:19757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:19779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -20060,7 +20082,7 @@ + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $XCFLAGS" + cat > conftest.$ac_ext < +@@ -20076,7 +20098,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:20080: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:20102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 --- kompozer-0.8~b3.dfsg.1.orig/debian/patches/18_crmf.patch +++ kompozer-0.8~b3.dfsg.1/debian/patches/18_crmf.patch @@ -0,0 +1,12 @@ +Put the crmf library before the NSS libraries +--- a/mozilla/configure.in ++++ b/mozilla/configure.in +@@ -3772,7 +3772,7 @@ if test -n "$_USE_SYSTEM_NSS"; then + fi + + if test -n "$MOZ_NATIVE_NSS"; then +- NSS_LIBS="$NSS_LIBS -lcrmf" ++ NSS_LIBS=`echo $NSS_LIBS | sed 's/-l/-lcrmf &/'` + else + NSS_CFLAGS='-I$(DIST)/public/nss' + NSS_DEP_LIBS='\\\ --- kompozer-0.8~b3.dfsg.1.orig/debian/patches/11_arm_xpcom_unused_attribute.patch +++ kompozer-0.8~b3.dfsg.1/debian/patches/11_arm_xpcom_unused_attribute.patch @@ -0,0 +1,14 @@ +Patch from Steve Langasek to fix unused vs. used gcc attribute on arm. +bz#307418 +--- a/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp ++++ b/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp +@@ -45,7 +45,8 @@ + #endif + + /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */ +-static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); ++static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch") ++__attribute__((used)); + + static nsresult + PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) --- kompozer-0.8~b3.dfsg.1.orig/debian/patches/23_x11-session.patch +++ kompozer-0.8~b3.dfsg.1/debian/patches/23_x11-session.patch @@ -0,0 +1,221 @@ +From: upstream +Subject: Support X11 session management +References: +https://bugzilla.novell.com/show_bug.cgi?id=227047 +https://bugzilla.mozilla.org/show_bug.cgi?id=93789 + +--- a/mozilla/toolkit/xre/Makefile.in ++++ b/mozilla/toolkit/xre/Makefile.in +@@ -133,11 +133,15 @@ else + ifeq ($(MOZ_WIDGET_TOOLKIT),beos) + CPPSRCS += nsNativeAppSupportBeOS.cpp + else ++ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) ++CPPSRCS += nsNativeAppSupportUnix.cpp ++else + CPPSRCS += nsNativeAppSupportDefault.cpp + endif + endif + endif + endif ++endif + + ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) + CMSRCS = MacLaunchHelper.m +--- /dev/null ++++ b/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp +@@ -0,0 +1,194 @@ ++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * 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 Unix Native App Support. ++ * ++ * The Initial Developer of the Original Code is ++ * Mozilla Corporation. ++ * Portions created by the Initial Developer are Copyright (C) 2007 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Michael Wu (original author) ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the MPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the MPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++#include "nsNativeAppSupportBase.h" ++#include "nsCOMPtr.h" ++#include "nsXPCOM.h" ++#include "nsISupportsPrimitives.h" ++#include "nsIObserverService.h" ++#include "nsIAppStartup.h" ++#include "nsServiceManagerUtils.h" ++#include "prlink.h" ++ ++#include ++#include ++ ++typedef struct _GnomeProgram GnomeProgram; ++typedef struct _GnomeModuleInfo GnomeModuleInfo; ++typedef struct _GnomeClient GnomeClient; ++ ++typedef enum { ++ GNOME_SAVE_GLOBAL, ++ GNOME_SAVE_LOCAL, ++ GNOME_SAVE_BOTH ++} GnomeSaveStyle; ++ ++typedef enum { ++ GNOME_INTERACT_NONE, ++ GNOME_INTERACT_ERRORS, ++ GNOME_INTERACT_ANY ++} GnomeInteractStyle; ++ ++typedef enum { ++ GNOME_DIALOG_ERROR, ++ GNOME_DIALOG_NORMAL ++} GnomeDialogType; ++ ++typedef GnomeProgram * (*_gnome_program_init_fn)(const char *, const char *, ++ const GnomeModuleInfo *, int, ++ char **, const char *, ...); ++typedef const GnomeModuleInfo * (*_libgnomeui_module_info_get_fn)(); ++typedef GnomeClient * (*_gnome_master_client_fn)(void); ++typedef void (*GnomeInteractFunction)(GnomeClient *, gint, GnomeDialogType, ++ gpointer); ++typedef void (*_gnome_client_request_interaction_fn)(GnomeClient *, ++ GnomeDialogType, ++ GnomeInteractFunction, ++ gpointer); ++typedef void (*_gnome_interaction_key_return_fn)(gint, gboolean); ++ ++static _gnome_client_request_interaction_fn gnome_client_request_interaction; ++static _gnome_interaction_key_return_fn gnome_interaction_key_return; ++ ++void interact_cb(GnomeClient *client, gint key, ++ GnomeDialogType type, gpointer data) ++{ ++ nsCOMPtr obsServ = ++ do_GetService("@mozilla.org/observer-service;1"); ++ nsCOMPtr cancelQuit = ++ do_CreateInstance(NS_SUPPORTS_PRBOOL_CONTRACTID); ++ ++ cancelQuit->SetData(PR_FALSE); ++ ++ obsServ->NotifyObservers(cancelQuit, "quit-application-requested", nsnull); ++ ++ PRBool abortQuit; ++ cancelQuit->GetData(&abortQuit); ++ ++ gnome_interaction_key_return(key, abortQuit); ++} ++ ++gboolean save_yourself_cb(GnomeClient *client, gint phase, ++ GnomeSaveStyle style, gboolean shutdown, ++ GnomeInteractStyle interact, gboolean fast, ++ gpointer user_data) ++{ ++ if (interact == GNOME_INTERACT_ANY) ++ gnome_client_request_interaction(client, GNOME_DIALOG_NORMAL, ++ interact_cb, nsnull); ++ return TRUE; ++} ++ ++void die_cb(GnomeClient *client, gpointer user_data) ++{ ++ nsCOMPtr obsServ = ++ do_GetService("@mozilla.org/observer-service;1"); ++ nsCOMPtr appService = ++ do_GetService("@mozilla.org/toolkit/app-startup;1"); ++ ++ if (obsServ) ++ obsServ->NotifyObservers(nsnull, "quit-application-granted", nsnull); ++ ++ if (appService) ++ appService->Quit(nsIAppStartup::eForceQuit); ++} ++ ++class nsNativeAppSupportUnix : public nsNativeAppSupportBase ++{ ++public: ++ NS_IMETHOD Start(PRBool* aRetVal); ++}; ++ ++NS_IMETHODIMP ++nsNativeAppSupportUnix::Start(PRBool *aRetVal) ++{ ++ *aRetVal = PR_TRUE; ++ ++ PRLibrary *gnomeuiLib = PR_LoadLibrary("libgnomeui-2.so.0"); ++ if (!gnomeuiLib) ++ return NS_OK; ++ ++ PRLibrary *gnomeLib = PR_LoadLibrary("libgnome-2.so.0"); ++ if (!gnomeLib) { ++ PR_UnloadLibrary(gnomeuiLib); ++ return NS_OK; ++ } ++ ++ _gnome_program_init_fn gnome_program_init = ++ (_gnome_program_init_fn)PR_FindFunctionSymbol(gnomeLib, "gnome_program_init"); ++ _libgnomeui_module_info_get_fn libgnomeui_module_info_get = (_libgnomeui_module_info_get_fn)PR_FindFunctionSymbol(gnomeuiLib, "libgnomeui_module_info_get"); ++ if (!gnome_program_init || !libgnomeui_module_info_get) { ++ PR_UnloadLibrary(gnomeuiLib); ++ PR_UnloadLibrary(gnomeLib); ++ return NS_OK; ++ } ++ ++ char *argv[2] = { "gecko", "--disable-crash-dialog" }; ++ gnome_program_init("Gecko", "1.0", libgnomeui_module_info_get(), 2, argv, NULL); ++ ++ // Careful! These libraries cannot be unloaded after this point because ++ // gnome_program_init causes atexit handlers to be registered. Strange ++ // crashes will occur if these libraries are unloaded. ++ ++ gnome_client_request_interaction = (_gnome_client_request_interaction_fn) ++ PR_FindFunctionSymbol(gnomeuiLib, "gnome_client_request_interaction"); ++ gnome_interaction_key_return = (_gnome_interaction_key_return_fn) ++ PR_FindFunctionSymbol(gnomeuiLib, "gnome_interaction_key_return"); ++ ++ _gnome_master_client_fn gnome_master_client = (_gnome_master_client_fn) ++ PR_FindFunctionSymbol(gnomeuiLib, "gnome_master_client"); ++ ++ GnomeClient *client = gnome_master_client(); ++ g_signal_connect(client, "save-yourself", G_CALLBACK(save_yourself_cb), NULL); ++ g_signal_connect(client, "die", G_CALLBACK(die_cb), NULL); ++ ++ return NS_OK; ++} ++ ++nsresult ++NS_CreateNativeAppSupport(nsINativeAppSupport **aResult) ++{ ++ nsNativeAppSupportBase* native = new nsNativeAppSupportUnix(); ++ if (!native) ++ return NS_ERROR_OUT_OF_MEMORY; ++ ++ *aResult = native; ++ NS_ADDREF(*aResult); ++ ++ return NS_OK; ++} --- kompozer-0.8~b3.dfsg.1.orig/debian/patches/17_locale.patch +++ kompozer-0.8~b3.dfsg.1/debian/patches/17_locale.patch @@ -0,0 +1,12 @@ +use OS locale. bz#331779 +--- a/mozilla/modules/libpref/src/init/all.js ++++ b/mozilla/modules/libpref/src/init/all.js +@@ -793,7 +793,7 @@ pref("intl.charsetmenu.browser.cache.siz + pref("intl.charset.detector", "chrome://navigator/locale/navigator.properties"); + pref("intl.charset.default", "chrome://navigator-platform/locale/navigator.properties"); + pref("intl.content.langcode", "chrome://communicator-region/locale/region.properties"); +-pref("intl.locale.matchOS", false); ++pref("intl.locale.matchOS", true); + // fallback charset list for Unicode conversion (converting from Unicode) + // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes) + // for ISO-8859-1 --- kompozer-0.8~b3.dfsg.1.orig/debian/patches/16_uname.patch +++ kompozer-0.8~b3.dfsg.1/debian/patches/16_uname.patch @@ -0,0 +1,50 @@ +Use ${host_*} variables instead of uname in configure.in. +This is a minimalist patch to solve the particular bad assembler +choice issue. It would need a much greater work to actually do +something totally clean, but the current patch should be enough +for Linux builds. +Also incorporates fix for bz#363263. +--- a/mozilla/configure.in ++++ b/mozilla/configure.in +@@ -880,7 +880,7 @@ if test -n "$CROSS_COMPILE"; then + OS_RELEASE= + OS_TEST="${target_cpu}" + case "${target_os}" in +- linux*) OS_ARCH=Linux ;; ++ linux*) OS_ARCH=Linux OS_TARGET=Linux;; + kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;; + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; + mingw*) OS_ARCH=WINNT ;; +@@ -888,10 +888,18 @@ if test -n "$CROSS_COMPILE"; then + darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;; + esac + else +- OS_TARGET=`uname -s` +- OS_ARCH=`uname -s | sed -e 's|/|_|g'` ++ OS_TARGET="${host_os}" ++ OS_ARCH=`echo $host_os | sed -e 's|/|_|g'` + OS_RELEASE=`uname -r` +- OS_TEST=`uname -m` ++ OS_TEST="${host_cpu}" ++ case "${host_os}" in ++ linux*) OS_ARCH=Linux OS_TARGET=Linux;; ++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;; ++ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; ++ mingw*) OS_ARCH=WINNT ;; ++ wince*) OS_ARCH=WINCE ;; ++ darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;; ++ esac + fi + + if test -n "$FORCE_USE_HOST_OS"; then +--- a/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ++++ b/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in +@@ -295,7 +295,7 @@ endif + # + # Linux/PPC + # +-ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc) ++ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc) + CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp + ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s + AS := $(CC) -c -x assembler-with-cpp --- kompozer-0.8~b3.dfsg.1.orig/debian/conf/.mozconfig.mk +++ kompozer-0.8~b3.dfsg.1/debian/conf/.mozconfig.mk @@ -0,0 +1,34 @@ +# gmake +# This file is automatically generated for client.mk. +# Do not edit. Edit /home/kaze/Documents/KompoZer/svn/trunk/mozilla/.mozconfig instead. +# To create a new .mozconfig file, you can visit, +# http://webtools.mozilla.org/build/config.cgi + +# PATH=/home/kaze/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games +MOZ_OBJDIR=$(TOPSRCDIR)/../obj-$(CONFIG_GUESS) +# --enable-application=composer is used by configure (not client.mk) +# --enable-optimize is used by configure (not client.mk) +# --disable-debug is used by configure (not client.mk) +# --enable-xpfe-components is used by configure (not client.mk) +# --disable-tests is used by configure (not client.mk) +# --disable-installer is used by configure (not client.mk) +# --enable-extensions=default spellcheck is used by configure (not client.mk) +# --enable-necko-protocols=http,ftp,file,jar,viewsource,res,data is used by configure (not client.mk) +# --enable-default-toolkit=gtk2 is used by configure (not client.mk) +# --enable-xft is used by configure (not client.mk) +# --enable-pango is used by configure (not client.mk) +# --enable-postscript is used by configure (not client.mk) +# --disable-xprint is used by configure (not client.mk) +# --enable-mathml is used by configure (not client.mk) +# --enable-svg is used by configure (not client.mk) +# --enable-svg-renderer=cairo is used by configure (not client.mk) +# --enable-system-cairo is used by configure (not client.mk) +# --enable-canvas is used by configure (not client.mk) +# --with-system-png=/usr is used by configure (not client.mk) +# --with-system-jpeg=/usr is used by configure (not client.mk) +# --with-system-zlib=/usr is used by configure (not client.mk) +# --enable-gnomevfs is used by configure (not client.mk) +# --enable-xinerama is used by configure (not client.mk) +# --enable-single-profile is used by configure (not client.mk) +# --disable-profilesharing is used by configure (not client.mk) +# --enable-system-myspell is used by configure (not client.mk) --- kompozer-0.8~b3.dfsg.1.orig/debian/conf/.mozconfig.out +++ kompozer-0.8~b3.dfsg.1/debian/conf/.mozconfig.out @@ -0,0 +1,2 @@ +Adding client.mk options from /home/kaze/Documents/KompoZer/svn/trunk/mozilla/.mozconfig: + MOZ_OBJDIR=$(TOPSRCDIR)/../obj-$(CONFIG_GUESS) --- kompozer-0.8~b3.dfsg.1.orig/mozilla/toolkit/xre/nsAppRunner.cpp +++ kompozer-0.8~b3.dfsg.1/mozilla/toolkit/xre/nsAppRunner.cpp @@ -703,7 +703,7 @@ } #endif -static const nsXULAppInfo kAppInfo; +static const nsXULAppInfo kAppInfo = nsXULAppInfo(); static NS_METHOD AppInfoConstructor(nsISupports* aOuter, REFNSIID aIID, void **aResult) {