Merge lp:~samuel-cowen89/photofiltre-lx/photofiltre-lx into lp:photofiltre-lx

Proposed by Dylan Coakley
Status: Merged
Merge reported by: Dylan Coakley
Merged at revision: not available
Proposed branch: lp:~samuel-cowen89/photofiltre-lx/photofiltre-lx
Merge into: lp:photofiltre-lx
Diff against target: 93458 lines (+36194/-53152)
65 files modified
COPYING (+0/-674)
ChangeLog (+0/-132)
Credits (+0/-17)
GPL v3 (+0/-621)
INSTALL (+0/-365)
Makefile (+52/-117)
Makefile.am (+2/-36)
Makefile.in (+27/-92)
aclocal.m4 (+0/-489)
autogen.sh (+0/-159)
autom4te.cache/output.0 (+149/-3905)
autom4te.cache/output.1 (+243/-3771)
autom4te.cache/output.2 (+4658/-0)
autom4te.cache/requests (+94/-35)
autom4te.cache/traces.0 (+153/-456)
autom4te.cache/traces.1 (+336/-669)
autom4te.cache/traces.2 (+884/-0)
config.h (+8/-71)
config.h.in (+1/-64)
config.log (+111/-512)
config.status (+43/-105)
configure (+243/-3771)
configure.ac (+8/-0)
configure.in (+0/-90)
cursors/cursors.svg (+625/-0)
depcomp (+0/-630)
install-sh (+0/-520)
main.glade (+3171/-0)
missing (+0/-376)
mkinstalldirs (+0/-162)
po/Makefile (+0/-282)
po/Makefile.in (+0/-280)
po/Makefile.in.in (+0/-280)
po/POTFILES (+0/-2)
po/POTFILES.in (+0/-4)
src/.deps/PhotoFiltre-LX-LX.Po (+0/-1)
src/.deps/PhotoFiltre-LX.Po (+0/-1)
src/.deps/about.Po (+2780/-1)
src/.deps/canvas.Po (+2867/-1492)
src/.deps/font.Po (+2806/-1)
src/.deps/frame.Po (+3975/-0)
src/.deps/main.Po (+2119/-1730)
src/.deps/mainwindow.Po (+3624/-2716)
src/.deps/mytabs.Po (+0/-1)
src/.deps/newdialog.Po (+2255/-1123)
src/.deps/newfile.Po (+0/-3592)
src/.deps/openfile.Po (+1186/-1124)
src/.deps/photofiltrelx-LX.Po (+0/-1)
src/.deps/prefs.Po (+2800/-1)
src/Makefile (+471/-39)
src/Makefile.am (+4/-36)
src/Makefile.in (+175/-468)
src/autom4te.cache/output.0 (+0/-8186)
src/autom4te.cache/output.1 (+0/-8186)
src/autom4te.cache/requests (+0/-158)
src/autom4te.cache/traces.0 (+0/-1083)
src/autom4te.cache/traces.1 (+0/-681)
src/canvas.cc (+207/-39)
src/canvas.h (+10/-2)
src/compile (+0/-5)
src/config.h (+89/-0)
src/cursors/cursors.svg (+0/-625)
src/main.glade (+0/-3171)
src/mainwindow.cc (+16/-2)
src/mainwindow.h (+2/-0)
To merge this branch: bzr merge lp:~samuel-cowen89/photofiltre-lx/photofiltre-lx
Reviewer Review Type Date Requested Status
Dylan Coakley Pending
Review via email: mp+140014@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'AUTHORS'
2=== removed file 'COPYING'
3--- COPYING 2010-11-05 14:14:00 +0000
4+++ COPYING 1970-01-01 00:00:00 +0000
5@@ -1,674 +0,0 @@
6- GNU GENERAL PUBLIC LICENSE
7- Version 3, 29 June 2007
8-
9- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
10- Everyone is permitted to copy and distribute verbatim copies
11- of this license document, but changing it is not allowed.
12-
13- Preamble
14-
15- The GNU General Public License is a free, copyleft license for
16-software and other kinds of works.
17-
18- The licenses for most software and other practical works are designed
19-to take away your freedom to share and change the works. By contrast,
20-the GNU General Public License is intended to guarantee your freedom to
21-share and change all versions of a program--to make sure it remains free
22-software for all its users. We, the Free Software Foundation, use the
23-GNU General Public License for most of our software; it applies also to
24-any other work released this way by its authors. You can apply it to
25-your programs, too.
26-
27- When we speak of free software, we are referring to freedom, not
28-price. Our General Public Licenses are designed to make sure that you
29-have the freedom to distribute copies of free software (and charge for
30-them if you wish), that you receive source code or can get it if you
31-want it, that you can change the software or use pieces of it in new
32-free programs, and that you know you can do these things.
33-
34- To protect your rights, we need to prevent others from denying you
35-these rights or asking you to surrender the rights. Therefore, you have
36-certain responsibilities if you distribute copies of the software, or if
37-you modify it: responsibilities to respect the freedom of others.
38-
39- For example, if you distribute copies of such a program, whether
40-gratis or for a fee, you must pass on to the recipients the same
41-freedoms that you received. You must make sure that they, too, receive
42-or can get the source code. And you must show them these terms so they
43-know their rights.
44-
45- Developers that use the GNU GPL protect your rights with two steps:
46-(1) assert copyright on the software, and (2) offer you this License
47-giving you legal permission to copy, distribute and/or modify it.
48-
49- For the developers' and authors' protection, the GPL clearly explains
50-that there is no warranty for this free software. For both users' and
51-authors' sake, the GPL requires that modified versions be marked as
52-changed, so that their problems will not be attributed erroneously to
53-authors of previous versions.
54-
55- Some devices are designed to deny users access to install or run
56-modified versions of the software inside them, although the manufacturer
57-can do so. This is fundamentally incompatible with the aim of
58-protecting users' freedom to change the software. The systematic
59-pattern of such abuse occurs in the area of products for individuals to
60-use, which is precisely where it is most unacceptable. Therefore, we
61-have designed this version of the GPL to prohibit the practice for those
62-products. If such problems arise substantially in other domains, we
63-stand ready to extend this provision to those domains in future versions
64-of the GPL, as needed to protect the freedom of users.
65-
66- Finally, every program is threatened constantly by software patents.
67-States should not allow patents to restrict development and use of
68-software on general-purpose computers, but in those that do, we wish to
69-avoid the special danger that patents applied to a free program could
70-make it effectively proprietary. To prevent this, the GPL assures that
71-patents cannot be used to render the program non-free.
72-
73- The precise terms and conditions for copying, distribution and
74-modification follow.
75-
76- TERMS AND CONDITIONS
77-
78- 0. Definitions.
79-
80- "This License" refers to version 3 of the GNU General Public License.
81-
82- "Copyright" also means copyright-like laws that apply to other kinds of
83-works, such as semiconductor masks.
84-
85- "The Program" refers to any copyrightable work licensed under this
86-License. Each licensee is addressed as "you". "Licensees" and
87-"recipients" may be individuals or organizations.
88-
89- To "modify" a work means to copy from or adapt all or part of the work
90-in a fashion requiring copyright permission, other than the making of an
91-exact copy. The resulting work is called a "modified version" of the
92-earlier work or a work "based on" the earlier work.
93-
94- A "covered work" means either the unmodified Program or a work based
95-on the Program.
96-
97- To "propagate" a work means to do anything with it that, without
98-permission, would make you directly or secondarily liable for
99-infringement under applicable copyright law, except executing it on a
100-computer or modifying a private copy. Propagation includes copying,
101-distribution (with or without modification), making available to the
102-public, and in some countries other activities as well.
103-
104- To "convey" a work means any kind of propagation that enables other
105-parties to make or receive copies. Mere interaction with a user through
106-a computer network, with no transfer of a copy, is not conveying.
107-
108- An interactive user interface displays "Appropriate Legal Notices"
109-to the extent that it includes a convenient and prominently visible
110-feature that (1) displays an appropriate copyright notice, and (2)
111-tells the user that there is no warranty for the work (except to the
112-extent that warranties are provided), that licensees may convey the
113-work under this License, and how to view a copy of this License. If
114-the interface presents a list of user commands or options, such as a
115-menu, a prominent item in the list meets this criterion.
116-
117- 1. Source Code.
118-
119- The "source code" for a work means the preferred form of the work
120-for making modifications to it. "Object code" means any non-source
121-form of a work.
122-
123- A "Standard Interface" means an interface that either is an official
124-standard defined by a recognized standards body, or, in the case of
125-interfaces specified for a particular programming language, one that
126-is widely used among developers working in that language.
127-
128- The "System Libraries" of an executable work include anything, other
129-than the work as a whole, that (a) is included in the normal form of
130-packaging a Major Component, but which is not part of that Major
131-Component, and (b) serves only to enable use of the work with that
132-Major Component, or to implement a Standard Interface for which an
133-implementation is available to the public in source code form. A
134-"Major Component", in this context, means a major essential component
135-(kernel, window system, and so on) of the specific operating system
136-(if any) on which the executable work runs, or a compiler used to
137-produce the work, or an object code interpreter used to run it.
138-
139- The "Corresponding Source" for a work in object code form means all
140-the source code needed to generate, install, and (for an executable
141-work) run the object code and to modify the work, including scripts to
142-control those activities. However, it does not include the work's
143-System Libraries, or general-purpose tools or generally available free
144-programs which are used unmodified in performing those activities but
145-which are not part of the work. For example, Corresponding Source
146-includes interface definition files associated with source files for
147-the work, and the source code for shared libraries and dynamically
148-linked subprograms that the work is specifically designed to require,
149-such as by intimate data communication or control flow between those
150-subprograms and other parts of the work.
151-
152- The Corresponding Source need not include anything that users
153-can regenerate automatically from other parts of the Corresponding
154-Source.
155-
156- The Corresponding Source for a work in source code form is that
157-same work.
158-
159- 2. Basic Permissions.
160-
161- All rights granted under this License are granted for the term of
162-copyright on the Program, and are irrevocable provided the stated
163-conditions are met. This License explicitly affirms your unlimited
164-permission to run the unmodified Program. The output from running a
165-covered work is covered by this License only if the output, given its
166-content, constitutes a covered work. This License acknowledges your
167-rights of fair use or other equivalent, as provided by copyright law.
168-
169- You may make, run and propagate covered works that you do not
170-convey, without conditions so long as your license otherwise remains
171-in force. You may convey covered works to others for the sole purpose
172-of having them make modifications exclusively for you, or provide you
173-with facilities for running those works, provided that you comply with
174-the terms of this License in conveying all material for which you do
175-not control copyright. Those thus making or running the covered works
176-for you must do so exclusively on your behalf, under your direction
177-and control, on terms that prohibit them from making any copies of
178-your copyrighted material outside their relationship with you.
179-
180- Conveying under any other circumstances is permitted solely under
181-the conditions stated below. Sublicensing is not allowed; section 10
182-makes it unnecessary.
183-
184- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
185-
186- No covered work shall be deemed part of an effective technological
187-measure under any applicable law fulfilling obligations under article
188-11 of the WIPO copyright treaty adopted on 20 December 1996, or
189-similar laws prohibiting or restricting circumvention of such
190-measures.
191-
192- When you convey a covered work, you waive any legal power to forbid
193-circumvention of technological measures to the extent such circumvention
194-is effected by exercising rights under this License with respect to
195-the covered work, and you disclaim any intention to limit operation or
196-modification of the work as a means of enforcing, against the work's
197-users, your or third parties' legal rights to forbid circumvention of
198-technological measures.
199-
200- 4. Conveying Verbatim Copies.
201-
202- You may convey verbatim copies of the Program's source code as you
203-receive it, in any medium, provided that you conspicuously and
204-appropriately publish on each copy an appropriate copyright notice;
205-keep intact all notices stating that this License and any
206-non-permissive terms added in accord with section 7 apply to the code;
207-keep intact all notices of the absence of any warranty; and give all
208-recipients a copy of this License along with the Program.
209-
210- You may charge any price or no price for each copy that you convey,
211-and you may offer support or warranty protection for a fee.
212-
213- 5. Conveying Modified Source Versions.
214-
215- You may convey a work based on the Program, or the modifications to
216-produce it from the Program, in the form of source code under the
217-terms of section 4, provided that you also meet all of these conditions:
218-
219- a) The work must carry prominent notices stating that you modified
220- it, and giving a relevant date.
221-
222- b) The work must carry prominent notices stating that it is
223- released under this License and any conditions added under section
224- 7. This requirement modifies the requirement in section 4 to
225- "keep intact all notices".
226-
227- c) You must license the entire work, as a whole, under this
228- License to anyone who comes into possession of a copy. This
229- License will therefore apply, along with any applicable section 7
230- additional terms, to the whole of the work, and all its parts,
231- regardless of how they are packaged. This License gives no
232- permission to license the work in any other way, but it does not
233- invalidate such permission if you have separately received it.
234-
235- d) If the work has interactive user interfaces, each must display
236- Appropriate Legal Notices; however, if the Program has interactive
237- interfaces that do not display Appropriate Legal Notices, your
238- work need not make them do so.
239-
240- A compilation of a covered work with other separate and independent
241-works, which are not by their nature extensions of the covered work,
242-and which are not combined with it such as to form a larger program,
243-in or on a volume of a storage or distribution medium, is called an
244-"aggregate" if the compilation and its resulting copyright are not
245-used to limit the access or legal rights of the compilation's users
246-beyond what the individual works permit. Inclusion of a covered work
247-in an aggregate does not cause this License to apply to the other
248-parts of the aggregate.
249-
250- 6. Conveying Non-Source Forms.
251-
252- You may convey a covered work in object code form under the terms
253-of sections 4 and 5, provided that you also convey the
254-machine-readable Corresponding Source under the terms of this License,
255-in one of these ways:
256-
257- a) Convey the object code in, or embodied in, a physical product
258- (including a physical distribution medium), accompanied by the
259- Corresponding Source fixed on a durable physical medium
260- customarily used for software interchange.
261-
262- b) Convey the object code in, or embodied in, a physical product
263- (including a physical distribution medium), accompanied by a
264- written offer, valid for at least three years and valid for as
265- long as you offer spare parts or customer support for that product
266- model, to give anyone who possesses the object code either (1) a
267- copy of the Corresponding Source for all the software in the
268- product that is covered by this License, on a durable physical
269- medium customarily used for software interchange, for a price no
270- more than your reasonable cost of physically performing this
271- conveying of source, or (2) access to copy the
272- Corresponding Source from a network server at no charge.
273-
274- c) Convey individual copies of the object code with a copy of the
275- written offer to provide the Corresponding Source. This
276- alternative is allowed only occasionally and noncommercially, and
277- only if you received the object code with such an offer, in accord
278- with subsection 6b.
279-
280- d) Convey the object code by offering access from a designated
281- place (gratis or for a charge), and offer equivalent access to the
282- Corresponding Source in the same way through the same place at no
283- further charge. You need not require recipients to copy the
284- Corresponding Source along with the object code. If the place to
285- copy the object code is a network server, the Corresponding Source
286- may be on a different server (operated by you or a third party)
287- that supports equivalent copying facilities, provided you maintain
288- clear directions next to the object code saying where to find the
289- Corresponding Source. Regardless of what server hosts the
290- Corresponding Source, you remain obligated to ensure that it is
291- available for as long as needed to satisfy these requirements.
292-
293- e) Convey the object code using peer-to-peer transmission, provided
294- you inform other peers where the object code and Corresponding
295- Source of the work are being offered to the general public at no
296- charge under subsection 6d.
297-
298- A separable portion of the object code, whose source code is excluded
299-from the Corresponding Source as a System Library, need not be
300-included in conveying the object code work.
301-
302- A "User Product" is either (1) a "consumer product", which means any
303-tangible personal property which is normally used for personal, family,
304-or household purposes, or (2) anything designed or sold for incorporation
305-into a dwelling. In determining whether a product is a consumer product,
306-doubtful cases shall be resolved in favor of coverage. For a particular
307-product received by a particular user, "normally used" refers to a
308-typical or common use of that class of product, regardless of the status
309-of the particular user or of the way in which the particular user
310-actually uses, or expects or is expected to use, the product. A product
311-is a consumer product regardless of whether the product has substantial
312-commercial, industrial or non-consumer uses, unless such uses represent
313-the only significant mode of use of the product.
314-
315- "Installation Information" for a User Product means any methods,
316-procedures, authorization keys, or other information required to install
317-and execute modified versions of a covered work in that User Product from
318-a modified version of its Corresponding Source. The information must
319-suffice to ensure that the continued functioning of the modified object
320-code is in no case prevented or interfered with solely because
321-modification has been made.
322-
323- If you convey an object code work under this section in, or with, or
324-specifically for use in, a User Product, and the conveying occurs as
325-part of a transaction in which the right of possession and use of the
326-User Product is transferred to the recipient in perpetuity or for a
327-fixed term (regardless of how the transaction is characterized), the
328-Corresponding Source conveyed under this section must be accompanied
329-by the Installation Information. But this requirement does not apply
330-if neither you nor any third party retains the ability to install
331-modified object code on the User Product (for example, the work has
332-been installed in ROM).
333-
334- The requirement to provide Installation Information does not include a
335-requirement to continue to provide support service, warranty, or updates
336-for a work that has been modified or installed by the recipient, or for
337-the User Product in which it has been modified or installed. Access to a
338-network may be denied when the modification itself materially and
339-adversely affects the operation of the network or violates the rules and
340-protocols for communication across the network.
341-
342- Corresponding Source conveyed, and Installation Information provided,
343-in accord with this section must be in a format that is publicly
344-documented (and with an implementation available to the public in
345-source code form), and must require no special password or key for
346-unpacking, reading or copying.
347-
348- 7. Additional Terms.
349-
350- "Additional permissions" are terms that supplement the terms of this
351-License by making exceptions from one or more of its conditions.
352-Additional permissions that are applicable to the entire Program shall
353-be treated as though they were included in this License, to the extent
354-that they are valid under applicable law. If additional permissions
355-apply only to part of the Program, that part may be used separately
356-under those permissions, but the entire Program remains governed by
357-this License without regard to the additional permissions.
358-
359- When you convey a copy of a covered work, you may at your option
360-remove any additional permissions from that copy, or from any part of
361-it. (Additional permissions may be written to require their own
362-removal in certain cases when you modify the work.) You may place
363-additional permissions on material, added by you to a covered work,
364-for which you have or can give appropriate copyright permission.
365-
366- Notwithstanding any other provision of this License, for material you
367-add to a covered work, you may (if authorized by the copyright holders of
368-that material) supplement the terms of this License with terms:
369-
370- a) Disclaiming warranty or limiting liability differently from the
371- terms of sections 15 and 16 of this License; or
372-
373- b) Requiring preservation of specified reasonable legal notices or
374- author attributions in that material or in the Appropriate Legal
375- Notices displayed by works containing it; or
376-
377- c) Prohibiting misrepresentation of the origin of that material, or
378- requiring that modified versions of such material be marked in
379- reasonable ways as different from the original version; or
380-
381- d) Limiting the use for publicity purposes of names of licensors or
382- authors of the material; or
383-
384- e) Declining to grant rights under trademark law for use of some
385- trade names, trademarks, or service marks; or
386-
387- f) Requiring indemnification of licensors and authors of that
388- material by anyone who conveys the material (or modified versions of
389- it) with contractual assumptions of liability to the recipient, for
390- any liability that these contractual assumptions directly impose on
391- those licensors and authors.
392-
393- All other non-permissive additional terms are considered "further
394-restrictions" within the meaning of section 10. If the Program as you
395-received it, or any part of it, contains a notice stating that it is
396-governed by this License along with a term that is a further
397-restriction, you may remove that term. If a license document contains
398-a further restriction but permits relicensing or conveying under this
399-License, you may add to a covered work material governed by the terms
400-of that license document, provided that the further restriction does
401-not survive such relicensing or conveying.
402-
403- If you add terms to a covered work in accord with this section, you
404-must place, in the relevant source files, a statement of the
405-additional terms that apply to those files, or a notice indicating
406-where to find the applicable terms.
407-
408- Additional terms, permissive or non-permissive, may be stated in the
409-form of a separately written license, or stated as exceptions;
410-the above requirements apply either way.
411-
412- 8. Termination.
413-
414- You may not propagate or modify a covered work except as expressly
415-provided under this License. Any attempt otherwise to propagate or
416-modify it is void, and will automatically terminate your rights under
417-this License (including any patent licenses granted under the third
418-paragraph of section 11).
419-
420- However, if you cease all violation of this License, then your
421-license from a particular copyright holder is reinstated (a)
422-provisionally, unless and until the copyright holder explicitly and
423-finally terminates your license, and (b) permanently, if the copyright
424-holder fails to notify you of the violation by some reasonable means
425-prior to 60 days after the cessation.
426-
427- Moreover, your license from a particular copyright holder is
428-reinstated permanently if the copyright holder notifies you of the
429-violation by some reasonable means, this is the first time you have
430-received notice of violation of this License (for any work) from that
431-copyright holder, and you cure the violation prior to 30 days after
432-your receipt of the notice.
433-
434- Termination of your rights under this section does not terminate the
435-licenses of parties who have received copies or rights from you under
436-this License. If your rights have been terminated and not permanently
437-reinstated, you do not qualify to receive new licenses for the same
438-material under section 10.
439-
440- 9. Acceptance Not Required for Having Copies.
441-
442- You are not required to accept this License in order to receive or
443-run a copy of the Program. Ancillary propagation of a covered work
444-occurring solely as a consequence of using peer-to-peer transmission
445-to receive a copy likewise does not require acceptance. However,
446-nothing other than this License grants you permission to propagate or
447-modify any covered work. These actions infringe copyright if you do
448-not accept this License. Therefore, by modifying or propagating a
449-covered work, you indicate your acceptance of this License to do so.
450-
451- 10. Automatic Licensing of Downstream Recipients.
452-
453- Each time you convey a covered work, the recipient automatically
454-receives a license from the original licensors, to run, modify and
455-propagate that work, subject to this License. You are not responsible
456-for enforcing compliance by third parties with this License.
457-
458- An "entity transaction" is a transaction transferring control of an
459-organization, or substantially all assets of one, or subdividing an
460-organization, or merging organizations. If propagation of a covered
461-work results from an entity transaction, each party to that
462-transaction who receives a copy of the work also receives whatever
463-licenses to the work the party's predecessor in interest had or could
464-give under the previous paragraph, plus a right to possession of the
465-Corresponding Source of the work from the predecessor in interest, if
466-the predecessor has it or can get it with reasonable efforts.
467-
468- You may not impose any further restrictions on the exercise of the
469-rights granted or affirmed under this License. For example, you may
470-not impose a license fee, royalty, or other charge for exercise of
471-rights granted under this License, and you may not initiate litigation
472-(including a cross-claim or counterclaim in a lawsuit) alleging that
473-any patent claim is infringed by making, using, selling, offering for
474-sale, or importing the Program or any portion of it.
475-
476- 11. Patents.
477-
478- A "contributor" is a copyright holder who authorizes use under this
479-License of the Program or a work on which the Program is based. The
480-work thus licensed is called the contributor's "contributor version".
481-
482- A contributor's "essential patent claims" are all patent claims
483-owned or controlled by the contributor, whether already acquired or
484-hereafter acquired, that would be infringed by some manner, permitted
485-by this License, of making, using, or selling its contributor version,
486-but do not include claims that would be infringed only as a
487-consequence of further modification of the contributor version. For
488-purposes of this definition, "control" includes the right to grant
489-patent sublicenses in a manner consistent with the requirements of
490-this License.
491-
492- Each contributor grants you a non-exclusive, worldwide, royalty-free
493-patent license under the contributor's essential patent claims, to
494-make, use, sell, offer for sale, import and otherwise run, modify and
495-propagate the contents of its contributor version.
496-
497- In the following three paragraphs, a "patent license" is any express
498-agreement or commitment, however denominated, not to enforce a patent
499-(such as an express permission to practice a patent or covenant not to
500-sue for patent infringement). To "grant" such a patent license to a
501-party means to make such an agreement or commitment not to enforce a
502-patent against the party.
503-
504- If you convey a covered work, knowingly relying on a patent license,
505-and the Corresponding Source of the work is not available for anyone
506-to copy, free of charge and under the terms of this License, through a
507-publicly available network server or other readily accessible means,
508-then you must either (1) cause the Corresponding Source to be so
509-available, or (2) arrange to deprive yourself of the benefit of the
510-patent license for this particular work, or (3) arrange, in a manner
511-consistent with the requirements of this License, to extend the patent
512-license to downstream recipients. "Knowingly relying" means you have
513-actual knowledge that, but for the patent license, your conveying the
514-covered work in a country, or your recipient's use of the covered work
515-in a country, would infringe one or more identifiable patents in that
516-country that you have reason to believe are valid.
517-
518- If, pursuant to or in connection with a single transaction or
519-arrangement, you convey, or propagate by procuring conveyance of, a
520-covered work, and grant a patent license to some of the parties
521-receiving the covered work authorizing them to use, propagate, modify
522-or convey a specific copy of the covered work, then the patent license
523-you grant is automatically extended to all recipients of the covered
524-work and works based on it.
525-
526- A patent license is "discriminatory" if it does not include within
527-the scope of its coverage, prohibits the exercise of, or is
528-conditioned on the non-exercise of one or more of the rights that are
529-specifically granted under this License. You may not convey a covered
530-work if you are a party to an arrangement with a third party that is
531-in the business of distributing software, under which you make payment
532-to the third party based on the extent of your activity of conveying
533-the work, and under which the third party grants, to any of the
534-parties who would receive the covered work from you, a discriminatory
535-patent license (a) in connection with copies of the covered work
536-conveyed by you (or copies made from those copies), or (b) primarily
537-for and in connection with specific products or compilations that
538-contain the covered work, unless you entered into that arrangement,
539-or that patent license was granted, prior to 28 March 2007.
540-
541- Nothing in this License shall be construed as excluding or limiting
542-any implied license or other defenses to infringement that may
543-otherwise be available to you under applicable patent law.
544-
545- 12. No Surrender of Others' Freedom.
546-
547- If conditions are imposed on you (whether by court order, agreement or
548-otherwise) that contradict the conditions of this License, they do not
549-excuse you from the conditions of this License. If you cannot convey a
550-covered work so as to satisfy simultaneously your obligations under this
551-License and any other pertinent obligations, then as a consequence you may
552-not convey it at all. For example, if you agree to terms that obligate you
553-to collect a royalty for further conveying from those to whom you convey
554-the Program, the only way you could satisfy both those terms and this
555-License would be to refrain entirely from conveying the Program.
556-
557- 13. Use with the GNU Affero General Public License.
558-
559- Notwithstanding any other provision of this License, you have
560-permission to link or combine any covered work with a work licensed
561-under version 3 of the GNU Affero General Public License into a single
562-combined work, and to convey the resulting work. The terms of this
563-License will continue to apply to the part which is the covered work,
564-but the special requirements of the GNU Affero General Public License,
565-section 13, concerning interaction through a network will apply to the
566-combination as such.
567-
568- 14. Revised Versions of this License.
569-
570- The Free Software Foundation may publish revised and/or new versions of
571-the GNU General Public License from time to time. Such new versions will
572-be similar in spirit to the present version, but may differ in detail to
573-address new problems or concerns.
574-
575- Each version is given a distinguishing version number. If the
576-Program specifies that a certain numbered version of the GNU General
577-Public License "or any later version" applies to it, you have the
578-option of following the terms and conditions either of that numbered
579-version or of any later version published by the Free Software
580-Foundation. If the Program does not specify a version number of the
581-GNU General Public License, you may choose any version ever published
582-by the Free Software Foundation.
583-
584- If the Program specifies that a proxy can decide which future
585-versions of the GNU General Public License can be used, that proxy's
586-public statement of acceptance of a version permanently authorizes you
587-to choose that version for the Program.
588-
589- Later license versions may give you additional or different
590-permissions. However, no additional obligations are imposed on any
591-author or copyright holder as a result of your choosing to follow a
592-later version.
593-
594- 15. Disclaimer of Warranty.
595-
596- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
597-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
598-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
599-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
600-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
601-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
602-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
603-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
604-
605- 16. Limitation of Liability.
606-
607- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
608-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
609-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
610-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
611-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
612-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
613-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
614-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
615-SUCH DAMAGES.
616-
617- 17. Interpretation of Sections 15 and 16.
618-
619- If the disclaimer of warranty and limitation of liability provided
620-above cannot be given local legal effect according to their terms,
621-reviewing courts shall apply local law that most closely approximates
622-an absolute waiver of all civil liability in connection with the
623-Program, unless a warranty or assumption of liability accompanies a
624-copy of the Program in return for a fee.
625-
626- END OF TERMS AND CONDITIONS
627-
628- How to Apply These Terms to Your New Programs
629-
630- If you develop a new program, and you want it to be of the greatest
631-possible use to the public, the best way to achieve this is to make it
632-free software which everyone can redistribute and change under these terms.
633-
634- To do so, attach the following notices to the program. It is safest
635-to attach them to the start of each source file to most effectively
636-state the exclusion of warranty; and each file should have at least
637-the "copyright" line and a pointer to where the full notice is found.
638-
639- <one line to give the program's name and a brief idea of what it does.>
640- Copyright (C) <year> <name of author>
641-
642- This program is free software: you can redistribute it and/or modify
643- it under the terms of the GNU General Public License as published by
644- the Free Software Foundation, either version 3 of the License, or
645- (at your option) any later version.
646-
647- This program is distributed in the hope that it will be useful,
648- but WITHOUT ANY WARRANTY; without even the implied warranty of
649- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
650- GNU General Public License for more details.
651-
652- You should have received a copy of the GNU General Public License
653- along with this program. If not, see <http://www.gnu.org/licenses/>.
654-
655-Also add information on how to contact you by electronic and paper mail.
656-
657- If the program does terminal interaction, make it output a short
658-notice like this when it starts in an interactive mode:
659-
660- <program> Copyright (C) <year> <name of author>
661- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
662- This is free software, and you are welcome to redistribute it
663- under certain conditions; type `show c' for details.
664-
665-The hypothetical commands `show w' and `show c' should show the appropriate
666-parts of the General Public License. Of course, your program's commands
667-might be different; for a GUI interface, you would use an "about box".
668-
669- You should also get your employer (if you work as a programmer) or school,
670-if any, to sign a "copyright disclaimer" for the program, if necessary.
671-For more information on this, and how to apply and follow the GNU GPL, see
672-<http://www.gnu.org/licenses/>.
673-
674- The GNU General Public License does not permit incorporating your program
675-into proprietary programs. If your program is a subroutine library, you
676-may consider it more useful to permit linking proprietary applications with
677-the library. If this is what you want to do, use the GNU Lesser General
678-Public License instead of this License. But first, please read
679-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
680
681=== removed file 'ChangeLog'
682--- ChangeLog 2012-11-26 16:30:46 +0000
683+++ ChangeLog 1970-01-01 00:00:00 +0000
684@@ -1,132 +0,0 @@
685-0.0.6.0
686- -The Ok button on the newfile dialog can now create a new tab.
687- -A new canvas can be created from the newfile dialog taking both width and height into account.
688- -PNG, JPEG, BMP, TGA and GIF files can be opened with the open button or File>>Open menu.
689- -Added paintBrush tool with colour selection.
690- -PNG, JPEG, BMP, TGA and GIF files can be saved if created/edited.
691- -PhotoFiltre LX now creates a preferences file and can read/write to it.
692- -Added file filters back to the Open file dialog.
693- -Changed application icon to the new one.
694- -Added colour picker tool.
695- -Images are now contained within a scrollview, you can scroll the image both horizontally and vertically.
696- -Added zooming/scaling which can be controlled with the scrollwheel or menus.
697- -Now has Greyscale, Brightness increase/decrease, Contrast increase/decrease, Old photography functionality.
698- -Recent files menu entry with filtered results to only display supported image files.
699- -Added paintBucket tool.
700-
701-0.0.5.0
702- -Replaced Blur toolpalette icon.
703- -Rewrote GUI code to use one .glade file at startup to avoid constant xml parsing for dialogs.
704- -Fixed preferences dialog not appearing.
705- -Added functionality for buttons, comboboxes and spinbuttons in newDialog.
706- -Changed toolpalette from code to being built into the .glade file.
707- -Added app icon for the Unity sidebar.
708- -Updated newfile dialog (pixels/cm conversion).
709- -Added full tab support to contain user images/graphics.
710- -Added full cursor support.
711- -Added new better looking Blur cursor.
712- -Minor additions to preferences dialog.
713- -Fixed critical bug, source not compiling with GNU autotools.
714-
715-0.0.4.5
716- -Gave toolpalette proper tooltips instead of using icon filenames.
717- -Set size of toolpalette to hold two columns of icons.
718- -Added second toolbar and toolbar items.
719- -Fixed Autotools in order to build using Gtkmm 3.0.
720- -Updated new file dialog for better appearance.
721- -Made width,height spin buttons tickable in new file dialog.
722- -Added colour selection button and dialog.
723- -Improved appearance of colour selection button.
724-
725-0.0.4.0
726- -Linked fontDialog to menu entry.
727- -Added new GTK3 fontDialog.
728- -Fixed width of Toolpalette expanding too much on maximize.
729- -Updated aboutDialog to include proper license information.
730- -Fixed regression with the toolpalette width.
731- -Ported existing code to GTK3.
732- -Removed GTK2 textDialog from mainwindow.glade.
733- -Updated compile script for less delay and better binary name.
734-
735-
736-0.0.3.0
737- -Added basic preferences dialog.
738- -Changed credits inside aboutDialog to remove horizontal scrollbar.
739- -Updated credits to include logo/icon creators.
740- -Changed size of mainwindow and width of preferences dialog.
741- -Improved text alignment of the newfile dialog.
742-
743- Mainwindow Re-write:
744- -Rewrote mainwindow code.
745- -Added toolpalette to new mainwindow.
746- -Added my basic toolpalette icons.
747- -Added menu placeholders.
748- -Added toolbar.
749- -Added stock and custom icons to toolbar.
750- -Added toolbar tooltips.
751- -Added Newfile dialog to menu and button.
752- -Added Openfile dialog to menu and button.
753- -Added full menus for everything in the menubar.
754- -Fixed width of toolpalette.
755-
756-
757-0.0.2.7
758- -Split about dialog from mainwindow into separate files.
759- -Split open dialog from mainwindow into separate files.
760- -Added simple compile script for those who can't use GNU-autoTools.
761-
762-0.0.2.6
763- -Merged NewDialog in main codebase.
764- -Stripped out un-used code in NewDialog.
765-
766-0.0.2.5
767- -Converted to GNU autotools build system - Michael Sheppard 07.13.2010.
768- -Added PhotoFiltre LX logo in the aboutdialog.
769- -Complete re-write of the newfiledialog.
770-
771-0.0.2.0
772- -Added a full icon set for the first toolbar.
773- -Created new GUI for the Newfiledialog. (not merged with mainwindow yet)
774- -Fixed appearance of the about dialog.
775-
776-0.0.1.9
777-
778- -Implemented a working "Recent Files" function.
779- -Added a new much improved RGB icon.
780- -Added a new Openfile dialog.
781- -Implemented filters for JPEG and PNG files.
782- -Optimized and did code cleanup for Openfile dialog.
783- -Filled out all code with plenty of comments to make development easier.
784- -Started Newfile dialog.
785-
786-0.0.1.5
787-
788- -Finished about dialog.
789- -Merged the about dialog from the separate about.cc and about.h files into mainwindow.cc, mainwindow.h.
790- -Applied fixes provided by SledgeHammer_999 to properly link the about dialog to menu entry.
791- -Added tooltips to all toolbar buttons with icons.
792-
793-0.0.1.1
794-
795- -Reduced overall toolbar size.
796- -Removed toolbar text.
797- -Completed first toolbar.
798- -Added icon for RGB Mode.
799- -Added submenus for Mode in the Image menu.
800- -Added submenus for Import twain in the File menu.
801- -Added icon for Acquire image (scan) on the toolbar.
802- -Started preparation of an about dialog.
803-
804-0.0.0.8
805-
806- - Completed Image menu, Selection menu, Adjust menu, Filter menu, View menu, Tools menu, Window menu and ? menu.
807-
808-0.0.0.2
809-
810- - Completed File and Edit menus.
811- - Started work on first toolbar.
812-
813-0.0.0.1
814-
815- - Added main window.
816-
817
818=== removed file 'Credits'
819--- Credits 2010-11-05 14:14:00 +0000
820+++ Credits 1970-01-01 00:00:00 +0000
821@@ -1,17 +0,0 @@
822-The Developer(s):
823-
824-Dylan Coakley (C++/Gtkmm)
825--------------------------------------------------------------
826-The Contributor(s):
827-
828-Michael Sheppard (C++/GTKmm)
829-SledgeHammer_999 from Ubuntu forums (GTKmm)
830-makefile from Gnomelook.org (Icon)
831-Helene Levernieux (Official PhotoFiltre LX icon)
832--------------------------------------------------------------
833-Special thanks to the following people for their help/advice:
834-
835-Messaoudi Rabah
836-Tony Ekron
837-Sasha Kuznetsov
838-
839
840=== removed file 'GPL v3'
841--- GPL v3 2010-11-05 14:14:00 +0000
842+++ GPL v3 1970-01-01 00:00:00 +0000
843@@ -1,621 +0,0 @@
844- GNU GENERAL PUBLIC LICENSE
845- Version 3, 29 June 2007
846-
847- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
848- Everyone is permitted to copy and distribute verbatim copies
849- of this license document, but changing it is not allowed.
850-
851- Preamble
852-
853- The GNU General Public License is a free, copyleft license for
854-software and other kinds of works.
855-
856- The licenses for most software and other practical works are designed
857-to take away your freedom to share and change the works. By contrast,
858-the GNU General Public License is intended to guarantee your freedom to
859-share and change all versions of a program--to make sure it remains free
860-software for all its users. We, the Free Software Foundation, use the
861-GNU General Public License for most of our software; it applies also to
862-any other work released this way by its authors. You can apply it to
863-your programs, too.
864-
865- When we speak of free software, we are referring to freedom, not
866-price. Our General Public Licenses are designed to make sure that you
867-have the freedom to distribute copies of free software (and charge for
868-them if you wish), that you receive source code or can get it if you
869-want it, that you can change the software or use pieces of it in new
870-free programs, and that you know you can do these things.
871-
872- To protect your rights, we need to prevent others from denying you
873-these rights or asking you to surrender the rights. Therefore, you have
874-certain responsibilities if you distribute copies of the software, or if
875-you modify it: responsibilities to respect the freedom of others.
876-
877- For example, if you distribute copies of such a program, whether
878-gratis or for a fee, you must pass on to the recipients the same
879-freedoms that you received. You must make sure that they, too, receive
880-or can get the source code. And you must show them these terms so they
881-know their rights.
882-
883- Developers that use the GNU GPL protect your rights with two steps:
884-(1) assert copyright on the software, and (2) offer you this License
885-giving you legal permission to copy, distribute and/or modify it.
886-
887- For the developers' and authors' protection, the GPL clearly explains
888-that there is no warranty for this free software. For both users' and
889-authors' sake, the GPL requires that modified versions be marked as
890-changed, so that their problems will not be attributed erroneously to
891-authors of previous versions.
892-
893- Some devices are designed to deny users access to install or run
894-modified versions of the software inside them, although the manufacturer
895-can do so. This is fundamentally incompatible with the aim of
896-protecting users' freedom to change the software. The systematic
897-pattern of such abuse occurs in the area of products for individuals to
898-use, which is precisely where it is most unacceptable. Therefore, we
899-have designed this version of the GPL to prohibit the practice for those
900-products. If such problems arise substantially in other domains, we
901-stand ready to extend this provision to those domains in future versions
902-of the GPL, as needed to protect the freedom of users.
903-
904- Finally, every program is threatened constantly by software patents.
905-States should not allow patents to restrict development and use of
906-software on general-purpose computers, but in those that do, we wish to
907-avoid the special danger that patents applied to a free program could
908-make it effectively proprietary. To prevent this, the GPL assures that
909-patents cannot be used to render the program non-free.
910-
911- The precise terms and conditions for copying, distribution and
912-modification follow.
913-
914- TERMS AND CONDITIONS
915-
916- 0. Definitions.
917-
918- "This License" refers to version 3 of the GNU General Public License.
919-
920- "Copyright" also means copyright-like laws that apply to other kinds of
921-works, such as semiconductor masks.
922-
923- "The Program" refers to any copyrightable work licensed under this
924-License. Each licensee is addressed as "you". "Licensees" and
925-"recipients" may be individuals or organizations.
926-
927- To "modify" a work means to copy from or adapt all or part of the work
928-in a fashion requiring copyright permission, other than the making of an
929-exact copy. The resulting work is called a "modified version" of the
930-earlier work or a work "based on" the earlier work.
931-
932- A "covered work" means either the unmodified Program or a work based
933-on the Program.
934-
935- To "propagate" a work means to do anything with it that, without
936-permission, would make you directly or secondarily liable for
937-infringement under applicable copyright law, except executing it on a
938-computer or modifying a private copy. Propagation includes copying,
939-distribution (with or without modification), making available to the
940-public, and in some countries other activities as well.
941-
942- To "convey" a work means any kind of propagation that enables other
943-parties to make or receive copies. Mere interaction with a user through
944-a computer network, with no transfer of a copy, is not conveying.
945-
946- An interactive user interface displays "Appropriate Legal Notices"
947-to the extent that it includes a convenient and prominently visible
948-feature that (1) displays an appropriate copyright notice, and (2)
949-tells the user that there is no warranty for the work (except to the
950-extent that warranties are provided), that licensees may convey the
951-work under this License, and how to view a copy of this License. If
952-the interface presents a list of user commands or options, such as a
953-menu, a prominent item in the list meets this criterion.
954-
955- 1. Source Code.
956-
957- The "source code" for a work means the preferred form of the work
958-for making modifications to it. "Object code" means any non-source
959-form of a work.
960-
961- A "Standard Interface" means an interface that either is an official
962-standard defined by a recognized standards body, or, in the case of
963-interfaces specified for a particular programming language, one that
964-is widely used among developers working in that language.
965-
966- The "System Libraries" of an executable work include anything, other
967-than the work as a whole, that (a) is included in the normal form of
968-packaging a Major Component, but which is not part of that Major
969-Component, and (b) serves only to enable use of the work with that
970-Major Component, or to implement a Standard Interface for which an
971-implementation is available to the public in source code form. A
972-"Major Component", in this context, means a major essential component
973-(kernel, window system, and so on) of the specific operating system
974-(if any) on which the executable work runs, or a compiler used to
975-produce the work, or an object code interpreter used to run it.
976-
977- The "Corresponding Source" for a work in object code form means all
978-the source code needed to generate, install, and (for an executable
979-work) run the object code and to modify the work, including scripts to
980-control those activities. However, it does not include the work's
981-System Libraries, or general-purpose tools or generally available free
982-programs which are used unmodified in performing those activities but
983-which are not part of the work. For example, Corresponding Source
984-includes interface definition files associated with source files for
985-the work, and the source code for shared libraries and dynamically
986-linked subprograms that the work is specifically designed to require,
987-such as by intimate data communication or control flow between those
988-subprograms and other parts of the work.
989-
990- The Corresponding Source need not include anything that users
991-can regenerate automatically from other parts of the Corresponding
992-Source.
993-
994- The Corresponding Source for a work in source code form is that
995-same work.
996-
997- 2. Basic Permissions.
998-
999- All rights granted under this License are granted for the term of
1000-copyright on the Program, and are irrevocable provided the stated
1001-conditions are met. This License explicitly affirms your unlimited
1002-permission to run the unmodified Program. The output from running a
1003-covered work is covered by this License only if the output, given its
1004-content, constitutes a covered work. This License acknowledges your
1005-rights of fair use or other equivalent, as provided by copyright law.
1006-
1007- You may make, run and propagate covered works that you do not
1008-convey, without conditions so long as your license otherwise remains
1009-in force. You may convey covered works to others for the sole purpose
1010-of having them make modifications exclusively for you, or provide you
1011-with facilities for running those works, provided that you comply with
1012-the terms of this License in conveying all material for which you do
1013-not control copyright. Those thus making or running the covered works
1014-for you must do so exclusively on your behalf, under your direction
1015-and control, on terms that prohibit them from making any copies of
1016-your copyrighted material outside their relationship with you.
1017-
1018- Conveying under any other circumstances is permitted solely under
1019-the conditions stated below. Sublicensing is not allowed; section 10
1020-makes it unnecessary.
1021-
1022- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
1023-
1024- No covered work shall be deemed part of an effective technological
1025-measure under any applicable law fulfilling obligations under article
1026-11 of the WIPO copyright treaty adopted on 20 December 1996, or
1027-similar laws prohibiting or restricting circumvention of such
1028-measures.
1029-
1030- When you convey a covered work, you waive any legal power to forbid
1031-circumvention of technological measures to the extent such circumvention
1032-is effected by exercising rights under this License with respect to
1033-the covered work, and you disclaim any intention to limit operation or
1034-modification of the work as a means of enforcing, against the work's
1035-users, your or third parties' legal rights to forbid circumvention of
1036-technological measures.
1037-
1038- 4. Conveying Verbatim Copies.
1039-
1040- You may convey verbatim copies of the Program's source code as you
1041-receive it, in any medium, provided that you conspicuously and
1042-appropriately publish on each copy an appropriate copyright notice;
1043-keep intact all notices stating that this License and any
1044-non-permissive terms added in accord with section 7 apply to the code;
1045-keep intact all notices of the absence of any warranty; and give all
1046-recipients a copy of this License along with the Program.
1047-
1048- You may charge any price or no price for each copy that you convey,
1049-and you may offer support or warranty protection for a fee.
1050-
1051- 5. Conveying Modified Source Versions.
1052-
1053- You may convey a work based on the Program, or the modifications to
1054-produce it from the Program, in the form of source code under the
1055-terms of section 4, provided that you also meet all of these conditions:
1056-
1057- a) The work must carry prominent notices stating that you modified
1058- it, and giving a relevant date.
1059-
1060- b) The work must carry prominent notices stating that it is
1061- released under this License and any conditions added under section
1062- 7. This requirement modifies the requirement in section 4 to
1063- "keep intact all notices".
1064-
1065- c) You must license the entire work, as a whole, under this
1066- License to anyone who comes into possession of a copy. This
1067- License will therefore apply, along with any applicable section 7
1068- additional terms, to the whole of the work, and all its parts,
1069- regardless of how they are packaged. This License gives no
1070- permission to license the work in any other way, but it does not
1071- invalidate such permission if you have separately received it.
1072-
1073- d) If the work has interactive user interfaces, each must display
1074- Appropriate Legal Notices; however, if the Program has interactive
1075- interfaces that do not display Appropriate Legal Notices, your
1076- work need not make them do so.
1077-
1078- A compilation of a covered work with other separate and independent
1079-works, which are not by their nature extensions of the covered work,
1080-and which are not combined with it such as to form a larger program,
1081-in or on a volume of a storage or distribution medium, is called an
1082-"aggregate" if the compilation and its resulting copyright are not
1083-used to limit the access or legal rights of the compilation's users
1084-beyond what the individual works permit. Inclusion of a covered work
1085-in an aggregate does not cause this License to apply to the other
1086-parts of the aggregate.
1087-
1088- 6. Conveying Non-Source Forms.
1089-
1090- You may convey a covered work in object code form under the terms
1091-of sections 4 and 5, provided that you also convey the
1092-machine-readable Corresponding Source under the terms of this License,
1093-in one of these ways:
1094-
1095- a) Convey the object code in, or embodied in, a physical product
1096- (including a physical distribution medium), accompanied by the
1097- Corresponding Source fixed on a durable physical medium
1098- customarily used for software interchange.
1099-
1100- b) Convey the object code in, or embodied in, a physical product
1101- (including a physical distribution medium), accompanied by a
1102- written offer, valid for at least three years and valid for as
1103- long as you offer spare parts or customer support for that product
1104- model, to give anyone who possesses the object code either (1) a
1105- copy of the Corresponding Source for all the software in the
1106- product that is covered by this License, on a durable physical
1107- medium customarily used for software interchange, for a price no
1108- more than your reasonable cost of physically performing this
1109- conveying of source, or (2) access to copy the
1110- Corresponding Source from a network server at no charge.
1111-
1112- c) Convey individual copies of the object code with a copy of the
1113- written offer to provide the Corresponding Source. This
1114- alternative is allowed only occasionally and noncommercially, and
1115- only if you received the object code with such an offer, in accord
1116- with subsection 6b.
1117-
1118- d) Convey the object code by offering access from a designated
1119- place (gratis or for a charge), and offer equivalent access to the
1120- Corresponding Source in the same way through the same place at no
1121- further charge. You need not require recipients to copy the
1122- Corresponding Source along with the object code. If the place to
1123- copy the object code is a network server, the Corresponding Source
1124- may be on a different server (operated by you or a third party)
1125- that supports equivalent copying facilities, provided you maintain
1126- clear directions next to the object code saying where to find the
1127- Corresponding Source. Regardless of what server hosts the
1128- Corresponding Source, you remain obligated to ensure that it is
1129- available for as long as needed to satisfy these requirements.
1130-
1131- e) Convey the object code using peer-to-peer transmission, provided
1132- you inform other peers where the object code and Corresponding
1133- Source of the work are being offered to the general public at no
1134- charge under subsection 6d.
1135-
1136- A separable portion of the object code, whose source code is excluded
1137-from the Corresponding Source as a System Library, need not be
1138-included in conveying the object code work.
1139-
1140- A "User Product" is either (1) a "consumer product", which means any
1141-tangible personal property which is normally used for personal, family,
1142-or household purposes, or (2) anything designed or sold for incorporation
1143-into a dwelling. In determining whether a product is a consumer product,
1144-doubtful cases shall be resolved in favor of coverage. For a particular
1145-product received by a particular user, "normally used" refers to a
1146-typical or common use of that class of product, regardless of the status
1147-of the particular user or of the way in which the particular user
1148-actually uses, or expects or is expected to use, the product. A product
1149-is a consumer product regardless of whether the product has substantial
1150-commercial, industrial or non-consumer uses, unless such uses represent
1151-the only significant mode of use of the product.
1152-
1153- "Installation Information" for a User Product means any methods,
1154-procedures, authorization keys, or other information required to install
1155-and execute modified versions of a covered work in that User Product from
1156-a modified version of its Corresponding Source. The information must
1157-suffice to ensure that the continued functioning of the modified object
1158-code is in no case prevented or interfered with solely because
1159-modification has been made.
1160-
1161- If you convey an object code work under this section in, or with, or
1162-specifically for use in, a User Product, and the conveying occurs as
1163-part of a transaction in which the right of possession and use of the
1164-User Product is transferred to the recipient in perpetuity or for a
1165-fixed term (regardless of how the transaction is characterized), the
1166-Corresponding Source conveyed under this section must be accompanied
1167-by the Installation Information. But this requirement does not apply
1168-if neither you nor any third party retains the ability to install
1169-modified object code on the User Product (for example, the work has
1170-been installed in ROM).
1171-
1172- The requirement to provide Installation Information does not include a
1173-requirement to continue to provide support service, warranty, or updates
1174-for a work that has been modified or installed by the recipient, or for
1175-the User Product in which it has been modified or installed. Access to a
1176-network may be denied when the modification itself materially and
1177-adversely affects the operation of the network or violates the rules and
1178-protocols for communication across the network.
1179-
1180- Corresponding Source conveyed, and Installation Information provided,
1181-in accord with this section must be in a format that is publicly
1182-documented (and with an implementation available to the public in
1183-source code form), and must require no special password or key for
1184-unpacking, reading or copying.
1185-
1186- 7. Additional Terms.
1187-
1188- "Additional permissions" are terms that supplement the terms of this
1189-License by making exceptions from one or more of its conditions.
1190-Additional permissions that are applicable to the entire Program shall
1191-be treated as though they were included in this License, to the extent
1192-that they are valid under applicable law. If additional permissions
1193-apply only to part of the Program, that part may be used separately
1194-under those permissions, but the entire Program remains governed by
1195-this License without regard to the additional permissions.
1196-
1197- When you convey a copy of a covered work, you may at your option
1198-remove any additional permissions from that copy, or from any part of
1199-it. (Additional permissions may be written to require their own
1200-removal in certain cases when you modify the work.) You may place
1201-additional permissions on material, added by you to a covered work,
1202-for which you have or can give appropriate copyright permission.
1203-
1204- Notwithstanding any other provision of this License, for material you
1205-add to a covered work, you may (if authorized by the copyright holders of
1206-that material) supplement the terms of this License with terms:
1207-
1208- a) Disclaiming warranty or limiting liability differently from the
1209- terms of sections 15 and 16 of this License; or
1210-
1211- b) Requiring preservation of specified reasonable legal notices or
1212- author attributions in that material or in the Appropriate Legal
1213- Notices displayed by works containing it; or
1214-
1215- c) Prohibiting misrepresentation of the origin of that material, or
1216- requiring that modified versions of such material be marked in
1217- reasonable ways as different from the original version; or
1218-
1219- d) Limiting the use for publicity purposes of names of licensors or
1220- authors of the material; or
1221-
1222- e) Declining to grant rights under trademark law for use of some
1223- trade names, trademarks, or service marks; or
1224-
1225- f) Requiring indemnification of licensors and authors of that
1226- material by anyone who conveys the material (or modified versions of
1227- it) with contractual assumptions of liability to the recipient, for
1228- any liability that these contractual assumptions directly impose on
1229- those licensors and authors.
1230-
1231- All other non-permissive additional terms are considered "further
1232-restrictions" within the meaning of section 10. If the Program as you
1233-received it, or any part of it, contains a notice stating that it is
1234-governed by this License along with a term that is a further
1235-restriction, you may remove that term. If a license document contains
1236-a further restriction but permits relicensing or conveying under this
1237-License, you may add to a covered work material governed by the terms
1238-of that license document, provided that the further restriction does
1239-not survive such relicensing or conveying.
1240-
1241- If you add terms to a covered work in accord with this section, you
1242-must place, in the relevant source files, a statement of the
1243-additional terms that apply to those files, or a notice indicating
1244-where to find the applicable terms.
1245-
1246- Additional terms, permissive or non-permissive, may be stated in the
1247-form of a separately written license, or stated as exceptions;
1248-the above requirements apply either way.
1249-
1250- 8. Termination.
1251-
1252- You may not propagate or modify a covered work except as expressly
1253-provided under this License. Any attempt otherwise to propagate or
1254-modify it is void, and will automatically terminate your rights under
1255-this License (including any patent licenses granted under the third
1256-paragraph of section 11).
1257-
1258- However, if you cease all violation of this License, then your
1259-license from a particular copyright holder is reinstated (a)
1260-provisionally, unless and until the copyright holder explicitly and
1261-finally terminates your license, and (b) permanently, if the copyright
1262-holder fails to notify you of the violation by some reasonable means
1263-prior to 60 days after the cessation.
1264-
1265- Moreover, your license from a particular copyright holder is
1266-reinstated permanently if the copyright holder notifies you of the
1267-violation by some reasonable means, this is the first time you have
1268-received notice of violation of this License (for any work) from that
1269-copyright holder, and you cure the violation prior to 30 days after
1270-your receipt of the notice.
1271-
1272- Termination of your rights under this section does not terminate the
1273-licenses of parties who have received copies or rights from you under
1274-this License. If your rights have been terminated and not permanently
1275-reinstated, you do not qualify to receive new licenses for the same
1276-material under section 10.
1277-
1278- 9. Acceptance Not Required for Having Copies.
1279-
1280- You are not required to accept this License in order to receive or
1281-run a copy of the Program. Ancillary propagation of a covered work
1282-occurring solely as a consequence of using peer-to-peer transmission
1283-to receive a copy likewise does not require acceptance. However,
1284-nothing other than this License grants you permission to propagate or
1285-modify any covered work. These actions infringe copyright if you do
1286-not accept this License. Therefore, by modifying or propagating a
1287-covered work, you indicate your acceptance of this License to do so.
1288-
1289- 10. Automatic Licensing of Downstream Recipients.
1290-
1291- Each time you convey a covered work, the recipient automatically
1292-receives a license from the original licensors, to run, modify and
1293-propagate that work, subject to this License. You are not responsible
1294-for enforcing compliance by third parties with this License.
1295-
1296- An "entity transaction" is a transaction transferring control of an
1297-organization, or substantially all assets of one, or subdividing an
1298-organization, or merging organizations. If propagation of a covered
1299-work results from an entity transaction, each party to that
1300-transaction who receives a copy of the work also receives whatever
1301-licenses to the work the party's predecessor in interest had or could
1302-give under the previous paragraph, plus a right to possession of the
1303-Corresponding Source of the work from the predecessor in interest, if
1304-the predecessor has it or can get it with reasonable efforts.
1305-
1306- You may not impose any further restrictions on the exercise of the
1307-rights granted or affirmed under this License. For example, you may
1308-not impose a license fee, royalty, or other charge for exercise of
1309-rights granted under this License, and you may not initiate litigation
1310-(including a cross-claim or counterclaim in a lawsuit) alleging that
1311-any patent claim is infringed by making, using, selling, offering for
1312-sale, or importing the Program or any portion of it.
1313-
1314- 11. Patents.
1315-
1316- A "contributor" is a copyright holder who authorizes use under this
1317-License of the Program or a work on which the Program is based. The
1318-work thus licensed is called the contributor's "contributor version".
1319-
1320- A contributor's "essential patent claims" are all patent claims
1321-owned or controlled by the contributor, whether already acquired or
1322-hereafter acquired, that would be infringed by some manner, permitted
1323-by this License, of making, using, or selling its contributor version,
1324-but do not include claims that would be infringed only as a
1325-consequence of further modification of the contributor version. For
1326-purposes of this definition, "control" includes the right to grant
1327-patent sublicenses in a manner consistent with the requirements of
1328-this License.
1329-
1330- Each contributor grants you a non-exclusive, worldwide, royalty-free
1331-patent license under the contributor's essential patent claims, to
1332-make, use, sell, offer for sale, import and otherwise run, modify and
1333-propagate the contents of its contributor version.
1334-
1335- In the following three paragraphs, a "patent license" is any express
1336-agreement or commitment, however denominated, not to enforce a patent
1337-(such as an express permission to practice a patent or covenant not to
1338-sue for patent infringement). To "grant" such a patent license to a
1339-party means to make such an agreement or commitment not to enforce a
1340-patent against the party.
1341-
1342- If you convey a covered work, knowingly relying on a patent license,
1343-and the Corresponding Source of the work is not available for anyone
1344-to copy, free of charge and under the terms of this License, through a
1345-publicly available network server or other readily accessible means,
1346-then you must either (1) cause the Corresponding Source to be so
1347-available, or (2) arrange to deprive yourself of the benefit of the
1348-patent license for this particular work, or (3) arrange, in a manner
1349-consistent with the requirements of this License, to extend the patent
1350-license to downstream recipients. "Knowingly relying" means you have
1351-actual knowledge that, but for the patent license, your conveying the
1352-covered work in a country, or your recipient's use of the covered work
1353-in a country, would infringe one or more identifiable patents in that
1354-country that you have reason to believe are valid.
1355-
1356- If, pursuant to or in connection with a single transaction or
1357-arrangement, you convey, or propagate by procuring conveyance of, a
1358-covered work, and grant a patent license to some of the parties
1359-receiving the covered work authorizing them to use, propagate, modify
1360-or convey a specific copy of the covered work, then the patent license
1361-you grant is automatically extended to all recipients of the covered
1362-work and works based on it.
1363-
1364- A patent license is "discriminatory" if it does not include within
1365-the scope of its coverage, prohibits the exercise of, or is
1366-conditioned on the non-exercise of one or more of the rights that are
1367-specifically granted under this License. You may not convey a covered
1368-work if you are a party to an arrangement with a third party that is
1369-in the business of distributing software, under which you make payment
1370-to the third party based on the extent of your activity of conveying
1371-the work, and under which the third party grants, to any of the
1372-parties who would receive the covered work from you, a discriminatory
1373-patent license (a) in connection with copies of the covered work
1374-conveyed by you (or copies made from those copies), or (b) primarily
1375-for and in connection with specific products or compilations that
1376-contain the covered work, unless you entered into that arrangement,
1377-or that patent license was granted, prior to 28 March 2007.
1378-
1379- Nothing in this License shall be construed as excluding or limiting
1380-any implied license or other defenses to infringement that may
1381-otherwise be available to you under applicable patent law.
1382-
1383- 12. No Surrender of Others' Freedom.
1384-
1385- If conditions are imposed on you (whether by court order, agreement or
1386-otherwise) that contradict the conditions of this License, they do not
1387-excuse you from the conditions of this License. If you cannot convey a
1388-covered work so as to satisfy simultaneously your obligations under this
1389-License and any other pertinent obligations, then as a consequence you may
1390-not convey it at all. For example, if you agree to terms that obligate you
1391-to collect a royalty for further conveying from those to whom you convey
1392-the Program, the only way you could satisfy both those terms and this
1393-License would be to refrain entirely from conveying the Program.
1394-
1395- 13. Use with the GNU Affero General Public License.
1396-
1397- Notwithstanding any other provision of this License, you have
1398-permission to link or combine any covered work with a work licensed
1399-under version 3 of the GNU Affero General Public License into a single
1400-combined work, and to convey the resulting work. The terms of this
1401-License will continue to apply to the part which is the covered work,
1402-but the special requirements of the GNU Affero General Public License,
1403-section 13, concerning interaction through a network will apply to the
1404-combination as such.
1405-
1406- 14. Revised Versions of this License.
1407-
1408- The Free Software Foundation may publish revised and/or new versions of
1409-the GNU General Public License from time to time. Such new versions will
1410-be similar in spirit to the present version, but may differ in detail to
1411-address new problems or concerns.
1412-
1413- Each version is given a distinguishing version number. If the
1414-Program specifies that a certain numbered version of the GNU General
1415-Public License "or any later version" applies to it, you have the
1416-option of following the terms and conditions either of that numbered
1417-version or of any later version published by the Free Software
1418-Foundation. If the Program does not specify a version number of the
1419-GNU General Public License, you may choose any version ever published
1420-by the Free Software Foundation.
1421-
1422- If the Program specifies that a proxy can decide which future
1423-versions of the GNU General Public License can be used, that proxy's
1424-public statement of acceptance of a version permanently authorizes you
1425-to choose that version for the Program.
1426-
1427- Later license versions may give you additional or different
1428-permissions. However, no additional obligations are imposed on any
1429-author or copyright holder as a result of your choosing to follow a
1430-later version.
1431-
1432- 15. Disclaimer of Warranty.
1433-
1434- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
1435-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
1436-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
1437-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
1438-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
1439-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
1440-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
1441-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
1442-
1443- 16. Limitation of Liability.
1444-
1445- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
1446-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
1447-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
1448-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
1449-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
1450-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
1451-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
1452-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
1453-SUCH DAMAGES.
1454-
1455- 17. Interpretation of Sections 15 and 16.
1456-
1457- If the disclaimer of warranty and limitation of liability provided
1458-above cannot be given local legal effect according to their terms,
1459-reviewing courts shall apply local law that most closely approximates
1460-an absolute waiver of all civil liability in connection with the
1461-Program, unless a warranty or assumption of liability accompanies a
1462-copy of the Program in return for a fee.
1463-
1464- END OF TERMS AND CONDITIONS
1465
1466=== added directory 'Helper-Shots'
1467=== added file 'Helper-Shots/Texttool.png'
1468Binary files Helper-Shots/Texttool.png 1970-01-01 00:00:00 +0000 and Helper-Shots/Texttool.png 2012-12-14 19:53:22 +0000 differ
1469=== added file 'Helper-Shots/Toolpalette.png'
1470Binary files Helper-Shots/Toolpalette.png 1970-01-01 00:00:00 +0000 and Helper-Shots/Toolpalette.png 2012-12-14 19:53:22 +0000 differ
1471=== added file 'Helper-Shots/toolbar.png'
1472Binary files Helper-Shots/toolbar.png 1970-01-01 00:00:00 +0000 and Helper-Shots/toolbar.png 2012-12-14 19:53:22 +0000 differ
1473=== removed file 'INSTALL'
1474--- INSTALL 2010-11-05 14:14:00 +0000
1475+++ INSTALL 1970-01-01 00:00:00 +0000
1476@@ -1,365 +0,0 @@
1477-Installation Instructions
1478-*************************
1479-
1480-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
1481-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
1482-
1483- Copying and distribution of this file, with or without modification,
1484-are permitted in any medium without royalty provided the copyright
1485-notice and this notice are preserved. This file is offered as-is,
1486-without warranty of any kind.
1487-
1488-Basic Installation
1489-==================
1490-
1491- Briefly, the shell commands `./configure; make; make install' should
1492-configure, build, and install this package. The following
1493-more-detailed instructions are generic; see the `README' file for
1494-instructions specific to this package. Some packages provide this
1495-`INSTALL' file but do not implement all of the features documented
1496-below. The lack of an optional feature in a given package is not
1497-necessarily a bug. More recommendations for GNU packages can be found
1498-in *note Makefile Conventions: (standards)Makefile Conventions.
1499-
1500- The `configure' shell script attempts to guess correct values for
1501-various system-dependent variables used during compilation. It uses
1502-those values to create a `Makefile' in each directory of the package.
1503-It may also create one or more `.h' files containing system-dependent
1504-definitions. Finally, it creates a shell script `config.status' that
1505-you can run in the future to recreate the current configuration, and a
1506-file `config.log' containing compiler output (useful mainly for
1507-debugging `configure').
1508-
1509- It can also use an optional file (typically called `config.cache'
1510-and enabled with `--cache-file=config.cache' or simply `-C') that saves
1511-the results of its tests to speed up reconfiguring. Caching is
1512-disabled by default to prevent problems with accidental use of stale
1513-cache files.
1514-
1515- If you need to do unusual things to compile the package, please try
1516-to figure out how `configure' could check whether to do them, and mail
1517-diffs or instructions to the address given in the `README' so they can
1518-be considered for the next release. If you are using the cache, and at
1519-some point `config.cache' contains results you don't want to keep, you
1520-may remove or edit it.
1521-
1522- The file `configure.ac' (or `configure.in') is used to create
1523-`configure' by a program called `autoconf'. You need `configure.ac' if
1524-you want to change it or regenerate `configure' using a newer version
1525-of `autoconf'.
1526-
1527- The simplest way to compile this package is:
1528-
1529- 1. `cd' to the directory containing the package's source code and type
1530- `./configure' to configure the package for your system.
1531-
1532- Running `configure' might take a while. While running, it prints
1533- some messages telling which features it is checking for.
1534-
1535- 2. Type `make' to compile the package.
1536-
1537- 3. Optionally, type `make check' to run any self-tests that come with
1538- the package, generally using the just-built uninstalled binaries.
1539-
1540- 4. Type `make install' to install the programs and any data files and
1541- documentation. When installing into a prefix owned by root, it is
1542- recommended that the package be configured and built as a regular
1543- user, and only the `make install' phase executed with root
1544- privileges.
1545-
1546- 5. Optionally, type `make installcheck' to repeat any self-tests, but
1547- this time using the binaries in their final installed location.
1548- This target does not install anything. Running this target as a
1549- regular user, particularly if the prior `make install' required
1550- root privileges, verifies that the installation completed
1551- correctly.
1552-
1553- 6. You can remove the program binaries and object files from the
1554- source code directory by typing `make clean'. To also remove the
1555- files that `configure' created (so you can compile the package for
1556- a different kind of computer), type `make distclean'. There is
1557- also a `make maintainer-clean' target, but that is intended mainly
1558- for the package's developers. If you use it, you may have to get
1559- all sorts of other programs in order to regenerate files that came
1560- with the distribution.
1561-
1562- 7. Often, you can also type `make uninstall' to remove the installed
1563- files again. In practice, not all packages have tested that
1564- uninstallation works correctly, even though it is required by the
1565- GNU Coding Standards.
1566-
1567- 8. Some packages, particularly those that use Automake, provide `make
1568- distcheck', which can by used by developers to test that all other
1569- targets like `make install' and `make uninstall' work correctly.
1570- This target is generally not run by end users.
1571-
1572-Compilers and Options
1573-=====================
1574-
1575- Some systems require unusual options for compilation or linking that
1576-the `configure' script does not know about. Run `./configure --help'
1577-for details on some of the pertinent environment variables.
1578-
1579- You can give `configure' initial values for configuration parameters
1580-by setting variables in the command line or in the environment. Here
1581-is an example:
1582-
1583- ./configure CC=c99 CFLAGS=-g LIBS=-lposix
1584-
1585- *Note Defining Variables::, for more details.
1586-
1587-Compiling For Multiple Architectures
1588-====================================
1589-
1590- You can compile the package for more than one kind of computer at the
1591-same time, by placing the object files for each architecture in their
1592-own directory. To do this, you can use GNU `make'. `cd' to the
1593-directory where you want the object files and executables to go and run
1594-the `configure' script. `configure' automatically checks for the
1595-source code in the directory that `configure' is in and in `..'. This
1596-is known as a "VPATH" build.
1597-
1598- With a non-GNU `make', it is safer to compile the package for one
1599-architecture at a time in the source code directory. After you have
1600-installed the package for one architecture, use `make distclean' before
1601-reconfiguring for another architecture.
1602-
1603- On MacOS X 10.5 and later systems, you can create libraries and
1604-executables that work on multiple system types--known as "fat" or
1605-"universal" binaries--by specifying multiple `-arch' options to the
1606-compiler but only a single `-arch' option to the preprocessor. Like
1607-this:
1608-
1609- ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
1610- CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
1611- CPP="gcc -E" CXXCPP="g++ -E"
1612-
1613- This is not guaranteed to produce working output in all cases, you
1614-may have to build one architecture at a time and combine the results
1615-using the `lipo' tool if you have problems.
1616-
1617-Installation Names
1618-==================
1619-
1620- By default, `make install' installs the package's commands under
1621-`/usr/local/bin', include files under `/usr/local/include', etc. You
1622-can specify an installation prefix other than `/usr/local' by giving
1623-`configure' the option `--prefix=PREFIX', where PREFIX must be an
1624-absolute file name.
1625-
1626- You can specify separate installation prefixes for
1627-architecture-specific files and architecture-independent files. If you
1628-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
1629-PREFIX as the prefix for installing programs and libraries.
1630-Documentation and other data files still use the regular prefix.
1631-
1632- In addition, if you use an unusual directory layout you can give
1633-options like `--bindir=DIR' to specify different values for particular
1634-kinds of files. Run `configure --help' for a list of the directories
1635-you can set and what kinds of files go in them. In general, the
1636-default for these options is expressed in terms of `${prefix}', so that
1637-specifying just `--prefix' will affect all of the other directory
1638-specifications that were not explicitly provided.
1639-
1640- The most portable way to affect installation locations is to pass the
1641-correct locations to `configure'; however, many packages provide one or
1642-both of the following shortcuts of passing variable assignments to the
1643-`make install' command line to change installation locations without
1644-having to reconfigure or recompile.
1645-
1646- The first method involves providing an override variable for each
1647-affected directory. For example, `make install
1648-prefix=/alternate/directory' will choose an alternate location for all
1649-directory configuration variables that were expressed in terms of
1650-`${prefix}'. Any directories that were specified during `configure',
1651-but not in terms of `${prefix}', must each be overridden at install
1652-time for the entire installation to be relocated. The approach of
1653-makefile variable overrides for each directory variable is required by
1654-the GNU Coding Standards, and ideally causes no recompilation.
1655-However, some platforms have known limitations with the semantics of
1656-shared libraries that end up requiring recompilation when using this
1657-method, particularly noticeable in packages that use GNU Libtool.
1658-
1659- The second method involves providing the `DESTDIR' variable. For
1660-example, `make install DESTDIR=/alternate/directory' will prepend
1661-`/alternate/directory' before all installation names. The approach of
1662-`DESTDIR' overrides is not required by the GNU Coding Standards, and
1663-does not work on platforms that have drive letters. On the other hand,
1664-it does better at avoiding recompilation issues, and works well even
1665-when some directory options were not specified in terms of `${prefix}'
1666-at `configure' time.
1667-
1668-Optional Features
1669-=================
1670-
1671- If the package supports it, you can cause programs to be installed
1672-with an extra prefix or suffix on their names by giving `configure' the
1673-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
1674-
1675- Some packages pay attention to `--enable-FEATURE' options to
1676-`configure', where FEATURE indicates an optional part of the package.
1677-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
1678-is something like `gnu-as' or `x' (for the X Window System). The
1679-`README' should mention any `--enable-' and `--with-' options that the
1680-package recognizes.
1681-
1682- For packages that use the X Window System, `configure' can usually
1683-find the X include and library files automatically, but if it doesn't,
1684-you can use the `configure' options `--x-includes=DIR' and
1685-`--x-libraries=DIR' to specify their locations.
1686-
1687- Some packages offer the ability to configure how verbose the
1688-execution of `make' will be. For these packages, running `./configure
1689---enable-silent-rules' sets the default to minimal output, which can be
1690-overridden with `make V=1'; while running `./configure
1691---disable-silent-rules' sets the default to verbose, which can be
1692-overridden with `make V=0'.
1693-
1694-Particular systems
1695-==================
1696-
1697- On HP-UX, the default C compiler is not ANSI C compatible. If GNU
1698-CC is not installed, it is recommended to use the following options in
1699-order to use an ANSI C compiler:
1700-
1701- ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
1702-
1703-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
1704-
1705- On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
1706-parse its `<wchar.h>' header file. The option `-nodtk' can be used as
1707-a workaround. If GNU CC is not installed, it is therefore recommended
1708-to try
1709-
1710- ./configure CC="cc"
1711-
1712-and if that doesn't work, try
1713-
1714- ./configure CC="cc -nodtk"
1715-
1716- On Solaris, don't put `/usr/ucb' early in your `PATH'. This
1717-directory contains several dysfunctional programs; working variants of
1718-these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
1719-in your `PATH', put it _after_ `/usr/bin'.
1720-
1721- On Haiku, software installed for all users goes in `/boot/common',
1722-not `/usr/local'. It is recommended to use the following options:
1723-
1724- ./configure --prefix=/boot/common
1725-
1726-Specifying the System Type
1727-==========================
1728-
1729- There may be some features `configure' cannot figure out
1730-automatically, but needs to determine by the type of machine the package
1731-will run on. Usually, assuming the package is built to be run on the
1732-_same_ architectures, `configure' can figure that out, but if it prints
1733-a message saying it cannot guess the machine type, give it the
1734-`--build=TYPE' option. TYPE can either be a short name for the system
1735-type, such as `sun4', or a canonical name which has the form:
1736-
1737- CPU-COMPANY-SYSTEM
1738-
1739-where SYSTEM can have one of these forms:
1740-
1741- OS
1742- KERNEL-OS
1743-
1744- See the file `config.sub' for the possible values of each field. If
1745-`config.sub' isn't included in this package, then this package doesn't
1746-need to know the machine type.
1747-
1748- If you are _building_ compiler tools for cross-compiling, you should
1749-use the option `--target=TYPE' to select the type of system they will
1750-produce code for.
1751-
1752- If you want to _use_ a cross compiler, that generates code for a
1753-platform different from the build platform, you should specify the
1754-"host" platform (i.e., that on which the generated programs will
1755-eventually be run) with `--host=TYPE'.
1756-
1757-Sharing Defaults
1758-================
1759-
1760- If you want to set default values for `configure' scripts to share,
1761-you can create a site shell script called `config.site' that gives
1762-default values for variables like `CC', `cache_file', and `prefix'.
1763-`configure' looks for `PREFIX/share/config.site' if it exists, then
1764-`PREFIX/etc/config.site' if it exists. Or, you can set the
1765-`CONFIG_SITE' environment variable to the location of the site script.
1766-A warning: not all `configure' scripts look for a site script.
1767-
1768-Defining Variables
1769-==================
1770-
1771- Variables not defined in a site shell script can be set in the
1772-environment passed to `configure'. However, some packages may run
1773-configure again during the build, and the customized values of these
1774-variables may be lost. In order to avoid this problem, you should set
1775-them in the `configure' command line, using `VAR=value'. For example:
1776-
1777- ./configure CC=/usr/local2/bin/gcc
1778-
1779-causes the specified `gcc' to be used as the C compiler (unless it is
1780-overridden in the site shell script).
1781-
1782-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
1783-an Autoconf bug. Until the bug is fixed you can use this workaround:
1784-
1785- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
1786-
1787-`configure' Invocation
1788-======================
1789-
1790- `configure' recognizes the following options to control how it
1791-operates.
1792-
1793-`--help'
1794-`-h'
1795- Print a summary of all of the options to `configure', and exit.
1796-
1797-`--help=short'
1798-`--help=recursive'
1799- Print a summary of the options unique to this package's
1800- `configure', and exit. The `short' variant lists options used
1801- only in the top level, while the `recursive' variant lists options
1802- also present in any nested packages.
1803-
1804-`--version'
1805-`-V'
1806- Print the version of Autoconf used to generate the `configure'
1807- script, and exit.
1808-
1809-`--cache-file=FILE'
1810- Enable the cache: use and save the results of the tests in FILE,
1811- traditionally `config.cache'. FILE defaults to `/dev/null' to
1812- disable caching.
1813-
1814-`--config-cache'
1815-`-C'
1816- Alias for `--cache-file=config.cache'.
1817-
1818-`--quiet'
1819-`--silent'
1820-`-q'
1821- Do not print messages saying which checks are being made. To
1822- suppress all normal output, redirect it to `/dev/null' (any error
1823- messages will still be shown).
1824-
1825-`--srcdir=DIR'
1826- Look for the package's source code in directory DIR. Usually
1827- `configure' can determine that directory automatically.
1828-
1829-`--prefix=DIR'
1830- Use DIR as the installation prefix. *note Installation Names::
1831- for more details, including other options available for fine-tuning
1832- the installation locations.
1833-
1834-`--no-create'
1835-`-n'
1836- Run the configure checks, but stop before creating any output
1837- files.
1838-
1839-`configure' also accepts some other, not widely useful, options. Run
1840-`configure --help' for more details.
1841-
1842
1843=== modified file 'Makefile'
1844--- Makefile 2012-05-22 16:15:59 +0000
1845+++ Makefile 2012-12-14 19:53:22 +0000
1846@@ -15,10 +15,10 @@
1847
1848
1849
1850-pkgdatadir = $(datadir)/photofiltreLX
1851-pkgincludedir = $(includedir)/photofiltreLX
1852-pkglibdir = $(libdir)/photofiltreLX
1853-pkglibexecdir = $(libexecdir)/photofiltreLX
1854+pkgdatadir = $(datadir)/amhello
1855+pkgincludedir = $(includedir)/amhello
1856+pkglibdir = $(libdir)/amhello
1857+pkglibexecdir = $(libexecdir)/amhello
1858 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
1859 install_sh_DATA = $(install_sh) -c -m 644
1860 install_sh_PROGRAM = $(install_sh) -c
1861@@ -32,17 +32,16 @@
1862 PRE_UNINSTALL = :
1863 POST_UNINSTALL = :
1864 subdir = .
1865-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
1866+DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
1867 $(srcdir)/Makefile.in $(srcdir)/config.h.in \
1868- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
1869- depcomp install-sh missing mkinstalldirs
1870+ $(top_srcdir)/configure depcomp install-sh missing
1871 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1872-am__aclocal_m4_deps = $(top_srcdir)/configure.in
1873+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
1874 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1875 $(ACLOCAL_M4)
1876 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
1877 configure.lineno config.status.lineno
1878-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
1879+mkinstalldirs = $(install_sh) -d
1880 CONFIG_HEADER = config.h
1881 CONFIG_CLEAN_FILES =
1882 CONFIG_CLEAN_VPATH_FILES =
1883@@ -103,87 +102,56 @@
1884 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
1885 | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
1886 distcleancheck_listfiles = find . -type f -print
1887-ACLOCAL = ${SHELL} /home/dylan/Desktop/trunk/missing --run aclocal-1.11
1888+ACLOCAL = ${SHELL} "/home/samuel/Programming/PhotoFiltre LX/bzr/photofiltre-lx/missing" --run aclocal-1.11
1889 AMTAR = $${TAR-tar}
1890-AUTOCONF = ${SHELL} /home/dylan/Desktop/trunk/missing --run autoconf
1891-AUTOHEADER = ${SHELL} /home/dylan/Desktop/trunk/missing --run autoheader
1892-AUTOMAKE = ${SHELL} /home/dylan/Desktop/trunk/missing --run automake-1.11
1893-AWK = mawk
1894-CATALOGS =
1895-CATOBJEXT = .gmo
1896-CC = gcc
1897-CCDEPMODE = depmode=gcc3
1898-CFLAGS = -O2 -D_FORTIFY_SOURCE=2 -Wall
1899-CPP = gcc -E
1900+AUTOCONF = ${SHELL} "/home/samuel/Programming/PhotoFiltre LX/bzr/photofiltre-lx/missing" --run autoconf
1901+AUTOHEADER = ${SHELL} "/home/samuel/Programming/PhotoFiltre LX/bzr/photofiltre-lx/missing" --run autoheader
1902+AUTOMAKE = ${SHELL} "/home/samuel/Programming/PhotoFiltre LX/bzr/photofiltre-lx/missing" --run automake-1.11
1903+AWK = gawk
1904 CPPFLAGS =
1905 CXX = g++
1906-CXXCPP = g++ -E
1907 CXXDEPMODE = depmode=gcc3
1908-CXXFLAGS = -O2 -D_FORTIFY_SOURCE=2 -Wall
1909+CXXFLAGS = -g -O2
1910 CYGPATH_W = echo
1911-DATADIRNAME = share
1912 DEFS = -DHAVE_CONFIG_H
1913 DEPDIR = .deps
1914+DEPS_CFLAGS = -pthread -fopenmp -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/gio-unix-2.0/ -I/usr/include/atkmm-1.6 -I/usr/include/giomm-2.4 -I/usr/lib/i386-linux-gnu/giomm-2.4/include -I/usr/include/pangomm-1.4 -I/usr/lib/i386-linux-gnu/pangomm-1.4/include -I/usr/include/gtk-3.0 -I/usr/include/cairomm-1.0 -I/usr/lib/i386-linux-gnu/cairomm-1.0/include -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gtk-3.0/unix-print -I/usr/include/atk-1.0 -I/usr/include/glibmm-2.4 -I/usr/lib/i386-linux-gnu/glibmm-2.4/include -I/usr/include/sigc++-2.0 -I/usr/lib/i386-linux-gnu/sigc++-2.0/include -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gtkmm-3.0 -I/usr/lib/gtkmm-3.0/include -I/usr/include/gdkmm-3.0 -I/usr/lib/gdkmm-3.0/include -I/usr/include/ImageMagick
1915+DEPS_LIBS = -L/usr/local/lib -lgtkmm-3.0 -latkmm-1.6 -lgdkmm-3.0 -lgiomm-2.4 -lpangomm-1.4 -lgtk-3 -lglibmm-2.4 -lcairomm-1.0 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lsigc-2.0 -lgobject-2.0 -lglib-2.0 -lMagick++ -lMagickCore
1916 ECHO_C =
1917 ECHO_N = -n
1918 ECHO_T =
1919-EGREP = /bin/grep -E
1920 EXEEXT =
1921-GETTEXT_PACKAGE = photofiltreLX
1922-GLIBMMDEPS_CFLAGS = -I/usr/include/glibmm-2.4 -I/usr/lib/i386-linux-gnu/glibmm-2.4/include -I/usr/include/sigc++-2.0 -I/usr/lib/i386-linux-gnu/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/glib-2.0/include
1923-GLIBMMDEPS_LIBS = -lglibmm-2.4 -lgobject-2.0 -lsigc-2.0 -lglib-2.0
1924-GLIBMM_CFLAGS =
1925-GLIBMM_LIBS =
1926-GMOFILES =
1927-GMSGFMT = /usr/bin/msgfmt
1928-GREP = /bin/grep
1929 INSTALL = /usr/bin/install -c
1930 INSTALL_DATA = ${INSTALL} -m 644
1931 INSTALL_PROGRAM = ${INSTALL}
1932 INSTALL_SCRIPT = ${INSTALL}
1933 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
1934-INSTOBJEXT = .mo
1935-INTLLIBS =
1936 LDFLAGS =
1937 LIBOBJS =
1938-LIBS = -L/usr/lib/i386-linux-gnu -lcurl -Wl,-Bsymbolic-functions -Wl,-z,relro
1939+LIBS =
1940 LTLIBOBJS =
1941-MAINT = #
1942-MAKEINFO = ${SHELL} /home/dylan/Desktop/trunk/missing --run makeinfo
1943+MAKEINFO = ${SHELL} "/home/samuel/Programming/PhotoFiltre LX/bzr/photofiltre-lx/missing" --run makeinfo
1944 MKDIR_P = /bin/mkdir -p
1945-MKINSTALLDIRS = ./mkinstalldirs
1946-MSGFMT = /usr/bin/msgfmt
1947-MSGFMT_OPTS = -c
1948 OBJEXT = o
1949-PACKAGE = photofiltreLX
1950-PACKAGE_BUGREPORT =
1951-PACKAGE_CFLAGS = -pthread -I/usr/include/atkmm-1.6 -I/usr/include/giomm-2.4 -I/usr/lib/i386-linux-gnu/giomm-2.4/include -I/usr/include/pangomm-1.4 -I/usr/lib/i386-linux-gnu/pangomm-1.4/include -I/usr/include/gtk-3.0 -I/usr/include/cairomm-1.0 -I/usr/lib/i386-linux-gnu/cairomm-1.0/include -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gtk-3.0/unix-print -I/usr/include/atk-1.0 -I/usr/include/glibmm-2.4 -I/usr/lib/i386-linux-gnu/glibmm-2.4/include -I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/sigc++-2.0 -I/usr/lib/i386-linux-gnu/sigc++-2.0/include -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gio-unix-2.0/ -I/usr/include/gtkmm-3.0 -I/usr/lib/gtkmm-3.0/include -I/usr/include/gdkmm-3.0 -I/usr/lib/gdkmm-3.0/include
1952-PACKAGE_CPPFLAGS =
1953-PACKAGE_LIBS = -lgtkmm-3.0 -latkmm-1.6 -lgdkmm-3.0 -lgiomm-2.4 -lpangomm-1.4 -lgtk-3 -lglibmm-2.4 -lcairomm-1.0 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lsigc-2.0 -lgobject-2.0 -lglib-2.0
1954-PACKAGE_NAME =
1955-PACKAGE_STRING =
1956-PACKAGE_TARNAME =
1957+PACKAGE = amhello
1958+PACKAGE_BUGREPORT = bug-report@address
1959+PACKAGE_NAME = amhello
1960+PACKAGE_STRING = amhello 1.0
1961+PACKAGE_TARNAME = amhello
1962 PACKAGE_URL =
1963-PACKAGE_VERSION =
1964+PACKAGE_VERSION = 1.0
1965 PATH_SEPARATOR = :
1966 PKG_CONFIG = /usr/bin/pkg-config
1967 PKG_CONFIG_LIBDIR =
1968 PKG_CONFIG_PATH =
1969-POFILES =
1970-POSUB = po
1971-PO_IN_DATADIR_FALSE =
1972-PO_IN_DATADIR_TRUE =
1973 SET_MAKE =
1974 SHELL = /bin/bash
1975 STRIP =
1976-USE_NLS = yes
1977-VERSION = 0.0.5.0
1978-XGETTEXT = /usr/bin/xgettext
1979-abs_builddir = /home/dylan/Desktop/trunk
1980-abs_srcdir = /home/dylan/Desktop/trunk
1981-abs_top_builddir = /home/dylan/Desktop/trunk
1982-abs_top_srcdir = /home/dylan/Desktop/trunk
1983-ac_ct_CC = gcc
1984+VERSION = 1.0
1985+abs_builddir = /home/samuel/Programming/PhotoFiltre LX/bzr/photofiltre-lx
1986+abs_srcdir = /home/samuel/Programming/PhotoFiltre LX/bzr/photofiltre-lx
1987+abs_top_builddir = /home/samuel/Programming/PhotoFiltre LX/bzr/photofiltre-lx
1988+abs_top_srcdir = /home/samuel/Programming/PhotoFiltre LX/bzr/photofiltre-lx
1989 ac_ct_CXX = g++
1990 am__include = include
1991 am__leading_dot = .
1992@@ -195,14 +163,14 @@
1993 builddir = .
1994 datadir = ${datarootdir}
1995 datarootdir = ${prefix}/share
1996-docdir = ${datarootdir}/doc/${PACKAGE}
1997+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
1998 dvidir = ${docdir}
1999 exec_prefix = ${prefix}
2000 host_alias =
2001 htmldir = ${docdir}
2002 includedir = ${prefix}/include
2003 infodir = ${datarootdir}/info
2004-install_sh = ${SHELL} /home/dylan/Desktop/trunk/install-sh
2005+install_sh = ${SHELL} '/home/samuel/Programming/PhotoFiltre LX/bzr/photofiltre-lx/install-sh'
2006 libdir = ${exec_prefix}/lib
2007 libexecdir = ${exec_prefix}/libexec
2008 localedir = ${datarootdir}/locale
2009@@ -222,30 +190,26 @@
2010 top_build_prefix =
2011 top_builddir = .
2012 top_srcdir = .
2013-SUBDIRS = src po
2014-EXTRA_DIST = \
2015- autogen.sh \
2016- main.glade
2017-
2018+SUBDIRS = src
2019 all: config.h
2020 $(MAKE) $(AM_MAKEFLAGS) all-recursive
2021
2022 .SUFFIXES:
2023 am--refresh: Makefile
2024 @:
2025-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps)
2026+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
2027 @for dep in $?; do \
2028 case '$(am__configure_deps)' in \
2029 *$$dep*) \
2030- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
2031- $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
2032+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
2033+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
2034 && exit 0; \
2035 exit 1;; \
2036 esac; \
2037 done; \
2038- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
2039+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
2040 $(am__cd) $(top_srcdir) && \
2041- $(AUTOMAKE) --gnu Makefile
2042+ $(AUTOMAKE) --foreign Makefile
2043 .PRECIOUS: Makefile
2044 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
2045 @case '$?' in \
2046@@ -260,9 +224,9 @@
2047 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
2048 $(SHELL) ./config.status --recheck
2049
2050-$(top_srcdir)/configure: # $(am__configure_deps)
2051+$(top_srcdir)/configure: $(am__configure_deps)
2052 $(am__cd) $(srcdir) && $(AUTOCONF)
2053-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
2054+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
2055 $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
2056 $(am__aclocal_m4_deps):
2057
2058@@ -273,7 +237,7 @@
2059 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
2060 @rm -f stamp-h1
2061 cd $(top_builddir) && $(SHELL) ./config.status config.h
2062-$(srcdir)/config.h.in: # $(am__configure_deps)
2063+$(srcdir)/config.h.in: $(am__configure_deps)
2064 ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
2065 rm -f stamp-h1
2066 touch $@
2067@@ -476,9 +440,6 @@
2068 || exit 1; \
2069 fi; \
2070 done
2071- $(MAKE) $(AM_MAKEFLAGS) \
2072- top_distdir="$(top_distdir)" distdir="$(distdir)" \
2073- dist-hook
2074 -test -n "$(am__skip_mode_fix)" \
2075 || find "$(distdir)" -type d ! -perm -755 \
2076 -exec chmod u+rwx,go+rx {} \; -o \
2077@@ -665,7 +626,7 @@
2078
2079 info-am:
2080
2081-install-data-am: install-data-local
2082+install-data-am:
2083
2084 install-dvi: install-dvi-recursive
2085
2086@@ -719,45 +680,19 @@
2087 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
2088 all all-am am--refresh check check-am clean clean-generic \
2089 ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
2090- dist-hook dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
2091- dist-zip distcheck distclean distclean-generic distclean-hdr \
2092+ dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
2093+ distcheck distclean distclean-generic distclean-hdr \
2094 distclean-tags distcleancheck distdir distuninstallcheck dvi \
2095 dvi-am html html-am info info-am install install-am \
2096- install-data install-data-am install-data-local install-dvi \
2097- install-dvi-am install-exec install-exec-am install-html \
2098- install-html-am install-info install-info-am install-man \
2099- install-pdf install-pdf-am install-ps install-ps-am \
2100- install-strip installcheck installcheck-am installdirs \
2101- installdirs-am maintainer-clean maintainer-clean-generic \
2102- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
2103- tags-recursive uninstall uninstall-am
2104-
2105-
2106-install-data-local:
2107- @$(NORMAL_INSTALL)
2108- if test -d $(srcdir)/pixmaps; then \
2109- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \
2110- for pixmap in $(srcdir)/pixmaps/*; do \
2111- if test -f $$pixmap; then \
2112- $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/pixmaps; \
2113- fi \
2114- done \
2115- fi
2116- for gladefile in main.glade; do \
2117- if test -f $$gladefile; then \
2118- $(INSTALL_DATA) $$gladefile $(DESTDIR)$(pkgdatadir); \
2119- fi \
2120- done
2121-
2122-dist-hook:
2123- if test -d pixmaps; then \
2124- mkdir $(distdir)/pixmaps; \
2125- for pixmap in pixmaps/*; do \
2126- if test -f $$pixmap; then \
2127- cp -p $$pixmap $(distdir)/pixmaps; \
2128- fi \
2129- done \
2130- fi
2131+ install-data install-data-am install-dvi install-dvi-am \
2132+ install-exec install-exec-am install-html install-html-am \
2133+ install-info install-info-am install-man install-pdf \
2134+ install-pdf-am install-ps install-ps-am install-strip \
2135+ installcheck installcheck-am installdirs installdirs-am \
2136+ maintainer-clean maintainer-clean-generic mostlyclean \
2137+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
2138+ uninstall uninstall-am
2139+
2140
2141 # Tell versions [3.59,3.63) of GNU make to not export all variables.
2142 # Otherwise a system limit (for SysV at least) may be exceeded.
2143
2144=== modified file 'Makefile.am'
2145--- Makefile.am 2012-05-22 16:15:59 +0000
2146+++ Makefile.am 2012-12-14 19:53:22 +0000
2147@@ -1,36 +1,2 @@
2148-## Process this file with automake to produce Makefile.in
2149-##
2150-## save this - ln -s ../$$gladefile $(DESTDIR)$(pkgdatadir)/$$gladefile; \
2151-## save this too - rm -f $(DESTDIR)$(pkgdatadir)/$$gladefile; \
2152-
2153-SUBDIRS = src po
2154-
2155-EXTRA_DIST = \
2156- autogen.sh \
2157- main.glade
2158-
2159-install-data-local:
2160- @$(NORMAL_INSTALL)
2161- if test -d $(srcdir)/pixmaps; then \
2162- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \
2163- for pixmap in $(srcdir)/pixmaps/*; do \
2164- if test -f $$pixmap; then \
2165- $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/pixmaps; \
2166- fi \
2167- done \
2168- fi
2169- for gladefile in main.glade; do \
2170- if test -f $$gladefile; then \
2171- $(INSTALL_DATA) $$gladefile $(DESTDIR)$(pkgdatadir); \
2172- fi \
2173- done
2174-
2175-dist-hook:
2176- if test -d pixmaps; then \
2177- mkdir $(distdir)/pixmaps; \
2178- for pixmap in pixmaps/*; do \
2179- if test -f $$pixmap; then \
2180- cp -p $$pixmap $(distdir)/pixmaps; \
2181- fi \
2182- done \
2183- fi
2184+SUBDIRS = src
2185+
2186
2187=== modified file 'Makefile.in'
2188--- Makefile.in 2012-05-22 16:15:59 +0000
2189+++ Makefile.in 2012-12-14 19:53:22 +0000
2190@@ -32,17 +32,16 @@
2191 PRE_UNINSTALL = :
2192 POST_UNINSTALL = :
2193 subdir = .
2194-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
2195+DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
2196 $(srcdir)/Makefile.in $(srcdir)/config.h.in \
2197- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
2198- depcomp install-sh missing mkinstalldirs
2199+ $(top_srcdir)/configure depcomp install-sh missing
2200 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
2201-am__aclocal_m4_deps = $(top_srcdir)/configure.in
2202+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
2203 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
2204 $(ACLOCAL_M4)
2205 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
2206 configure.lineno config.status.lineno
2207-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
2208+mkinstalldirs = $(install_sh) -d
2209 CONFIG_HEADER = config.h
2210 CONFIG_CLEAN_FILES =
2211 CONFIG_CLEAN_VPATH_FILES =
2212@@ -109,57 +108,33 @@
2213 AUTOHEADER = @AUTOHEADER@
2214 AUTOMAKE = @AUTOMAKE@
2215 AWK = @AWK@
2216-CATALOGS = @CATALOGS@
2217-CATOBJEXT = @CATOBJEXT@
2218-CC = @CC@
2219-CCDEPMODE = @CCDEPMODE@
2220-CFLAGS = @CFLAGS@
2221-CPP = @CPP@
2222 CPPFLAGS = @CPPFLAGS@
2223 CXX = @CXX@
2224-CXXCPP = @CXXCPP@
2225 CXXDEPMODE = @CXXDEPMODE@
2226 CXXFLAGS = @CXXFLAGS@
2227 CYGPATH_W = @CYGPATH_W@
2228-DATADIRNAME = @DATADIRNAME@
2229 DEFS = @DEFS@
2230 DEPDIR = @DEPDIR@
2231+DEPS_CFLAGS = @DEPS_CFLAGS@
2232+DEPS_LIBS = @DEPS_LIBS@
2233 ECHO_C = @ECHO_C@
2234 ECHO_N = @ECHO_N@
2235 ECHO_T = @ECHO_T@
2236-EGREP = @EGREP@
2237 EXEEXT = @EXEEXT@
2238-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
2239-GLIBMMDEPS_CFLAGS = @GLIBMMDEPS_CFLAGS@
2240-GLIBMMDEPS_LIBS = @GLIBMMDEPS_LIBS@
2241-GLIBMM_CFLAGS = @GLIBMM_CFLAGS@
2242-GLIBMM_LIBS = @GLIBMM_LIBS@
2243-GMOFILES = @GMOFILES@
2244-GMSGFMT = @GMSGFMT@
2245-GREP = @GREP@
2246 INSTALL = @INSTALL@
2247 INSTALL_DATA = @INSTALL_DATA@
2248 INSTALL_PROGRAM = @INSTALL_PROGRAM@
2249 INSTALL_SCRIPT = @INSTALL_SCRIPT@
2250 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
2251-INSTOBJEXT = @INSTOBJEXT@
2252-INTLLIBS = @INTLLIBS@
2253 LDFLAGS = @LDFLAGS@
2254 LIBOBJS = @LIBOBJS@
2255 LIBS = @LIBS@
2256 LTLIBOBJS = @LTLIBOBJS@
2257-MAINT = @MAINT@
2258 MAKEINFO = @MAKEINFO@
2259 MKDIR_P = @MKDIR_P@
2260-MKINSTALLDIRS = @MKINSTALLDIRS@
2261-MSGFMT = @MSGFMT@
2262-MSGFMT_OPTS = @MSGFMT_OPTS@
2263 OBJEXT = @OBJEXT@
2264 PACKAGE = @PACKAGE@
2265 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
2266-PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
2267-PACKAGE_CPPFLAGS = @PACKAGE_CPPFLAGS@
2268-PACKAGE_LIBS = @PACKAGE_LIBS@
2269 PACKAGE_NAME = @PACKAGE_NAME@
2270 PACKAGE_STRING = @PACKAGE_STRING@
2271 PACKAGE_TARNAME = @PACKAGE_TARNAME@
2272@@ -169,21 +144,14 @@
2273 PKG_CONFIG = @PKG_CONFIG@
2274 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
2275 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
2276-POFILES = @POFILES@
2277-POSUB = @POSUB@
2278-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
2279-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
2280 SET_MAKE = @SET_MAKE@
2281 SHELL = @SHELL@
2282 STRIP = @STRIP@
2283-USE_NLS = @USE_NLS@
2284 VERSION = @VERSION@
2285-XGETTEXT = @XGETTEXT@
2286 abs_builddir = @abs_builddir@
2287 abs_srcdir = @abs_srcdir@
2288 abs_top_builddir = @abs_top_builddir@
2289 abs_top_srcdir = @abs_top_srcdir@
2290-ac_ct_CC = @ac_ct_CC@
2291 ac_ct_CXX = @ac_ct_CXX@
2292 am__include = @am__include@
2293 am__leading_dot = @am__leading_dot@
2294@@ -222,30 +190,26 @@
2295 top_build_prefix = @top_build_prefix@
2296 top_builddir = @top_builddir@
2297 top_srcdir = @top_srcdir@
2298-SUBDIRS = src po
2299-EXTRA_DIST = \
2300- autogen.sh \
2301- main.glade
2302-
2303+SUBDIRS = src
2304 all: config.h
2305 $(MAKE) $(AM_MAKEFLAGS) all-recursive
2306
2307 .SUFFIXES:
2308 am--refresh: Makefile
2309 @:
2310-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
2311+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
2312 @for dep in $?; do \
2313 case '$(am__configure_deps)' in \
2314 *$$dep*) \
2315- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
2316- $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
2317+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
2318+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
2319 && exit 0; \
2320 exit 1;; \
2321 esac; \
2322 done; \
2323- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
2324+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
2325 $(am__cd) $(top_srcdir) && \
2326- $(AUTOMAKE) --gnu Makefile
2327+ $(AUTOMAKE) --foreign Makefile
2328 .PRECIOUS: Makefile
2329 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
2330 @case '$?' in \
2331@@ -260,9 +224,9 @@
2332 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
2333 $(SHELL) ./config.status --recheck
2334
2335-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
2336+$(top_srcdir)/configure: $(am__configure_deps)
2337 $(am__cd) $(srcdir) && $(AUTOCONF)
2338-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
2339+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
2340 $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
2341 $(am__aclocal_m4_deps):
2342
2343@@ -273,7 +237,7 @@
2344 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
2345 @rm -f stamp-h1
2346 cd $(top_builddir) && $(SHELL) ./config.status config.h
2347-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
2348+$(srcdir)/config.h.in: $(am__configure_deps)
2349 ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
2350 rm -f stamp-h1
2351 touch $@
2352@@ -476,9 +440,6 @@
2353 || exit 1; \
2354 fi; \
2355 done
2356- $(MAKE) $(AM_MAKEFLAGS) \
2357- top_distdir="$(top_distdir)" distdir="$(distdir)" \
2358- dist-hook
2359 -test -n "$(am__skip_mode_fix)" \
2360 || find "$(distdir)" -type d ! -perm -755 \
2361 -exec chmod u+rwx,go+rx {} \; -o \
2362@@ -665,7 +626,7 @@
2363
2364 info-am:
2365
2366-install-data-am: install-data-local
2367+install-data-am:
2368
2369 install-dvi: install-dvi-recursive
2370
2371@@ -719,45 +680,19 @@
2372 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
2373 all all-am am--refresh check check-am clean clean-generic \
2374 ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
2375- dist-hook dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
2376- dist-zip distcheck distclean distclean-generic distclean-hdr \
2377+ dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
2378+ distcheck distclean distclean-generic distclean-hdr \
2379 distclean-tags distcleancheck distdir distuninstallcheck dvi \
2380 dvi-am html html-am info info-am install install-am \
2381- install-data install-data-am install-data-local install-dvi \
2382- install-dvi-am install-exec install-exec-am install-html \
2383- install-html-am install-info install-info-am install-man \
2384- install-pdf install-pdf-am install-ps install-ps-am \
2385- install-strip installcheck installcheck-am installdirs \
2386- installdirs-am maintainer-clean maintainer-clean-generic \
2387- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
2388- tags-recursive uninstall uninstall-am
2389-
2390-
2391-install-data-local:
2392- @$(NORMAL_INSTALL)
2393- if test -d $(srcdir)/pixmaps; then \
2394- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \
2395- for pixmap in $(srcdir)/pixmaps/*; do \
2396- if test -f $$pixmap; then \
2397- $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/pixmaps; \
2398- fi \
2399- done \
2400- fi
2401- for gladefile in main.glade; do \
2402- if test -f $$gladefile; then \
2403- $(INSTALL_DATA) $$gladefile $(DESTDIR)$(pkgdatadir); \
2404- fi \
2405- done
2406-
2407-dist-hook:
2408- if test -d pixmaps; then \
2409- mkdir $(distdir)/pixmaps; \
2410- for pixmap in pixmaps/*; do \
2411- if test -f $$pixmap; then \
2412- cp -p $$pixmap $(distdir)/pixmaps; \
2413- fi \
2414- done \
2415- fi
2416+ install-data install-data-am install-dvi install-dvi-am \
2417+ install-exec install-exec-am install-html install-html-am \
2418+ install-info install-info-am install-man install-pdf \
2419+ install-pdf-am install-ps install-ps-am install-strip \
2420+ installcheck installcheck-am installdirs installdirs-am \
2421+ maintainer-clean maintainer-clean-generic mostlyclean \
2422+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
2423+ uninstall uninstall-am
2424+
2425
2426 # Tell versions [3.59,3.63) of GNU make to not export all variables.
2427 # Otherwise a system limit (for SysV at least) may be exceeded.
2428
2429=== removed file 'NEWS'
2430=== removed file 'README'
2431=== modified file 'aclocal.m4'
2432--- aclocal.m4 2012-05-22 16:15:59 +0000
2433+++ aclocal.m4 2012-12-14 19:53:22 +0000
2434@@ -20,443 +20,6 @@
2435 If you have problems, you may need to regenerate the build system entirely.
2436 To do so, use the procedure documented by the package, typically `autoreconf'.])])
2437
2438-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
2439-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
2440-#
2441-# This file is free software, distributed under the terms of the GNU
2442-# General Public License. As a special exception to the GNU General
2443-# Public License, this file may be distributed as part of a program
2444-# that contains a configuration script generated by Autoconf, under
2445-# the same distribution terms as the rest of that program.
2446-#
2447-# This file can be copied and used freely without restrictions. It can
2448-# be used in projects which are not available under the GNU Public License
2449-# but which still want to provide support for the GNU gettext functionality.
2450-#
2451-# Macro to add for using GNU gettext.
2452-# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
2453-#
2454-# Modified to never use included libintl.
2455-# Owen Taylor <otaylor@redhat.com>, 12/15/1998
2456-#
2457-# Major rework to remove unused code
2458-# Owen Taylor <otaylor@redhat.com>, 12/11/2002
2459-#
2460-# Added better handling of ALL_LINGUAS from GNU gettext version
2461-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
2462-#
2463-# Modified to require ngettext
2464-# Matthias Clasen <mclasen@redhat.com> 08/06/2004
2465-#
2466-# We need this here as well, since someone might use autoconf-2.5x
2467-# to configure GLib then an older version to configure a package
2468-# using AM_GLIB_GNU_GETTEXT
2469-AC_PREREQ(2.53)
2470-
2471-dnl
2472-dnl We go to great lengths to make sure that aclocal won't
2473-dnl try to pull in the installed version of these macros
2474-dnl when running aclocal in the glib directory.
2475-dnl
2476-m4_copy([AC_DEFUN],[glib_DEFUN])
2477-m4_copy([AC_REQUIRE],[glib_REQUIRE])
2478-dnl
2479-dnl At the end, if we're not within glib, we'll define the public
2480-dnl definitions in terms of our private definitions.
2481-dnl
2482-
2483-# GLIB_LC_MESSAGES
2484-#--------------------
2485-glib_DEFUN([GLIB_LC_MESSAGES],
2486- [AC_CHECK_HEADERS([locale.h])
2487- if test $ac_cv_header_locale_h = yes; then
2488- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
2489- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
2490- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
2491- if test $am_cv_val_LC_MESSAGES = yes; then
2492- AC_DEFINE(HAVE_LC_MESSAGES, 1,
2493- [Define if your <locale.h> file defines LC_MESSAGES.])
2494- fi
2495- fi])
2496-
2497-# GLIB_PATH_PROG_WITH_TEST
2498-#----------------------------
2499-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
2500-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
2501-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
2502-[# Extract the first word of "$2", so it can be a program name with args.
2503-set dummy $2; ac_word=[$]2
2504-AC_MSG_CHECKING([for $ac_word])
2505-AC_CACHE_VAL(ac_cv_path_$1,
2506-[case "[$]$1" in
2507- /*)
2508- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
2509- ;;
2510- *)
2511- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
2512- for ac_dir in ifelse([$5], , $PATH, [$5]); do
2513- test -z "$ac_dir" && ac_dir=.
2514- if test -f $ac_dir/$ac_word; then
2515- if [$3]; then
2516- ac_cv_path_$1="$ac_dir/$ac_word"
2517- break
2518- fi
2519- fi
2520- done
2521- IFS="$ac_save_ifs"
2522-dnl If no 4th arg is given, leave the cache variable unset,
2523-dnl so AC_PATH_PROGS will keep looking.
2524-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
2525-])dnl
2526- ;;
2527-esac])dnl
2528-$1="$ac_cv_path_$1"
2529-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
2530- AC_MSG_RESULT([$]$1)
2531-else
2532- AC_MSG_RESULT(no)
2533-fi
2534-AC_SUBST($1)dnl
2535-])
2536-
2537-# GLIB_WITH_NLS
2538-#-----------------
2539-glib_DEFUN([GLIB_WITH_NLS],
2540- dnl NLS is obligatory
2541- [USE_NLS=yes
2542- AC_SUBST(USE_NLS)
2543-
2544- gt_cv_have_gettext=no
2545-
2546- CATOBJEXT=NONE
2547- XGETTEXT=:
2548- INTLLIBS=
2549-
2550- AC_CHECK_HEADER(libintl.h,
2551- [gt_cv_func_dgettext_libintl="no"
2552- libintl_extra_libs=""
2553-
2554- #
2555- # First check in libc
2556- #
2557- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
2558- [AC_TRY_LINK([
2559-#include <libintl.h>
2560-],
2561- [return !ngettext ("","", 1)],
2562- gt_cv_func_ngettext_libc=yes,
2563- gt_cv_func_ngettext_libc=no)
2564- ])
2565-
2566- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
2567- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
2568- [AC_TRY_LINK([
2569-#include <libintl.h>
2570-],
2571- [return !dgettext ("","")],
2572- gt_cv_func_dgettext_libc=yes,
2573- gt_cv_func_dgettext_libc=no)
2574- ])
2575- fi
2576-
2577- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
2578- AC_CHECK_FUNCS(bind_textdomain_codeset)
2579- fi
2580-
2581- #
2582- # If we don't have everything we want, check in libintl
2583- #
2584- if test "$gt_cv_func_dgettext_libc" != "yes" \
2585- || test "$gt_cv_func_ngettext_libc" != "yes" \
2586- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
2587-
2588- AC_CHECK_LIB(intl, bindtextdomain,
2589- [AC_CHECK_LIB(intl, ngettext,
2590- [AC_CHECK_LIB(intl, dgettext,
2591- gt_cv_func_dgettext_libintl=yes)])])
2592-
2593- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
2594- AC_MSG_CHECKING([if -liconv is needed to use gettext])
2595- AC_MSG_RESULT([])
2596- AC_CHECK_LIB(intl, ngettext,
2597- [AC_CHECK_LIB(intl, dcgettext,
2598- [gt_cv_func_dgettext_libintl=yes
2599- libintl_extra_libs=-liconv],
2600- :,-liconv)],
2601- :,-liconv)
2602- fi
2603-
2604- #
2605- # If we found libintl, then check in it for bind_textdomain_codeset();
2606- # we'll prefer libc if neither have bind_textdomain_codeset(),
2607- # and both have dgettext and ngettext
2608- #
2609- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
2610- glib_save_LIBS="$LIBS"
2611- LIBS="$LIBS -lintl $libintl_extra_libs"
2612- unset ac_cv_func_bind_textdomain_codeset
2613- AC_CHECK_FUNCS(bind_textdomain_codeset)
2614- LIBS="$glib_save_LIBS"
2615-
2616- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
2617- gt_cv_func_dgettext_libc=no
2618- else
2619- if test "$gt_cv_func_dgettext_libc" = "yes" \
2620- && test "$gt_cv_func_ngettext_libc" = "yes"; then
2621- gt_cv_func_dgettext_libintl=no
2622- fi
2623- fi
2624- fi
2625- fi
2626-
2627- if test "$gt_cv_func_dgettext_libc" = "yes" \
2628- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
2629- gt_cv_have_gettext=yes
2630- fi
2631-
2632- if test "$gt_cv_func_dgettext_libintl" = "yes"; then
2633- INTLLIBS="-lintl $libintl_extra_libs"
2634- fi
2635-
2636- if test "$gt_cv_have_gettext" = "yes"; then
2637- AC_DEFINE(HAVE_GETTEXT,1,
2638- [Define if the GNU gettext() function is already present or preinstalled.])
2639- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
2640- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
2641- if test "$MSGFMT" != "no"; then
2642- glib_save_LIBS="$LIBS"
2643- LIBS="$LIBS $INTLLIBS"
2644- AC_CHECK_FUNCS(dcgettext)
2645- MSGFMT_OPTS=
2646- AC_MSG_CHECKING([if msgfmt accepts -c])
2647- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
2648-msgid ""
2649-msgstr ""
2650-"Content-Type: text/plain; charset=UTF-8\n"
2651-"Project-Id-Version: test 1.0\n"
2652-"PO-Revision-Date: 2007-02-15 12:01+0100\n"
2653-"Last-Translator: test <foo@bar.xx>\n"
2654-"Language-Team: C <LL@li.org>\n"
2655-"MIME-Version: 1.0\n"
2656-"Content-Transfer-Encoding: 8bit\n"
2657-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
2658- AC_SUBST(MSGFMT_OPTS)
2659- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
2660- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
2661- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
2662- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
2663- return _nl_msg_cat_cntr],
2664- [CATOBJEXT=.gmo
2665- DATADIRNAME=share],
2666- [case $host in
2667- *-*-solaris*)
2668- dnl On Solaris, if bind_textdomain_codeset is in libc,
2669- dnl GNU format message catalog is always supported,
2670- dnl since both are added to the libc all together.
2671- dnl Hence, we'd like to go with DATADIRNAME=share and
2672- dnl and CATOBJEXT=.gmo in this case.
2673- AC_CHECK_FUNC(bind_textdomain_codeset,
2674- [CATOBJEXT=.gmo
2675- DATADIRNAME=share],
2676- [CATOBJEXT=.mo
2677- DATADIRNAME=lib])
2678- ;;
2679- *-*-openbsd*)
2680- CATOBJEXT=.mo
2681- DATADIRNAME=share
2682- ;;
2683- *)
2684- CATOBJEXT=.mo
2685- DATADIRNAME=lib
2686- ;;
2687- esac])
2688- LIBS="$glib_save_LIBS"
2689- INSTOBJEXT=.mo
2690- else
2691- gt_cv_have_gettext=no
2692- fi
2693- fi
2694- ])
2695-
2696- if test "$gt_cv_have_gettext" = "yes" ; then
2697- AC_DEFINE(ENABLE_NLS, 1,
2698- [always defined to indicate that i18n is enabled])
2699- fi
2700-
2701- dnl Test whether we really found GNU xgettext.
2702- if test "$XGETTEXT" != ":"; then
2703- dnl If it is not GNU xgettext we define it as : so that the
2704- dnl Makefiles still can work.
2705- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
2706- : ;
2707- else
2708- AC_MSG_RESULT(
2709- [found xgettext program is not GNU xgettext; ignore it])
2710- XGETTEXT=":"
2711- fi
2712- fi
2713-
2714- # We need to process the po/ directory.
2715- POSUB=po
2716-
2717- AC_OUTPUT_COMMANDS(
2718- [case "$CONFIG_FILES" in *po/Makefile.in*)
2719- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
2720- esac])
2721-
2722- dnl These rules are solely for the distribution goal. While doing this
2723- dnl we only have to keep exactly one list of the available catalogs
2724- dnl in configure.ac.
2725- for lang in $ALL_LINGUAS; do
2726- GMOFILES="$GMOFILES $lang.gmo"
2727- POFILES="$POFILES $lang.po"
2728- done
2729-
2730- dnl Make all variables we use known to autoconf.
2731- AC_SUBST(CATALOGS)
2732- AC_SUBST(CATOBJEXT)
2733- AC_SUBST(DATADIRNAME)
2734- AC_SUBST(GMOFILES)
2735- AC_SUBST(INSTOBJEXT)
2736- AC_SUBST(INTLLIBS)
2737- AC_SUBST(PO_IN_DATADIR_TRUE)
2738- AC_SUBST(PO_IN_DATADIR_FALSE)
2739- AC_SUBST(POFILES)
2740- AC_SUBST(POSUB)
2741- ])
2742-
2743-# AM_GLIB_GNU_GETTEXT
2744-# -------------------
2745-# Do checks necessary for use of gettext. If a suitable implementation
2746-# of gettext is found in either in libintl or in the C library,
2747-# it will set INTLLIBS to the libraries needed for use of gettext
2748-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
2749-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
2750-# on various variables needed by the Makefile.in.in installed by
2751-# glib-gettextize.
2752-dnl
2753-glib_DEFUN([GLIB_GNU_GETTEXT],
2754- [AC_REQUIRE([AC_PROG_CC])dnl
2755- AC_REQUIRE([AC_HEADER_STDC])dnl
2756-
2757- GLIB_LC_MESSAGES
2758- GLIB_WITH_NLS
2759-
2760- if test "$gt_cv_have_gettext" = "yes"; then
2761- if test "x$ALL_LINGUAS" = "x"; then
2762- LINGUAS=
2763- else
2764- AC_MSG_CHECKING(for catalogs to be installed)
2765- NEW_LINGUAS=
2766- for presentlang in $ALL_LINGUAS; do
2767- useit=no
2768- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
2769- desiredlanguages="$LINGUAS"
2770- else
2771- desiredlanguages="$ALL_LINGUAS"
2772- fi
2773- for desiredlang in $desiredlanguages; do
2774- # Use the presentlang catalog if desiredlang is
2775- # a. equal to presentlang, or
2776- # b. a variant of presentlang (because in this case,
2777- # presentlang can be used as a fallback for messages
2778- # which are not translated in the desiredlang catalog).
2779- case "$desiredlang" in
2780- "$presentlang"*) useit=yes;;
2781- esac
2782- done
2783- if test $useit = yes; then
2784- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
2785- fi
2786- done
2787- LINGUAS=$NEW_LINGUAS
2788- AC_MSG_RESULT($LINGUAS)
2789- fi
2790-
2791- dnl Construct list of names of catalog files to be constructed.
2792- if test -n "$LINGUAS"; then
2793- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
2794- fi
2795- fi
2796-
2797- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
2798- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
2799- dnl Try to locate is.
2800- MKINSTALLDIRS=
2801- if test -n "$ac_aux_dir"; then
2802- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
2803- fi
2804- if test -z "$MKINSTALLDIRS"; then
2805- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
2806- fi
2807- AC_SUBST(MKINSTALLDIRS)
2808-
2809- dnl Generate list of files to be processed by xgettext which will
2810- dnl be included in po/Makefile.
2811- test -d po || mkdir po
2812- if test "x$srcdir" != "x."; then
2813- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
2814- posrcprefix="$srcdir/"
2815- else
2816- posrcprefix="../$srcdir/"
2817- fi
2818- else
2819- posrcprefix="../"
2820- fi
2821- rm -f po/POTFILES
2822- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
2823- < $srcdir/po/POTFILES.in > po/POTFILES
2824- ])
2825-
2826-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
2827-# -------------------------------
2828-# Define VARIABLE to the location where catalog files will
2829-# be installed by po/Makefile.
2830-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
2831-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
2832-glib_save_prefix="$prefix"
2833-glib_save_exec_prefix="$exec_prefix"
2834-glib_save_datarootdir="$datarootdir"
2835-test "x$prefix" = xNONE && prefix=$ac_default_prefix
2836-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
2837-datarootdir=`eval echo "${datarootdir}"`
2838-if test "x$CATOBJEXT" = "x.mo" ; then
2839- localedir=`eval echo "${libdir}/locale"`
2840-else
2841- localedir=`eval echo "${datadir}/locale"`
2842-fi
2843-prefix="$glib_save_prefix"
2844-exec_prefix="$glib_save_exec_prefix"
2845-datarootdir="$glib_save_datarootdir"
2846-AC_DEFINE_UNQUOTED($1, "$localedir",
2847- [Define the location where the catalogs will be installed])
2848-])
2849-
2850-dnl
2851-dnl Now the definitions that aclocal will find
2852-dnl
2853-ifdef(glib_configure_ac,[],[
2854-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
2855-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
2856-])dnl
2857-
2858-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
2859-#
2860-# Create a temporary file with TEST-FILE as its contents and pass the
2861-# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
2862-# 0 and perform ACTION-IF-FAIL for any other exit status.
2863-AC_DEFUN([GLIB_RUN_PROG],
2864-[cat >conftest.foo <<_ACEOF
2865-$2
2866-_ACEOF
2867-if AC_RUN_LOG([$1 conftest.foo]); then
2868- m4_ifval([$3], [$3], [:])
2869-m4_ifvaln([$4], [else $4])dnl
2870-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
2871-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
2872-fi])
2873-
2874-
2875 # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
2876 # serial 1 (pkg-config-0.24)
2877 #
2878@@ -1013,18 +576,6 @@
2879 [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
2880 ])
2881
2882-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
2883-# Free Software Foundation, Inc.
2884-#
2885-# This file is free software; the Free Software Foundation
2886-# gives unlimited permission to copy and/or distribute it,
2887-# with or without modifications, as long as this notice is preserved.
2888-
2889-# serial 8
2890-
2891-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
2892-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
2893-
2894 # Do all the work for Automake. -*- Autoconf -*-
2895
2896 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
2897@@ -1209,46 +760,6 @@
2898 rmdir .tst 2>/dev/null
2899 AC_SUBST([am__leading_dot])])
2900
2901-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
2902-# From Jim Meyering
2903-
2904-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
2905-# 2011 Free Software Foundation, Inc.
2906-#
2907-# This file is free software; the Free Software Foundation
2908-# gives unlimited permission to copy and/or distribute it,
2909-# with or without modifications, as long as this notice is preserved.
2910-
2911-# serial 5
2912-
2913-# AM_MAINTAINER_MODE([DEFAULT-MODE])
2914-# ----------------------------------
2915-# Control maintainer-specific portions of Makefiles.
2916-# Default is to disable them, unless `enable' is passed literally.
2917-# For symmetry, `disable' may be passed as well. Anyway, the user
2918-# can override the default with the --enable/--disable switch.
2919-AC_DEFUN([AM_MAINTAINER_MODE],
2920-[m4_case(m4_default([$1], [disable]),
2921- [enable], [m4_define([am_maintainer_other], [disable])],
2922- [disable], [m4_define([am_maintainer_other], [enable])],
2923- [m4_define([am_maintainer_other], [enable])
2924- m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
2925-AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
2926- dnl maintainer-mode's default is 'disable' unless 'enable' is passed
2927- AC_ARG_ENABLE([maintainer-mode],
2928-[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
2929- (and sometimes confusing) to the casual installer],
2930- [USE_MAINTAINER_MODE=$enableval],
2931- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
2932- AC_MSG_RESULT([$USE_MAINTAINER_MODE])
2933- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
2934- MAINT=$MAINTAINER_MODE_TRUE
2935- AC_SUBST([MAINT])dnl
2936-]
2937-)
2938-
2939-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
2940-
2941 # Check to see how 'make' treats includes. -*- Autoconf -*-
2942
2943 # Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
2944
2945=== removed file 'autogen.sh'
2946--- autogen.sh 2012-04-10 21:01:12 +0000
2947+++ autogen.sh 1970-01-01 00:00:00 +0000
2948@@ -1,159 +0,0 @@
2949-#!/bin/sh
2950-# Run this to generate all the initial makefiles, etc.
2951-
2952-srcdir=`dirname $0`
2953-test -z "$srcdir" && srcdir=.
2954-
2955-DIE=0
2956-
2957-if [ -n "$GNOME2_DIR" ]; then
2958- ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS"
2959- LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH"
2960- PATH="$GNOME2_DIR/bin:$PATH"
2961- export PATH
2962- export LD_LIBRARY_PATH
2963-fi
2964-
2965-(test -f $srcdir/configure.in) || {
2966- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
2967- echo " top-level package directory"
2968- exit 1
2969-}
2970-
2971-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
2972- echo
2973- echo "**Error**: You must have \`autoconf' installed."
2974- echo "Download the appropriate package for your distribution,"
2975- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
2976- DIE=1
2977-}
2978-
2979-(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
2980- (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
2981- echo
2982- echo "**Error**: You must have \`intltool' installed."
2983- echo "You can get it from:"
2984- echo " ftp://ftp.gnome.org/pub/GNOME/"
2985- DIE=1
2986- }
2987-}
2988-
2989-(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.in >/dev/null) && {
2990- (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || {
2991- echo
2992- echo "**Error**: You must have \`xml-i18n-toolize' installed."
2993- echo "You can get it from:"
2994- echo " ftp://ftp.gnome.org/pub/GNOME/"
2995- DIE=1
2996- }
2997-}
2998-
2999-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
3000- (libtool --version) < /dev/null > /dev/null 2>&1 || {
3001- echo
3002- echo "**Error**: You must have \`libtool' installed."
3003- echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
3004- DIE=1
3005- }
3006-}
3007-
3008-(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.in >/dev/null) && {
3009- (grep "sed.*POTFILES" $srcdir/configure.in) > /dev/null || \
3010- (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || {
3011- echo
3012- echo "**Error**: You must have \`glib' installed."
3013- echo "You can get it from: ftp://ftp.gtk.org/pub/gtk"
3014- DIE=1
3015- }
3016-}
3017-
3018-(automake --version) < /dev/null > /dev/null 2>&1 || {
3019- echo
3020- echo "**Error**: You must have \`automake' installed."
3021- echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
3022- DIE=1
3023- NO_AUTOMAKE=yes
3024-}
3025-
3026-
3027-# if no automake, don't bother testing for aclocal
3028-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
3029- echo
3030- echo "**Error**: Missing \`aclocal'. The version of \`automake'"
3031- echo "installed doesn't appear recent enough."
3032- echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/"
3033- DIE=1
3034-}
3035-
3036-if test "$DIE" -eq 1; then
3037- exit 1
3038-fi
3039-
3040-if test -z "$*"; then
3041- echo "**Warning**: I am going to run \`configure' with no arguments."
3042- echo "If you wish to pass any to it, please specify them on the"
3043- echo \`$0\'" command line."
3044- echo
3045-fi
3046-
3047-case $CC in
3048-xlc )
3049- am_opt=--include-deps;;
3050-esac
3051-
3052-for coin in `find $srcdir -path $srcdir/CVS -prune -o -name configure.in -print`
3053-do
3054- dr=`dirname $coin`
3055- if test -f $dr/NO-AUTO-GEN; then
3056- echo skipping $dr -- flagged as no auto-gen
3057- else
3058- echo processing $dr
3059- ( cd $dr
3060-
3061- aclocalinclude="$ACLOCAL_FLAGS"
3062-
3063- if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then
3064- echo "Creating $dr/aclocal.m4 ..."
3065- test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
3066- echo "Running glib-gettextize... Ignore non-fatal messages."
3067- echo "no" | glib-gettextize --force --copy
3068- echo "Making $dr/aclocal.m4 writable ..."
3069- test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
3070- fi
3071- if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
3072- echo "Running intltoolize..."
3073- intltoolize --copy --force --automake
3074- fi
3075- if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then
3076- echo "Running xml-i18n-toolize..."
3077- xml-i18n-toolize --copy --force --automake
3078- fi
3079- if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
3080- if test -z "$NO_LIBTOOLIZE" ; then
3081- echo "Running libtoolize..."
3082- libtoolize --force --copy
3083- fi
3084- fi
3085- echo "Running aclocal $aclocalinclude ..."
3086- aclocal $aclocalinclude
3087- if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
3088- echo "Running autoheader..."
3089- autoheader
3090- fi
3091- echo "Running automake --gnu $am_opt ..."
3092- automake --add-missing --gnu $am_opt
3093- echo "Running autoconf ..."
3094- autoconf
3095- )
3096- fi
3097-done
3098-
3099-conf_flags="--enable-maintainer-mode"
3100-
3101-if test x$NOCONFIGURE = x; then
3102- echo Running $srcdir/configure $conf_flags "$@" ...
3103- $srcdir/configure $conf_flags "$@" \
3104- && echo Now type \`make\' to compile. || exit 1
3105-else
3106- echo Skipping configure process.
3107-fi
3108
3109=== modified file 'autom4te.cache/output.0'
3110--- autom4te.cache/output.0 2012-05-22 16:15:59 +0000
3111+++ autom4te.cache/output.0 2012-12-14 19:53:22 +0000
3112@@ -1,6 +1,8 @@
3113 @%:@! /bin/sh
3114 @%:@ Guess values for system-dependent variables and create Makefiles.
3115-@%:@ Generated by GNU Autoconf 2.68.
3116+@%:@ Generated by GNU Autoconf 2.68 for amhello 1.0.
3117+@%:@
3118+@%:@ Report bugs to <bug-report@address>.
3119 @%:@
3120 @%:@
3121 @%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
3122@@ -171,8 +173,7 @@
3123 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
3124 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
3125 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
3126- test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
3127-test \$(( 1 + 1 )) = 2 || exit 1"
3128+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
3129 if (eval "$as_required") 2>/dev/null; then :
3130 as_have_required=yes
3131 else
3132@@ -236,10 +237,11 @@
3133 $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
3134 $as_echo "$0: be upgraded to zsh 4.3.4 or later."
3135 else
3136- $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
3137-$0: including any error possibly output before this
3138-$0: message. Then install a modern shell, or manually run
3139-$0: the script under such a shell if you do have one."
3140+ $as_echo "$0: Please tell bug-autoconf@gnu.org and bug-report@address
3141+$0: about your system, including any error possibly output
3142+$0: before this message. Then install a modern shell, or
3143+$0: manually run the script under such a shell if you do
3144+$0: have one."
3145 fi
3146 exit 1
3147 fi
3148@@ -555,93 +557,20 @@
3149 MAKEFLAGS=
3150
3151 # Identity of this package.
3152-PACKAGE_NAME=
3153-PACKAGE_TARNAME=
3154-PACKAGE_VERSION=
3155-PACKAGE_STRING=
3156-PACKAGE_BUGREPORT=
3157-PACKAGE_URL=
3158-
3159-ac_unique_file="configure.in"
3160-# Factoring default headers for most tests.
3161-ac_includes_default="\
3162-#include <stdio.h>
3163-#ifdef HAVE_SYS_TYPES_H
3164-# include <sys/types.h>
3165-#endif
3166-#ifdef HAVE_SYS_STAT_H
3167-# include <sys/stat.h>
3168-#endif
3169-#ifdef STDC_HEADERS
3170-# include <stdlib.h>
3171-# include <stddef.h>
3172-#else
3173-# ifdef HAVE_STDLIB_H
3174-# include <stdlib.h>
3175-# endif
3176-#endif
3177-#ifdef HAVE_STRING_H
3178-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
3179-# include <memory.h>
3180-# endif
3181-# include <string.h>
3182-#endif
3183-#ifdef HAVE_STRINGS_H
3184-# include <strings.h>
3185-#endif
3186-#ifdef HAVE_INTTYPES_H
3187-# include <inttypes.h>
3188-#endif
3189-#ifdef HAVE_STDINT_H
3190-# include <stdint.h>
3191-#endif
3192-#ifdef HAVE_UNISTD_H
3193-# include <unistd.h>
3194-#endif"
3195+PACKAGE_NAME='amhello'
3196+PACKAGE_TARNAME='amhello'
3197+PACKAGE_VERSION='1.0'
3198+PACKAGE_STRING='amhello 1.0'
3199+PACKAGE_BUGREPORT='bug-report@address'
3200+PACKAGE_URL=''
3201
3202 ac_subst_vars='am__EXEEXT_FALSE
3203 am__EXEEXT_TRUE
3204 LTLIBOBJS
3205 LIB@&t@OBJS
3206-MKINSTALLDIRS
3207-POSUB
3208-POFILES
3209-PO_IN_DATADIR_FALSE
3210-PO_IN_DATADIR_TRUE
3211-INTLLIBS
3212-INSTOBJEXT
3213-GMOFILES
3214-DATADIRNAME
3215-CATOBJEXT
3216-CATALOGS
3217-XGETTEXT
3218-GMSGFMT
3219-MSGFMT_OPTS
3220-MSGFMT
3221-USE_NLS
3222-CXXCPP
3223-GETTEXT_PACKAGE
3224-GLIBMM_LIBS
3225-GLIBMM_CFLAGS
3226-GLIBMMDEPS_LIBS
3227-GLIBMMDEPS_CFLAGS
3228-PACKAGE_CPPFLAGS
3229-PACKAGE_LIBS
3230-PACKAGE_CFLAGS
3231-PKG_CONFIG_LIBDIR
3232-PKG_CONFIG_PATH
3233-PKG_CONFIG
3234-EGREP
3235-GREP
3236-CPP
3237 am__fastdepCXX_FALSE
3238 am__fastdepCXX_TRUE
3239 CXXDEPMODE
3240-ac_ct_CXX
3241-CXX
3242-am__fastdepCC_FALSE
3243-am__fastdepCC_TRUE
3244-CCDEPMODE
3245 am__nodep
3246 AMDEPBACKSLASH
3247 AMDEP_FALSE
3248@@ -651,15 +580,11 @@
3249 DEPDIR
3250 OBJEXT
3251 EXEEXT
3252-ac_ct_CC
3253+ac_ct_CXX
3254 CPPFLAGS
3255 LDFLAGS
3256-CC
3257 CXXFLAGS
3258-CFLAGS
3259-MAINT
3260-MAINTAINER_MODE_FALSE
3261-MAINTAINER_MODE_TRUE
3262+CXX
3263 am__untar
3264 am__tar
3265 AMTAR
3266@@ -724,30 +649,17 @@
3267 ac_subst_files=''
3268 ac_user_opts='
3269 enable_option_checking
3270-enable_maintainer_mode
3271 enable_dependency_tracking
3272-enable_debug
3273 '
3274 ac_precious_vars='build_alias
3275 host_alias
3276 target_alias
3277-CC
3278-CFLAGS
3279+CXX
3280+CXXFLAGS
3281 LDFLAGS
3282 LIBS
3283 CPPFLAGS
3284-CXX
3285-CXXFLAGS
3286-CCC
3287-CPP
3288-PKG_CONFIG
3289-PKG_CONFIG_PATH
3290-PKG_CONFIG_LIBDIR
3291-PACKAGE_CFLAGS
3292-PACKAGE_LIBS
3293-GLIBMMDEPS_CFLAGS
3294-GLIBMMDEPS_LIBS
3295-CXXCPP'
3296+CCC'
3297
3298
3299 # Initialize some variables set by options.
3300@@ -788,7 +700,7 @@
3301 localstatedir='${prefix}/var'
3302 includedir='${prefix}/include'
3303 oldincludedir='/usr/include'
3304-docdir='${datarootdir}/doc/${PACKAGE}'
3305+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
3306 infodir='${datarootdir}/info'
3307 htmldir='${docdir}'
3308 dvidir='${docdir}'
3309@@ -1290,7 +1202,7 @@
3310 # Omit some internal or obsolete options to make the list less imposing.
3311 # This message is too long to be a string in the A/UX 3.1 sh.
3312 cat <<_ACEOF
3313-\`configure' configures this package to adapt to many kinds of systems.
3314+\`configure' configures amhello 1.0 to adapt to many kinds of systems.
3315
3316 Usage: $0 [OPTION]... [VAR=VALUE]...
3317
3318@@ -1338,7 +1250,7 @@
3319 --infodir=DIR info documentation [DATAROOTDIR/info]
3320 --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
3321 --mandir=DIR man documentation [DATAROOTDIR/man]
3322- --docdir=DIR documentation root @<:@DATAROOTDIR/doc/PACKAGE@:>@
3323+ --docdir=DIR documentation root @<:@DATAROOTDIR/doc/amhello@:>@
3324 --htmldir=DIR html documentation [DOCDIR]
3325 --dvidir=DIR dvi documentation [DOCDIR]
3326 --pdfdir=DIR pdf documentation [DOCDIR]
3327@@ -1355,49 +1267,31 @@
3328 fi
3329
3330 if test -n "$ac_init_help"; then
3331-
3332+ case $ac_init_help in
3333+ short | recursive ) echo "Configuration of amhello 1.0:";;
3334+ esac
3335 cat <<\_ACEOF
3336
3337 Optional Features:
3338 --disable-option-checking ignore unrecognized --enable/--with options
3339 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
3340 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
3341- --enable-maintainer-mode enable make rules and dependencies not useful
3342- (and sometimes confusing) to the casual installer
3343 --disable-dependency-tracking speeds up one-time build
3344 --enable-dependency-tracking do not reject slow dependency extractors
3345- --enable-debug compile with debug symbols @<:@default=no@:>@
3346
3347 Some influential environment variables:
3348- CC C compiler command
3349- CFLAGS C compiler flags
3350+ CXX C++ compiler command
3351+ CXXFLAGS C++ compiler flags
3352 LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
3353 nonstandard directory <lib dir>
3354 LIBS libraries to pass to the linker, e.g. -l<library>
3355 CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
3356 you have headers in a nonstandard directory <include dir>
3357- CXX C++ compiler command
3358- CXXFLAGS C++ compiler flags
3359- CPP C preprocessor
3360- PKG_CONFIG path to pkg-config utility
3361- PKG_CONFIG_PATH
3362- directories to add to pkg-config's search path
3363- PKG_CONFIG_LIBDIR
3364- path overriding pkg-config's built-in search path
3365- PACKAGE_CFLAGS
3366- C compiler flags for PACKAGE, overriding pkg-config
3367- PACKAGE_LIBS
3368- linker flags for PACKAGE, overriding pkg-config
3369- GLIBMMDEPS_CFLAGS
3370- C compiler flags for GLIBMMDEPS, overriding pkg-config
3371- GLIBMMDEPS_LIBS
3372- linker flags for GLIBMMDEPS, overriding pkg-config
3373- CXXCPP C++ preprocessor
3374
3375 Use these variables to override the choices made by `configure' or to help
3376 it to find libraries and programs with nonstandard names/locations.
3377
3378-Report bugs to the package provider.
3379+Report bugs to <bug-report@address>.
3380 _ACEOF
3381 ac_status=$?
3382 fi
3383@@ -1460,7 +1354,7 @@
3384 test -n "$ac_init_help" && exit $ac_status
3385 if $ac_init_version; then
3386 cat <<\_ACEOF
3387-configure
3388+amhello configure 1.0
3389 generated by GNU Autoconf 2.68
3390
3391 Copyright (C) 2010 Free Software Foundation, Inc.
3392@@ -1474,90 +1368,6 @@
3393 ## Autoconf initialization. ##
3394 ## ------------------------ ##
3395
3396-@%:@ ac_fn_c_try_compile LINENO
3397-@%:@ --------------------------
3398-@%:@ Try to compile conftest.@S|@ac_ext, and return whether this succeeded.
3399-ac_fn_c_try_compile ()
3400-{
3401- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3402- rm -f conftest.$ac_objext
3403- if { { ac_try="$ac_compile"
3404-case "(($ac_try" in
3405- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3406- *) ac_try_echo=$ac_try;;
3407-esac
3408-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3409-$as_echo "$ac_try_echo"; } >&5
3410- (eval "$ac_compile") 2>conftest.err
3411- ac_status=$?
3412- if test -s conftest.err; then
3413- grep -v '^ *+' conftest.err >conftest.er1
3414- cat conftest.er1 >&5
3415- mv -f conftest.er1 conftest.err
3416- fi
3417- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3418- test $ac_status = 0; } && {
3419- test -z "$ac_c_werror_flag" ||
3420- test ! -s conftest.err
3421- } && test -s conftest.$ac_objext; then :
3422- ac_retval=0
3423-else
3424- $as_echo "$as_me: failed program was:" >&5
3425-sed 's/^/| /' conftest.$ac_ext >&5
3426-
3427- ac_retval=1
3428-fi
3429- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
3430- as_fn_set_status $ac_retval
3431-
3432-} @%:@ ac_fn_c_try_compile
3433-
3434-@%:@ ac_fn_c_try_link LINENO
3435-@%:@ -----------------------
3436-@%:@ Try to link conftest.@S|@ac_ext, and return whether this succeeded.
3437-ac_fn_c_try_link ()
3438-{
3439- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3440- rm -f conftest.$ac_objext conftest$ac_exeext
3441- if { { ac_try="$ac_link"
3442-case "(($ac_try" in
3443- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3444- *) ac_try_echo=$ac_try;;
3445-esac
3446-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3447-$as_echo "$ac_try_echo"; } >&5
3448- (eval "$ac_link") 2>conftest.err
3449- ac_status=$?
3450- if test -s conftest.err; then
3451- grep -v '^ *+' conftest.err >conftest.er1
3452- cat conftest.er1 >&5
3453- mv -f conftest.er1 conftest.err
3454- fi
3455- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3456- test $ac_status = 0; } && {
3457- test -z "$ac_c_werror_flag" ||
3458- test ! -s conftest.err
3459- } && test -s conftest$ac_exeext && {
3460- test "$cross_compiling" = yes ||
3461- $as_test_x conftest$ac_exeext
3462- }; then :
3463- ac_retval=0
3464-else
3465- $as_echo "$as_me: failed program was:" >&5
3466-sed 's/^/| /' conftest.$ac_ext >&5
3467-
3468- ac_retval=1
3469-fi
3470- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
3471- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
3472- # interfere with the next link command; also delete a directory that is
3473- # left behind by Apple's compiler. We do this before executing the actions.
3474- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
3475- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
3476- as_fn_set_status $ac_retval
3477-
3478-} @%:@ ac_fn_c_try_link
3479-
3480 @%:@ ac_fn_cxx_try_compile LINENO
3481 @%:@ ----------------------------
3482 @%:@ Try to compile conftest.@S|@ac_ext, and return whether this succeeded.
3483@@ -1595,445 +1405,11 @@
3484 as_fn_set_status $ac_retval
3485
3486 } @%:@ ac_fn_cxx_try_compile
3487-
3488-@%:@ ac_fn_c_try_cpp LINENO
3489-@%:@ ----------------------
3490-@%:@ Try to preprocess conftest.@S|@ac_ext, and return whether this succeeded.
3491-ac_fn_c_try_cpp ()
3492-{
3493- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3494- if { { ac_try="$ac_cpp conftest.$ac_ext"
3495-case "(($ac_try" in
3496- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3497- *) ac_try_echo=$ac_try;;
3498-esac
3499-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3500-$as_echo "$ac_try_echo"; } >&5
3501- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
3502- ac_status=$?
3503- if test -s conftest.err; then
3504- grep -v '^ *+' conftest.err >conftest.er1
3505- cat conftest.er1 >&5
3506- mv -f conftest.er1 conftest.err
3507- fi
3508- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3509- test $ac_status = 0; } > conftest.i && {
3510- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
3511- test ! -s conftest.err
3512- }; then :
3513- ac_retval=0
3514-else
3515- $as_echo "$as_me: failed program was:" >&5
3516-sed 's/^/| /' conftest.$ac_ext >&5
3517-
3518- ac_retval=1
3519-fi
3520- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
3521- as_fn_set_status $ac_retval
3522-
3523-} @%:@ ac_fn_c_try_cpp
3524-
3525-@%:@ ac_fn_c_try_run LINENO
3526-@%:@ ----------------------
3527-@%:@ Try to link conftest.@S|@ac_ext, and return whether this succeeded. Assumes
3528-@%:@ that executables *can* be run.
3529-ac_fn_c_try_run ()
3530-{
3531- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3532- if { { ac_try="$ac_link"
3533-case "(($ac_try" in
3534- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3535- *) ac_try_echo=$ac_try;;
3536-esac
3537-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3538-$as_echo "$ac_try_echo"; } >&5
3539- (eval "$ac_link") 2>&5
3540- ac_status=$?
3541- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3542- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
3543- { { case "(($ac_try" in
3544- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3545- *) ac_try_echo=$ac_try;;
3546-esac
3547-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3548-$as_echo "$ac_try_echo"; } >&5
3549- (eval "$ac_try") 2>&5
3550- ac_status=$?
3551- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3552- test $ac_status = 0; }; }; then :
3553- ac_retval=0
3554-else
3555- $as_echo "$as_me: program exited with status $ac_status" >&5
3556- $as_echo "$as_me: failed program was:" >&5
3557-sed 's/^/| /' conftest.$ac_ext >&5
3558-
3559- ac_retval=$ac_status
3560-fi
3561- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
3562- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
3563- as_fn_set_status $ac_retval
3564-
3565-} @%:@ ac_fn_c_try_run
3566-
3567-@%:@ ac_fn_cxx_try_cpp LINENO
3568-@%:@ ------------------------
3569-@%:@ Try to preprocess conftest.@S|@ac_ext, and return whether this succeeded.
3570-ac_fn_cxx_try_cpp ()
3571-{
3572- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3573- if { { ac_try="$ac_cpp conftest.$ac_ext"
3574-case "(($ac_try" in
3575- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3576- *) ac_try_echo=$ac_try;;
3577-esac
3578-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3579-$as_echo "$ac_try_echo"; } >&5
3580- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
3581- ac_status=$?
3582- if test -s conftest.err; then
3583- grep -v '^ *+' conftest.err >conftest.er1
3584- cat conftest.er1 >&5
3585- mv -f conftest.er1 conftest.err
3586- fi
3587- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3588- test $ac_status = 0; } > conftest.i && {
3589- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
3590- test ! -s conftest.err
3591- }; then :
3592- ac_retval=0
3593-else
3594- $as_echo "$as_me: failed program was:" >&5
3595-sed 's/^/| /' conftest.$ac_ext >&5
3596-
3597- ac_retval=1
3598-fi
3599- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
3600- as_fn_set_status $ac_retval
3601-
3602-} @%:@ ac_fn_cxx_try_cpp
3603-
3604-@%:@ ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
3605-@%:@ ---------------------------------------------------------
3606-@%:@ Tests whether HEADER exists, giving a warning if it cannot be compiled using
3607-@%:@ the include files in INCLUDES and setting the cache variable VAR
3608-@%:@ accordingly.
3609-ac_fn_cxx_check_header_mongrel ()
3610-{
3611- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3612- if eval \${$3+:} false; then :
3613- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
3614-$as_echo_n "checking for $2... " >&6; }
3615-if eval \${$3+:} false; then :
3616- $as_echo_n "(cached) " >&6
3617-fi
3618-eval ac_res=\$$3
3619- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
3620-$as_echo "$ac_res" >&6; }
3621-else
3622- # Is the header compilable?
3623-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
3624-$as_echo_n "checking $2 usability... " >&6; }
3625-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3626-/* end confdefs.h. */
3627-$4
3628-@%:@include <$2>
3629-_ACEOF
3630-if ac_fn_cxx_try_compile "$LINENO"; then :
3631- ac_header_compiler=yes
3632-else
3633- ac_header_compiler=no
3634-fi
3635-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3636-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
3637-$as_echo "$ac_header_compiler" >&6; }
3638-
3639-# Is the header present?
3640-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
3641-$as_echo_n "checking $2 presence... " >&6; }
3642-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3643-/* end confdefs.h. */
3644-@%:@include <$2>
3645-_ACEOF
3646-if ac_fn_cxx_try_cpp "$LINENO"; then :
3647- ac_header_preproc=yes
3648-else
3649- ac_header_preproc=no
3650-fi
3651-rm -f conftest.err conftest.i conftest.$ac_ext
3652-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
3653-$as_echo "$ac_header_preproc" >&6; }
3654-
3655-# So? What about this header?
3656-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
3657- yes:no: )
3658- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
3659-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
3660- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
3661-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
3662- ;;
3663- no:yes:* )
3664- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
3665-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
3666- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
3667-$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
3668- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
3669-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
3670- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
3671-$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
3672- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
3673-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
3674- ;;
3675-esac
3676- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
3677-$as_echo_n "checking for $2... " >&6; }
3678-if eval \${$3+:} false; then :
3679- $as_echo_n "(cached) " >&6
3680-else
3681- eval "$3=\$ac_header_compiler"
3682-fi
3683-eval ac_res=\$$3
3684- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
3685-$as_echo "$ac_res" >&6; }
3686-fi
3687- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
3688-
3689-} @%:@ ac_fn_cxx_check_header_mongrel
3690-
3691-@%:@ ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES
3692-@%:@ ---------------------------------------------------------
3693-@%:@ Tests whether HEADER exists and can be compiled using the include files in
3694-@%:@ INCLUDES, setting the cache variable VAR accordingly.
3695-ac_fn_cxx_check_header_compile ()
3696-{
3697- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3698- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
3699-$as_echo_n "checking for $2... " >&6; }
3700-if eval \${$3+:} false; then :
3701- $as_echo_n "(cached) " >&6
3702-else
3703- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3704-/* end confdefs.h. */
3705-$4
3706-@%:@include <$2>
3707-_ACEOF
3708-if ac_fn_cxx_try_compile "$LINENO"; then :
3709- eval "$3=yes"
3710-else
3711- eval "$3=no"
3712-fi
3713-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3714-fi
3715-eval ac_res=\$$3
3716- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
3717-$as_echo "$ac_res" >&6; }
3718- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
3719-
3720-} @%:@ ac_fn_cxx_check_header_compile
3721-
3722-@%:@ ac_fn_cxx_try_link LINENO
3723-@%:@ -------------------------
3724-@%:@ Try to link conftest.@S|@ac_ext, and return whether this succeeded.
3725-ac_fn_cxx_try_link ()
3726-{
3727- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3728- rm -f conftest.$ac_objext conftest$ac_exeext
3729- if { { ac_try="$ac_link"
3730-case "(($ac_try" in
3731- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3732- *) ac_try_echo=$ac_try;;
3733-esac
3734-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3735-$as_echo "$ac_try_echo"; } >&5
3736- (eval "$ac_link") 2>conftest.err
3737- ac_status=$?
3738- if test -s conftest.err; then
3739- grep -v '^ *+' conftest.err >conftest.er1
3740- cat conftest.er1 >&5
3741- mv -f conftest.er1 conftest.err
3742- fi
3743- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3744- test $ac_status = 0; } && {
3745- test -z "$ac_cxx_werror_flag" ||
3746- test ! -s conftest.err
3747- } && test -s conftest$ac_exeext && {
3748- test "$cross_compiling" = yes ||
3749- $as_test_x conftest$ac_exeext
3750- }; then :
3751- ac_retval=0
3752-else
3753- $as_echo "$as_me: failed program was:" >&5
3754-sed 's/^/| /' conftest.$ac_ext >&5
3755-
3756- ac_retval=1
3757-fi
3758- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
3759- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
3760- # interfere with the next link command; also delete a directory that is
3761- # left behind by Apple's compiler. We do this before executing the actions.
3762- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
3763- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
3764- as_fn_set_status $ac_retval
3765-
3766-} @%:@ ac_fn_cxx_try_link
3767-
3768-@%:@ ac_fn_cxx_check_func LINENO FUNC VAR
3769-@%:@ ------------------------------------
3770-@%:@ Tests whether FUNC exists, setting the cache variable VAR accordingly
3771-ac_fn_cxx_check_func ()
3772-{
3773- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3774- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
3775-$as_echo_n "checking for $2... " >&6; }
3776-if eval \${$3+:} false; then :
3777- $as_echo_n "(cached) " >&6
3778-else
3779- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3780-/* end confdefs.h. */
3781-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
3782- For example, HP-UX 11i <limits.h> declares gettimeofday. */
3783-#define $2 innocuous_$2
3784-
3785-/* System header to define __stub macros and hopefully few prototypes,
3786- which can conflict with char $2 (); below.
3787- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
3788- <limits.h> exists even on freestanding compilers. */
3789-
3790-#ifdef __STDC__
3791-# include <limits.h>
3792-#else
3793-# include <assert.h>
3794-#endif
3795-
3796-#undef $2
3797-
3798-/* Override any GCC internal prototype to avoid an error.
3799- Use char because int might match the return type of a GCC
3800- builtin and then its argument prototype would still apply. */
3801-#ifdef __cplusplus
3802-extern "C"
3803-#endif
3804-char $2 ();
3805-/* The GNU C library defines this for functions which it implements
3806- to always fail with ENOSYS. Some functions are actually named
3807- something starting with __ and the normal name is an alias. */
3808-#if defined __stub_$2 || defined __stub___$2
3809-choke me
3810-#endif
3811-
3812-int
3813-main ()
3814-{
3815-return $2 ();
3816- ;
3817- return 0;
3818-}
3819-_ACEOF
3820-if ac_fn_cxx_try_link "$LINENO"; then :
3821- eval "$3=yes"
3822-else
3823- eval "$3=no"
3824-fi
3825-rm -f core conftest.err conftest.$ac_objext \
3826- conftest$ac_exeext conftest.$ac_ext
3827-fi
3828-eval ac_res=\$$3
3829- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
3830-$as_echo "$ac_res" >&6; }
3831- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
3832-
3833-} @%:@ ac_fn_cxx_check_func
3834-
3835-@%:@ ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
3836-@%:@ -------------------------------------------------------
3837-@%:@ Tests whether HEADER exists, giving a warning if it cannot be compiled using
3838-@%:@ the include files in INCLUDES and setting the cache variable VAR
3839-@%:@ accordingly.
3840-ac_fn_c_check_header_mongrel ()
3841-{
3842- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3843- if eval \${$3+:} false; then :
3844- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
3845-$as_echo_n "checking for $2... " >&6; }
3846-if eval \${$3+:} false; then :
3847- $as_echo_n "(cached) " >&6
3848-fi
3849-eval ac_res=\$$3
3850- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
3851-$as_echo "$ac_res" >&6; }
3852-else
3853- # Is the header compilable?
3854-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
3855-$as_echo_n "checking $2 usability... " >&6; }
3856-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3857-/* end confdefs.h. */
3858-$4
3859-@%:@include <$2>
3860-_ACEOF
3861-if ac_fn_c_try_compile "$LINENO"; then :
3862- ac_header_compiler=yes
3863-else
3864- ac_header_compiler=no
3865-fi
3866-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3867-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
3868-$as_echo "$ac_header_compiler" >&6; }
3869-
3870-# Is the header present?
3871-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
3872-$as_echo_n "checking $2 presence... " >&6; }
3873-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3874-/* end confdefs.h. */
3875-@%:@include <$2>
3876-_ACEOF
3877-if ac_fn_c_try_cpp "$LINENO"; then :
3878- ac_header_preproc=yes
3879-else
3880- ac_header_preproc=no
3881-fi
3882-rm -f conftest.err conftest.i conftest.$ac_ext
3883-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
3884-$as_echo "$ac_header_preproc" >&6; }
3885-
3886-# So? What about this header?
3887-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
3888- yes:no: )
3889- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
3890-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
3891- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
3892-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
3893- ;;
3894- no:yes:* )
3895- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
3896-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
3897- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
3898-$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
3899- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
3900-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
3901- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
3902-$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
3903- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
3904-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
3905- ;;
3906-esac
3907- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
3908-$as_echo_n "checking for $2... " >&6; }
3909-if eval \${$3+:} false; then :
3910- $as_echo_n "(cached) " >&6
3911-else
3912- eval "$3=\$ac_header_compiler"
3913-fi
3914-eval ac_res=\$$3
3915- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
3916-$as_echo "$ac_res" >&6; }
3917-fi
3918- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
3919-
3920-} @%:@ ac_fn_c_check_header_mongrel
3921 cat >config.log <<_ACEOF
3922 This file contains any messages produced by compilers while
3923 running configure, to aid debugging if configure makes a mistake.
3924
3925-It was created by $as_me, which was
3926+It was created by amhello $as_me 1.0, which was
3927 generated by GNU Autoconf 2.68. Invocation command line was
3928
3929 $ $0 $@
3930@@ -2847,8 +2223,8 @@
3931
3932
3933 # Define the identity of the package.
3934- PACKAGE=photofiltreLX
3935- VERSION=0.0.5.0
3936+ PACKAGE='amhello'
3937+ VERSION='1.0'
3938
3939
3940 cat >>confdefs.h <<_ACEOF
3941@@ -2888,312 +2264,27 @@
3942
3943
3944
3945-ac_config_headers="$ac_config_headers config.h"
3946-
3947-
3948-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
3949-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
3950- @%:@ Check whether --enable-maintainer-mode was given.
3951-if test "${enable_maintainer_mode+set}" = set; then :
3952- enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
3953-else
3954- USE_MAINTAINER_MODE=no
3955-fi
3956-
3957- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
3958-$as_echo "$USE_MAINTAINER_MODE" >&6; }
3959- if test $USE_MAINTAINER_MODE = yes; then
3960- MAINTAINER_MODE_TRUE=
3961- MAINTAINER_MODE_FALSE='#'
3962-else
3963- MAINTAINER_MODE_TRUE='#'
3964- MAINTAINER_MODE_FALSE=
3965-fi
3966-
3967- MAINT=$MAINTAINER_MODE_TRUE
3968-
3969-
3970-
3971-# prevent setting xFLAGS to default of -g -O2
3972-if test x"$CFLAGS" = x""; then
3973- CFLAGS=
3974-
3975-fi
3976-if test x"$CXXFLAGS" = x""; then
3977- CXXFLAGS=
3978-
3979-fi
3980-
3981-DEPDIR="${am__leading_dot}deps"
3982-
3983-ac_config_commands="$ac_config_commands depfiles"
3984-
3985-
3986-am_make=${MAKE-make}
3987-cat > confinc << 'END'
3988-am__doit:
3989- @echo this is the am__doit target
3990-.PHONY: am__doit
3991-END
3992-# If we don't find an include directive, just comment out the code.
3993-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
3994-$as_echo_n "checking for style of include used by $am_make... " >&6; }
3995-am__include="#"
3996-am__quote=
3997-_am_result=none
3998-# First try GNU make style include.
3999-echo "include confinc" > confmf
4000-# Ignore all kinds of additional output from `make'.
4001-case `$am_make -s -f confmf 2> /dev/null` in #(
4002-*the\ am__doit\ target*)
4003- am__include=include
4004- am__quote=
4005- _am_result=GNU
4006- ;;
4007-esac
4008-# Now try BSD make style include.
4009-if test "$am__include" = "#"; then
4010- echo '.include "confinc"' > confmf
4011- case `$am_make -s -f confmf 2> /dev/null` in #(
4012- *the\ am__doit\ target*)
4013- am__include=.include
4014- am__quote="\""
4015- _am_result=BSD
4016- ;;
4017- esac
4018-fi
4019-
4020-
4021-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
4022-$as_echo "$_am_result" >&6; }
4023-rm -f confinc confmf
4024-
4025-@%:@ Check whether --enable-dependency-tracking was given.
4026-if test "${enable_dependency_tracking+set}" = set; then :
4027- enableval=$enable_dependency_tracking;
4028-fi
4029-
4030-if test "x$enable_dependency_tracking" != xno; then
4031- am_depcomp="$ac_aux_dir/depcomp"
4032- AMDEPBACKSLASH='\'
4033- am__nodep='_no'
4034-fi
4035- if test "x$enable_dependency_tracking" != xno; then
4036- AMDEP_TRUE=
4037- AMDEP_FALSE='#'
4038-else
4039- AMDEP_TRUE='#'
4040- AMDEP_FALSE=
4041-fi
4042-
4043-
4044-ac_ext=c
4045-ac_cpp='$CPP $CPPFLAGS'
4046-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4047-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4048-ac_compiler_gnu=$ac_cv_c_compiler_gnu
4049-if test -n "$ac_tool_prefix"; then
4050- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
4051-set dummy ${ac_tool_prefix}gcc; ac_word=$2
4052-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4053-$as_echo_n "checking for $ac_word... " >&6; }
4054-if ${ac_cv_prog_CC+:} false; then :
4055- $as_echo_n "(cached) " >&6
4056-else
4057- if test -n "$CC"; then
4058- ac_cv_prog_CC="$CC" # Let the user override the test.
4059-else
4060-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4061-for as_dir in $PATH
4062-do
4063- IFS=$as_save_IFS
4064- test -z "$as_dir" && as_dir=.
4065- for ac_exec_ext in '' $ac_executable_extensions; do
4066- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4067- ac_cv_prog_CC="${ac_tool_prefix}gcc"
4068- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4069- break 2
4070- fi
4071-done
4072- done
4073-IFS=$as_save_IFS
4074-
4075-fi
4076-fi
4077-CC=$ac_cv_prog_CC
4078-if test -n "$CC"; then
4079- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
4080-$as_echo "$CC" >&6; }
4081-else
4082- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4083-$as_echo "no" >&6; }
4084-fi
4085-
4086-
4087-fi
4088-if test -z "$ac_cv_prog_CC"; then
4089- ac_ct_CC=$CC
4090- # Extract the first word of "gcc", so it can be a program name with args.
4091-set dummy gcc; ac_word=$2
4092-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4093-$as_echo_n "checking for $ac_word... " >&6; }
4094-if ${ac_cv_prog_ac_ct_CC+:} false; then :
4095- $as_echo_n "(cached) " >&6
4096-else
4097- if test -n "$ac_ct_CC"; then
4098- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
4099-else
4100-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4101-for as_dir in $PATH
4102-do
4103- IFS=$as_save_IFS
4104- test -z "$as_dir" && as_dir=.
4105- for ac_exec_ext in '' $ac_executable_extensions; do
4106- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4107- ac_cv_prog_ac_ct_CC="gcc"
4108- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4109- break 2
4110- fi
4111-done
4112- done
4113-IFS=$as_save_IFS
4114-
4115-fi
4116-fi
4117-ac_ct_CC=$ac_cv_prog_ac_ct_CC
4118-if test -n "$ac_ct_CC"; then
4119- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
4120-$as_echo "$ac_ct_CC" >&6; }
4121-else
4122- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4123-$as_echo "no" >&6; }
4124-fi
4125-
4126- if test "x$ac_ct_CC" = x; then
4127- CC=""
4128+ac_ext=cpp
4129+ac_cpp='$CXXCPP $CPPFLAGS'
4130+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4131+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4132+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
4133+if test -z "$CXX"; then
4134+ if test -n "$CCC"; then
4135+ CXX=$CCC
4136 else
4137- case $cross_compiling:$ac_tool_warned in
4138-yes:)
4139-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4140-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4141-ac_tool_warned=yes ;;
4142-esac
4143- CC=$ac_ct_CC
4144- fi
4145-else
4146- CC="$ac_cv_prog_CC"
4147-fi
4148-
4149-if test -z "$CC"; then
4150- if test -n "$ac_tool_prefix"; then
4151- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
4152-set dummy ${ac_tool_prefix}cc; ac_word=$2
4153-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4154-$as_echo_n "checking for $ac_word... " >&6; }
4155-if ${ac_cv_prog_CC+:} false; then :
4156- $as_echo_n "(cached) " >&6
4157-else
4158- if test -n "$CC"; then
4159- ac_cv_prog_CC="$CC" # Let the user override the test.
4160-else
4161-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4162-for as_dir in $PATH
4163-do
4164- IFS=$as_save_IFS
4165- test -z "$as_dir" && as_dir=.
4166- for ac_exec_ext in '' $ac_executable_extensions; do
4167- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4168- ac_cv_prog_CC="${ac_tool_prefix}cc"
4169- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4170- break 2
4171- fi
4172-done
4173- done
4174-IFS=$as_save_IFS
4175-
4176-fi
4177-fi
4178-CC=$ac_cv_prog_CC
4179-if test -n "$CC"; then
4180- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
4181-$as_echo "$CC" >&6; }
4182-else
4183- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4184-$as_echo "no" >&6; }
4185-fi
4186-
4187-
4188- fi
4189-fi
4190-if test -z "$CC"; then
4191- # Extract the first word of "cc", so it can be a program name with args.
4192-set dummy cc; ac_word=$2
4193-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4194-$as_echo_n "checking for $ac_word... " >&6; }
4195-if ${ac_cv_prog_CC+:} false; then :
4196- $as_echo_n "(cached) " >&6
4197-else
4198- if test -n "$CC"; then
4199- ac_cv_prog_CC="$CC" # Let the user override the test.
4200-else
4201- ac_prog_rejected=no
4202-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4203-for as_dir in $PATH
4204-do
4205- IFS=$as_save_IFS
4206- test -z "$as_dir" && as_dir=.
4207- for ac_exec_ext in '' $ac_executable_extensions; do
4208- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4209- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
4210- ac_prog_rejected=yes
4211- continue
4212- fi
4213- ac_cv_prog_CC="cc"
4214- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4215- break 2
4216- fi
4217-done
4218- done
4219-IFS=$as_save_IFS
4220-
4221-if test $ac_prog_rejected = yes; then
4222- # We found a bogon in the path, so make sure we never use it.
4223- set dummy $ac_cv_prog_CC
4224- shift
4225- if test $@%:@ != 0; then
4226- # We chose a different compiler from the bogus one.
4227- # However, it has the same basename, so the bogon will be chosen
4228- # first if we set CC to just the basename; use the full file name.
4229- shift
4230- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
4231- fi
4232-fi
4233-fi
4234-fi
4235-CC=$ac_cv_prog_CC
4236-if test -n "$CC"; then
4237- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
4238-$as_echo "$CC" >&6; }
4239-else
4240- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4241-$as_echo "no" >&6; }
4242-fi
4243-
4244-
4245-fi
4246-if test -z "$CC"; then
4247- if test -n "$ac_tool_prefix"; then
4248- for ac_prog in cl.exe
4249+ if test -n "$ac_tool_prefix"; then
4250+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
4251 do
4252 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
4253 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
4254 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4255 $as_echo_n "checking for $ac_word... " >&6; }
4256-if ${ac_cv_prog_CC+:} false; then :
4257+if ${ac_cv_prog_CXX+:} false; then :
4258 $as_echo_n "(cached) " >&6
4259 else
4260- if test -n "$CC"; then
4261- ac_cv_prog_CC="$CC" # Let the user override the test.
4262+ if test -n "$CXX"; then
4263+ ac_cv_prog_CXX="$CXX" # Let the user override the test.
4264 else
4265 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4266 for as_dir in $PATH
4267@@ -3202,7 +2293,7 @@
4268 test -z "$as_dir" && as_dir=.
4269 for ac_exec_ext in '' $ac_executable_extensions; do
4270 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4271- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
4272+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
4273 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4274 break 2
4275 fi
4276@@ -3212,32 +2303,32 @@
4277
4278 fi
4279 fi
4280-CC=$ac_cv_prog_CC
4281-if test -n "$CC"; then
4282- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
4283-$as_echo "$CC" >&6; }
4284+CXX=$ac_cv_prog_CXX
4285+if test -n "$CXX"; then
4286+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
4287+$as_echo "$CXX" >&6; }
4288 else
4289 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4290 $as_echo "no" >&6; }
4291 fi
4292
4293
4294- test -n "$CC" && break
4295+ test -n "$CXX" && break
4296 done
4297 fi
4298-if test -z "$CC"; then
4299- ac_ct_CC=$CC
4300- for ac_prog in cl.exe
4301+if test -z "$CXX"; then
4302+ ac_ct_CXX=$CXX
4303+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
4304 do
4305 # Extract the first word of "$ac_prog", so it can be a program name with args.
4306 set dummy $ac_prog; ac_word=$2
4307 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4308 $as_echo_n "checking for $ac_word... " >&6; }
4309-if ${ac_cv_prog_ac_ct_CC+:} false; then :
4310+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
4311 $as_echo_n "(cached) " >&6
4312 else
4313- if test -n "$ac_ct_CC"; then
4314- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
4315+ if test -n "$ac_ct_CXX"; then
4316+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
4317 else
4318 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4319 for as_dir in $PATH
4320@@ -3246,7 +2337,7 @@
4321 test -z "$as_dir" && as_dir=.
4322 for ac_exec_ext in '' $ac_executable_extensions; do
4323 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4324- ac_cv_prog_ac_ct_CC="$ac_prog"
4325+ ac_cv_prog_ac_ct_CXX="$ac_prog"
4326 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4327 break 2
4328 fi
4329@@ -3256,21 +2347,21 @@
4330
4331 fi
4332 fi
4333-ac_ct_CC=$ac_cv_prog_ac_ct_CC
4334-if test -n "$ac_ct_CC"; then
4335- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
4336-$as_echo "$ac_ct_CC" >&6; }
4337+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
4338+if test -n "$ac_ct_CXX"; then
4339+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
4340+$as_echo "$ac_ct_CXX" >&6; }
4341 else
4342 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4343 $as_echo "no" >&6; }
4344 fi
4345
4346
4347- test -n "$ac_ct_CC" && break
4348+ test -n "$ac_ct_CXX" && break
4349 done
4350
4351- if test "x$ac_ct_CC" = x; then
4352- CC=""
4353+ if test "x$ac_ct_CXX" = x; then
4354+ CXX="g++"
4355 else
4356 case $cross_compiling:$ac_tool_warned in
4357 yes:)
4358@@ -3278,20 +2369,14 @@
4359 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4360 ac_tool_warned=yes ;;
4361 esac
4362- CC=$ac_ct_CC
4363- fi
4364-fi
4365-
4366-fi
4367-
4368-
4369-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4370-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4371-as_fn_error $? "no acceptable C compiler found in \$PATH
4372-See \`config.log' for more details" "$LINENO" 5; }
4373-
4374+ CXX=$ac_ct_CXX
4375+ fi
4376+fi
4377+
4378+ fi
4379+fi
4380 # Provide some information about the compiler.
4381-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
4382+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
4383 set X $ac_compile
4384 ac_compiler=$2
4385 for ac_option in --version -v -V -qversion; do
4386@@ -3331,8 +2416,8 @@
4387 # Try to create an executable without -o first, disregard a.out.
4388 # It will help us diagnose broken compilers, and finding out an intuition
4389 # of exeext.
4390-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
4391-$as_echo_n "checking whether the C compiler works... " >&6; }
4392+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5
4393+$as_echo_n "checking whether the C++ compiler works... " >&6; }
4394 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
4395
4396 # The possible output files:
4397@@ -3402,14 +2487,14 @@
4398
4399 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4400 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4401-as_fn_error 77 "C compiler cannot create executables
4402+as_fn_error 77 "C++ compiler cannot create executables
4403 See \`config.log' for more details" "$LINENO" 5; }
4404 else
4405 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4406 $as_echo "yes" >&6; }
4407 fi
4408-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
4409-$as_echo_n "checking for C compiler default output file name... " >&6; }
4410+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5
4411+$as_echo_n "checking for C++ compiler default output file name... " >&6; }
4412 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
4413 $as_echo "$ac_file" >&6; }
4414 ac_exeext=$ac_cv_exeext
4415@@ -3503,7 +2588,7 @@
4416 else
4417 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4418 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4419-as_fn_error $? "cannot run C compiled programs.
4420+as_fn_error $? "cannot run C++ compiled programs.
4421 If you meant to cross compile, use \`--host'.
4422 See \`config.log' for more details" "$LINENO" 5; }
4423 fi
4424@@ -3565,1207 +2650,6 @@
4425 $as_echo "$ac_cv_objext" >&6; }
4426 OBJEXT=$ac_cv_objext
4427 ac_objext=$OBJEXT
4428-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
4429-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
4430-if ${ac_cv_c_compiler_gnu+:} false; then :
4431- $as_echo_n "(cached) " >&6
4432-else
4433- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4434-/* end confdefs.h. */
4435-
4436-int
4437-main ()
4438-{
4439-#ifndef __GNUC__
4440- choke me
4441-#endif
4442-
4443- ;
4444- return 0;
4445-}
4446-_ACEOF
4447-if ac_fn_c_try_compile "$LINENO"; then :
4448- ac_compiler_gnu=yes
4449-else
4450- ac_compiler_gnu=no
4451-fi
4452-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4453-ac_cv_c_compiler_gnu=$ac_compiler_gnu
4454-
4455-fi
4456-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
4457-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
4458-if test $ac_compiler_gnu = yes; then
4459- GCC=yes
4460-else
4461- GCC=
4462-fi
4463-ac_test_CFLAGS=${CFLAGS+set}
4464-ac_save_CFLAGS=$CFLAGS
4465-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
4466-$as_echo_n "checking whether $CC accepts -g... " >&6; }
4467-if ${ac_cv_prog_cc_g+:} false; then :
4468- $as_echo_n "(cached) " >&6
4469-else
4470- ac_save_c_werror_flag=$ac_c_werror_flag
4471- ac_c_werror_flag=yes
4472- ac_cv_prog_cc_g=no
4473- CFLAGS="-g"
4474- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4475-/* end confdefs.h. */
4476-
4477-int
4478-main ()
4479-{
4480-
4481- ;
4482- return 0;
4483-}
4484-_ACEOF
4485-if ac_fn_c_try_compile "$LINENO"; then :
4486- ac_cv_prog_cc_g=yes
4487-else
4488- CFLAGS=""
4489- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4490-/* end confdefs.h. */
4491-
4492-int
4493-main ()
4494-{
4495-
4496- ;
4497- return 0;
4498-}
4499-_ACEOF
4500-if ac_fn_c_try_compile "$LINENO"; then :
4501-
4502-else
4503- ac_c_werror_flag=$ac_save_c_werror_flag
4504- CFLAGS="-g"
4505- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4506-/* end confdefs.h. */
4507-
4508-int
4509-main ()
4510-{
4511-
4512- ;
4513- return 0;
4514-}
4515-_ACEOF
4516-if ac_fn_c_try_compile "$LINENO"; then :
4517- ac_cv_prog_cc_g=yes
4518-fi
4519-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4520-fi
4521-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4522-fi
4523-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4524- ac_c_werror_flag=$ac_save_c_werror_flag
4525-fi
4526-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
4527-$as_echo "$ac_cv_prog_cc_g" >&6; }
4528-if test "$ac_test_CFLAGS" = set; then
4529- CFLAGS=$ac_save_CFLAGS
4530-elif test $ac_cv_prog_cc_g = yes; then
4531- if test "$GCC" = yes; then
4532- CFLAGS="-g -O2"
4533- else
4534- CFLAGS="-g"
4535- fi
4536-else
4537- if test "$GCC" = yes; then
4538- CFLAGS="-O2"
4539- else
4540- CFLAGS=
4541- fi
4542-fi
4543-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
4544-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
4545-if ${ac_cv_prog_cc_c89+:} false; then :
4546- $as_echo_n "(cached) " >&6
4547-else
4548- ac_cv_prog_cc_c89=no
4549-ac_save_CC=$CC
4550-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4551-/* end confdefs.h. */
4552-#include <stdarg.h>
4553-#include <stdio.h>
4554-#include <sys/types.h>
4555-#include <sys/stat.h>
4556-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
4557-struct buf { int x; };
4558-FILE * (*rcsopen) (struct buf *, struct stat *, int);
4559-static char *e (p, i)
4560- char **p;
4561- int i;
4562-{
4563- return p[i];
4564-}
4565-static char *f (char * (*g) (char **, int), char **p, ...)
4566-{
4567- char *s;
4568- va_list v;
4569- va_start (v,p);
4570- s = g (p, va_arg (v,int));
4571- va_end (v);
4572- return s;
4573-}
4574-
4575-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
4576- function prototypes and stuff, but not '\xHH' hex character constants.
4577- These don't provoke an error unfortunately, instead are silently treated
4578- as 'x'. The following induces an error, until -std is added to get
4579- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
4580- array size at least. It's necessary to write '\x00'==0 to get something
4581- that's true only with -std. */
4582-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
4583-
4584-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
4585- inside strings and character constants. */
4586-#define FOO(x) 'x'
4587-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
4588-
4589-int test (int i, double x);
4590-struct s1 {int (*f) (int a);};
4591-struct s2 {int (*f) (double a);};
4592-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
4593-int argc;
4594-char **argv;
4595-int
4596-main ()
4597-{
4598-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
4599- ;
4600- return 0;
4601-}
4602-_ACEOF
4603-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
4604- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
4605-do
4606- CC="$ac_save_CC $ac_arg"
4607- if ac_fn_c_try_compile "$LINENO"; then :
4608- ac_cv_prog_cc_c89=$ac_arg
4609-fi
4610-rm -f core conftest.err conftest.$ac_objext
4611- test "x$ac_cv_prog_cc_c89" != "xno" && break
4612-done
4613-rm -f conftest.$ac_ext
4614-CC=$ac_save_CC
4615-
4616-fi
4617-# AC_CACHE_VAL
4618-case "x$ac_cv_prog_cc_c89" in
4619- x)
4620- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
4621-$as_echo "none needed" >&6; } ;;
4622- xno)
4623- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
4624-$as_echo "unsupported" >&6; } ;;
4625- *)
4626- CC="$CC $ac_cv_prog_cc_c89"
4627- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
4628-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
4629-esac
4630-if test "x$ac_cv_prog_cc_c89" != xno; then :
4631-
4632-fi
4633-
4634-ac_ext=c
4635-ac_cpp='$CPP $CPPFLAGS'
4636-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4637-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4638-ac_compiler_gnu=$ac_cv_c_compiler_gnu
4639-
4640-depcc="$CC" am_compiler_list=
4641-
4642-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
4643-$as_echo_n "checking dependency style of $depcc... " >&6; }
4644-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
4645- $as_echo_n "(cached) " >&6
4646-else
4647- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
4648- # We make a subdir and do the tests there. Otherwise we can end up
4649- # making bogus files that we don't know about and never remove. For
4650- # instance it was reported that on HP-UX the gcc test will end up
4651- # making a dummy file named `D' -- because `-MD' means `put the output
4652- # in D'.
4653- rm -rf conftest.dir
4654- mkdir conftest.dir
4655- # Copy depcomp to subdir because otherwise we won't find it if we're
4656- # using a relative directory.
4657- cp "$am_depcomp" conftest.dir
4658- cd conftest.dir
4659- # We will build objects and dependencies in a subdirectory because
4660- # it helps to detect inapplicable dependency modes. For instance
4661- # both Tru64's cc and ICC support -MD to output dependencies as a
4662- # side effect of compilation, but ICC will put the dependencies in
4663- # the current directory while Tru64 will put them in the object
4664- # directory.
4665- mkdir sub
4666-
4667- am_cv_CC_dependencies_compiler_type=none
4668- if test "$am_compiler_list" = ""; then
4669- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
4670- fi
4671- am__universal=false
4672- case " $depcc " in #(
4673- *\ -arch\ *\ -arch\ *) am__universal=true ;;
4674- esac
4675-
4676- for depmode in $am_compiler_list; do
4677- # Setup a source with many dependencies, because some compilers
4678- # like to wrap large dependency lists on column 80 (with \), and
4679- # we should not choose a depcomp mode which is confused by this.
4680- #
4681- # We need to recreate these files for each test, as the compiler may
4682- # overwrite some of them when testing with obscure command lines.
4683- # This happens at least with the AIX C compiler.
4684- : > sub/conftest.c
4685- for i in 1 2 3 4 5 6; do
4686- echo '#include "conftst'$i'.h"' >> sub/conftest.c
4687- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
4688- # Solaris 8's {/usr,}/bin/sh.
4689- touch sub/conftst$i.h
4690- done
4691- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
4692-
4693- # We check with `-c' and `-o' for the sake of the "dashmstdout"
4694- # mode. It turns out that the SunPro C++ compiler does not properly
4695- # handle `-M -o', and we need to detect this. Also, some Intel
4696- # versions had trouble with output in subdirs
4697- am__obj=sub/conftest.${OBJEXT-o}
4698- am__minus_obj="-o $am__obj"
4699- case $depmode in
4700- gcc)
4701- # This depmode causes a compiler race in universal mode.
4702- test "$am__universal" = false || continue
4703- ;;
4704- nosideeffect)
4705- # after this tag, mechanisms are not by side-effect, so they'll
4706- # only be used when explicitly requested
4707- if test "x$enable_dependency_tracking" = xyes; then
4708- continue
4709- else
4710- break
4711- fi
4712- ;;
4713- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
4714- # This compiler won't grok `-c -o', but also, the minuso test has
4715- # not run yet. These depmodes are late enough in the game, and
4716- # so weak that their functioning should not be impacted.
4717- am__obj=conftest.${OBJEXT-o}
4718- am__minus_obj=
4719- ;;
4720- none) break ;;
4721- esac
4722- if depmode=$depmode \
4723- source=sub/conftest.c object=$am__obj \
4724- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
4725- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
4726- >/dev/null 2>conftest.err &&
4727- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
4728- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
4729- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
4730- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
4731- # icc doesn't choke on unknown options, it will just issue warnings
4732- # or remarks (even with -Werror). So we grep stderr for any message
4733- # that says an option was ignored or not supported.
4734- # When given -MP, icc 7.0 and 7.1 complain thusly:
4735- # icc: Command line warning: ignoring option '-M'; no argument required
4736- # The diagnosis changed in icc 8.0:
4737- # icc: Command line remark: option '-MP' not supported
4738- if (grep 'ignoring option' conftest.err ||
4739- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
4740- am_cv_CC_dependencies_compiler_type=$depmode
4741- break
4742- fi
4743- fi
4744- done
4745-
4746- cd ..
4747- rm -rf conftest.dir
4748-else
4749- am_cv_CC_dependencies_compiler_type=none
4750-fi
4751-
4752-fi
4753-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
4754-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
4755-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
4756-
4757- if
4758- test "x$enable_dependency_tracking" != xno \
4759- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
4760- am__fastdepCC_TRUE=
4761- am__fastdepCC_FALSE='#'
4762-else
4763- am__fastdepCC_TRUE='#'
4764- am__fastdepCC_FALSE=
4765-fi
4766-
4767-
4768-
4769-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
4770-$as_echo_n "checking for library containing strerror... " >&6; }
4771-if ${ac_cv_search_strerror+:} false; then :
4772- $as_echo_n "(cached) " >&6
4773-else
4774- ac_func_search_save_LIBS=$LIBS
4775-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4776-/* end confdefs.h. */
4777-
4778-/* Override any GCC internal prototype to avoid an error.
4779- Use char because int might match the return type of a GCC
4780- builtin and then its argument prototype would still apply. */
4781-#ifdef __cplusplus
4782-extern "C"
4783-#endif
4784-char strerror ();
4785-int
4786-main ()
4787-{
4788-return strerror ();
4789- ;
4790- return 0;
4791-}
4792-_ACEOF
4793-for ac_lib in '' cposix; do
4794- if test -z "$ac_lib"; then
4795- ac_res="none required"
4796- else
4797- ac_res=-l$ac_lib
4798- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
4799- fi
4800- if ac_fn_c_try_link "$LINENO"; then :
4801- ac_cv_search_strerror=$ac_res
4802-fi
4803-rm -f core conftest.err conftest.$ac_objext \
4804- conftest$ac_exeext
4805- if ${ac_cv_search_strerror+:} false; then :
4806- break
4807-fi
4808-done
4809-if ${ac_cv_search_strerror+:} false; then :
4810-
4811-else
4812- ac_cv_search_strerror=no
4813-fi
4814-rm conftest.$ac_ext
4815-LIBS=$ac_func_search_save_LIBS
4816-fi
4817-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
4818-$as_echo "$ac_cv_search_strerror" >&6; }
4819-ac_res=$ac_cv_search_strerror
4820-if test "$ac_res" != no; then :
4821- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
4822-
4823-fi
4824-
4825-ac_ext=c
4826-ac_cpp='$CPP $CPPFLAGS'
4827-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4828-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4829-ac_compiler_gnu=$ac_cv_c_compiler_gnu
4830-if test -n "$ac_tool_prefix"; then
4831- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
4832-set dummy ${ac_tool_prefix}gcc; ac_word=$2
4833-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4834-$as_echo_n "checking for $ac_word... " >&6; }
4835-if ${ac_cv_prog_CC+:} false; then :
4836- $as_echo_n "(cached) " >&6
4837-else
4838- if test -n "$CC"; then
4839- ac_cv_prog_CC="$CC" # Let the user override the test.
4840-else
4841-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4842-for as_dir in $PATH
4843-do
4844- IFS=$as_save_IFS
4845- test -z "$as_dir" && as_dir=.
4846- for ac_exec_ext in '' $ac_executable_extensions; do
4847- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4848- ac_cv_prog_CC="${ac_tool_prefix}gcc"
4849- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4850- break 2
4851- fi
4852-done
4853- done
4854-IFS=$as_save_IFS
4855-
4856-fi
4857-fi
4858-CC=$ac_cv_prog_CC
4859-if test -n "$CC"; then
4860- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
4861-$as_echo "$CC" >&6; }
4862-else
4863- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4864-$as_echo "no" >&6; }
4865-fi
4866-
4867-
4868-fi
4869-if test -z "$ac_cv_prog_CC"; then
4870- ac_ct_CC=$CC
4871- # Extract the first word of "gcc", so it can be a program name with args.
4872-set dummy gcc; ac_word=$2
4873-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4874-$as_echo_n "checking for $ac_word... " >&6; }
4875-if ${ac_cv_prog_ac_ct_CC+:} false; then :
4876- $as_echo_n "(cached) " >&6
4877-else
4878- if test -n "$ac_ct_CC"; then
4879- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
4880-else
4881-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4882-for as_dir in $PATH
4883-do
4884- IFS=$as_save_IFS
4885- test -z "$as_dir" && as_dir=.
4886- for ac_exec_ext in '' $ac_executable_extensions; do
4887- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4888- ac_cv_prog_ac_ct_CC="gcc"
4889- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4890- break 2
4891- fi
4892-done
4893- done
4894-IFS=$as_save_IFS
4895-
4896-fi
4897-fi
4898-ac_ct_CC=$ac_cv_prog_ac_ct_CC
4899-if test -n "$ac_ct_CC"; then
4900- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
4901-$as_echo "$ac_ct_CC" >&6; }
4902-else
4903- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4904-$as_echo "no" >&6; }
4905-fi
4906-
4907- if test "x$ac_ct_CC" = x; then
4908- CC=""
4909- else
4910- case $cross_compiling:$ac_tool_warned in
4911-yes:)
4912-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4913-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4914-ac_tool_warned=yes ;;
4915-esac
4916- CC=$ac_ct_CC
4917- fi
4918-else
4919- CC="$ac_cv_prog_CC"
4920-fi
4921-
4922-if test -z "$CC"; then
4923- if test -n "$ac_tool_prefix"; then
4924- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
4925-set dummy ${ac_tool_prefix}cc; ac_word=$2
4926-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4927-$as_echo_n "checking for $ac_word... " >&6; }
4928-if ${ac_cv_prog_CC+:} false; then :
4929- $as_echo_n "(cached) " >&6
4930-else
4931- if test -n "$CC"; then
4932- ac_cv_prog_CC="$CC" # Let the user override the test.
4933-else
4934-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4935-for as_dir in $PATH
4936-do
4937- IFS=$as_save_IFS
4938- test -z "$as_dir" && as_dir=.
4939- for ac_exec_ext in '' $ac_executable_extensions; do
4940- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4941- ac_cv_prog_CC="${ac_tool_prefix}cc"
4942- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4943- break 2
4944- fi
4945-done
4946- done
4947-IFS=$as_save_IFS
4948-
4949-fi
4950-fi
4951-CC=$ac_cv_prog_CC
4952-if test -n "$CC"; then
4953- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
4954-$as_echo "$CC" >&6; }
4955-else
4956- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4957-$as_echo "no" >&6; }
4958-fi
4959-
4960-
4961- fi
4962-fi
4963-if test -z "$CC"; then
4964- # Extract the first word of "cc", so it can be a program name with args.
4965-set dummy cc; ac_word=$2
4966-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4967-$as_echo_n "checking for $ac_word... " >&6; }
4968-if ${ac_cv_prog_CC+:} false; then :
4969- $as_echo_n "(cached) " >&6
4970-else
4971- if test -n "$CC"; then
4972- ac_cv_prog_CC="$CC" # Let the user override the test.
4973-else
4974- ac_prog_rejected=no
4975-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4976-for as_dir in $PATH
4977-do
4978- IFS=$as_save_IFS
4979- test -z "$as_dir" && as_dir=.
4980- for ac_exec_ext in '' $ac_executable_extensions; do
4981- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4982- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
4983- ac_prog_rejected=yes
4984- continue
4985- fi
4986- ac_cv_prog_CC="cc"
4987- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4988- break 2
4989- fi
4990-done
4991- done
4992-IFS=$as_save_IFS
4993-
4994-if test $ac_prog_rejected = yes; then
4995- # We found a bogon in the path, so make sure we never use it.
4996- set dummy $ac_cv_prog_CC
4997- shift
4998- if test $@%:@ != 0; then
4999- # We chose a different compiler from the bogus one.
5000- # However, it has the same basename, so the bogon will be chosen
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches