Ubuntu
acct package

Merge lp://staging/~cyphermox/ubuntu/lucid/acct/merge_6.5.1-1_lp510177 into lp://staging/ubuntu/lucid/acct

  1. Lucid (10.04)
  2. merge_6.5.1-1_lp510177
  3. Merge into lucid
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~cyphermox/ubuntu/lucid/acct/merge_6.5.1-1_lp510177
Merge into: lp://staging/ubuntu/lucid/acct
Diff against target: 80113 lines
To merge this branch: bzr merge lp://staging/~cyphermox/ubuntu/lucid/acct/merge_6.5.1-1_lp510177
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Review via email: mp+17766@code.staging.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=== modified file 'AUTHORS'
2--- AUTHORS 2006-03-18 18:38:00 +0000
3+++ AUTHORS 2010-01-20 17:40:26 +0000
4@@ -3,4 +3,6 @@
5 Noel Cragg <noel@gnu.ai.mit.edu>. Wrote initial versions of all
6 utilities and was stuck maintaining them until 1998.
7
8-Ciaran O'Riordan <ciaran@member.fsf.org> is the current maintainer.
9+Ciaran O'Riordan <ciaran@member.fsf.org> was the former maintainer.
10+
11+Markus Gothe <nietzsche@lysator.liu.se> is the current maintainer.
12
13=== modified file 'COPYING'
14--- COPYING 2002-03-06 21:54:12 +0000
15+++ COPYING 2010-01-20 17:40:26 +0000
16@@ -1,285 +1,626 @@
17- GNU GENERAL PUBLIC LICENSE
18- Version 2, June 1991
19+ GNU GENERAL PUBLIC LICENSE
20+ Version 3, 29 June 2007
21
22- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
23- 675 Mass Ave, Cambridge, MA 02139, USA
24+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
25 Everyone is permitted to copy and distribute verbatim copies
26 of this license document, but changing it is not allowed.
27
28- Preamble
29-
30- The licenses for most software are designed to take away your
31-freedom to share and change it. By contrast, the GNU General Public
32-License is intended to guarantee your freedom to share and change free
33-software--to make sure the software is free for all its users. This
34-General Public License applies to most of the Free Software
35-Foundation's software and to any other program whose authors commit to
36-using it. (Some other Free Software Foundation software is covered by
37-the GNU Library General Public License instead.) You can apply it to
38+ Preamble
39+
40+ The GNU General Public License is a free, copyleft license for
41+software and other kinds of works.
42+
43+ The licenses for most software and other practical works are designed
44+to take away your freedom to share and change the works. By contrast,
45+the GNU General Public License is intended to guarantee your freedom to
46+share and change all versions of a program--to make sure it remains free
47+software for all its users. We, the Free Software Foundation, use the
48+GNU General Public License for most of our software; it applies also to
49+any other work released this way by its authors. You can apply it to
50 your programs, too.
51
52 When we speak of free software, we are referring to freedom, not
53 price. Our General Public Licenses are designed to make sure that you
54 have the freedom to distribute copies of free software (and charge for
55-this service if you wish), that you receive source code or can get it
56-if you want it, that you can change the software or use pieces of it
57-in new free programs; and that you know you can do these things.
58+them if you wish), that you receive source code or can get it if you
59+want it, that you can change the software or use pieces of it in new
60+free programs, and that you know you can do these things.
61
62- To protect your rights, we need to make restrictions that forbid
63-anyone to deny you these rights or to ask you to surrender the rights.
64-These restrictions translate to certain responsibilities for you if you
65-distribute copies of the software, or if you modify it.
66+ To protect your rights, we need to prevent others from denying you
67+these rights or asking you to surrender the rights. Therefore, you have
68+certain responsibilities if you distribute copies of the software, or if
69+you modify it: responsibilities to respect the freedom of others.
70
71 For example, if you distribute copies of such a program, whether
72-gratis or for a fee, you must give the recipients all the rights that
73-you have. You must make sure that they, too, receive or can get the
74-source code. And you must show them these terms so they know their
75-rights.
76-
77- We protect your rights with two steps: (1) copyright the software, and
78-(2) offer you this license which gives you legal permission to copy,
79-distribute and/or modify the software.
80-
81- Also, for each author's protection and ours, we want to make certain
82-that everyone understands that there is no warranty for this free
83-software. If the software is modified by someone else and passed on, we
84-want its recipients to know that what they have is not the original, so
85-that any problems introduced by others will not reflect on the original
86-authors' reputations.
87-
88- Finally, any free program is threatened constantly by software
89-patents. We wish to avoid the danger that redistributors of a free
90-program will individually obtain patent licenses, in effect making the
91-program proprietary. To prevent this, we have made it clear that any
92-patent must be licensed for everyone's free use or not licensed at all.
93+gratis or for a fee, you must pass on to the recipients the same
94+freedoms that you received. You must make sure that they, too, receive
95+or can get the source code. And you must show them these terms so they
96+know their rights.
97+
98+ Developers that use the GNU GPL protect your rights with two steps:
99+(1) assert copyright on the software, and (2) offer you this License
100+giving you legal permission to copy, distribute and/or modify it.
101+
102+ For the developers' and authors' protection, the GPL clearly explains
103+that there is no warranty for this free software. For both users' and
104+authors' sake, the GPL requires that modified versions be marked as
105+changed, so that their problems will not be attributed erroneously to
106+authors of previous versions.
107+
108+ Some devices are designed to deny users access to install or run
109+modified versions of the software inside them, although the manufacturer
110+can do so. This is fundamentally incompatible with the aim of
111+protecting users' freedom to change the software. The systematic
112+pattern of such abuse occurs in the area of products for individuals to
113+use, which is precisely where it is most unacceptable. Therefore, we
114+have designed this version of the GPL to prohibit the practice for those
115+products. If such problems arise substantially in other domains, we
116+stand ready to extend this provision to those domains in future versions
117+of the GPL, as needed to protect the freedom of users.
118+
119+ Finally, every program is threatened constantly by software patents.
120+States should not allow patents to restrict development and use of
121+software on general-purpose computers, but in those that do, we wish to
122+avoid the special danger that patents applied to a free program could
123+make it effectively proprietary. To prevent this, the GPL assures that
124+patents cannot be used to render the program non-free.
125
126 The precise terms and conditions for copying, distribution and
127 modification follow.
128-
129
130- GNU GENERAL PUBLIC LICENSE
131- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
132-
133- 0. This License applies to any program or other work which contains
134-a notice placed by the copyright holder saying it may be distributed
135-under the terms of this General Public License. The "Program", below,
136-refers to any such program or work, and a "work based on the Program"
137-means either the Program or any derivative work under copyright law:
138-that is to say, a work containing the Program or a portion of it,
139-either verbatim or with modifications and/or translated into another
140-language. (Hereinafter, translation is included without limitation in
141-the term "modification".) Each licensee is addressed as "you".
142-
143-Activities other than copying, distribution and modification are not
144-covered by this License; they are outside its scope. The act of
145-running the Program is not restricted, and the output from the Program
146-is covered only if its contents constitute a work based on the
147-Program (independent of having been made by running the Program).
148-Whether that is true depends on what the Program does.
149-
150- 1. You may copy and distribute verbatim copies of the Program's
151-source code as you receive it, in any medium, provided that you
152-conspicuously and appropriately publish on each copy an appropriate
153-copyright notice and disclaimer of warranty; keep intact all the
154-notices that refer to this License and to the absence of any warranty;
155-and give any other recipients of the Program a copy of this License
156-along with the Program.
157-
158-You may charge a fee for the physical act of transferring a copy, and
159-you may at your option offer warranty protection in exchange for a fee.
160-
161- 2. You may modify your copy or copies of the Program or any portion
162-of it, thus forming a work based on the Program, and copy and
163-distribute such modifications or work under the terms of Section 1
164-above, provided that you also meet all of these conditions:
165-
166- a) You must cause the modified files to carry prominent notices
167- stating that you changed the files and the date of any change.
168-
169- b) You must cause any work that you distribute or publish, that in
170- whole or in part contains or is derived from the Program or any
171- part thereof, to be licensed as a whole at no charge to all third
172- parties under the terms of this License.
173-
174- c) If the modified program normally reads commands interactively
175- when run, you must cause it, when started running for such
176- interactive use in the most ordinary way, to print or display an
177- announcement including an appropriate copyright notice and a
178- notice that there is no warranty (or else, saying that you provide
179- a warranty) and that users may redistribute the program under
180- these conditions, and telling the user how to view a copy of this
181- License. (Exception: if the Program itself is interactive but
182- does not normally print such an announcement, your work based on
183- the Program is not required to print an announcement.)
184-
185
186-These requirements apply to the modified work as a whole. If
187-identifiable sections of that work are not derived from the Program,
188-and can be reasonably considered independent and separate works in
189-themselves, then this License, and its terms, do not apply to those
190-sections when you distribute them as separate works. But when you
191-distribute the same sections as part of a whole which is a work based
192-on the Program, the distribution of the whole must be on the terms of
193-this License, whose permissions for other licensees extend to the
194-entire whole, and thus to each and every part regardless of who wrote it.
195-
196-Thus, it is not the intent of this section to claim rights or contest
197-your rights to work written entirely by you; rather, the intent is to
198-exercise the right to control the distribution of derivative or
199-collective works based on the Program.
200-
201-In addition, mere aggregation of another work not based on the Program
202-with the Program (or with a work based on the Program) on a volume of
203-a storage or distribution medium does not bring the other work under
204-the scope of this License.
205-
206- 3. You may copy and distribute the Program (or a work based on it,
207-under Section 2) in object code or executable form under the terms of
208-Sections 1 and 2 above provided that you also do one of the following:
209-
210- a) Accompany it with the complete corresponding machine-readable
211- source code, which must be distributed under the terms of Sections
212- 1 and 2 above on a medium customarily used for software interchange; or,
213-
214- b) Accompany it with a written offer, valid for at least three
215- years, to give any third party, for a charge no more than your
216- cost of physically performing source distribution, a complete
217- machine-readable copy of the corresponding source code, to be
218- distributed under the terms of Sections 1 and 2 above on a medium
219- customarily used for software interchange; or,
220-
221- c) Accompany it with the information you received as to the offer
222- to distribute corresponding source code. (This alternative is
223- allowed only for noncommercial distribution and only if you
224- received the program in object code or executable form with such
225- an offer, in accord with Subsection b above.)
226-
227-The source code for a work means the preferred form of the work for
228-making modifications to it. For an executable work, complete source
229-code means all the source code for all modules it contains, plus any
230-associated interface definition files, plus the scripts used to
231-control compilation and installation of the executable. However, as a
232-special exception, the source code distributed need not include
233-anything that is normally distributed (in either source or binary
234-form) with the major components (compiler, kernel, and so on) of the
235-operating system on which the executable runs, unless that component
236-itself accompanies the executable.
237-
238-If distribution of executable or object code is made by offering
239-access to copy from a designated place, then offering equivalent
240-access to copy the source code from the same place counts as
241-distribution of the source code, even though third parties are not
242-compelled to copy the source along with the object code.
243-
244
245- 4. You may not copy, modify, sublicense, or distribute the Program
246-except as expressly provided under this License. Any attempt
247-otherwise to copy, modify, sublicense or distribute the Program is
248-void, and will automatically terminate your rights under this License.
249-However, parties who have received copies, or rights, from you under
250-this License will not have their licenses terminated so long as such
251-parties remain in full compliance.
252-
253- 5. You are not required to accept this License, since you have not
254-signed it. However, nothing else grants you permission to modify or
255-distribute the Program or its derivative works. These actions are
256-prohibited by law if you do not accept this License. Therefore, by
257-modifying or distributing the Program (or any work based on the
258-Program), you indicate your acceptance of this License to do so, and
259-all its terms and conditions for copying, distributing or modifying
260-the Program or works based on it.
261-
262- 6. Each time you redistribute the Program (or any work based on the
263-Program), the recipient automatically receives a license from the
264-original licensor to copy, distribute or modify the Program subject to
265-these terms and conditions. You may not impose any further
266-restrictions on the recipients' exercise of the rights granted herein.
267-You are not responsible for enforcing compliance by third parties to
268+
269+ TERMS AND CONDITIONS
270+
271+ 0. Definitions.
272+
273+ "This License" refers to version 3 of the GNU General Public License.
274+
275+ "Copyright" also means copyright-like laws that apply to other kinds of
276+works, such as semiconductor masks.
277+
278+ "The Program" refers to any copyrightable work licensed under this
279+License. Each licensee is addressed as "you". "Licensees" and
280+"recipients" may be individuals or organizations.
281+
282+ To "modify" a work means to copy from or adapt all or part of the work
283+in a fashion requiring copyright permission, other than the making of an
284+exact copy. The resulting work is called a "modified version" of the
285+earlier work or a work "based on" the earlier work.
286+
287+ A "covered work" means either the unmodified Program or a work based
288+on the Program.
289+
290+ To "propagate" a work means to do anything with it that, without
291+permission, would make you directly or secondarily liable for
292+infringement under applicable copyright law, except executing it on a
293+computer or modifying a private copy. Propagation includes copying,
294+distribution (with or without modification), making available to the
295+public, and in some countries other activities as well.
296+
297+ To "convey" a work means any kind of propagation that enables other
298+parties to make or receive copies. Mere interaction with a user through
299+a computer network, with no transfer of a copy, is not conveying.
300+
301+ An interactive user interface displays "Appropriate Legal Notices"
302+to the extent that it includes a convenient and prominently visible
303+feature that (1) displays an appropriate copyright notice, and (2)
304+tells the user that there is no warranty for the work (except to the
305+extent that warranties are provided), that licensees may convey the
306+work under this License, and how to view a copy of this License. If
307+the interface presents a list of user commands or options, such as a
308+menu, a prominent item in the list meets this criterion.
309+
310+ 1. Source Code.
311+
312+ The "source code" for a work means the preferred form of the work
313+for making modifications to it. "Object code" means any non-source
314+form of a work.
315+
316+ A "Standard Interface" means an interface that either is an official
317+standard defined by a recognized standards body, or, in the case of
318+interfaces specified for a particular programming language, one that
319+is widely used among developers working in that language.
320+
321+ The "System Libraries" of an executable work include anything, other
322+than the work as a whole, that (a) is included in the normal form of
323+packaging a Major Component, but which is not part of that Major
324+Component, and (b) serves only to enable use of the work with that
325+Major Component, or to implement a Standard Interface for which an
326+implementation is available to the public in source code form. A
327+"Major Component", in this context, means a major essential component
328+(kernel, window system, and so on) of the specific operating system
329+(if any) on which the executable work runs, or a compiler used to
330+produce the work, or an object code interpreter used to run it.
331+
332+ The "Corresponding Source" for a work in object code form means all
333+the source code needed to generate, install, and (for an executable
334+work) run the object code and to modify the work, including scripts to
335+control those activities. However, it does not include the work's
336+System Libraries, or general-purpose tools or generally available free
337+programs which are used unmodified in performing those activities but
338+which are not part of the work. For example, Corresponding Source
339+includes interface definition files associated with source files for
340+the work, and the source code for shared libraries and dynamically
341+linked subprograms that the work is specifically designed to require,
342+such as by intimate data communication or control flow between those
343+subprograms and other parts of the work.
344+
345+ The Corresponding Source need not include anything that users
346+can regenerate automatically from other parts of the Corresponding
347+Source.
348+
349+ The Corresponding Source for a work in source code form is that
350+same work.
351+
352+ 2. Basic Permissions.
353+
354+ All rights granted under this License are granted for the term of
355+copyright on the Program, and are irrevocable provided the stated
356+conditions are met. This License explicitly affirms your unlimited
357+permission to run the unmodified Program. The output from running a
358+covered work is covered by this License only if the output, given its
359+content, constitutes a covered work. This License acknowledges your
360+rights of fair use or other equivalent, as provided by copyright law.
361+
362+ You may make, run and propagate covered works that you do not
363+convey, without conditions so long as your license otherwise remains
364+in force. You may convey covered works to others for the sole purpose
365+of having them make modifications exclusively for you, or provide you
366+with facilities for running those works, provided that you comply with
367+the terms of this License in conveying all material for which you do
368+not control copyright. Those thus making or running the covered works
369+for you must do so exclusively on your behalf, under your direction
370+and control, on terms that prohibit them from making any copies of
371+your copyrighted material outside their relationship with you.
372+
373+ Conveying under any other circumstances is permitted solely under
374+the conditions stated below. Sublicensing is not allowed; section 10
375+makes it unnecessary.
376+
377+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
378+
379+ No covered work shall be deemed part of an effective technological
380+measure under any applicable law fulfilling obligations under article
381+11 of the WIPO copyright treaty adopted on 20 December 1996, or
382+similar laws prohibiting or restricting circumvention of such
383+measures.
384+
385+ When you convey a covered work, you waive any legal power to forbid
386+circumvention of technological measures to the extent such circumvention
387+is effected by exercising rights under this License with respect to
388+the covered work, and you disclaim any intention to limit operation or
389+modification of the work as a means of enforcing, against the work's
390+users, your or third parties' legal rights to forbid circumvention of
391+technological measures.
392+
393+ 4. Conveying Verbatim Copies.
394+
395+ You may convey verbatim copies of the Program's source code as you
396+receive it, in any medium, provided that you conspicuously and
397+appropriately publish on each copy an appropriate copyright notice;
398+keep intact all notices stating that this License and any
399+non-permissive terms added in accord with section 7 apply to the code;
400+keep intact all notices of the absence of any warranty; and give all
401+recipients a copy of this License along with the Program.
402+
403+ You may charge any price or no price for each copy that you convey,
404+and you may offer support or warranty protection for a fee.
405+
406+ 5. Conveying Modified Source Versions.
407+
408+ You may convey a work based on the Program, or the modifications to
409+produce it from the Program, in the form of source code under the
410+terms of section 4, provided that you also meet all of these conditions:
411+
412+ a) The work must carry prominent notices stating that you modified
413+ it, and giving a relevant date.
414+
415+ b) The work must carry prominent notices stating that it is
416+ released under this License and any conditions added under section
417+ 7. This requirement modifies the requirement in section 4 to
418+ "keep intact all notices".
419+
420+ c) You must license the entire work, as a whole, under this
421+ License to anyone who comes into possession of a copy. This
422+ License will therefore apply, along with any applicable section 7
423+ additional terms, to the whole of the work, and all its parts,
424+ regardless of how they are packaged. This License gives no
425+ permission to license the work in any other way, but it does not
426+ invalidate such permission if you have separately received it.
427+
428+ d) If the work has interactive user interfaces, each must display
429+ Appropriate Legal Notices; however, if the Program has interactive
430+ interfaces that do not display Appropriate Legal Notices, your
431+ work need not make them do so.
432+
433+ A compilation of a covered work with other separate and independent
434+works, which are not by their nature extensions of the covered work,
435+and which are not combined with it such as to form a larger program,
436+in or on a volume of a storage or distribution medium, is called an
437+"aggregate" if the compilation and its resulting copyright are not
438+used to limit the access or legal rights of the compilation's users
439+beyond what the individual works permit. Inclusion of a covered work
440+in an aggregate does not cause this License to apply to the other
441+parts of the aggregate.
442+
443+ 6. Conveying Non-Source Forms.
444+
445+ You may convey a covered work in object code form under the terms
446+of sections 4 and 5, provided that you also convey the
447+machine-readable Corresponding Source under the terms of this License,
448+in one of these ways:
449+
450+ a) Convey the object code in, or embodied in, a physical product
451+ (including a physical distribution medium), accompanied by the
452+ Corresponding Source fixed on a durable physical medium
453+ customarily used for software interchange.
454+
455+ b) Convey the object code in, or embodied in, a physical product
456+ (including a physical distribution medium), accompanied by a
457+ written offer, valid for at least three years and valid for as
458+ long as you offer spare parts or customer support for that product
459+ model, to give anyone who possesses the object code either (1) a
460+ copy of the Corresponding Source for all the software in the
461+ product that is covered by this License, on a durable physical
462+ medium customarily used for software interchange, for a price no
463+ more than your reasonable cost of physically performing this
464+ conveying of source, or (2) access to copy the
465+ Corresponding Source from a network server at no charge.
466+
467+ c) Convey individual copies of the object code with a copy of the
468+ written offer to provide the Corresponding Source. This
469+ alternative is allowed only occasionally and noncommercially, and
470+ only if you received the object code with such an offer, in accord
471+ with subsection 6b.
472+
473+ d) Convey the object code by offering access from a designated
474+ place (gratis or for a charge), and offer equivalent access to the
475+ Corresponding Source in the same way through the same place at no
476+ further charge. You need not require recipients to copy the
477+ Corresponding Source along with the object code. If the place to
478+ copy the object code is a network server, the Corresponding Source
479+ may be on a different server (operated by you or a third party)
480+ that supports equivalent copying facilities, provided you maintain
481+ clear directions next to the object code saying where to find the
482+ Corresponding Source. Regardless of what server hosts the
483+ Corresponding Source, you remain obligated to ensure that it is
484+ available for as long as needed to satisfy these requirements.
485+
486+ e) Convey the object code using peer-to-peer transmission, provided
487+ you inform other peers where the object code and Corresponding
488+ Source of the work are being offered to the general public at no
489+ charge under subsection 6d.
490+
491+ A separable portion of the object code, whose source code is excluded
492+from the Corresponding Source as a System Library, need not be
493+included in conveying the object code work.
494+
495+ A "User Product" is either (1) a "consumer product", which means any
496+tangible personal property which is normally used for personal, family,
497+or household purposes, or (2) anything designed or sold for incorporation
498+into a dwelling. In determining whether a product is a consumer product,
499+doubtful cases shall be resolved in favor of coverage. For a particular
500+product received by a particular user, "normally used" refers to a
501+typical or common use of that class of product, regardless of the status
502+of the particular user or of the way in which the particular user
503+actually uses, or expects or is expected to use, the product. A product
504+is a consumer product regardless of whether the product has substantial
505+commercial, industrial or non-consumer uses, unless such uses represent
506+the only significant mode of use of the product.
507+
508+ "Installation Information" for a User Product means any methods,
509+procedures, authorization keys, or other information required to install
510+and execute modified versions of a covered work in that User Product from
511+a modified version of its Corresponding Source. The information must
512+suffice to ensure that the continued functioning of the modified object
513+code is in no case prevented or interfered with solely because
514+modification has been made.
515+
516+ If you convey an object code work under this section in, or with, or
517+specifically for use in, a User Product, and the conveying occurs as
518+part of a transaction in which the right of possession and use of the
519+User Product is transferred to the recipient in perpetuity or for a
520+fixed term (regardless of how the transaction is characterized), the
521+Corresponding Source conveyed under this section must be accompanied
522+by the Installation Information. But this requirement does not apply
523+if neither you nor any third party retains the ability to install
524+modified object code on the User Product (for example, the work has
525+been installed in ROM).
526+
527+ The requirement to provide Installation Information does not include a
528+requirement to continue to provide support service, warranty, or updates
529+for a work that has been modified or installed by the recipient, or for
530+the User Product in which it has been modified or installed. Access to a
531+network may be denied when the modification itself materially and
532+adversely affects the operation of the network or violates the rules and
533+protocols for communication across the network.
534+
535+ Corresponding Source conveyed, and Installation Information provided,
536+in accord with this section must be in a format that is publicly
537+documented (and with an implementation available to the public in
538+source code form), and must require no special password or key for
539+unpacking, reading or copying.
540+
541+ 7. Additional Terms.
542+
543+ "Additional permissions" are terms that supplement the terms of this
544+License by making exceptions from one or more of its conditions.
545+Additional permissions that are applicable to the entire Program shall
546+be treated as though they were included in this License, to the extent
547+that they are valid under applicable law. If additional permissions
548+apply only to part of the Program, that part may be used separately
549+under those permissions, but the entire Program remains governed by
550+this License without regard to the additional permissions.
551+
552+ When you convey a copy of a covered work, you may at your option
553+remove any additional permissions from that copy, or from any part of
554+it. (Additional permissions may be written to require their own
555+removal in certain cases when you modify the work.) You may place
556+additional permissions on material, added by you to a covered work,
557+for which you have or can give appropriate copyright permission.
558+
559+ Notwithstanding any other provision of this License, for material you
560+add to a covered work, you may (if authorized by the copyright holders of
561+that material) supplement the terms of this License with terms:
562+
563+ a) Disclaiming warranty or limiting liability differently from the
564+ terms of sections 15 and 16 of this License; or
565+
566+ b) Requiring preservation of specified reasonable legal notices or
567+ author attributions in that material or in the Appropriate Legal
568+ Notices displayed by works containing it; or
569+
570+ c) Prohibiting misrepresentation of the origin of that material, or
571+ requiring that modified versions of such material be marked in
572+ reasonable ways as different from the original version; or
573+
574+ d) Limiting the use for publicity purposes of names of licensors or
575+ authors of the material; or
576+
577+ e) Declining to grant rights under trademark law for use of some
578+ trade names, trademarks, or service marks; or
579+
580+ f) Requiring indemnification of licensors and authors of that
581+ material by anyone who conveys the material (or modified versions of
582+ it) with contractual assumptions of liability to the recipient, for
583+ any liability that these contractual assumptions directly impose on
584+ those licensors and authors.
585+
586+ All other non-permissive additional terms are considered "further
587+restrictions" within the meaning of section 10. If the Program as you
588+received it, or any part of it, contains a notice stating that it is
589+governed by this License along with a term that is a further
590+restriction, you may remove that term. If a license document contains
591+a further restriction but permits relicensing or conveying under this
592+License, you may add to a covered work material governed by the terms
593+of that license document, provided that the further restriction does
594+not survive such relicensing or conveying.
595+
596+ If you add terms to a covered work in accord with this section, you
597+must place, in the relevant source files, a statement of the
598+additional terms that apply to those files, or a notice indicating
599+where to find the applicable terms.
600+
601+ Additional terms, permissive or non-permissive, may be stated in the
602+form of a separately written license, or stated as exceptions;
603+the above requirements apply either way.
604+
605+ 8. Termination.
606+
607+ You may not propagate or modify a covered work except as expressly
608+provided under this License. Any attempt otherwise to propagate or
609+modify it is void, and will automatically terminate your rights under
610+this License (including any patent licenses granted under the third
611+paragraph of section 11).
612+
613+ However, if you cease all violation of this License, then your
614+license from a particular copyright holder is reinstated (a)
615+provisionally, unless and until the copyright holder explicitly and
616+finally terminates your license, and (b) permanently, if the copyright
617+holder fails to notify you of the violation by some reasonable means
618+prior to 60 days after the cessation.
619+
620+ Moreover, your license from a particular copyright holder is
621+reinstated permanently if the copyright holder notifies you of the
622+violation by some reasonable means, this is the first time you have
623+received notice of violation of this License (for any work) from that
624+copyright holder, and you cure the violation prior to 30 days after
625+your receipt of the notice.
626+
627+ Termination of your rights under this section does not terminate the
628+licenses of parties who have received copies or rights from you under
629+this License. If your rights have been terminated and not permanently
630+reinstated, you do not qualify to receive new licenses for the same
631+material under section 10.
632+
633+ 9. Acceptance Not Required for Having Copies.
634+
635+ You are not required to accept this License in order to receive or
636+run a copy of the Program. Ancillary propagation of a covered work
637+occurring solely as a consequence of using peer-to-peer transmission
638+to receive a copy likewise does not require acceptance. However,
639+nothing other than this License grants you permission to propagate or
640+modify any covered work. These actions infringe copyright if you do
641+not accept this License. Therefore, by modifying or propagating a
642+covered work, you indicate your acceptance of this License to do so.
643+
644+ 10. Automatic Licensing of Downstream Recipients.
645+
646+ Each time you convey a covered work, the recipient automatically
647+receives a license from the original licensors, to run, modify and
648+propagate that work, subject to this License. You are not responsible
649+for enforcing compliance by third parties with this License.
650+
651+ An "entity transaction" is a transaction transferring control of an
652+organization, or substantially all assets of one, or subdividing an
653+organization, or merging organizations. If propagation of a covered
654+work results from an entity transaction, each party to that
655+transaction who receives a copy of the work also receives whatever
656+licenses to the work the party's predecessor in interest had or could
657+give under the previous paragraph, plus a right to possession of the
658+Corresponding Source of the work from the predecessor in interest, if
659+the predecessor has it or can get it with reasonable efforts.
660+
661+ You may not impose any further restrictions on the exercise of the
662+rights granted or affirmed under this License. For example, you may
663+not impose a license fee, royalty, or other charge for exercise of
664+rights granted under this License, and you may not initiate litigation
665+(including a cross-claim or counterclaim in a lawsuit) alleging that
666+any patent claim is infringed by making, using, selling, offering for
667+sale, or importing the Program or any portion of it.
668+
669+ 11. Patents.
670+
671+ A "contributor" is a copyright holder who authorizes use under this
672+License of the Program or a work on which the Program is based. The
673+work thus licensed is called the contributor's "contributor version".
674+
675+ A contributor's "essential patent claims" are all patent claims
676+owned or controlled by the contributor, whether already acquired or
677+hereafter acquired, that would be infringed by some manner, permitted
678+by this License, of making, using, or selling its contributor version,
679+but do not include claims that would be infringed only as a
680+consequence of further modification of the contributor version. For
681+purposes of this definition, "control" includes the right to grant
682+patent sublicenses in a manner consistent with the requirements of
683 this License.
684
685- 7. If, as a consequence of a court judgment or allegation of patent
686-infringement or for any other reason (not limited to patent issues),
687-conditions are imposed on you (whether by court order, agreement or
688+ Each contributor grants you a non-exclusive, worldwide, royalty-free
689+patent license under the contributor's essential patent claims, to
690+make, use, sell, offer for sale, import and otherwise run, modify and
691+propagate the contents of its contributor version.
692+
693+ In the following three paragraphs, a "patent license" is any express
694+agreement or commitment, however denominated, not to enforce a patent
695+(such as an express permission to practice a patent or covenant not to
696+sue for patent infringement). To "grant" such a patent license to a
697+party means to make such an agreement or commitment not to enforce a
698+patent against the party.
699+
700+ If you convey a covered work, knowingly relying on a patent license,
701+and the Corresponding Source of the work is not available for anyone
702+to copy, free of charge and under the terms of this License, through a
703+publicly available network server or other readily accessible means,
704+then you must either (1) cause the Corresponding Source to be so
705+available, or (2) arrange to deprive yourself of the benefit of the
706+patent license for this particular work, or (3) arrange, in a manner
707+consistent with the requirements of this License, to extend the patent
708+license to downstream recipients. "Knowingly relying" means you have
709+actual knowledge that, but for the patent license, your conveying the
710+covered work in a country, or your recipient's use of the covered work
711+in a country, would infringe one or more identifiable patents in that
712+country that you have reason to believe are valid.
713+
714+ If, pursuant to or in connection with a single transaction or
715+arrangement, you convey, or propagate by procuring conveyance of, a
716+covered work, and grant a patent license to some of the parties
717+receiving the covered work authorizing them to use, propagate, modify
718+or convey a specific copy of the covered work, then the patent license
719+you grant is automatically extended to all recipients of the covered
720+work and works based on it.
721+
722+ A patent license is "discriminatory" if it does not include within
723+the scope of its coverage, prohibits the exercise of, or is
724+conditioned on the non-exercise of one or more of the rights that are
725+specifically granted under this License. You may not convey a covered
726+work if you are a party to an arrangement with a third party that is
727+in the business of distributing software, under which you make payment
728+to the third party based on the extent of your activity of conveying
729+the work, and under which the third party grants, to any of the
730+parties who would receive the covered work from you, a discriminatory
731+patent license (a) in connection with copies of the covered work
732+conveyed by you (or copies made from those copies), or (b) primarily
733+for and in connection with specific products or compilations that
734+contain the covered work, unless you entered into that arrangement,
735+or that patent license was granted, prior to 28 March 2007.
736+
737+ Nothing in this License shall be construed as excluding or limiting
738+any implied license or other defenses to infringement that may
739+otherwise be available to you under applicable patent law.
740+
741+ 12. No Surrender of Others' Freedom.
742+
743+ If conditions are imposed on you (whether by court order, agreement or
744 otherwise) that contradict the conditions of this License, they do not
745-excuse you from the conditions of this License. If you cannot
746-distribute so as to satisfy simultaneously your obligations under this
747-License and any other pertinent obligations, then as a consequence you
748-may not distribute the Program at all. For example, if a patent
749-license would not permit royalty-free redistribution of the Program by
750-all those who receive copies directly or indirectly through you, then
751-the only way you could satisfy both it and this License would be to
752-refrain entirely from distribution of the Program.
753-
754-If any portion of this section is held invalid or unenforceable under
755-any particular circumstance, the balance of the section is intended to
756-apply and the section as a whole is intended to apply in other
757-circumstances.
758-
759-It is not the purpose of this section to induce you to infringe any
760-patents or other property right claims or to contest validity of any
761-such claims; this section has the sole purpose of protecting the
762-integrity of the free software distribution system, which is
763-implemented by public license practices. Many people have made
764-generous contributions to the wide range of software distributed
765-through that system in reliance on consistent application of that
766-system; it is up to the author/donor to decide if he or she is willing
767-to distribute software through any other system and a licensee cannot
768-impose that choice.
769-
770-This section is intended to make thoroughly clear what is believed to
771-be a consequence of the rest of this License.
772-
773
774- 8. If the distribution and/or use of the Program is restricted in
775-certain countries either by patents or by copyrighted interfaces, the
776-original copyright holder who places the Program under this License
777-may add an explicit geographical distribution limitation excluding
778-those countries, so that distribution is permitted only in or among
779-countries not thus excluded. In such case, this License incorporates
780-the limitation as if written in the body of this License.
781-
782- 9. The Free Software Foundation may publish revised and/or new versions
783-of the General Public License from time to time. Such new versions will
784+excuse you from the conditions of this License. If you cannot convey a
785+covered work so as to satisfy simultaneously your obligations under this
786+License and any other pertinent obligations, then as a consequence you may
787+not convey it at all. For example, if you agree to terms that obligate you
788+to collect a royalty for further conveying from those to whom you convey
789+the Program, the only way you could satisfy both those terms and this
790+License would be to refrain entirely from conveying the Program.
791+
792+ 13. Use with the GNU Affero General Public License.
793+
794+ Notwithstanding any other provision of this License, you have
795+permission to link or combine any covered work with a work licensed
796+under version 3 of the GNU Affero General Public License into a single
797+combined work, and to convey the resulting work. The terms of this
798+License will continue to apply to the part which is the covered work,
799+but the special requirements of the GNU Affero General Public License,
800+section 13, concerning interaction through a network will apply to the
801+combination as such.
802+
803+ 14. Revised Versions of this License.
804+
805+ The Free Software Foundation may publish revised and/or new versions of
806+the GNU General Public License from time to time. Such new versions will
807 be similar in spirit to the present version, but may differ in detail to
808 address new problems or concerns.
809
810-Each version is given a distinguishing version number. If the Program
811-specifies a version number of this License which applies to it and "any
812-later version", you have the option of following the terms and conditions
813-either of that version or of any later version published by the Free
814-Software Foundation. If the Program does not specify a version number of
815-this License, you may choose any version ever published by the Free Software
816-Foundation.
817-
818- 10. If you wish to incorporate parts of the Program into other free
819-programs whose distribution conditions are different, write to the author
820-to ask for permission. For software which is copyrighted by the Free
821-Software Foundation, write to the Free Software Foundation; we sometimes
822-make exceptions for this. Our decision will be guided by the two goals
823-of preserving the free status of all derivatives of our free software and
824-of promoting the sharing and reuse of software generally.
825-
826- NO WARRANTY
827-
828- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
829-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
830-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
831-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
832-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
833-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
834-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
835-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
836-REPAIR OR CORRECTION.
837-
838- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
839-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
840-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
841-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
842-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
843-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
844-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
845-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
846-POSSIBILITY OF SUCH DAMAGES.
847-
848- END OF TERMS AND CONDITIONS
849-
850
851- Appendix: How to Apply These Terms to Your New Programs
852+ Each version is given a distinguishing version number. If the
853+Program specifies that a certain numbered version of the GNU General
854+Public License "or any later version" applies to it, you have the
855+option of following the terms and conditions either of that numbered
856+version or of any later version published by the Free Software
857+Foundation. If the Program does not specify a version number of the
858+GNU General Public License, you may choose any version ever published
859+by the Free Software Foundation.
860+
861+ If the Program specifies that a proxy can decide which future
862+versions of the GNU General Public License can be used, that proxy's
863+public statement of acceptance of a version permanently authorizes you
864+to choose that version for the Program.
865+
866+ Later license versions may give you additional or different
867+permissions. However, no additional obligations are imposed on any
868+author or copyright holder as a result of your choosing to follow a
869+later version.
870+
871+ 15. Disclaimer of Warranty.
872+
873+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
874+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
875+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
876+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
877+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
878+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
879+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
880+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
881+
882+ 16. Limitation of Liability.
883+
884+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
885+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
886+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
887+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
888+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
889+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
890+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
891+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
892+SUCH DAMAGES.
893+
894+ 17. Interpretation of Sections 15 and 16.
895+
896+ If the disclaimer of warranty and limitation of liability provided
897+above cannot be given local legal effect according to their terms,
898+reviewing courts shall apply local law that most closely approximates
899+an absolute waiver of all civil liability in connection with the
900+Program, unless a warranty or assumption of liability accompanies a
901+copy of the Program in return for a fee.
902+
903+ END OF TERMS AND CONDITIONS
904+
905+ How to Apply These Terms to Your New Programs
906
907 If you develop a new program, and you want it to be of the greatest
908 possible use to the public, the best way to achieve this is to make it
909@@ -287,15 +628,15 @@
910
911 To do so, attach the following notices to the program. It is safest
912 to attach them to the start of each source file to most effectively
913-convey the exclusion of warranty; and each file should have at least
914+state the exclusion of warranty; and each file should have at least
915 the "copyright" line and a pointer to where the full notice is found.
916
917 <one line to give the program's name and a brief idea of what it does.>
918- Copyright (C) 19yy <name of author>
919+ Copyright (C) <year> <name of author>
920
921- This program is free software; you can redistribute it and/or modify
922+ This program is free software: you can redistribute it and/or modify
923 it under the terms of the GNU General Public License as published by
924- the Free Software Foundation; either version 2 of the License, or
925+ the Free Software Foundation, either version 3 of the License, or
926 (at your option) any later version.
927
928 This program is distributed in the hope that it will be useful,
929@@ -304,36 +645,30 @@
930 GNU General Public License for more details.
931
932 You should have received a copy of the GNU General Public License
933- along with this program; if not, write to the Free Software
934- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
935+ along with this program. If not, see <http://www.gnu.org/licenses/>.
936
937 Also add information on how to contact you by electronic and paper mail.
938
939-If the program is interactive, make it output a short notice like this
940-when it starts in an interactive mode:
941+ If the program does terminal interaction, make it output a short
942+notice like this when it starts in an interactive mode:
943
944- Gnomovision version 69, Copyright (C) 19yy name of author
945- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
946+ <program> Copyright (C) <year> <name of author>
947+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
948 This is free software, and you are welcome to redistribute it
949 under certain conditions; type `show c' for details.
950
951 The hypothetical commands `show w' and `show c' should show the appropriate
952-parts of the General Public License. Of course, the commands you use may
953-be called something other than `show w' and `show c'; they could even be
954-mouse-clicks or menu items--whatever suits your program.
955-
956-You should also get your employer (if you work as a programmer) or your
957-school, if any, to sign a "copyright disclaimer" for the program, if
958-necessary. Here is a sample; alter the names:
959-
960- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
961- `Gnomovision' (which makes passes at compilers) written by James Hacker.
962-
963- <signature of Ty Coon>, 1 April 1989
964- Ty Coon, President of Vice
965-
966-This General Public License does not permit incorporating your program into
967-proprietary programs. If your program is a subroutine library, you may
968-consider it more useful to permit linking proprietary applications with the
969-library. If this is what you want to do, use the GNU Library General
970-Public License instead of this License.
971+parts of the General Public License. Of course, your program's commands
972+might be different; for a GUI interface, you would use an "about box".
973+
974+ You should also get your employer (if you work as a programmer) or school,
975+if any, to sign a "copyright disclaimer" for the program, if necessary.
976+For more information on this, and how to apply and follow the GNU GPL, see
977+<http://www.gnu.org/licenses/>.
978+
979+ The GNU General Public License does not permit incorporating your program
980+into proprietary programs. If your program is a subroutine library, you
981+may consider it more useful to permit linking proprietary applications with
982+the library. If this is what you want to do, use the GNU Lesser General
983+Public License instead of this License. But first, please read
984+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
985
986=== modified file 'ChangeLog'
987--- ChangeLog 2006-03-18 18:38:00 +0000
988+++ ChangeLog 2010-01-20 17:40:26 +0000
989@@ -1,3 +1,7 @@
990+Mon Aug 24 00:01:05 2009 Markus Gothe <nietzsche@lysator.liu.se>
991+
992+ * Major overhaul, releasing GNU Acct 6.5.
993+
994 Sat Jan 07 23:10:00 2006 Tim Schmielau <tim@physik3.uni-rostock.de>
995
996 * NEWS: document changes in the upcoming 6.4 release.
997
998=== modified file 'INSTALL'
999--- INSTALL 2006-03-18 18:38:00 +0000
1000+++ INSTALL 2010-01-20 17:40:26 +0000
1001@@ -1,16 +1,19 @@
1002 Installation Instructions
1003 *************************
1004
1005-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
1006-Software Foundation, Inc.
1007+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
1008+2006, 2007, 2008 Free Software Foundation, Inc.
1009
1010-This file is free documentation; the Free Software Foundation gives
1011+ This file is free documentation; the Free Software Foundation gives
1012 unlimited permission to copy, distribute and modify it.
1013
1014 Basic Installation
1015 ==================
1016
1017-These are generic installation instructions.
1018+ Briefly, the shell commands `./configure; make; make install' should
1019+configure, build, and install this package. The following
1020+more-detailed instructions are generic; see the `README' file for
1021+instructions specific to this package.
1022
1023 The `configure' shell script attempts to guess correct values for
1024 various system-dependent variables used during compilation. It uses
1025@@ -23,9 +26,9 @@
1026
1027 It can also use an optional file (typically called `config.cache'
1028 and enabled with `--cache-file=config.cache' or simply `-C') that saves
1029-the results of its tests to speed up reconfiguring. (Caching is
1030+the results of its tests to speed up reconfiguring. Caching is
1031 disabled by default to prevent problems with accidental use of stale
1032-cache files.)
1033+cache files.
1034
1035 If you need to do unusual things to compile the package, please try
1036 to figure out how `configure' could check whether to do them, and mail
1037@@ -35,20 +38,17 @@
1038 may remove or edit it.
1039
1040 The file `configure.ac' (or `configure.in') is used to create
1041-`configure' by a program called `autoconf'. You only need
1042-`configure.ac' if you want to change it or regenerate `configure' using
1043-a newer version of `autoconf'.
1044+`configure' by a program called `autoconf'. You need `configure.ac' if
1045+you want to change it or regenerate `configure' using a newer version
1046+of `autoconf'.
1047
1048 The simplest way to compile this package is:
1049
1050 1. `cd' to the directory containing the package's source code and type
1051- `./configure' to configure the package for your system. If you're
1052- using `csh' on an old version of System V, you might need to type
1053- `sh ./configure' instead to prevent `csh' from trying to execute
1054- `configure' itself.
1055+ `./configure' to configure the package for your system.
1056
1057- Running `configure' takes awhile. While running, it prints some
1058- messages telling which features it is checking for.
1059+ Running `configure' might take a while. While running, it prints
1060+ some messages telling which features it is checking for.
1061
1062 2. Type `make' to compile the package.
1063
1064@@ -67,42 +67,57 @@
1065 all sorts of other programs in order to regenerate files that came
1066 with the distribution.
1067
1068+ 6. Often, you can also type `make uninstall' to remove the installed
1069+ files again.
1070+
1071 Compilers and Options
1072 =====================
1073
1074-Some systems require unusual options for compilation or linking that the
1075-`configure' script does not know about. Run `./configure --help' for
1076-details on some of the pertinent environment variables.
1077+ Some systems require unusual options for compilation or linking that
1078+the `configure' script does not know about. Run `./configure --help'
1079+for details on some of the pertinent environment variables.
1080
1081 You can give `configure' initial values for configuration parameters
1082 by setting variables in the command line or in the environment. Here
1083 is an example:
1084
1085- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
1086+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
1087
1088 *Note Defining Variables::, for more details.
1089
1090 Compiling For Multiple Architectures
1091 ====================================
1092
1093-You can compile the package for more than one kind of computer at the
1094+ You can compile the package for more than one kind of computer at the
1095 same time, by placing the object files for each architecture in their
1096-own directory. To do this, you must use a version of `make' that
1097-supports the `VPATH' variable, such as GNU `make'. `cd' to the
1098+own directory. To do this, you can use GNU `make'. `cd' to the
1099 directory where you want the object files and executables to go and run
1100 the `configure' script. `configure' automatically checks for the
1101 source code in the directory that `configure' is in and in `..'.
1102
1103- If you have to use a `make' that does not support the `VPATH'
1104-variable, you have to compile the package for one architecture at a
1105-time in the source code directory. After you have installed the
1106-package for one architecture, use `make distclean' before reconfiguring
1107-for another architecture.
1108+ With a non-GNU `make', it is safer to compile the package for one
1109+architecture at a time in the source code directory. After you have
1110+installed the package for one architecture, use `make distclean' before
1111+reconfiguring for another architecture.
1112+
1113+ On MacOS X 10.5 and later systems, you can create libraries and
1114+executables that work on multiple system types--known as "fat" or
1115+"universal" binaries--by specifying multiple `-arch' options to the
1116+compiler but only a single `-arch' option to the preprocessor. Like
1117+this:
1118+
1119+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
1120+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
1121+ CPP="gcc -E" CXXCPP="g++ -E"
1122+
1123+ This is not guaranteed to produce working output in all cases, you
1124+may have to build one architecture at a time and combine the results
1125+using the `lipo' tool if you have problems.
1126
1127 Installation Names
1128 ==================
1129
1130-By default, `make install' installs the package's commands under
1131+ By default, `make install' installs the package's commands under
1132 `/usr/local/bin', include files under `/usr/local/include', etc. You
1133 can specify an installation prefix other than `/usr/local' by giving
1134 `configure' the option `--prefix=PREFIX'.
1135@@ -125,7 +140,7 @@
1136 Optional Features
1137 =================
1138
1139-Some packages pay attention to `--enable-FEATURE' options to
1140+ Some packages pay attention to `--enable-FEATURE' options to
1141 `configure', where FEATURE indicates an optional part of the package.
1142 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
1143 is something like `gnu-as' or `x' (for the X Window System). The
1144@@ -137,14 +152,36 @@
1145 you can use the `configure' options `--x-includes=DIR' and
1146 `--x-libraries=DIR' to specify their locations.
1147
1148+Particular systems
1149+==================
1150+
1151+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
1152+CC is not installed, it is recommended to use the following options in
1153+order to use an ANSI C compiler:
1154+
1155+ ./configure CC="cc -Ae"
1156+
1157+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
1158+
1159+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
1160+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
1161+a workaround. If GNU CC is not installed, it is therefore recommended
1162+to try
1163+
1164+ ./configure CC="cc"
1165+
1166+and if that doesn't work, try
1167+
1168+ ./configure CC="cc -nodtk"
1169+
1170 Specifying the System Type
1171 ==========================
1172
1173-There may be some features `configure' cannot figure out automatically,
1174-but needs to determine by the type of machine the package will run on.
1175-Usually, assuming the package is built to be run on the _same_
1176-architectures, `configure' can figure that out, but if it prints a
1177-message saying it cannot guess the machine type, give it the
1178+ There may be some features `configure' cannot figure out
1179+automatically, but needs to determine by the type of machine the package
1180+will run on. Usually, assuming the package is built to be run on the
1181+_same_ architectures, `configure' can figure that out, but if it prints
1182+a message saying it cannot guess the machine type, give it the
1183 `--build=TYPE' option. TYPE can either be a short name for the system
1184 type, such as `sun4', or a canonical name which has the form:
1185
1186@@ -170,9 +207,9 @@
1187 Sharing Defaults
1188 ================
1189
1190-If you want to set default values for `configure' scripts to share, you
1191-can create a site shell script called `config.site' that gives default
1192-values for variables like `CC', `cache_file', and `prefix'.
1193+ If you want to set default values for `configure' scripts to share,
1194+you can create a site shell script called `config.site' that gives
1195+default values for variables like `CC', `cache_file', and `prefix'.
1196 `configure' looks for `PREFIX/share/config.site' if it exists, then
1197 `PREFIX/etc/config.site' if it exists. Or, you can set the
1198 `CONFIG_SITE' environment variable to the location of the site script.
1199@@ -181,7 +218,7 @@
1200 Defining Variables
1201 ==================
1202
1203-Variables not defined in a site shell script can be set in the
1204+ Variables not defined in a site shell script can be set in the
1205 environment passed to `configure'. However, some packages may run
1206 configure again during the build, and the customized values of these
1207 variables may be lost. In order to avoid this problem, you should set
1208@@ -190,21 +227,29 @@
1209 ./configure CC=/usr/local2/bin/gcc
1210
1211 causes the specified `gcc' to be used as the C compiler (unless it is
1212-overridden in the site shell script). Here is a another example:
1213-
1214- /bin/bash ./configure CONFIG_SHELL=/bin/bash
1215-
1216-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
1217-configuration-related scripts to be executed by `/bin/bash'.
1218+overridden in the site shell script).
1219+
1220+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
1221+an Autoconf bug. Until the bug is fixed you can use this workaround:
1222+
1223+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
1224
1225 `configure' Invocation
1226 ======================
1227
1228-`configure' recognizes the following options to control how it operates.
1229+ `configure' recognizes the following options to control how it
1230+operates.
1231
1232 `--help'
1233 `-h'
1234- Print a summary of the options to `configure', and exit.
1235+ Print a summary of all of the options to `configure', and exit.
1236+
1237+`--help=short'
1238+`--help=recursive'
1239+ Print a summary of the options unique to this package's
1240+ `configure', and exit. The `short' variant lists options used
1241+ only in the top level, while the `recursive' variant lists options
1242+ also present in any nested packages.
1243
1244 `--version'
1245 `-V'
1246@@ -231,6 +276,16 @@
1247 Look for the package's source code in directory DIR. Usually
1248 `configure' can determine that directory automatically.
1249
1250+`--prefix=DIR'
1251+ Use DIR as the installation prefix. *Note Installation Names::
1252+ for more details, including other options available for fine-tuning
1253+ the installation locations.
1254+
1255+`--no-create'
1256+`-n'
1257+ Run the configure checks, but stop before creating any output
1258+ files.
1259+
1260 `configure' also accepts some other, not widely useful, options. Run
1261 `configure --help' for more details.
1262
1263
1264=== modified file 'Makefile.am'
1265--- Makefile.am 2006-03-18 18:38:00 +0000
1266+++ Makefile.am 2010-01-20 17:40:26 +0000
1267@@ -1,6 +1,11 @@
1268+## Â$Id: Makefile.am,v 1.12 2009/09/05 20:58:56 nihilus Exp $
1269 ## Process this file with automake to produce Makefile.in
1270
1271-AUTOMAKE_OPTIONS = ansi2knr
1272+AUTOMAKE_OPTIONS =
1273+ACLOCAL_AMFLAGS = -I m4
1274+AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
1275+
1276+SUBDIRS = lib
1277
1278 ## What programs do we want to build?
1279
1280@@ -8,36 +13,33 @@
1281 sbin_PROGRAMS = dump-utmp @DUMP_ACCT_PROG@ @ACCTON_PROG@ @SA_PROG@
1282 EXTRA_PROGRAMS = lastcomm dump-acct accton sa
1283
1284+# What libs do we want to link against?
1285+
1286+LDADD = lib/libgnu.la
1287+
1288 ## From what sources are those programs built?
1289
1290-ac_SOURCES = ac.c common.c file_rd.c getopt.c getopt1.c hashtab.c \
1291- mktime.c utmp_rd.c
1292-ac_LDADD = @ALLOCA@
1293-
1294-accton_SOURCES = accton.c common.c getopt.c getopt1.c
1295-accton_LDADD = @ALLOCA@
1296-
1297-dump_acct_SOURCES = dump-acct.c common.c getopt.c getopt1.c file_rd.c \
1298+ac_SOURCES = ac.c common.c file_rd.c hashtab.c \
1299+ utmp_rd.c
1300+
1301+accton_SOURCES = accton.c common.c
1302+
1303+dump_acct_SOURCES = dump-acct.c common.c file_rd.c \
1304 pacct_rd.c
1305-dump_acct_LDADD = @ALLOCA@
1306-
1307-dump_utmp_SOURCES = dump-utmp.c common.c getopt.c getopt1.c file_rd.c \
1308- utmp_rd.c
1309-dump_utmp_LDADD = @ALLOCA@
1310-
1311-last_SOURCES = last.c common.c file_rd.c getopt.c getopt1.c hashtab.c \
1312- utmp_rd.c
1313-last_LDADD = @ALLOCA@
1314-
1315-lastcomm_SOURCES = lastcomm.c common.c dev_hash.c file_rd.c getopt.c \
1316- getopt1.c hashtab.c pacct_rd.c uid_hash.c
1317-lastcomm_LDADD = @ALLOCA@
1318-
1319-sa_SOURCES = sa.c common.c file_rd.c getopt.c getopt1.c hashtab.c \
1320+
1321+dump_utmp_SOURCES = dump-utmp.c common.c file_rd.c \
1322+ utmp_rd.c
1323+
1324+last_SOURCES = last.c common.c file_rd.c hashtab.c \
1325+ utmp_rd.c
1326+
1327+lastcomm_SOURCES = lastcomm.c common.c dev_hash.c file_rd.c \
1328+ hashtab.c pacct_rd.c uid_hash.c
1329+
1330+sa_SOURCES = sa.c common.c file_rd.c hashtab.c \
1331 pacct_rd.c uid_hash.c
1332-sa_LDADD = @ALLOCA@
1333
1334-noinst_HEADERS = common.h config.h dev_hash.h file_rd.h getopt.h hashtab.h \
1335+noinst_HEADERS = common.h config.h dev_hash.h file_rd.h hashtab.h \
1336 pacct_rd.h uid_hash.h utmp_rd.h al_share.cpp linux-acct.h
1337
1338 # What documentation should we include?
1339@@ -50,7 +52,7 @@
1340 #man_MANS = ac.1 last.1 @ACCTON_MAN@ @LASTCOMM_MAN@ @SA_MAN@
1341 # but I had to use:
1342 man_MANS = ac.1 accton.8 last.1 lastcomm.1 sa.8
1343-EXTRA_DIST = ac.1 accton.8 last.1 lastcomm.1 sa.8 TODO mktime.c
1344+EXTRA_DIST = ac.1 accton.8 last.1 lastcomm.1 sa.8 TODO m4/gnulib-cache.m4
1345
1346 ## Extra stuff to remove when cleaning
1347
1348@@ -58,9 +60,6 @@
1349
1350 ## Extra targets for debugging
1351
1352-mktime: mktime.c
1353- $(CC) $(LDFLAGS) -DDEBUG mktime.c -o mktime
1354-
1355 ## Extra targets for comparing system utilities to these utils
1356
1357 compare: compare-ac compare-last compare-lastcomm compare-sa
1358
1359=== modified file 'Makefile.in'
1360--- Makefile.in 2006-03-18 18:38:00 +0000
1361+++ Makefile.in 2010-01-20 17:40:26 +0000
1362@@ -1,8 +1,8 @@
1363-# Makefile.in generated by automake 1.9.6 from Makefile.am.
1364+# Makefile.in generated by automake 1.10.2 from Makefile.am.
1365 # @configure_input@
1366
1367 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1368-# 2003, 2004, 2005 Free Software Foundation, Inc.
1369+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
1370 # This Makefile.in is free software; the Free Software Foundation
1371 # gives unlimited permission to copy and/or distribute it,
1372 # with or without modifications, as long as this notice is preserved.
1373@@ -15,15 +15,11 @@
1374 @SET_MAKE@
1375
1376
1377-srcdir = @srcdir@
1378-top_srcdir = @top_srcdir@
1379 VPATH = @srcdir@
1380 pkgdatadir = $(datadir)/@PACKAGE@
1381 pkglibdir = $(libdir)/@PACKAGE@
1382 pkgincludedir = $(includedir)/@PACKAGE@
1383-top_builddir = .
1384 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
1385-INSTALL = @INSTALL@
1386 install_sh_DATA = $(install_sh) -c -m 644
1387 install_sh_PROGRAM = $(install_sh) -c
1388 install_sh_SCRIPT = $(install_sh) -c
1389@@ -38,26 +34,44 @@
1390 build_triplet = @build@
1391 host_triplet = @host@
1392 target_triplet = @target@
1393-ANSI2KNR = @ANSI2KNR@
1394 bin_PROGRAMS = ac$(EXEEXT) last$(EXEEXT) @LASTCOMM_PROG@
1395 sbin_PROGRAMS = dump-utmp$(EXEEXT) @DUMP_ACCT_PROG@ @ACCTON_PROG@ \
1396 @SA_PROG@ $(am__empty)
1397 EXTRA_PROGRAMS = lastcomm$(EXEEXT) dump-acct$(EXEEXT) accton$(EXEEXT) \
1398 sa$(EXEEXT)
1399+subdir = .
1400 DIST_COMMON = README $(am__configure_deps) $(noinst_HEADERS) \
1401 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
1402 $(srcdir)/config.h.in $(srcdir)/files.h.in $(srcdir)/stamp-vti \
1403 $(srcdir)/version.h.in $(srcdir)/version.texi \
1404 $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
1405- TODO alloca.c ansi2knr.1 ansi2knr.c config.guess config.sub \
1406- depcomp install-sh mdate-sh missing mkinstalldirs texinfo.tex
1407-subdir = .
1408+ TODO config.guess config.sub depcomp install-sh ltmain.sh \
1409+ mdate-sh missing mkinstalldirs texinfo.tex
1410 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1411-am__aclocal_m4_deps = $(top_srcdir)/configure.in
1412+am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
1413+ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/dirname.m4 \
1414+ $(top_srcdir)/m4/dos.m4 $(top_srcdir)/m4/double-slash-root.m4 \
1415+ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \
1416+ $(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \
1417+ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \
1418+ $(top_srcdir)/m4/gnulib-common.m4 \
1419+ $(top_srcdir)/m4/gnulib-comp.m4 \
1420+ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \
1421+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
1422+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
1423+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/mktime.m4 \
1424+ $(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/onceonly.m4 \
1425+ $(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/stdbool.m4 \
1426+ $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strerror.m4 \
1427+ $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strndup.m4 \
1428+ $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/sys_stat_h.m4 \
1429+ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \
1430+ $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/xalloc.m4 \
1431+ $(top_srcdir)/m4/xstrndup.m4 $(top_srcdir)/configure.ac
1432 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1433 $(ACLOCAL_M4)
1434 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
1435- configure.lineno configure.status.lineno
1436+ configure.lineno config.status.lineno
1437 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
1438 CONFIG_HEADER = config.h
1439 CONFIG_CLEAN_FILES = files.h version.h
1440@@ -67,48 +81,53 @@
1441 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
1442 sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
1443 PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
1444-am_ac_OBJECTS = ac$U.$(OBJEXT) common$U.$(OBJEXT) file_rd$U.$(OBJEXT) \
1445- getopt$U.$(OBJEXT) getopt1$U.$(OBJEXT) hashtab$U.$(OBJEXT) \
1446- mktime$U.$(OBJEXT) utmp_rd$U.$(OBJEXT)
1447+am_ac_OBJECTS = ac.$(OBJEXT) common.$(OBJEXT) file_rd.$(OBJEXT) \
1448+ hashtab.$(OBJEXT) utmp_rd.$(OBJEXT)
1449 ac_OBJECTS = $(am_ac_OBJECTS)
1450-ac_DEPENDENCIES = @ALLOCA@
1451-am_accton_OBJECTS = accton$U.$(OBJEXT) common$U.$(OBJEXT) \
1452- getopt$U.$(OBJEXT) getopt1$U.$(OBJEXT)
1453+ac_LDADD = $(LDADD)
1454+ac_DEPENDENCIES = lib/libgnu.la
1455+am_accton_OBJECTS = accton.$(OBJEXT) common.$(OBJEXT)
1456 accton_OBJECTS = $(am_accton_OBJECTS)
1457-accton_DEPENDENCIES = @ALLOCA@
1458-am_dump_acct_OBJECTS = dump-acct$U.$(OBJEXT) common$U.$(OBJEXT) \
1459- getopt$U.$(OBJEXT) getopt1$U.$(OBJEXT) file_rd$U.$(OBJEXT) \
1460- pacct_rd$U.$(OBJEXT)
1461+accton_LDADD = $(LDADD)
1462+accton_DEPENDENCIES = lib/libgnu.la
1463+am_dump_acct_OBJECTS = dump-acct.$(OBJEXT) common.$(OBJEXT) \
1464+ file_rd.$(OBJEXT) pacct_rd.$(OBJEXT)
1465 dump_acct_OBJECTS = $(am_dump_acct_OBJECTS)
1466-dump_acct_DEPENDENCIES = @ALLOCA@
1467-am_dump_utmp_OBJECTS = dump-utmp$U.$(OBJEXT) common$U.$(OBJEXT) \
1468- getopt$U.$(OBJEXT) getopt1$U.$(OBJEXT) file_rd$U.$(OBJEXT) \
1469- utmp_rd$U.$(OBJEXT)
1470+dump_acct_LDADD = $(LDADD)
1471+dump_acct_DEPENDENCIES = lib/libgnu.la
1472+am_dump_utmp_OBJECTS = dump-utmp.$(OBJEXT) common.$(OBJEXT) \
1473+ file_rd.$(OBJEXT) utmp_rd.$(OBJEXT)
1474 dump_utmp_OBJECTS = $(am_dump_utmp_OBJECTS)
1475-dump_utmp_DEPENDENCIES = @ALLOCA@
1476-am_last_OBJECTS = last$U.$(OBJEXT) common$U.$(OBJEXT) \
1477- file_rd$U.$(OBJEXT) getopt$U.$(OBJEXT) getopt1$U.$(OBJEXT) \
1478- hashtab$U.$(OBJEXT) utmp_rd$U.$(OBJEXT)
1479+dump_utmp_LDADD = $(LDADD)
1480+dump_utmp_DEPENDENCIES = lib/libgnu.la
1481+am_last_OBJECTS = last.$(OBJEXT) common.$(OBJEXT) file_rd.$(OBJEXT) \
1482+ hashtab.$(OBJEXT) utmp_rd.$(OBJEXT)
1483 last_OBJECTS = $(am_last_OBJECTS)
1484-last_DEPENDENCIES = @ALLOCA@
1485-am_lastcomm_OBJECTS = lastcomm$U.$(OBJEXT) common$U.$(OBJEXT) \
1486- dev_hash$U.$(OBJEXT) file_rd$U.$(OBJEXT) getopt$U.$(OBJEXT) \
1487- getopt1$U.$(OBJEXT) hashtab$U.$(OBJEXT) pacct_rd$U.$(OBJEXT) \
1488- uid_hash$U.$(OBJEXT)
1489+last_LDADD = $(LDADD)
1490+last_DEPENDENCIES = lib/libgnu.la
1491+am_lastcomm_OBJECTS = lastcomm.$(OBJEXT) common.$(OBJEXT) \
1492+ dev_hash.$(OBJEXT) file_rd.$(OBJEXT) hashtab.$(OBJEXT) \
1493+ pacct_rd.$(OBJEXT) uid_hash.$(OBJEXT)
1494 lastcomm_OBJECTS = $(am_lastcomm_OBJECTS)
1495-lastcomm_DEPENDENCIES = @ALLOCA@
1496-am_sa_OBJECTS = sa$U.$(OBJEXT) common$U.$(OBJEXT) file_rd$U.$(OBJEXT) \
1497- getopt$U.$(OBJEXT) getopt1$U.$(OBJEXT) hashtab$U.$(OBJEXT) \
1498- pacct_rd$U.$(OBJEXT) uid_hash$U.$(OBJEXT)
1499+lastcomm_LDADD = $(LDADD)
1500+lastcomm_DEPENDENCIES = lib/libgnu.la
1501+am_sa_OBJECTS = sa.$(OBJEXT) common.$(OBJEXT) file_rd.$(OBJEXT) \
1502+ hashtab.$(OBJEXT) pacct_rd.$(OBJEXT) uid_hash.$(OBJEXT)
1503 sa_OBJECTS = $(am_sa_OBJECTS)
1504-sa_DEPENDENCIES = @ALLOCA@
1505-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
1506+sa_LDADD = $(LDADD)
1507+sa_DEPENDENCIES = lib/libgnu.la
1508+DEFAULT_INCLUDES = -I.@am__isrc@
1509 depcomp = $(SHELL) $(top_srcdir)/depcomp
1510 am__depfiles_maybe = depfiles
1511 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
1512 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
1513+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
1514+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
1515+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
1516 CCLD = $(CC)
1517-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
1518+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
1519+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
1520+ $(LDFLAGS) -o $@
1521 SOURCES = $(ac_SOURCES) $(accton_SOURCES) $(dump_acct_SOURCES) \
1522 $(dump_utmp_SOURCES) $(last_SOURCES) $(lastcomm_SOURCES) \
1523 $(sa_SOURCES)
1524@@ -127,13 +146,29 @@
1525 MAKEINFOHTML = $(MAKEINFO) --html
1526 AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
1527 DVIPS = dvips
1528+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
1529+ html-recursive info-recursive install-data-recursive \
1530+ install-dvi-recursive install-exec-recursive \
1531+ install-html-recursive install-info-recursive \
1532+ install-pdf-recursive install-ps-recursive install-recursive \
1533+ installcheck-recursive installdirs-recursive pdf-recursive \
1534+ ps-recursive uninstall-recursive
1535+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
1536+am__vpath_adj = case $$p in \
1537+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
1538+ *) f=$$p;; \
1539+ esac;
1540+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
1541 man1dir = $(mandir)/man1
1542 man8dir = $(mandir)/man8
1543 NROFF = nroff
1544 MANS = $(man_MANS)
1545 HEADERS = $(noinst_HEADERS)
1546+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
1547+ distclean-recursive maintainer-clean-recursive
1548 ETAGS = etags
1549 CTAGS = ctags
1550+DIST_SUBDIRS = $(SUBDIRS)
1551 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
1552 distdir = $(PACKAGE)-$(VERSION)
1553 top_distdir = $(distdir)
1554@@ -150,9 +185,10 @@
1555 ACCT_FILE_LOC = @ACCT_FILE_LOC@
1556 ACLOCAL = @ACLOCAL@
1557 ALLOCA = @ALLOCA@
1558-AMDEP_FALSE = @AMDEP_FALSE@
1559-AMDEP_TRUE = @AMDEP_TRUE@
1560+ALLOCA_H = @ALLOCA_H@
1561 AMTAR = @AMTAR@
1562+APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
1563+AR = @AR@
1564 AUTOCONF = @AUTOCONF@
1565 AUTOHEADER = @AUTOHEADER@
1566 AUTOMAKE = @AUTOMAKE@
1567@@ -165,26 +201,187 @@
1568 CYGPATH_W = @CYGPATH_W@
1569 DEFS = @DEFS@
1570 DEPDIR = @DEPDIR@
1571+DSYMUTIL = @DSYMUTIL@
1572+DUMPBIN = @DUMPBIN@
1573 DUMP_ACCT_PROG = @DUMP_ACCT_PROG@
1574 ECHO_C = @ECHO_C@
1575 ECHO_N = @ECHO_N@
1576 ECHO_T = @ECHO_T@
1577 EGREP = @EGREP@
1578+EMULTIHOP_HIDDEN = @EMULTIHOP_HIDDEN@
1579+EMULTIHOP_VALUE = @EMULTIHOP_VALUE@
1580+ENOLINK_HIDDEN = @ENOLINK_HIDDEN@
1581+ENOLINK_VALUE = @ENOLINK_VALUE@
1582+EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@
1583+EOVERFLOW_VALUE = @EOVERFLOW_VALUE@
1584+ERRNO_H = @ERRNO_H@
1585 EXEEXT = @EXEEXT@
1586+FGREP = @FGREP@
1587+GETOPT_H = @GETOPT_H@
1588+GNULIB_ATOLL = @GNULIB_ATOLL@
1589+GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
1590+GNULIB_CHOWN = @GNULIB_CHOWN@
1591+GNULIB_CLOSE = @GNULIB_CLOSE@
1592+GNULIB_DUP2 = @GNULIB_DUP2@
1593+GNULIB_ENVIRON = @GNULIB_ENVIRON@
1594+GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
1595+GNULIB_FCHDIR = @GNULIB_FCHDIR@
1596+GNULIB_FSYNC = @GNULIB_FSYNC@
1597+GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
1598+GNULIB_GETCWD = @GNULIB_GETCWD@
1599+GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
1600+GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@
1601+GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@
1602+GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
1603+GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
1604+GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
1605+GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
1606+GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
1607+GNULIB_LCHMOD = @GNULIB_LCHMOD@
1608+GNULIB_LCHOWN = @GNULIB_LCHOWN@
1609+GNULIB_LINK = @GNULIB_LINK@
1610+GNULIB_LSEEK = @GNULIB_LSEEK@
1611+GNULIB_LSTAT = @GNULIB_LSTAT@
1612+GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
1613+GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@
1614+GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@
1615+GNULIB_MBSCHR = @GNULIB_MBSCHR@
1616+GNULIB_MBSCSPN = @GNULIB_MBSCSPN@
1617+GNULIB_MBSLEN = @GNULIB_MBSLEN@
1618+GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@
1619+GNULIB_MBSNLEN = @GNULIB_MBSNLEN@
1620+GNULIB_MBSPBRK = @GNULIB_MBSPBRK@
1621+GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@
1622+GNULIB_MBSRCHR = @GNULIB_MBSRCHR@
1623+GNULIB_MBSSEP = @GNULIB_MBSSEP@
1624+GNULIB_MBSSPN = @GNULIB_MBSSPN@
1625+GNULIB_MBSSTR = @GNULIB_MBSSTR@
1626+GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
1627+GNULIB_MEMMEM = @GNULIB_MEMMEM@
1628+GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
1629+GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
1630+GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
1631+GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
1632+GNULIB_PUTENV = @GNULIB_PUTENV@
1633+GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
1634+GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
1635+GNULIB_READLINK = @GNULIB_READLINK@
1636+GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
1637+GNULIB_RPMATCH = @GNULIB_RPMATCH@
1638+GNULIB_SETENV = @GNULIB_SETENV@
1639+GNULIB_SLEEP = @GNULIB_SLEEP@
1640+GNULIB_STPCPY = @GNULIB_STPCPY@
1641+GNULIB_STPNCPY = @GNULIB_STPNCPY@
1642+GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
1643+GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
1644+GNULIB_STRDUP = @GNULIB_STRDUP@
1645+GNULIB_STRERROR = @GNULIB_STRERROR@
1646+GNULIB_STRNDUP = @GNULIB_STRNDUP@
1647+GNULIB_STRNLEN = @GNULIB_STRNLEN@
1648+GNULIB_STRPBRK = @GNULIB_STRPBRK@
1649+GNULIB_STRSEP = @GNULIB_STRSEP@
1650+GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
1651+GNULIB_STRSTR = @GNULIB_STRSTR@
1652+GNULIB_STRTOD = @GNULIB_STRTOD@
1653+GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
1654+GNULIB_STRTOLL = @GNULIB_STRTOLL@
1655+GNULIB_STRTOULL = @GNULIB_STRTOULL@
1656+GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
1657+GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
1658+GNULIB_UNSETENV = @GNULIB_UNSETENV@
1659+GNULIB_WRITE = @GNULIB_WRITE@
1660+GREP = @GREP@
1661+HAVE_ATOLL = @HAVE_ATOLL@
1662+HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
1663+HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
1664+HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
1665+HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
1666+HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
1667+HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
1668+HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
1669+HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@
1670+HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
1671+HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
1672+HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
1673+HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
1674+HAVE_DUP2 = @HAVE_DUP2@
1675+HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
1676+HAVE_FSYNC = @HAVE_FSYNC@
1677+HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
1678+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
1679+HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
1680+HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
1681+HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
1682+HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
1683+HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@
1684+HAVE_LCHMOD = @HAVE_LCHMOD@
1685+HAVE_LINK = @HAVE_LINK@
1686+HAVE_LSTAT = @HAVE_LSTAT@
1687+HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
1688+HAVE_MEMPCPY = @HAVE_MEMPCPY@
1689+HAVE_MKDTEMP = @HAVE_MKDTEMP@
1690+HAVE_OS_H = @HAVE_OS_H@
1691+HAVE_RANDOM_H = @HAVE_RANDOM_H@
1692+HAVE_RANDOM_R = @HAVE_RANDOM_R@
1693+HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
1694+HAVE_READLINK = @HAVE_READLINK@
1695+HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
1696+HAVE_RPMATCH = @HAVE_RPMATCH@
1697+HAVE_SETENV = @HAVE_SETENV@
1698+HAVE_SLEEP = @HAVE_SLEEP@
1699+HAVE_STPCPY = @HAVE_STPCPY@
1700+HAVE_STPNCPY = @HAVE_STPNCPY@
1701+HAVE_STRCASESTR = @HAVE_STRCASESTR@
1702+HAVE_STRCHRNUL = @HAVE_STRCHRNUL@
1703+HAVE_STRNDUP = @HAVE_STRNDUP@
1704+HAVE_STRPBRK = @HAVE_STRPBRK@
1705+HAVE_STRSEP = @HAVE_STRSEP@
1706+HAVE_STRTOD = @HAVE_STRTOD@
1707+HAVE_STRTOLL = @HAVE_STRTOLL@
1708+HAVE_STRTOULL = @HAVE_STRTOULL@
1709+HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
1710+HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
1711+HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
1712+HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
1713+HAVE_UNISTD_H = @HAVE_UNISTD_H@
1714+HAVE_UNSETENV = @HAVE_UNSETENV@
1715+HAVE__BOOL = @HAVE__BOOL@
1716+INCLUDE_NEXT = @INCLUDE_NEXT@
1717+INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
1718+INSTALL = @INSTALL@
1719 INSTALL_DATA = @INSTALL_DATA@
1720 INSTALL_PROGRAM = @INSTALL_PROGRAM@
1721 INSTALL_SCRIPT = @INSTALL_SCRIPT@
1722 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
1723 LASTCOMM_MAN = @LASTCOMM_MAN@
1724 LASTCOMM_PROG = @LASTCOMM_PROG@
1725+LD = @LD@
1726 LDFLAGS = @LDFLAGS@
1727+LIBINTL = @LIBINTL@
1728 LIBOBJS = @LIBOBJS@
1729 LIBS = @LIBS@
1730+LIBTOOL = @LIBTOOL@
1731+LIBTOOL_DEPS = @LIBTOOL_DEPS@
1732+LIPO = @LIPO@
1733+LN_S = @LN_S@
1734+LTALLOCA = @LTALLOCA@
1735+LTLIBINTL = @LTLIBINTL@
1736 LTLIBOBJS = @LTLIBOBJS@
1737+MAINT = @MAINT@
1738 MAKEINFO = @MAKEINFO@
1739-MKTIME_C = @MKTIME_C@
1740-MKTIME_O = @MKTIME_O@
1741+MKDIR_P = @MKDIR_P@
1742+NEXT_ERRNO_H = @NEXT_ERRNO_H@
1743+NEXT_STDLIB_H = @NEXT_STDLIB_H@
1744+NEXT_STRING_H = @NEXT_STRING_H@
1745+NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
1746+NEXT_TIME_H = @NEXT_TIME_H@
1747+NEXT_UNISTD_H = @NEXT_UNISTD_H@
1748+NM = @NM@
1749+NMEDIT = @NMEDIT@
1750+OBJDUMP = @OBJDUMP@
1751 OBJEXT = @OBJEXT@
1752+OTOOL = @OTOOL@
1753+OTOOL64 = @OTOOL64@
1754 PACKAGE = @PACKAGE@
1755 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
1756 PACKAGE_NAME = @PACKAGE_NAME@
1757@@ -192,24 +389,57 @@
1758 PACKAGE_TARNAME = @PACKAGE_TARNAME@
1759 PACKAGE_VERSION = @PACKAGE_VERSION@
1760 PATH_SEPARATOR = @PATH_SEPARATOR@
1761+PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
1762+RANLIB = @RANLIB@
1763+REPLACE_CHOWN = @REPLACE_CHOWN@
1764+REPLACE_CLOSE = @REPLACE_CLOSE@
1765+REPLACE_FCHDIR = @REPLACE_FCHDIR@
1766+REPLACE_GETCWD = @REPLACE_GETCWD@
1767+REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
1768+REPLACE_LCHOWN = @REPLACE_LCHOWN@
1769+REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
1770+REPLACE_LSEEK = @REPLACE_LSEEK@
1771+REPLACE_LSTAT = @REPLACE_LSTAT@
1772+REPLACE_MEMMEM = @REPLACE_MEMMEM@
1773+REPLACE_MKDIR = @REPLACE_MKDIR@
1774+REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
1775+REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
1776+REPLACE_PUTENV = @REPLACE_PUTENV@
1777+REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
1778+REPLACE_STRDUP = @REPLACE_STRDUP@
1779+REPLACE_STRERROR = @REPLACE_STRERROR@
1780+REPLACE_STRPTIME = @REPLACE_STRPTIME@
1781+REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
1782+REPLACE_STRSTR = @REPLACE_STRSTR@
1783+REPLACE_STRTOD = @REPLACE_STRTOD@
1784+REPLACE_TIMEGM = @REPLACE_TIMEGM@
1785+REPLACE_WRITE = @REPLACE_WRITE@
1786 SAVACCT_FILE_LOC = @SAVACCT_FILE_LOC@
1787 SA_MAN = @SA_MAN@
1788 SA_PROG = @SA_PROG@
1789+SED = @SED@
1790 SET_MAKE = @SET_MAKE@
1791 SHELL = @SHELL@
1792+STDBOOL_H = @STDBOOL_H@
1793 STRIP = @STRIP@
1794 SYS_AC = @SYS_AC@
1795 SYS_LAST = @SYS_LAST@
1796 SYS_LASTCOMM = @SYS_LASTCOMM@
1797 SYS_SA = @SYS_SA@
1798-U = @U@
1799+SYS_STAT_H = @SYS_STAT_H@
1800+SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
1801+TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
1802+UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
1803 USRACCT_FILE_LOC = @USRACCT_FILE_LOC@
1804 VERSION = @VERSION@
1805+VOID_UNSETENV = @VOID_UNSETENV@
1806 WTMP_FILE_LOC = @WTMP_FILE_LOC@
1807+abs_builddir = @abs_builddir@
1808+abs_srcdir = @abs_srcdir@
1809+abs_top_builddir = @abs_top_builddir@
1810+abs_top_srcdir = @abs_top_srcdir@
1811 ac_ct_CC = @ac_ct_CC@
1812-ac_ct_STRIP = @ac_ct_STRIP@
1813-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
1814-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
1815+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
1816 am__include = @am__include@
1817 am__leading_dot = @am__leading_dot@
1818 am__quote = @am__quote@
1819@@ -221,60 +451,76 @@
1820 build_cpu = @build_cpu@
1821 build_os = @build_os@
1822 build_vendor = @build_vendor@
1823+builddir = @builddir@
1824 datadir = @datadir@
1825+datarootdir = @datarootdir@
1826+docdir = @docdir@
1827+dvidir = @dvidir@
1828 exec_prefix = @exec_prefix@
1829+gl_LIBOBJS = @gl_LIBOBJS@
1830+gl_LTLIBOBJS = @gl_LTLIBOBJS@
1831+gltests_LIBOBJS = @gltests_LIBOBJS@
1832+gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
1833 host = @host@
1834 host_alias = @host_alias@
1835 host_cpu = @host_cpu@
1836 host_os = @host_os@
1837 host_vendor = @host_vendor@
1838+htmldir = @htmldir@
1839 includedir = @includedir@
1840 infodir = @infodir@
1841 install_sh = @install_sh@
1842 libdir = @libdir@
1843 libexecdir = @libexecdir@
1844+localedir = @localedir@
1845 localstatedir = @localstatedir@
1846+lt_ECHO = @lt_ECHO@
1847 mandir = @mandir@
1848 mkdir_p = @mkdir_p@
1849 oldincludedir = @oldincludedir@
1850+pdfdir = @pdfdir@
1851 prefix = @prefix@
1852 program_transform_name = @program_transform_name@
1853+psdir = @psdir@
1854 sbindir = @sbindir@
1855 sharedstatedir = @sharedstatedir@
1856+srcdir = @srcdir@
1857 sysconfdir = @sysconfdir@
1858 target = @target@
1859 target_alias = @target_alias@
1860 target_cpu = @target_cpu@
1861 target_os = @target_os@
1862 target_vendor = @target_vendor@
1863-AUTOMAKE_OPTIONS = ansi2knr
1864-ac_SOURCES = ac.c common.c file_rd.c getopt.c getopt1.c hashtab.c \
1865- mktime.c utmp_rd.c
1866-
1867-ac_LDADD = @ALLOCA@
1868-accton_SOURCES = accton.c common.c getopt.c getopt1.c
1869-accton_LDADD = @ALLOCA@
1870-dump_acct_SOURCES = dump-acct.c common.c getopt.c getopt1.c file_rd.c \
1871+top_build_prefix = @top_build_prefix@
1872+top_builddir = @top_builddir@
1873+top_srcdir = @top_srcdir@
1874+AUTOMAKE_OPTIONS =
1875+ACLOCAL_AMFLAGS = -I m4
1876+AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
1877+SUBDIRS = lib
1878+
1879+# What libs do we want to link against?
1880+LDADD = lib/libgnu.la
1881+ac_SOURCES = ac.c common.c file_rd.c hashtab.c \
1882+ utmp_rd.c
1883+
1884+accton_SOURCES = accton.c common.c
1885+dump_acct_SOURCES = dump-acct.c common.c file_rd.c \
1886 pacct_rd.c
1887
1888-dump_acct_LDADD = @ALLOCA@
1889-dump_utmp_SOURCES = dump-utmp.c common.c getopt.c getopt1.c file_rd.c \
1890- utmp_rd.c
1891-
1892-dump_utmp_LDADD = @ALLOCA@
1893-last_SOURCES = last.c common.c file_rd.c getopt.c getopt1.c hashtab.c \
1894- utmp_rd.c
1895-
1896-last_LDADD = @ALLOCA@
1897-lastcomm_SOURCES = lastcomm.c common.c dev_hash.c file_rd.c getopt.c \
1898- getopt1.c hashtab.c pacct_rd.c uid_hash.c
1899-
1900-lastcomm_LDADD = @ALLOCA@
1901-sa_SOURCES = sa.c common.c file_rd.c getopt.c getopt1.c hashtab.c \
1902+dump_utmp_SOURCES = dump-utmp.c common.c file_rd.c \
1903+ utmp_rd.c
1904+
1905+last_SOURCES = last.c common.c file_rd.c hashtab.c \
1906+ utmp_rd.c
1907+
1908+lastcomm_SOURCES = lastcomm.c common.c dev_hash.c file_rd.c \
1909+ hashtab.c pacct_rd.c uid_hash.c
1910+
1911+sa_SOURCES = sa.c common.c file_rd.c hashtab.c \
1912 pacct_rd.c uid_hash.c
1913
1914-sa_LDADD = @ALLOCA@
1915-noinst_HEADERS = common.h config.h dev_hash.h file_rd.h getopt.h hashtab.h \
1916+noinst_HEADERS = common.h config.h dev_hash.h file_rd.h hashtab.h \
1917 pacct_rd.h uid_hash.h utmp_rd.h al_share.cpp linux-acct.h
1918
1919
1920@@ -287,16 +533,16 @@
1921 #man_MANS = ac.1 last.1 @ACCTON_MAN@ @LASTCOMM_MAN@ @SA_MAN@
1922 # but I had to use:
1923 man_MANS = ac.1 accton.8 last.1 lastcomm.1 sa.8
1924-EXTRA_DIST = ac.1 accton.8 last.1 lastcomm.1 sa.8 TODO mktime.c
1925+EXTRA_DIST = ac.1 accton.8 last.1 lastcomm.1 sa.8 TODO m4/gnulib-cache.m4
1926 DISTCLEANFILES = files.h version.h stamp-h
1927 all: config.h
1928- $(MAKE) $(AM_MAKEFLAGS) all-am
1929+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
1930
1931 .SUFFIXES:
1932-.SUFFIXES: .c .dvi .html .info .o .obj .pdf .ps .texi
1933+.SUFFIXES: .c .dvi .html .info .lo .o .obj .pdf .ps .texi
1934 am--refresh:
1935 @:
1936-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
1937+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
1938 @for dep in $?; do \
1939 case '$(am__configure_deps)' in \
1940 *$$dep*) \
1941@@ -323,21 +569,21 @@
1942 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
1943 $(SHELL) ./config.status --recheck
1944
1945-$(top_srcdir)/configure: $(am__configure_deps)
1946+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
1947 cd $(srcdir) && $(AUTOCONF)
1948-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
1949+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
1950 cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
1951
1952 config.h: stamp-h1
1953 @if test ! -f $@; then \
1954 rm -f stamp-h1; \
1955- $(MAKE) stamp-h1; \
1956+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
1957 else :; fi
1958
1959 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
1960 @rm -f stamp-h1
1961 cd $(top_builddir) && $(SHELL) ./config.status config.h
1962-$(srcdir)/config.h.in: $(am__configure_deps)
1963+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
1964 cd $(top_srcdir) && $(AUTOHEADER)
1965 rm -f stamp-h1
1966 touch $@
1967@@ -350,14 +596,15 @@
1968 cd $(top_builddir) && $(SHELL) ./config.status $@
1969 install-binPROGRAMS: $(bin_PROGRAMS)
1970 @$(NORMAL_INSTALL)
1971- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
1972+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
1973 @list='$(bin_PROGRAMS)'; for p in $$list; do \
1974 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
1975 if test -f $$p \
1976+ || test -f $$p1 \
1977 ; then \
1978 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
1979- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
1980- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
1981+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
1982+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
1983 else :; fi; \
1984 done
1985
1986@@ -370,17 +617,22 @@
1987 done
1988
1989 clean-binPROGRAMS:
1990- -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
1991+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
1992+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
1993+ echo " rm -f $$p $$f"; \
1994+ rm -f $$p $$f ; \
1995+ done
1996 install-sbinPROGRAMS: $(sbin_PROGRAMS)
1997 @$(NORMAL_INSTALL)
1998- test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
1999+ test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
2000 @list='$(sbin_PROGRAMS)'; for p in $$list; do \
2001 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
2002 if test -f $$p \
2003+ || test -f $$p1 \
2004 ; then \
2005 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
2006- echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
2007- $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
2008+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
2009+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
2010 else :; fi; \
2011 done
2012
2013@@ -393,118 +645,83 @@
2014 done
2015
2016 clean-sbinPROGRAMS:
2017- -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
2018+ @list='$(sbin_PROGRAMS)'; for p in $$list; do \
2019+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
2020+ echo " rm -f $$p $$f"; \
2021+ rm -f $$p $$f ; \
2022+ done
2023 ac$(EXEEXT): $(ac_OBJECTS) $(ac_DEPENDENCIES)
2024 @rm -f ac$(EXEEXT)
2025- $(LINK) $(ac_LDFLAGS) $(ac_OBJECTS) $(ac_LDADD) $(LIBS)
2026+ $(LINK) $(ac_OBJECTS) $(ac_LDADD) $(LIBS)
2027 accton$(EXEEXT): $(accton_OBJECTS) $(accton_DEPENDENCIES)
2028 @rm -f accton$(EXEEXT)
2029- $(LINK) $(accton_LDFLAGS) $(accton_OBJECTS) $(accton_LDADD) $(LIBS)
2030+ $(LINK) $(accton_OBJECTS) $(accton_LDADD) $(LIBS)
2031 dump-acct$(EXEEXT): $(dump_acct_OBJECTS) $(dump_acct_DEPENDENCIES)
2032 @rm -f dump-acct$(EXEEXT)
2033- $(LINK) $(dump_acct_LDFLAGS) $(dump_acct_OBJECTS) $(dump_acct_LDADD) $(LIBS)
2034+ $(LINK) $(dump_acct_OBJECTS) $(dump_acct_LDADD) $(LIBS)
2035 dump-utmp$(EXEEXT): $(dump_utmp_OBJECTS) $(dump_utmp_DEPENDENCIES)
2036 @rm -f dump-utmp$(EXEEXT)
2037- $(LINK) $(dump_utmp_LDFLAGS) $(dump_utmp_OBJECTS) $(dump_utmp_LDADD) $(LIBS)
2038+ $(LINK) $(dump_utmp_OBJECTS) $(dump_utmp_LDADD) $(LIBS)
2039 last$(EXEEXT): $(last_OBJECTS) $(last_DEPENDENCIES)
2040 @rm -f last$(EXEEXT)
2041- $(LINK) $(last_LDFLAGS) $(last_OBJECTS) $(last_LDADD) $(LIBS)
2042+ $(LINK) $(last_OBJECTS) $(last_LDADD) $(LIBS)
2043 lastcomm$(EXEEXT): $(lastcomm_OBJECTS) $(lastcomm_DEPENDENCIES)
2044 @rm -f lastcomm$(EXEEXT)
2045- $(LINK) $(lastcomm_LDFLAGS) $(lastcomm_OBJECTS) $(lastcomm_LDADD) $(LIBS)
2046+ $(LINK) $(lastcomm_OBJECTS) $(lastcomm_LDADD) $(LIBS)
2047 sa$(EXEEXT): $(sa_OBJECTS) $(sa_DEPENDENCIES)
2048 @rm -f sa$(EXEEXT)
2049- $(LINK) $(sa_LDFLAGS) $(sa_OBJECTS) $(sa_LDADD) $(LIBS)
2050+ $(LINK) $(sa_OBJECTS) $(sa_LDADD) $(LIBS)
2051
2052 mostlyclean-compile:
2053 -rm -f *.$(OBJEXT)
2054
2055 distclean-compile:
2056 -rm -f *.tab.c
2057-ansi2knr: ansi2knr.$(OBJEXT)
2058- $(LINK) ansi2knr.$(OBJEXT) $(LIBS)
2059-ansi2knr.$(OBJEXT): $(CONFIG_HEADER)
2060-
2061-clean-krextra:
2062- -rm -f ansi2knr
2063-
2064-mostlyclean-kr:
2065- -test "$U" = "" || rm -f *_.c
2066-
2067-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/alloca.Po@am__quote@
2068-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ac$U.Po@am__quote@
2069-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/accton$U.Po@am__quote@
2070-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common$U.Po@am__quote@
2071-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dev_hash$U.Po@am__quote@
2072-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dump-acct$U.Po@am__quote@
2073-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dump-utmp$U.Po@am__quote@
2074-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file_rd$U.Po@am__quote@
2075-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt$U.Po@am__quote@
2076-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1$U.Po@am__quote@
2077-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hashtab$U.Po@am__quote@
2078-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/last$U.Po@am__quote@
2079-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lastcomm$U.Po@am__quote@
2080-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mktime$U.Po@am__quote@
2081-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pacct_rd$U.Po@am__quote@
2082-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sa$U.Po@am__quote@
2083-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uid_hash$U.Po@am__quote@
2084-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utmp_rd$U.Po@am__quote@
2085+
2086+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ac.Po@am__quote@
2087+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/accton.Po@am__quote@
2088+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Po@am__quote@
2089+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dev_hash.Po@am__quote@
2090+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dump-acct.Po@am__quote@
2091+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dump-utmp.Po@am__quote@
2092+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file_rd.Po@am__quote@
2093+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hashtab.Po@am__quote@
2094+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/last.Po@am__quote@
2095+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lastcomm.Po@am__quote@
2096+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pacct_rd.Po@am__quote@
2097+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sa.Po@am__quote@
2098+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uid_hash.Po@am__quote@
2099+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utmp_rd.Po@am__quote@
2100
2101 .c.o:
2102-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
2103-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
2104+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
2105+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
2106 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
2107 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2108 @am__fastdepCC_FALSE@ $(COMPILE) -c $<
2109
2110 .c.obj:
2111-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
2112-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
2113+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
2114+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
2115 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
2116 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2117 @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
2118-ac_.c: ac.c $(ANSI2KNR)
2119- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ac.c; then echo $(srcdir)/ac.c; else echo ac.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
2120-accton_.c: accton.c $(ANSI2KNR)
2121- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/accton.c; then echo $(srcdir)/accton.c; else echo accton.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
2122-alloca_.c: alloca.c $(ANSI2KNR)
2123- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/alloca.c; then echo $(srcdir)/alloca.c; else echo alloca.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
2124-common_.c: common.c $(ANSI2KNR)
2125- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/common.c; then echo $(srcdir)/common.c; else echo common.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
2126-dev_hash_.c: dev_hash.c $(ANSI2KNR)
2127- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dev_hash.c; then echo $(srcdir)/dev_hash.c; else echo dev_hash.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
2128-dump-acct_.c: dump-acct.c $(ANSI2KNR)
2129- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dump-acct.c; then echo $(srcdir)/dump-acct.c; else echo dump-acct.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
2130-dump-utmp_.c: dump-utmp.c $(ANSI2KNR)
2131- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dump-utmp.c; then echo $(srcdir)/dump-utmp.c; else echo dump-utmp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
2132-file_rd_.c: file_rd.c $(ANSI2KNR)
2133- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/file_rd.c; then echo $(srcdir)/file_rd.c; else echo file_rd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
2134-getopt_.c: getopt.c $(ANSI2KNR)
2135- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt.c; then echo $(srcdir)/getopt.c; else echo getopt.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
2136-getopt1_.c: getopt1.c $(ANSI2KNR)
2137- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt1.c; then echo $(srcdir)/getopt1.c; else echo getopt1.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
2138-hashtab_.c: hashtab.c $(ANSI2KNR)
2139- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/hashtab.c; then echo $(srcdir)/hashtab.c; else echo hashtab.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
2140-last_.c: last.c $(ANSI2KNR)
2141- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/last.c; then echo $(srcdir)/last.c; else echo last.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
2142-lastcomm_.c: lastcomm.c $(ANSI2KNR)
2143- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/lastcomm.c; then echo $(srcdir)/lastcomm.c; else echo lastcomm.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
2144-mktime_.c: mktime.c $(ANSI2KNR)
2145- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mktime.c; then echo $(srcdir)/mktime.c; else echo mktime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
2146-pacct_rd_.c: pacct_rd.c $(ANSI2KNR)
2147- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/pacct_rd.c; then echo $(srcdir)/pacct_rd.c; else echo pacct_rd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
2148-sa_.c: sa.c $(ANSI2KNR)
2149- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/sa.c; then echo $(srcdir)/sa.c; else echo sa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
2150-uid_hash_.c: uid_hash.c $(ANSI2KNR)
2151- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/uid_hash.c; then echo $(srcdir)/uid_hash.c; else echo uid_hash.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
2152-utmp_rd_.c: utmp_rd.c $(ANSI2KNR)
2153- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/utmp_rd.c; then echo $(srcdir)/utmp_rd.c; else echo utmp_rd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
2154-ac_.$(OBJEXT) accton_.$(OBJEXT) alloca_.$(OBJEXT) common_.$(OBJEXT) \
2155-dev_hash_.$(OBJEXT) dump-acct_.$(OBJEXT) dump-utmp_.$(OBJEXT) \
2156-file_rd_.$(OBJEXT) getopt_.$(OBJEXT) getopt1_.$(OBJEXT) \
2157-hashtab_.$(OBJEXT) last_.$(OBJEXT) lastcomm_.$(OBJEXT) \
2158-mktime_.$(OBJEXT) pacct_rd_.$(OBJEXT) sa_.$(OBJEXT) \
2159-uid_hash_.$(OBJEXT) utmp_rd_.$(OBJEXT) : $(ANSI2KNR)
2160+
2161+.c.lo:
2162+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
2163+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
2164+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
2165+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2166+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
2167+
2168+mostlyclean-libtool:
2169+ -rm -f *.lo
2170+
2171+clean-libtool:
2172+ -rm -rf .libs _libs
2173+
2174+distclean-libtool:
2175+ -rm -f libtool config.lt
2176
2177 .texi.info:
2178 restore=: && backupdir="$(am__leading_dot)am$$$$" && \
2179@@ -555,7 +772,7 @@
2180 accounting.dvi: accounting.texi $(srcdir)/version.texi
2181 accounting.pdf: accounting.texi $(srcdir)/version.texi
2182 accounting.html: accounting.texi $(srcdir)/version.texi
2183-$(srcdir)/version.texi: $(srcdir)/stamp-vti
2184+$(srcdir)/version.texi: @MAINTAINER_MODE_TRUE@ $(srcdir)/stamp-vti
2185 $(srcdir)/stamp-vti: accounting.texi $(top_srcdir)/configure
2186 @(dir=.; test -f ./accounting.texi || dir=$(srcdir); \
2187 set `$(SHELL) $(srcdir)/mdate-sh $$dir/accounting.texi`; \
2188@@ -573,14 +790,31 @@
2189 -rm -f vti.tmp
2190
2191 maintainer-clean-vti:
2192- -rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
2193+@MAINTAINER_MODE_TRUE@ -rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
2194 .dvi.ps:
2195 TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
2196 $(DVIPS) -o $@ $<
2197
2198+uninstall-dvi-am:
2199+ @$(NORMAL_UNINSTALL)
2200+ @list='$(DVIS)'; for p in $$list; do \
2201+ f=$(am__strip_dir) \
2202+ echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \
2203+ rm -f "$(DESTDIR)$(dvidir)/$$f"; \
2204+ done
2205+
2206+uninstall-html-am:
2207+ @$(NORMAL_UNINSTALL)
2208+ @list='$(HTMLS)'; for p in $$list; do \
2209+ f=$(am__strip_dir) \
2210+ echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \
2211+ rm -rf "$(DESTDIR)$(htmldir)/$$f"; \
2212+ done
2213+
2214 uninstall-info-am:
2215 @$(PRE_UNINSTALL)
2216- @if (install-info --version && \
2217+ @if test -d '$(DESTDIR)$(infodir)' && \
2218+ (install-info --version && \
2219 install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
2220 list='$(INFO_DEPS)'; \
2221 for file in $$list; do \
2222@@ -594,12 +828,28 @@
2223 for file in $$list; do \
2224 relfile=`echo "$$file" | sed 's|^.*/||'`; \
2225 relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
2226- (if cd "$(DESTDIR)$(infodir)"; then \
2227+ (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \
2228 echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
2229 rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
2230 else :; fi); \
2231 done
2232
2233+uninstall-pdf-am:
2234+ @$(NORMAL_UNINSTALL)
2235+ @list='$(PDFS)'; for p in $$list; do \
2236+ f=$(am__strip_dir) \
2237+ echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
2238+ rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
2239+ done
2240+
2241+uninstall-ps-am:
2242+ @$(NORMAL_UNINSTALL)
2243+ @list='$(PSS)'; for p in $$list; do \
2244+ f=$(am__strip_dir) \
2245+ echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \
2246+ rm -f "$(DESTDIR)$(psdir)/$$f"; \
2247+ done
2248+
2249 dist-info: $(INFO_DEPS)
2250 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
2251 list='$(INFO_DEPS)'; \
2252@@ -608,10 +858,13 @@
2253 $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
2254 esac; \
2255 if test -f $$base; then d=.; else d=$(srcdir); fi; \
2256- for file in $$d/$$base*; do \
2257- relfile=`expr "$$file" : "$$d/\(.*\)"`; \
2258- test -f $(distdir)/$$relfile || \
2259- cp -p $$file $(distdir)/$$relfile; \
2260+ base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \
2261+ for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
2262+ if test -f $$file; then \
2263+ relfile=`expr "$$file" : "$$d/\(.*\)"`; \
2264+ test -f $(distdir)/$$relfile || \
2265+ cp -p $$file $(distdir)/$$relfile; \
2266+ else :; fi; \
2267 done; \
2268 done
2269
2270@@ -630,7 +883,7 @@
2271 done
2272 install-man1: $(man1_MANS) $(man_MANS)
2273 @$(NORMAL_INSTALL)
2274- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
2275+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
2276 @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
2277 l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
2278 for i in $$l2; do \
2279@@ -639,8 +892,8 @@
2280 esac; \
2281 done; \
2282 for i in $$list; do \
2283- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
2284- else file=$$i; fi; \
2285+ if test -f $$i; then file=$$i; \
2286+ else file=$(srcdir)/$$i; fi; \
2287 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
2288 case "$$ext" in \
2289 1*) ;; \
2290@@ -675,7 +928,7 @@
2291 done
2292 install-man8: $(man8_MANS) $(man_MANS)
2293 @$(NORMAL_INSTALL)
2294- test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
2295+ test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
2296 @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
2297 l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
2298 for i in $$l2; do \
2299@@ -684,8 +937,8 @@
2300 esac; \
2301 done; \
2302 for i in $$list; do \
2303- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
2304- else file=$$i; fi; \
2305+ if test -f $$i; then file=$$i; \
2306+ else file=$(srcdir)/$$i; fi; \
2307 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
2308 case "$$ext" in \
2309 8*) ;; \
2310@@ -719,42 +972,124 @@
2311 rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
2312 done
2313
2314+# This directory's subdirectories are mostly independent; you can cd
2315+# into them and run `make' without going through this Makefile.
2316+# To change the values of `make' variables: instead of editing Makefiles,
2317+# (1) if the variable is set in `config.status', edit `config.status'
2318+# (which will cause the Makefiles to be regenerated when you run `make');
2319+# (2) otherwise, pass the desired values on the `make' command line.
2320+$(RECURSIVE_TARGETS):
2321+ @failcom='exit 1'; \
2322+ for f in x $$MAKEFLAGS; do \
2323+ case $$f in \
2324+ *=* | --[!k]*);; \
2325+ *k*) failcom='fail=yes';; \
2326+ esac; \
2327+ done; \
2328+ dot_seen=no; \
2329+ target=`echo $@ | sed s/-recursive//`; \
2330+ list='$(SUBDIRS)'; for subdir in $$list; do \
2331+ echo "Making $$target in $$subdir"; \
2332+ if test "$$subdir" = "."; then \
2333+ dot_seen=yes; \
2334+ local_target="$$target-am"; \
2335+ else \
2336+ local_target="$$target"; \
2337+ fi; \
2338+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
2339+ || eval $$failcom; \
2340+ done; \
2341+ if test "$$dot_seen" = "no"; then \
2342+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
2343+ fi; test -z "$$fail"
2344+
2345+$(RECURSIVE_CLEAN_TARGETS):
2346+ @failcom='exit 1'; \
2347+ for f in x $$MAKEFLAGS; do \
2348+ case $$f in \
2349+ *=* | --[!k]*);; \
2350+ *k*) failcom='fail=yes';; \
2351+ esac; \
2352+ done; \
2353+ dot_seen=no; \
2354+ case "$@" in \
2355+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
2356+ *) list='$(SUBDIRS)' ;; \
2357+ esac; \
2358+ rev=''; for subdir in $$list; do \
2359+ if test "$$subdir" = "."; then :; else \
2360+ rev="$$subdir $$rev"; \
2361+ fi; \
2362+ done; \
2363+ rev="$$rev ."; \
2364+ target=`echo $@ | sed s/-recursive//`; \
2365+ for subdir in $$rev; do \
2366+ echo "Making $$target in $$subdir"; \
2367+ if test "$$subdir" = "."; then \
2368+ local_target="$$target-am"; \
2369+ else \
2370+ local_target="$$target"; \
2371+ fi; \
2372+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
2373+ || eval $$failcom; \
2374+ done && test -z "$$fail"
2375+tags-recursive:
2376+ list='$(SUBDIRS)'; for subdir in $$list; do \
2377+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
2378+ done
2379+ctags-recursive:
2380+ list='$(SUBDIRS)'; for subdir in $$list; do \
2381+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
2382+ done
2383+
2384 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
2385 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
2386 unique=`for i in $$list; do \
2387 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
2388 done | \
2389- $(AWK) ' { files[$$0] = 1; } \
2390- END { for (i in files) print i; }'`; \
2391+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
2392+ END { if (nonempty) { for (i in files) print i; }; }'`; \
2393 mkid -fID $$unique
2394 tags: TAGS
2395
2396-TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
2397+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
2398 $(TAGS_FILES) $(LISP)
2399 tags=; \
2400 here=`pwd`; \
2401+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
2402+ include_option=--etags-include; \
2403+ empty_fix=.; \
2404+ else \
2405+ include_option=--include; \
2406+ empty_fix=; \
2407+ fi; \
2408+ list='$(SUBDIRS)'; for subdir in $$list; do \
2409+ if test "$$subdir" = .; then :; else \
2410+ test ! -f $$subdir/TAGS || \
2411+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
2412+ fi; \
2413+ done; \
2414 list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
2415 unique=`for i in $$list; do \
2416 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
2417 done | \
2418- $(AWK) ' { files[$$0] = 1; } \
2419- END { for (i in files) print i; }'`; \
2420+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
2421+ END { if (nonempty) { for (i in files) print i; }; }'`; \
2422 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
2423 test -n "$$unique" || unique=$$empty_fix; \
2424 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
2425 $$tags $$unique; \
2426 fi
2427 ctags: CTAGS
2428-CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
2429+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
2430 $(TAGS_FILES) $(LISP)
2431 tags=; \
2432- here=`pwd`; \
2433 list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
2434 unique=`for i in $$list; do \
2435 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
2436 done | \
2437- $(AWK) ' { files[$$0] = 1; } \
2438- END { for (i in files) print i; }'`; \
2439+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
2440+ END { if (nonempty) { for (i in files) print i; }; }'`; \
2441 test -z "$(CTAGS_ARGS)$$tags$$unique" \
2442 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
2443 $$tags $$unique
2444@@ -769,24 +1104,22 @@
2445
2446 distdir: $(DISTFILES)
2447 $(am__remove_distdir)
2448- mkdir $(distdir)
2449- $(mkdir_p) $(distdir)/.
2450- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
2451- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
2452- list='$(DISTFILES)'; for file in $$list; do \
2453- case $$file in \
2454- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
2455- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
2456- esac; \
2457+ test -d $(distdir) || mkdir $(distdir)
2458+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
2459+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
2460+ list='$(DISTFILES)'; \
2461+ dist_files=`for file in $$list; do echo $$file; done | \
2462+ sed -e "s|^$$srcdirstrip/||;t" \
2463+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
2464+ case $$dist_files in \
2465+ */*) $(MKDIR_P) `echo "$$dist_files" | \
2466+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
2467+ sort -u` ;; \
2468+ esac; \
2469+ for file in $$dist_files; do \
2470 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
2471- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
2472- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
2473- dir="/$$dir"; \
2474- $(mkdir_p) "$(distdir)$$dir"; \
2475- else \
2476- dir=''; \
2477- fi; \
2478 if test -d $$d/$$file; then \
2479+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
2480 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
2481 cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
2482 fi; \
2483@@ -797,13 +1130,30 @@
2484 || exit 1; \
2485 fi; \
2486 done
2487+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
2488+ if test "$$subdir" = .; then :; else \
2489+ test -d "$(distdir)/$$subdir" \
2490+ || $(MKDIR_P) "$(distdir)/$$subdir" \
2491+ || exit 1; \
2492+ distdir=`$(am__cd) $(distdir) && pwd`; \
2493+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
2494+ (cd $$subdir && \
2495+ $(MAKE) $(AM_MAKEFLAGS) \
2496+ top_distdir="$$top_distdir" \
2497+ distdir="$$distdir/$$subdir" \
2498+ am__remove_distdir=: \
2499+ am__skip_length_check=: \
2500+ distdir) \
2501+ || exit 1; \
2502+ fi; \
2503+ done
2504 $(MAKE) $(AM_MAKEFLAGS) \
2505 top_distdir="$(top_distdir)" distdir="$(distdir)" \
2506 dist-info
2507 -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
2508 ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
2509 ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
2510- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
2511+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
2512 || chmod -R a+r $(distdir)
2513 dist-gzip: distdir
2514 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
2515@@ -813,6 +1163,10 @@
2516 tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
2517 $(am__remove_distdir)
2518
2519+dist-lzma: distdir
2520+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
2521+ $(am__remove_distdir)
2522+
2523 dist-tarZ: distdir
2524 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
2525 $(am__remove_distdir)
2526@@ -839,6 +1193,8 @@
2527 GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
2528 *.tar.bz2*) \
2529 bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
2530+ *.tar.lzma*) \
2531+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
2532 *.tar.Z*) \
2533 uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
2534 *.shar.gz*) \
2535@@ -878,7 +1234,7 @@
2536 $(am__remove_distdir)
2537 @(echo "$(distdir) archives ready for distribution: "; \
2538 list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
2539- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
2540+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
2541 distuninstallcheck:
2542 @cd $(distuninstallcheck_dir) \
2543 && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
2544@@ -898,22 +1254,22 @@
2545 $(distcleancheck_listfiles) ; \
2546 exit 1; } >&2
2547 check-am: all-am
2548-check: check-am
2549-all-am: Makefile $(INFO_DEPS) $(ANSI2KNR) $(PROGRAMS) $(MANS) \
2550- $(HEADERS) config.h
2551-installdirs:
2552+check: check-recursive
2553+all-am: Makefile $(INFO_DEPS) $(PROGRAMS) $(MANS) $(HEADERS) config.h
2554+installdirs: installdirs-recursive
2555+installdirs-am:
2556 for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \
2557- test -z "$$dir" || $(mkdir_p) "$$dir"; \
2558+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
2559 done
2560-install: install-am
2561-install-exec: install-exec-am
2562-install-data: install-data-am
2563-uninstall: uninstall-am
2564+install: install-recursive
2565+install-exec: install-exec-recursive
2566+install-data: install-data-recursive
2567+uninstall: uninstall-recursive
2568
2569 install-am: all-am
2570 @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
2571
2572-installcheck: installcheck-am
2573+installcheck: installcheck-recursive
2574 install-strip:
2575 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
2576 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
2577@@ -930,39 +1286,68 @@
2578 maintainer-clean-generic:
2579 @echo "This command is intended for maintainers to use"
2580 @echo "it deletes files that may require special tools to rebuild."
2581-clean: clean-am
2582+clean: clean-recursive
2583
2584-clean-am: clean-binPROGRAMS clean-generic clean-krextra \
2585+clean-am: clean-binPROGRAMS clean-generic clean-libtool \
2586 clean-sbinPROGRAMS mostlyclean-am
2587
2588-distclean: distclean-am
2589+distclean: distclean-recursive
2590 -rm -f $(am__CONFIG_DISTCLEAN_FILES)
2591- -rm -rf $(DEPDIR) ./$(DEPDIR)
2592+ -rm -rf ./$(DEPDIR)
2593 -rm -f Makefile
2594 distclean-am: clean-am distclean-compile distclean-generic \
2595- distclean-hdr distclean-tags
2596+ distclean-hdr distclean-libtool distclean-tags
2597
2598-dvi: dvi-am
2599+dvi: dvi-recursive
2600
2601 dvi-am: $(DVIS)
2602
2603-html: html-am
2604+html: html-recursive
2605
2606 html-am: $(HTMLS)
2607
2608-info: info-am
2609+info: info-recursive
2610
2611 info-am: $(INFO_DEPS)
2612
2613 install-data-am: install-info-am install-man
2614
2615+install-dvi: install-dvi-recursive
2616+
2617+install-dvi-am: $(DVIS)
2618+ @$(NORMAL_INSTALL)
2619+ test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
2620+ @list='$(DVIS)'; for p in $$list; do \
2621+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
2622+ f=$(am__strip_dir) \
2623+ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \
2624+ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \
2625+ done
2626 install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
2627
2628-install-info: install-info-am
2629+install-html: install-html-recursive
2630+
2631+install-html-am: $(HTMLS)
2632+ @$(NORMAL_INSTALL)
2633+ test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
2634+ @list='$(HTMLS)'; for p in $$list; do \
2635+ if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
2636+ f=$(am__strip_dir) \
2637+ if test -d "$$d$$p"; then \
2638+ echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
2639+ $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
2640+ echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
2641+ $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
2642+ else \
2643+ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
2644+ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
2645+ fi; \
2646+ done
2647+install-info: install-info-recursive
2648
2649 install-info-am: $(INFO_DEPS)
2650 @$(NORMAL_INSTALL)
2651- test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)"
2652+ test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
2653 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
2654 list='$(INFO_DEPS)'; \
2655 for file in $$list; do \
2656@@ -992,57 +1377,85 @@
2657 else : ; fi
2658 install-man: install-man1 install-man8
2659
2660+install-pdf: install-pdf-recursive
2661+
2662+install-pdf-am: $(PDFS)
2663+ @$(NORMAL_INSTALL)
2664+ test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
2665+ @list='$(PDFS)'; for p in $$list; do \
2666+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
2667+ f=$(am__strip_dir) \
2668+ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
2669+ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
2670+ done
2671+install-ps: install-ps-recursive
2672+
2673+install-ps-am: $(PSS)
2674+ @$(NORMAL_INSTALL)
2675+ test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
2676+ @list='$(PSS)'; for p in $$list; do \
2677+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
2678+ f=$(am__strip_dir) \
2679+ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(psdir)/$$f'"; \
2680+ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(psdir)/$$f"; \
2681+ done
2682 installcheck-am:
2683
2684-maintainer-clean: maintainer-clean-am
2685+maintainer-clean: maintainer-clean-recursive
2686 -rm -f $(am__CONFIG_DISTCLEAN_FILES)
2687 -rm -rf $(top_srcdir)/autom4te.cache
2688- -rm -rf $(DEPDIR) ./$(DEPDIR)
2689+ -rm -rf ./$(DEPDIR)
2690 -rm -f Makefile
2691 maintainer-clean-am: distclean-am maintainer-clean-aminfo \
2692 maintainer-clean-generic maintainer-clean-vti
2693
2694-mostlyclean: mostlyclean-am
2695+mostlyclean: mostlyclean-recursive
2696
2697 mostlyclean-am: mostlyclean-aminfo mostlyclean-compile \
2698- mostlyclean-generic mostlyclean-kr mostlyclean-vti
2699+ mostlyclean-generic mostlyclean-libtool mostlyclean-vti
2700
2701-pdf: pdf-am
2702+pdf: pdf-recursive
2703
2704 pdf-am: $(PDFS)
2705
2706-ps: ps-am
2707+ps: ps-recursive
2708
2709 ps-am: $(PSS)
2710
2711-uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man \
2712- uninstall-sbinPROGRAMS
2713+uninstall-am: uninstall-binPROGRAMS uninstall-dvi-am uninstall-html-am \
2714+ uninstall-info-am uninstall-man uninstall-pdf-am \
2715+ uninstall-ps-am uninstall-sbinPROGRAMS
2716
2717 uninstall-man: uninstall-man1 uninstall-man8
2718
2719-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
2720- clean-binPROGRAMS clean-generic clean-krextra \
2721- clean-sbinPROGRAMS ctags dist dist-all dist-bzip2 dist-gzip \
2722- dist-info dist-shar dist-tarZ dist-zip distcheck distclean \
2723+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
2724+ install-strip
2725+
2726+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
2727+ all all-am am--refresh check check-am clean clean-binPROGRAMS \
2728+ clean-generic clean-libtool clean-sbinPROGRAMS ctags \
2729+ ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-info \
2730+ dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
2731 distclean-compile distclean-generic distclean-hdr \
2732- distclean-tags distcleancheck distdir distuninstallcheck dvi \
2733- dvi-am html html-am info info-am install install-am \
2734- install-binPROGRAMS install-data install-data-am install-exec \
2735- install-exec-am install-info install-info-am install-man \
2736- install-man1 install-man8 install-sbinPROGRAMS install-strip \
2737- installcheck installcheck-am installdirs maintainer-clean \
2738+ distclean-libtool distclean-tags distcleancheck distdir \
2739+ distuninstallcheck dvi dvi-am html html-am info info-am \
2740+ install install-am install-binPROGRAMS install-data \
2741+ install-data-am install-dvi install-dvi-am install-exec \
2742+ install-exec-am install-html install-html-am install-info \
2743+ install-info-am install-man install-man1 install-man8 \
2744+ install-pdf install-pdf-am install-ps install-ps-am \
2745+ install-sbinPROGRAMS install-strip installcheck \
2746+ installcheck-am installdirs installdirs-am maintainer-clean \
2747 maintainer-clean-aminfo maintainer-clean-generic \
2748 maintainer-clean-vti mostlyclean mostlyclean-aminfo \
2749- mostlyclean-compile mostlyclean-generic mostlyclean-kr \
2750- mostlyclean-vti pdf pdf-am ps ps-am tags uninstall \
2751- uninstall-am uninstall-binPROGRAMS uninstall-info-am \
2752- uninstall-man uninstall-man1 uninstall-man8 \
2753+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
2754+ mostlyclean-vti pdf pdf-am ps ps-am tags tags-recursive \
2755+ uninstall uninstall-am uninstall-binPROGRAMS uninstall-dvi-am \
2756+ uninstall-html-am uninstall-info-am uninstall-man \
2757+ uninstall-man1 uninstall-man8 uninstall-pdf-am uninstall-ps-am \
2758 uninstall-sbinPROGRAMS
2759
2760
2761-mktime: mktime.c
2762- $(CC) $(LDFLAGS) -DDEBUG mktime.c -o mktime
2763-
2764 compare: compare-ac compare-last compare-lastcomm compare-sa
2765
2766 compare-ac: ac
2767
2768=== modified file 'NEWS'
2769--- NEWS 2006-03-18 18:38:00 +0000
2770+++ NEWS 2010-01-20 17:40:26 +0000
2771@@ -1,3 +1,15 @@
2772+New in 6.5.1:
2773+
2774+ * GNUlib for compability, audited code... Reworked.
2775+
2776+New in 6.5:
2777+
2778+ * Patches from Debian.
2779+
2780+ * Actually released to the public.
2781+
2782+ * Huge code-refactoring.
2783+
2784 New in 6.4:
2785
2786 * Linux multiformat support: Starting from release 2.6.8, the Linux
2787@@ -24,11 +36,11 @@
2788
2789 * The build system was updated to recent versions of the tools used.
2790
2791-
2792
2793+
2794 New in 6.3.5:
2795 * Reverted below change to acct.h header search.
2796
2797-
2798
2799+
2800 New in 6.3.4:
2801 * When trying to find the acct.h header file, look in the linux
2802 directory before the sys directory, since the former is probably
2803@@ -36,7 +48,7 @@
2804
2805 * Documentation fixes for sa.
2806
2807-
2808
2809+
2810 New in 6.3.3:
2811
2812 * For those systems which have wide utmp fields, last now tries to
2813@@ -57,14 +69,14 @@
2814
2815 lastcomm --strict-match noel cat ttyp7
2816
2817-
2818
2819+
2820 New in 6.3.2:
2821
2822 * Small memory allocation problem fixed in sa.
2823
2824 * Released to the general public.
2825
2826-
2827
2828+
2829 New in 6.3.1:
2830
2831 * A `NEWS' file (and others) so that we conform to the GNU
2832@@ -76,7 +88,7 @@
2833 Very cool. I was suprised how easy it was to integrate into this
2834 package. Hats off to David J. MacKenzie and Tom Tromey!
2835
2836-
2837
2838+
2839 New in 6.3:
2840
2841 * Hey! We're on prep.ai.mit.edu!
2842@@ -92,7 +104,7 @@
2843
2844 * Fixed a buffer overrun error in sa which was preventing it from
2845 sorting the username list correctly.
2846-
2847
2848+
2849 Ancient history:
2850
2851 * Check the file `ChangeLog' in the source directory.
2852
2853=== modified file 'README'
2854--- README 2006-03-18 18:38:00 +0000
2855+++ README 2010-01-20 17:40:26 +0000
2856@@ -82,18 +82,18 @@
2857
2858 ----------------------------------------------------------------------
2859
2860-The GNU Accounting Utilities are Copyright (C) 1993, 1996, 1997 Free
2861-Software Foundation, Inc.
2862-
2863- This program is free software; you can redistribute it and/or modify
2864- it under the terms of the GNU General Public License as published by
2865- the Free Software Foundation; version 2 dated June, 1991.
2866-
2867- This program is distributed in the hope that it will be useful,
2868- but WITHOUT ANY WARRANTY; without even the implied warranty of
2869- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2870- GNU General Public License for more details.
2871-
2872- You should have received a copy of the GNU General Public License
2873- along with this program; if not, write to the Free Software
2874- Foundation, Inc., 675 Mass Ave., Cambridge, MA 02139, USA.
2875+The GNU Accounting Utilities are Copyright (C) 1993, 1996, 1997, 2008
2876+ Free Software Foundation, Inc.
2877+
2878+ This program is free software: you can redistribute it and/or modify
2879+ it under the terms of the GNU General Public License as published by
2880+ the Free Software Foundation, either version 3 of the License, or
2881+ (at your option) any later version.
2882+
2883+ This program is distributed in the hope that it will be useful,
2884+ but WITHOUT ANY WARRANTY; without even the implied warranty of
2885+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2886+ GNU General Public License for more details.
2887+
2888+ You should have received a copy of the GNU General Public License
2889+ along with this program. If not, see <http://www.gnu.org/licenses/>.
2890
2891=== modified file 'ac.c'
2892--- ac.c 2006-03-18 18:38:00 +0000
2893+++ ac.c 2010-01-20 17:40:26 +0000
2894@@ -1,11 +1,12 @@
2895-/* Copyright (C) 1993, 1996, 1997, 2003 Free Software Foundation, Inc.
2896+/*
2897+Copyright (C) 1993, 1996, 1997, 2003, 2008, 2009 Free Software Foundation, Inc.
2898
2899 This file is part of the GNU Accounting Utilities
2900
2901 The GNU Accounting Utilities are free software; you can redistribute
2902 them and/or modify them under the terms of the GNU General Public
2903 License as published by the Free Software Foundation; either version
2904-2, or (at your option) any later version.
2905+3, or (at your option) any later version.
2906
2907 The GNU Accounting Utilities are distributed in the hope that they will
2908 be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
2909@@ -15,7 +16,8 @@
2910 You should have received a copy of the GNU General Public License
2911 along with the GNU Accounting Utilities; see the file COPYING. If
2912 not, write to the Free Software Foundation, 675 Mass Ave, Cambridge,
2913-MA 02139, USA. */
2914+MA 02139, USA.
2915+*/
2916
2917 #include "config.h"
2918 #include <stdio.h>
2919@@ -43,13 +45,18 @@
2920
2921 #include "common.h"
2922 #include "utmp_rd.h"
2923+#ifdef HAVE_GETOPT_LONG_ONLY
2924+#include <getopt.h>
2925+#else
2926 #include "getopt.h"
2927+#endif
2928 #include "hashtab.h"
2929 #include "version.h"
2930
2931 /* static stuff */
2932
2933-static char *months[] = {
2934+static char *months[] =
2935+{
2936 "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul",
2937 "Aug", "Sep", "Oct", "Nov", "Dec"
2938 };
2939@@ -119,34 +126,31 @@
2940 int print_midnight_totals = 0; /* -d flag */
2941 int print_zero_totals = 0; /* -z flag */
2942
2943-
2944 /* A hash table to hold user totals. The names themselves are the
2945 keys for this table. */
2946
2947 struct hashtab *user_totals = NULL;
2948
2949-struct user_data {
2950- unsigned long time;
2951-};
2952-
2953+struct user_data
2954+ {
2955+ unsigned long time;
2956+ };
2957
2958 /* A hash table which contains the names that the user wants
2959 printed. The names themselves are the keys for this table. */
2960
2961 struct hashtab *names = NULL;
2962
2963-
2964 /* A table for the currently logged-in ttys. The UT_LINE fields are
2965 the keys for this table. */
2966
2967 struct hashtab *login_table;
2968
2969-struct login_data {
2970- char ut_name[NAME_LEN];
2971- time_t time;
2972-};
2973-
2974-
2975+struct login_data
2976+ {
2977+ char ut_name[NAME_LEN];
2978+ time_t time;
2979+ };
2980
2981 /* prototypes */
2982
2983@@ -161,19 +165,16 @@
2984 void update_system_time PARAMS((time_t));
2985 time_t midnight_after_me PARAMS((time_t));
2986
2987-
2988-
2989
2990 /* code */
2991
2992-int
2993-main (int argc, char *argv[])
2994+int main(int argc, char *argv[])
2995 {
2996 int c;
2997 int other_wtmp_file_specified = 0; /* nonzero if the user used the
2998 `-f' or `--other-file' flags */
2999
3000 program_name = argv[0];
3001-
3002+
3003 /* Init the utmp reader for reading forwards in the files. */
3004
3005 utmp_init (0);
3006@@ -181,107 +182,107 @@
3007 while (1)
3008 {
3009 int option_index = 0;
3010-
3011- static struct option long_options[] = {
3012- { "complain", no_argument, NULL, 1 },
3013- { "reboots", no_argument, NULL, 2 },
3014- { "supplants", no_argument, NULL, 3 },
3015- { "timewarps", no_argument, NULL, 4 },
3016- { "print-zeros", no_argument, NULL, 5 },
3017- { "debug", no_argument, NULL, 6 },
3018- { "tw-leniency", required_argument, NULL, 7 },
3019- { "version", no_argument, NULL, 8 },
3020- { "help", no_argument, NULL, 9 },
3021- { "daily-totals", no_argument, NULL, 10 },
3022- { "individual-totals", no_argument, NULL, 11 },
3023- { "file", required_argument, NULL, 12 },
3024- { "compatibility", no_argument, NULL, 13 },
3025- { "print-year", no_argument, NULL, 14 },
3026- { "all-days", no_argument, NULL, 15 },
3027- { "tw-suspicious", required_argument, NULL, 16 },
3028- { 0, 0, 0, 0 }
3029- };
3030-
3031+
3032+ static struct option long_options[] =
3033+ {
3034+ { "complain", no_argument, NULL, 1
3035+ },
3036+ { "reboots", no_argument, NULL, 2 },
3037+ { "supplants", no_argument, NULL, 3 },
3038+ { "timewarps", no_argument, NULL, 4 },
3039+ { "print-zeros", no_argument, NULL, 5 },
3040+ { "debug", no_argument, NULL, 6 },
3041+ { "tw-leniency", required_argument, NULL, 7 },
3042+ { "version", no_argument, NULL, 8 },
3043+ { "help", no_argument, NULL, 9 },
3044+ { "daily-totals", no_argument, NULL, 10 },
3045+ { "individual-totals", no_argument, NULL, 11 },
3046+ { "file", required_argument, NULL, 12 },
3047+ { "compatibility", no_argument, NULL, 13 },
3048+ { "print-year", no_argument, NULL, 14 },
3049+ { "all-days", no_argument, NULL, 15 },
3050+ { "tw-suspicious", required_argument, NULL, 16 },
3051+ { 0, 0, 0, 0 }
3052+ };
3053+
3054 c = getopt_long (argc, argv, "adf:hpVyz", long_options, &option_index);
3055-
3056+
3057 if (c == EOF)
3058- break;
3059+ break;
3060
3061 switch (c)
3062- {
3063- case 1:
3064- print_file_problems = 1;
3065- break;
3066- case 2:
3067- nasty_reboot = 1;
3068- break;
3069- case 3:
3070- nasty_supplant = 1;
3071- break;
3072- case 4:
3073- nasty_time_warp = 1;
3074- break;
3075- case 'z':
3076- case 5:
3077- print_zero_totals = 1;
3078- break;
3079- case 6:
3080- debugging_enabled = 1;
3081- print_file_problems = 1;
3082- break;
3083- case 7:
3084- time_warp_leniency = atol (optarg);
3085- if (time_warp_leniency < 0)
3086- fatal ("time warp leniency value has to be non-negative");
3087- break;
3088- case 'V':
3089- case 8:
3090- printf ("%s: GNU Accounting Utilities (release %s)\n",
3091- program_name, VERSION_STRING);
3092- exit (0);
3093- break;
3094- case 10:
3095- case 'd':
3096- print_midnight_totals = 1;
3097- break;
3098- case 11:
3099- case 'p':
3100- print_individual_totals = 1;
3101- break;
3102- case 12:
3103- case 'f':
3104- add_utmp_file (optarg);
3105- other_wtmp_file_specified = 1;
3106- break;
3107- case 13:
3108- /* u*x compatibility */
3109- nasty_time_warp = 1;
3110- nasty_supplant = 1;
3111- nasty_reboot = 1;
3112- break;
3113- case 'y':
3114- case 14:
3115- print_year = 1;
3116- break;
3117- case 'a':
3118- case 15:
3119- print_all_days = 1;
3120- break;
3121- case 16:
3122- time_warp_suspicious = atol (optarg);
3123- if (time_warp_suspicious < 0)
3124- fatal ("time warp suspicious value has to be non-negative");
3125- if (time_warp_suspicious <= time_warp_leniency)
3126- fatal ("time warp suspicious value has to greater than the time warp leniency value");
3127- break;
3128- case 'h':
3129- case 9:
3130- /* This should fall through to default! */
3131- default:
3132- give_usage ();
3133- exit (1);
3134- break;
3135- }
3136+ {
3137+ case 1:
3138+ print_file_problems = 1;
3139+ break;
3140+ case 2:
3141+ nasty_reboot = 1;
3142+ break;
3143+ case 3:
3144+ nasty_supplant = 1;
3145+ break;
3146+ case 4:
3147+ nasty_time_warp = 1;
3148+ break;
3149+ case 'z':
3150+ case 5:
3151+ print_zero_totals = 1;
3152+ break;
3153+ case 6:
3154+ debugging_enabled = 1;
3155+ print_file_problems = 1;
3156+ break;
3157+ case 7:
3158+ time_warp_leniency = strtol(optarg, (char **)NULL, 10);
3159+ if (time_warp_leniency < 0)
3160+ fatal ("time warp leniency value has to be non-negative");
3161+ break;
3162+ case 'V':
3163+ case 8:
3164+ (void)printf("%s: GNU Accounting Utilities (release %s)\n",
3165+ program_name, VERSION_STRING);
3166+ exit(EXIT_SUCCESS);
3167+ case 10:
3168+ case 'd':
3169+ print_midnight_totals = 1;
3170+ break;
3171+ case 11:
3172+ case 'p':
3173+ print_individual_totals = 1;
3174+ break;
3175+ case 12:
3176+ case 'f':
3177+ add_utmp_file (optarg);
3178+ other_wtmp_file_specified = 1;
3179+ break;
3180+ case 13:
3181+ /* u*x compatibility */
3182+ nasty_time_warp = 1;
3183+ nasty_supplant = 1;
3184+ nasty_reboot = 1;
3185+ break;
3186+ case 'y':
3187+ case 14:
3188+ print_year = 1;
3189+ break;
3190+ case 'a':
3191+ case 15:
3192+ print_all_days = 1;
3193+ break;
3194+ case 16:
3195+ time_warp_suspicious = strtol(optarg, (char **)NULL, 10);
3196+ if (time_warp_suspicious < 0)
3197+ fatal("time warp suspicious value has to be non-negative");
3198+ if (time_warp_suspicious <= time_warp_leniency)
3199+ fatal("time warp suspicious value has to greater than the time warp leniency value");
3200+ break;
3201+ case 'h':
3202+ case 9:
3203+ /* This should fall through to default! */
3204+ default:
3205+ give_usage();
3206+ exit(EXIT_FAILURE); /* FIXME: return 1; */
3207+ }
3208 }
3209
3210 /* Init the hash table for usernames. Don't init it if we don't
3211@@ -293,15 +294,15 @@
3212 names = hashtab_init (0);
3213
3214 while (optind < argc)
3215- hashtab_create (names, argv[optind++], 0);
3216-
3217+ hashtab_create (names, argv[optind++], 0);
3218+
3219 if (debugging_enabled)
3220- hashtab_dump_keys (names, stddebug);
3221+ hashtab_dump_keys (names, stddebug);
3222 }
3223-
3224- if (! other_wtmp_file_specified)
3225+
3226+ if (!other_wtmp_file_specified)
3227 add_utmp_file (WTMP_FILE_LOC);
3228-
3229+
3230 /* Create hash tables for user totals and logins. */
3231
3232 user_totals = hashtab_init (0);
3233@@ -310,7 +311,7 @@
3234 /* Do it! */
3235
3236 parse_entries ();
3237-
3238+
3239 /* At this point, there are no more entries in the wtmp file. We
3240 need to do statistics for everything up to now, so update all of
3241 the people who are logged in presently and print today's
3242@@ -325,51 +326,45 @@
3243
3244 if (now < last_time)
3245 now = last_time;
3246-
3247+
3248 do_totals (&next_midnight, now, TRUE, TRUE, "midnight logout");
3249-
3250+
3251 log_everyone_out (now, TRUE, FALSE, "catch-up");
3252 }
3253-
3254+
3255 do_statistics (print_midnight_totals
3256- ? (print_year ? "Today\t" : "Today")
3257- : "");
3258+ ? (print_year ? "Today\t" : "Today")
3259+ : "");
3260
3261- exit (0); /* guarantee the proper return value */
3262+ exit (EXIT_SUCCESS); /* guarantee the proper return value */
3263 }
3264
3265-
3266 /* guess what this does... */
3267-void
3268-give_usage (void)
3269+
3270+void give_usage(void)
3271 {
3272- char *usage = "\
3273-Usage: %s [-dhpVy] [-f <file>] [people] ...\n\
3274- [--daily-totals] [--individual-totals] [--file <file>]\n\
3275- [--complain] [--reboots] [--supplants] [--timewarps] [--print-year]\n\
3276- [--compatibility] [--print-zeros] [--debug] [--tw-leniency <value>]\n\
3277- [--tw-suspicious <value>] [--version] [--help]\n";
3278-
3279- printf (usage, program_name);
3280- print_wtmp_file_location ();
3281+ (void)printf("\
3282+ Usage: %s [-dhpVy] [-f <file>] [people] ...\n\
3283+ [--daily-totals] [--individual-totals] [--file <file>]\n\
3284+ [--complain] [--reboots] [--supplants] [--timewarps] [--print-year]\n\
3285+ [--compatibility] [--print-zeros] [--debug] [--tw-leniency <value>]\n\
3286+ [--tw-suspicious <value>] [--version] [--help]\n", program_name);
3287+ print_wtmp_file_location();
3288 }
3289
3290-
3291
3292-
3293 /* Since the routines in ac & last are so similar, just include them
3294 from another file. */
3295
3296 #include "al_share.cpp"
3297
3298-
3299
3300 /* since the sys clock has changed, each entry's login time has to be
3301 * adjusted... */
3302-void
3303-update_system_time (time_t the_time)
3304+
3305+void update_system_time(time_t the_time)
3306 {
3307 struct hashtab_order ho;
3308 struct hashtab_elem *he;
3309-
3310+
3311 for (he = hashtab_first (login_table, &ho);
3312 he != NULL;
3313 he = hashtab_next (&ho))
3314@@ -379,19 +374,17 @@
3315 }
3316 }
3317
3318-
3319 /* Log all entries out at THE_TIME. Update statistics if
3320 UPDATE_TIME_FLAG is non-zero, and print out the entries preceded by
3321 DEBUG_STR. If CHANGE_LOGIN_FLAG is non-zero, reset the login times
3322 to THE_TIME. */
3323
3324-void
3325-log_everyone_out (time_t the_time, int update_time_flag,
3326- int change_login_flag, char *debug_str)
3327+void log_everyone_out(time_t the_time, int update_time_flag,
3328+ int change_login_flag, char *debug_str)
3329 {
3330 struct hashtab_order ho;
3331 struct hashtab_elem *he;
3332-
3333+
3334 for (he = hashtab_first (login_table, &ho);
3335 he != NULL;
3336 he = hashtab_next (&ho))
3337@@ -399,55 +392,53 @@
3338 struct login_data *l = hashtab_get_value (he);
3339
3340 if (update_time_flag)
3341- update_user_time (l->ut_name, the_time - l->time, debug_str);
3342+ update_user_time (l->ut_name, the_time - l->time, debug_str);
3343
3344 if (change_login_flag)
3345- l->time = the_time;
3346+ l->time = the_time;
3347 else
3348- hashtab_delete (he);
3349+ hashtab_delete (he);
3350 }
3351 }
3352
3353-
3354 /* Put a terminal into the hash table. */
3355
3356-void
3357-log_in (struct utmp *entry)
3358+void log_in(struct utmp *entry)
3359 {
3360 struct hashtab_elem *he;
3361
3362 if (entry->ut_line[0] == '\0')
3363 {
3364 if (print_file_problems)
3365- {
3366- utmp_print_file_and_line (stddebug);
3367- fprintf (stddebug,
3368- ": problem: trying to hash rec with ut_line == NULL\n");
3369- }
3370+ {
3371+ utmp_print_file_and_line(stddebug);
3372+ (void)fprintf(stddebug,
3373+ ": problem: trying to hash rec with ut_line == NULL\n");
3374+ }
3375 return;
3376 }
3377
3378- he = hashtab_find (login_table, entry->ut_line, TTY_LEN);
3379+ he = hashtab_find(login_table, entry->ut_line, TTY_LEN);
3380
3381 if (he != NULL)
3382 {
3383 struct login_data *l = hashtab_get_value (he);
3384
3385 if (print_file_problems)
3386- {
3387- char *ttyname = hashtab_get_key (he);
3388- utmp_print_file_and_line (stddebug);
3389- fprintf (stddebug, ": problem: duplicate record for line `%.*s'\n",
3390- TTY_LEN, ttyname);
3391- }
3392-
3393+ {
3394+ char *ttyname = hashtab_get_key (he);
3395+ utmp_print_file_and_line (stddebug);
3396+ (void)fprintf(stddebug, ": problem: duplicate record for line `%.*s'\n",
3397+ TTY_LEN, ttyname);
3398+ }
3399+
3400 /* we should just write over the old one -- nasty ac's charge
3401- the user being for being logged in until this new tty entry
3402- appears, so the flag NASTY_SUPPLANT is included */
3403+ the user being for being logged in until this new tty entry
3404+ appears, so the flag NASTY_SUPPLANT is included */
3405
3406 if (nasty_supplant)
3407- update_user_time (l->ut_name, entry->ut_time - l->time, "supplant");
3408-
3409+ update_user_time(l->ut_name, entry->ut_time - l->time, "supplant");
3410+
3411 strncpy (l->ut_name, entry->ut_name, NAME_LEN);
3412 l->time = entry->ut_time;
3413 }
3414@@ -457,7 +448,7 @@
3415 a new one. */
3416
3417 struct login_data l;
3418-
3419+
3420 strncpy (l.ut_name, entry->ut_name, NAME_LEN);
3421 l.time = entry->ut_time;
3422
3423@@ -466,22 +457,20 @@
3424 }
3425 }
3426
3427-
3428 /* Remove an entry from the hash table. */
3429
3430-void
3431-log_out (struct utmp *entry)
3432+void log_out(struct utmp *entry)
3433 {
3434 struct hashtab_elem *he;
3435-
3436+
3437 if (entry->ut_line[0] == '\0')
3438 {
3439 if (print_file_problems)
3440- {
3441- utmp_print_file_and_line (stddebug);
3442- fprintf (stddebug,
3443- ": problem: trying to hash rec with ut_line == NULL\n");
3444- }
3445+ {
3446+ utmp_print_file_and_line (stddebug);
3447+ fprintf (stddebug,
3448+ ": problem: trying to hash rec with ut_line == NULL\n");
3449+ }
3450 return;
3451 }
3452
3453@@ -503,63 +492,70 @@
3454 any login corresponding to this logout. */
3455
3456 if (print_file_problems)
3457- {
3458- utmp_print_file_and_line (stddebug);
3459- fprintf (stddebug, ": problem: missing login record for `%.*s'\n",
3460- TTY_LEN, entry->ut_line);
3461- }
3462+ {
3463+ utmp_print_file_and_line (stddebug);
3464+ fprintf (stddebug, ": problem: missing login record for `%.*s'\n",
3465+ TTY_LEN, entry->ut_line);
3466+ }
3467 }
3468 }
3469
3470-
3471-
3472 /* fills in the days between entries, calculating how much time a user
3473 * has racked up by midnight of each period
3474 *
3475 * side-effect (desirable) -- changes the value passed in NEXT_MIDNIGHT
3476 * to catch up with CURRENT_TIME
3477 */
3478-void
3479-do_totals (time_t *next_midnight, time_t current_time,
3480- int update_time_flag, int change_login_flag, char *debug_str)
3481+
3482+void do_totals(time_t *next_midnight, time_t current_time,
3483+ int update_time_flag, int change_login_flag, char *debug_str)
3484 {
3485 while (*next_midnight < current_time)
3486 {
3487 log_everyone_out (*next_midnight, update_time_flag, change_login_flag,
3488- debug_str);
3489-
3490+ debug_str);
3491+
3492 if (print_midnight_totals)
3493- {
3494- /* We need the proper label for do_statistics: we can get it
3495- relative to next_midnight. */
3496+ {
3497+ /* We need the proper label for do_statistics: we can get it
3498+ relative to next_midnight. */
3499+#ifdef HAVE_SNPRINTF
3500+ char month_day_string[256];
3501+#else
3502+ char month_day_string[255];
3503+#endif
3504+ time_t temp_time = *next_midnight - 10;
3505+ struct tm *temp_tm = localtime (&temp_time);
3506+ if (print_year)
3507+#ifdef HAVE_SNPRINTF
3508+ (void)snprintf(month_day_string, sizeof(month_day_string), "%s %2d %4d",
3509+ months[temp_tm->tm_mon], temp_tm->tm_mday,
3510+ 1900 + temp_tm->tm_year);
3511+ else
3512+ (void)snprintf(month_day_string, sizeof(month_day_string),"%s %2d",
3513+ months[temp_tm->tm_mon], temp_tm->tm_mday);
3514+#else
3515+ (void)sprintf(month_day_string, "%s %2d %4d",
3516+ months[temp_tm->tm_mon], temp_tm->tm_mday,
3517+ 1900 + temp_tm->tm_year);
3518+ else
3519+ (void)sprintf(month_day_string, "%s %2d",
3520+ months[temp_tm->tm_mon], temp_tm->tm_mday);
3521+#endif
3522+ do_statistics (month_day_string);
3523+ }
3524
3525- char month_day_string[255];
3526- time_t temp_time = *next_midnight - 10;
3527- struct tm *temp_tm = localtime (&temp_time);
3528- if (print_year)
3529- sprintf (month_day_string, "%s %2d %4d",
3530- months[temp_tm->tm_mon], temp_tm->tm_mday,
3531- 1900 + temp_tm->tm_year);
3532- else
3533- sprintf (month_day_string, "%s %2d",
3534- months[temp_tm->tm_mon], temp_tm->tm_mday);
3535-
3536- do_statistics (month_day_string);
3537- }
3538-
3539 /* Get the next day ONLY if we're printing totals at midnight
3540 and the user wants to see all of the days (because it's much
3541 slower). */
3542
3543 *next_midnight =
3544- midnight_after_me ((print_midnight_totals && print_all_days)
3545- ? *next_midnight
3546- : current_time);
3547+ midnight_after_me ((print_midnight_totals && print_all_days)
3548+ ? *next_midnight
3549+ : current_time);
3550 }
3551 }
3552
3553-
3554-
3555 /* print out statistics and clear the user totals
3556 * if !PRINT_INDIVIDUAL_TOTALS && !PRINT_MIDNIGHT_TOTALS
3557 * don't print anything until the end
3558@@ -568,8 +564,8 @@
3559 * if PRINT_MIDNIGHT_TOTALS && PRINT_INDIVIDUAL_TOTALS
3560 * print totals, individ user times, & clear times
3561 */
3562-void
3563-do_statistics (char *date_string)
3564+
3565+void do_statistics(char *date_string)
3566 {
3567 unsigned long total;
3568 double float_total;
3569@@ -586,64 +582,63 @@
3570 char *username = hashtab_get_key (he);
3571
3572 /* print if the user table is null or the name is on the command line */
3573-
3574+
3575 if ((names == NULL) || hashtab_find (names, username, NAME_LEN))
3576- {
3577- struct user_data *u = hashtab_get_value (he);
3578-
3579- total += u->time;
3580-
3581- if ((print_individual_totals)
3582- && !((u->time == 0) && !print_zero_totals))
3583- printf ("%s%-*.*s %*.2f\n",
3584- (print_year ? "\t\t" : "\t"),
3585- NAME_LEN, NAME_LEN, username,
3586- number_precision, (double) u->time / 3600.0);
3587- }
3588+ {
3589+ struct user_data *u = hashtab_get_value (he);
3590+
3591+ total += u->time;
3592+
3593+ if ((print_individual_totals)
3594+ && !((u->time == 0) && !print_zero_totals))
3595+ printf ("%s%-*.*s %*.2f\n",
3596+ (print_year ? "\t\t" : "\t"),
3597+ NAME_LEN, NAME_LEN, username,
3598+ number_precision, (double) u->time / 3600.0);
3599+ }
3600
3601 hashtab_delete (he);
3602 }
3603-
3604+
3605 float_total = (double) total / 3600.0;
3606-
3607+
3608 if (print_midnight_totals)
3609 {
3610 if (!((float_total == 0.0) && !print_zero_totals))
3611- printf ("%s\ttotal %*.2f\n", date_string,
3612- number_precision + 3, float_total);
3613+ printf ("%s\ttotal %*.2f\n", date_string,
3614+ number_precision + 3, float_total);
3615 }
3616 else
3617 printf ("%stotal %*.2f\n",
3618- (print_year ? "\t\t" : "\t"),
3619- number_precision + 3, float_total);
3620+ (print_year ? "\t\t" : "\t"),
3621+ number_precision + 3, float_total);
3622 }
3623
3624-
3625 /* put something into the user table */
3626-void
3627-update_user_time (char *name, time_t the_time, char *debug_label)
3628+
3629+void update_user_time(char *name, time_t the_time, char *debug_label)
3630 {
3631 struct hashtab_elem *he;
3632-
3633+
3634 /* If we've rolled off the end of the range of time_t, it's possible
3635 to have negative values for THE_TIME. Yuck. Notify the user and
3636 quit. */
3637-
3638+
3639 if (the_time < 0)
3640 {
3641 utmp_print_file_and_line (stdout);
3642 fprintf (stddebug,
3643- ": problem: update user %.*s (for %s) with %ld seconds?!\n",
3644- NAME_LEN, name, debug_label, (long) the_time);
3645+ ": problem: update user %.*s (for %s) with %ld seconds?!\n",
3646+ NAME_LEN, name, debug_label, (long) the_time);
3647 fatal ("Possible overflow of time_t! Can't continue.");
3648 }
3649
3650 if (debugging_enabled
3651 && ((names == NULL) || hashtab_find (names, name, NAME_LEN)))
3652 fprintf (stddebug, "\t\t\t\t\t%*.2f %-*.*s (%s)\n",
3653- NAME_LEN, (double) the_time / 3600.0,
3654- NAME_LEN, NAME_LEN, name, debug_label);
3655-
3656+ NAME_LEN, (double) the_time / 3600.0,
3657+ NAME_LEN, NAME_LEN, name, debug_label);
3658+
3659 he = hashtab_find (user_totals, name, NAME_LEN);
3660 if (he == NULL)
3661 {
3662@@ -663,13 +658,13 @@
3663 }
3664
3665
3666-
3667
3668+
3669 /* return the time of midnight that will happen after our time */
3670-time_t
3671-midnight_after_me (time_t now_time)
3672+
3673+time_t midnight_after_me(time_t now_time)
3674 {
3675 struct tm *tm_ptr, temp_tm;
3676-
3677+
3678 tm_ptr = localtime (&now_time);
3679 memcpy ((void *)&temp_tm, (void *)tm_ptr, sizeof (struct tm));
3680 temp_tm.tm_sec = 0;
3681@@ -678,7 +673,6 @@
3682 temp_tm.tm_mday++; /* next day */
3683 temp_tm.tm_isdst = -1; /* mktime should figure out whether
3684 DST is enabled */
3685-
3686+
3687 return mktime (&temp_tm);
3688 }
3689-
3690
3691=== modified file 'accounting.info'
3692--- accounting.info 2006-03-18 18:38:00 +0000
3693+++ accounting.info 2010-01-20 17:40:26 +0000
3694@@ -1,8 +1,8 @@
3695-Dies ist accounting.info, hergestellt von Makeinfo Version 4.8 aus
3696+This is accounting.info, produced by makeinfo version 4.13 from
3697 accounting.texi.
3698
3699- GNU Accounting Utilities Copyright (C) 1993, 1996, 1997, 1998, 2005
3700-Free Software Foundation, Inc.
3701+GNU Accounting Utilities Copyright (C) 1993, 1996, 1997, 1998, 2005,
3702+2008, 2009 Free Software Foundation, Inc.
3703
3704 Permission is granted to make and distribute verbatim copies of this
3705 manual provided the copyright notice and this permission notice are
3706@@ -26,8 +26,8 @@
3707 information about any of the applications, see the chapter with the
3708 program's name.
3709
3710- This is Edition 6.4-pre1 of the documentation, updated 7 January
3711-2006 for version 6.4-pre1 of the GNU Accounting Utilities.
3712+ This is Edition 6.5.1 of the documentation, updated 23 August 2009
3713+for version 6.5.1 of the GNU Accounting Utilities.
3714
3715 * Menu:
3716
3717@@ -1037,13 +1037,13 @@
3718
3719 
3720 Tag Table:
3721-Node: Top848
3722+Node: Top854
3723 Node: Preface1764
3724 Node: ac10432
3725 Node: accton18745
3726 Node: last19250
3727 Node: lastcomm23726
3728 Node: sa26898
3729-Node: dump-acct33192
3730+Node: dump-acct33275
3731 
3732 End Tag Table
3733
3734=== modified file 'accounting.texi'
3735--- accounting.texi 2006-03-18 18:38:00 +0000
3736+++ accounting.texi 2010-01-20 17:40:26 +0000
3737@@ -6,7 +6,8 @@
3738
3739 @ifinfo
3740 GNU Accounting Utilities
3741-Copyright (C) 1993, 1996, 1997, 1998, 2005 Free Software Foundation, Inc.
3742+Copyright (C) 1993, 1996, 1997, 1998, 2005, 2008, 2009
3743+Free Software Foundation, Inc.
3744
3745 Permission is granted to make and distribute verbatim copies of
3746 this manual provided the copyright notice and this permission notice
3747
3748=== modified file 'accton.8'
3749--- accton.8 2002-03-06 21:54:12 +0000
3750+++ accton.8 2010-01-20 17:40:26 +0000
3751@@ -1,4 +1,4 @@
3752-.TH ACCTON 8 "1995 October 31"
3753+.TH ACCTON 8 "2008 November 24"
3754 .SH NAME
3755 accton \- turns process accounting on or off
3756 .SH SYNOPSIS
3757@@ -6,6 +6,10 @@
3758 .na
3759 .TP
3760 .B accton
3761+.RI [\| OPTION \|]
3762+.RB on \||\| off \||\| filename
3763+.TP
3764+.B accton
3765 [
3766 .B \-V
3767 |
3768@@ -16,9 +20,6 @@
3769 |
3770 .B \-\-help
3771 ]
3772-[
3773-.I filename
3774-]
3775 .SH DESCRIPTION
3776 .LP
3777 .B accton
3778
3779=== modified file 'accton.c'
3780--- accton.c 2006-03-18 18:38:00 +0000
3781+++ accton.c 2010-01-20 17:40:26 +0000
3782@@ -1,11 +1,12 @@
3783-/* Copyright (C) 1993, 1996, 1997, 2003 Free Software Foundation, Inc.
3784+/*
3785+Copyright (C) 1993, 1996, 1997, 2003, 2008, 2009 Free Software Foundation, Inc.
3786
3787 This file contains the code for GNU accton.
3788
3789 The GNU Accounting Utilities are free software; you can redistribute
3790 them and/or modify them under the terms of the GNU General Public
3791 License as published by the Free Software Foundation; either version
3792-2, or (at your option) any later version.
3793+3, or (at your option) any later version.
3794
3795 The GNU Accounting Utilities are distributed in the hope that they will
3796 be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
3797@@ -15,14 +16,19 @@
3798 You should have received a copy of the GNU General Public License
3799 along with the GNU Accounting Utilities; see the file COPYING. If
3800 not, write to the Free Software Foundation, 675 Mass Ave, Cambridge,
3801-MA 02139, USA. */
3802+MA 02139, USA.
3803+*/
3804
3805 #include "config.h"
3806
3807 #include <stdio.h>
3808 #include <stdlib.h>
3809 #include <sys/types.h>
3810+#ifdef HAVE_ERRNO_H
3811 #include <errno.h>
3812+#else
3813+extern int errno;
3814+#endif
3815 #include <string.h>
3816
3817 #ifdef HAVE_UNISTD_H
3818@@ -31,15 +37,17 @@
3819
3820 #include "common.h"
3821 #include "files.h"
3822+#ifdef HAVE_GETOPT_LONG_ONLY
3823+#include <getopt.h>
3824+#else
3825 #include "getopt.h"
3826+#endif
3827 #include "version.h"
3828
3829-
3830 /* globals */
3831
3832 char *program_name; /* name of this executable */
3833
3834-
3835 /* protos */
3836
3837 void print_option_error PARAMS((void));
3838@@ -47,75 +55,69 @@
3839 void print_usage PARAMS((void));
3840 void print_help PARAMS((void));
3841
3842-
3843 /* code */
3844
3845 /*
3846 * to print when there are errors related to options
3847 */
3848-void
3849-print_option_error (void)
3850+
3851+void print_option_error(void)
3852 {
3853- printf ("Try '%s --help' for more information.\n", program_name);
3854+ (void)printf ("Try '%s --help' for more information.\n", program_name);
3855 }
3856
3857-
3858 /*
3859 * to print version
3860 */
3861-void
3862-print_version (void)
3863+
3864+void print_version(void)
3865 {
3866- printf ("%s: GNU Accounting Utilities (release %s)\n",
3867- program_name, VERSION_STRING);
3868+ (void)printf("%s: GNU Accounting Utilities (release %s)\n",program_name, VERSION_STRING);
3869 }
3870
3871-
3872 /*
3873 * to print usage (kind of very brief help)
3874 */
3875-void
3876-print_usage (void)
3877+
3878+void print_usage(void)
3879 {
3880- printf ("Usage: %s [OPTION] on|off|ACCOUNTING_FILE\n", program_name);
3881+ (void)printf ("Usage: %s [OPTION] on|off|ACCOUNTING_FILE\n", program_name);
3882 }
3883
3884-
3885 /*
3886 * to print help
3887 */
3888-void
3889-print_help (void)
3890+
3891+void print_help(void)
3892 {
3893 print_usage ();
3894
3895 printf ("\n\
3896-Turns process accounting on or off, or changes the file where this\n\
3897-info is saved.\n\n\
3898-OPTIONS:\n\
3899- -h, --help Show help and exit\n\
3900- -V, --version Show version and exit\n\n\
3901-ARGUMENTS:\n\
3902- on Activate process accounting and use default file\n\
3903- off Deactivate process accounting\n\
3904- ACCOUNTING_FILE Activate (if not active) and save information in\n\
3905- this file\n\n\
3906-The system's default process accounting file is '%s'.\n\n\
3907-Report bugs to <bug-acct@gnu.org>\n",
3908- ACCT_FILE_LOC);
3909+ Turns process accounting on or off, or changes the file where this\n\
3910+ info is saved.\n\n\
3911+ OPTIONS:\n\
3912+ -h, --help Show help and exit\n\
3913+ -V, --version Show version and exit\n\n\
3914+ ARGUMENTS:\n\
3915+ on Activate process accounting and use default file\n\
3916+ off Deactivate process accounting\n\
3917+ ACCOUNTING_FILE Activate (if not active) and save information in\n\
3918+ this file\n\n\
3919+ The system's default process accounting file is '%s'.\n\n\
3920+ Report bugs to <bug-acct@gnu.org>\n",
3921+ ACCT_FILE_LOC);
3922 }
3923
3924
3925 /*
3926 * does all the real work
3927 */
3928-int
3929-main (int argc, char *argv[])
3930+
3931+int main(int argc, char *argv[])
3932 {
3933 int c, status_acct, number_args;
3934 char *acct_file = NULL;
3935
3936-
3937 program_name = argv[0];
3938
3939
3940@@ -123,37 +125,35 @@
3941 while (1)
3942 {
3943 int option_index = 0;
3944-
3945+
3946 static struct option long_options[] =
3947- {
3948- { "version", no_argument, NULL, 1 },
3949- { "help", no_argument, NULL, 2 },
3950- { 0, 0, 0, 0 }
3951- };
3952+ {
3953+ { "version", no_argument, NULL, 1
3954+ },
3955+ { "help", no_argument, NULL, 2 },
3956+ { 0, 0, 0, 0 }
3957+ };
3958
3959 c = getopt_long (argc, argv, "hV", long_options, &option_index);
3960-
3961+
3962 if (c == EOF)
3963- break;
3964+ break;
3965
3966 switch (c)
3967- {
3968- case 'V':
3969- case 1:
3970- print_version ();
3971- exit (EXIT_SUCCESS);
3972- break;
3973- case 'h':
3974- case 2:
3975- print_help ();
3976- exit (EXIT_SUCCESS);
3977- break;
3978- default:
3979- print_usage ();
3980- print_option_error ();
3981- exit (EXIT_FAILURE);
3982- break;
3983- }
3984+ {
3985+ case 'V':
3986+ case 1:
3987+ print_version ();
3988+ exit (EXIT_SUCCESS);
3989+ case 'h':
3990+ case 2:
3991+ print_help ();
3992+ exit (EXIT_SUCCESS);
3993+ default:
3994+ print_usage ();
3995+ print_option_error ();
3996+ exit (EXIT_FAILURE);
3997+ }
3998 }
3999
4000
4001@@ -186,8 +186,8 @@
4002 {
4003 status_acct = acct (ACCT_FILE_LOC);
4004 printf ("Turning on process accounting, file set to the default '%s'.\n",
4005- ACCT_FILE_LOC);
4006- }
4007+ ACCT_FILE_LOC);
4008+ }
4009 /* ..else if was "off", pass NULL to deactivate.. */
4010 else if (0 == strcasecmp (acct_file, "off"))
4011 {
4012@@ -205,16 +205,11 @@
4013 /* did the system call return an error? */
4014 if (-1 == status_acct)
4015 {
4016- int err;
4017- extern int errno;
4018-
4019- err = errno;
4020+ int err = errno;
4021 perror ("accton");
4022 exit (err);
4023 }
4024 }
4025-
4026-
4027 return EXIT_SUCCESS;
4028 }
4029
4030
4031=== modified file 'aclocal.m4'
4032--- aclocal.m4 2006-03-18 18:38:00 +0000
4033+++ aclocal.m4 2010-01-20 17:40:26 +0000
4034@@ -1,7 +1,7 @@
4035-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
4036+# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
4037
4038 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4039-# 2005 Free Software Foundation, Inc.
4040+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4041 # This file is free software; the Free Software Foundation
4042 # gives unlimited permission to copy and/or distribute it,
4043 # with or without modifications, as long as this notice is preserved.
4044@@ -11,7 +11,465 @@
4045 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
4046 # PARTICULAR PURPOSE.
4047
4048-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
4049+m4_ifndef([AC_AUTOCONF_VERSION],
4050+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
4051+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
4052+[m4_warning([this file was generated for autoconf 2.63.
4053+You have another version of autoconf. It may work, but is not guaranteed to.
4054+If you have problems, you may need to regenerate the build system entirely.
4055+To do so, use the procedure documented by the package, typically `autoreconf'.])])
4056+
4057+# po.m4 serial 15 (gettext-0.17)
4058+dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
4059+dnl This file is free software; the Free Software Foundation
4060+dnl gives unlimited permission to copy and/or distribute it,
4061+dnl with or without modifications, as long as this notice is preserved.
4062+dnl
4063+dnl This file can can be used in projects which are not available under
4064+dnl the GNU General Public License or the GNU Library General Public
4065+dnl License but which still want to provide support for the GNU gettext
4066+dnl functionality.
4067+dnl Please note that the actual code of the GNU gettext library is covered
4068+dnl by the GNU Library General Public License, and the rest of the GNU
4069+dnl gettext package package is covered by the GNU General Public License.
4070+dnl They are *not* in the public domain.
4071+
4072+dnl Authors:
4073+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
4074+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
4075+
4076+AC_PREREQ(2.50)
4077+
4078+dnl Checks for all prerequisites of the po subdirectory.
4079+AC_DEFUN([AM_PO_SUBDIRS],
4080+[
4081+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
4082+ AC_REQUIRE([AC_PROG_INSTALL])dnl
4083+ AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
4084+ AC_REQUIRE([AM_NLS])dnl
4085+
4086+ dnl Release version of the gettext macros. This is used to ensure that
4087+ dnl the gettext macros and po/Makefile.in.in are in sync.
4088+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
4089+
4090+ dnl Perform the following tests also if --disable-nls has been given,
4091+ dnl because they are needed for "make dist" to work.
4092+
4093+ dnl Search for GNU msgfmt in the PATH.
4094+ dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
4095+ dnl The second test excludes FreeBSD msgfmt.
4096+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
4097+ [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
4098+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
4099+ :)
4100+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
4101+
4102+ dnl Test whether it is GNU msgfmt >= 0.15.
4103+changequote(,)dnl
4104+ case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
4105+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
4106+ *) MSGFMT_015=$MSGFMT ;;
4107+ esac
4108+changequote([,])dnl
4109+ AC_SUBST([MSGFMT_015])
4110+changequote(,)dnl
4111+ case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
4112+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
4113+ *) GMSGFMT_015=$GMSGFMT ;;
4114+ esac
4115+changequote([,])dnl
4116+ AC_SUBST([GMSGFMT_015])
4117+
4118+ dnl Search for GNU xgettext 0.12 or newer in the PATH.
4119+ dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
4120+ dnl The second test excludes FreeBSD xgettext.
4121+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
4122+ [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
4123+ (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
4124+ :)
4125+ dnl Remove leftover from FreeBSD xgettext call.
4126+ rm -f messages.po
4127+
4128+ dnl Test whether it is GNU xgettext >= 0.15.
4129+changequote(,)dnl
4130+ case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
4131+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
4132+ *) XGETTEXT_015=$XGETTEXT ;;
4133+ esac
4134+changequote([,])dnl
4135+ AC_SUBST([XGETTEXT_015])
4136+
4137+ dnl Search for GNU msgmerge 0.11 or newer in the PATH.
4138+ AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
4139+ [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
4140+
4141+ dnl Installation directories.
4142+ dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
4143+ dnl have to define it here, so that it can be used in po/Makefile.
4144+ test -n "$localedir" || localedir='${datadir}/locale'
4145+ AC_SUBST([localedir])
4146+
4147+ dnl Support for AM_XGETTEXT_OPTION.
4148+ test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
4149+ AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
4150+
4151+ AC_CONFIG_COMMANDS([po-directories], [[
4152+ for ac_file in $CONFIG_FILES; do
4153+ # Support "outfile[:infile[:infile...]]"
4154+ case "$ac_file" in
4155+ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
4156+ esac
4157+ # PO directories have a Makefile.in generated from Makefile.in.in.
4158+ case "$ac_file" in */Makefile.in)
4159+ # Adjust a relative srcdir.
4160+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
4161+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
4162+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
4163+ # In autoconf-2.13 it is called $ac_given_srcdir.
4164+ # In autoconf-2.50 it is called $srcdir.
4165+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
4166+ case "$ac_given_srcdir" in
4167+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
4168+ /*) top_srcdir="$ac_given_srcdir" ;;
4169+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
4170+ esac
4171+ # Treat a directory as a PO directory if and only if it has a
4172+ # POTFILES.in file. This allows packages to have multiple PO
4173+ # directories under different names or in different locations.
4174+ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
4175+ rm -f "$ac_dir/POTFILES"
4176+ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
4177+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
4178+ POMAKEFILEDEPS="POTFILES.in"
4179+ # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
4180+ # on $ac_dir but don't depend on user-specified configuration
4181+ # parameters.
4182+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
4183+ # The LINGUAS file contains the set of available languages.
4184+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
4185+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
4186+ fi
4187+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
4188+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
4189+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
4190+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
4191+ else
4192+ # The set of available languages was given in configure.in.
4193+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
4194+ eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
4195+ fi
4196+ # Compute POFILES
4197+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
4198+ # Compute UPDATEPOFILES
4199+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
4200+ # Compute DUMMYPOFILES
4201+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
4202+ # Compute GMOFILES
4203+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
4204+ case "$ac_given_srcdir" in
4205+ .) srcdirpre= ;;
4206+ *) srcdirpre='$(srcdir)/' ;;
4207+ esac
4208+ POFILES=
4209+ UPDATEPOFILES=
4210+ DUMMYPOFILES=
4211+ GMOFILES=
4212+ for lang in $ALL_LINGUAS; do
4213+ POFILES="$POFILES $srcdirpre$lang.po"
4214+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
4215+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
4216+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
4217+ done
4218+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
4219+ # environment variable.
4220+ INST_LINGUAS=
4221+ if test -n "$ALL_LINGUAS"; then
4222+ for presentlang in $ALL_LINGUAS; do
4223+ useit=no
4224+ if test "%UNSET%" != "$LINGUAS"; then
4225+ desiredlanguages="$LINGUAS"
4226+ else
4227+ desiredlanguages="$ALL_LINGUAS"
4228+ fi
4229+ for desiredlang in $desiredlanguages; do
4230+ # Use the presentlang catalog if desiredlang is
4231+ # a. equal to presentlang, or
4232+ # b. a variant of presentlang (because in this case,
4233+ # presentlang can be used as a fallback for messages
4234+ # which are not translated in the desiredlang catalog).
4235+ case "$desiredlang" in
4236+ "$presentlang"*) useit=yes;;
4237+ esac
4238+ done
4239+ if test $useit = yes; then
4240+ INST_LINGUAS="$INST_LINGUAS $presentlang"
4241+ fi
4242+ done
4243+ fi
4244+ CATALOGS=
4245+ if test -n "$INST_LINGUAS"; then
4246+ for lang in $INST_LINGUAS; do
4247+ CATALOGS="$CATALOGS $lang.gmo"
4248+ done
4249+ fi
4250+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
4251+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
4252+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
4253+ if test -f "$f"; then
4254+ case "$f" in
4255+ *.orig | *.bak | *~) ;;
4256+ *) cat "$f" >> "$ac_dir/Makefile" ;;
4257+ esac
4258+ fi
4259+ done
4260+ fi
4261+ ;;
4262+ esac
4263+ done]],
4264+ [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
4265+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
4266+ # from automake < 1.5.
4267+ eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
4268+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
4269+ LINGUAS="${LINGUAS-%UNSET%}"
4270+ ])
4271+])
4272+
4273+dnl Postprocesses a Makefile in a directory containing PO files.
4274+AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
4275+[
4276+ # When this code is run, in config.status, two variables have already been
4277+ # set:
4278+ # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
4279+ # - LINGUAS is the value of the environment variable LINGUAS at configure
4280+ # time.
4281+
4282+changequote(,)dnl
4283+ # Adjust a relative srcdir.
4284+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
4285+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
4286+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
4287+ # In autoconf-2.13 it is called $ac_given_srcdir.
4288+ # In autoconf-2.50 it is called $srcdir.
4289+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
4290+ case "$ac_given_srcdir" in
4291+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
4292+ /*) top_srcdir="$ac_given_srcdir" ;;
4293+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
4294+ esac
4295+
4296+ # Find a way to echo strings without interpreting backslash.
4297+ if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
4298+ gt_echo='echo'
4299+ else
4300+ if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
4301+ gt_echo='printf %s\n'
4302+ else
4303+ echo_func () {
4304+ cat <<EOT
4305+$*
4306+EOT
4307+ }
4308+ gt_echo='echo_func'
4309+ fi
4310+ fi
4311+
4312+ # A sed script that extracts the value of VARIABLE from a Makefile.
4313+ sed_x_variable='
4314+# Test if the hold space is empty.
4315+x
4316+s/P/P/
4317+x
4318+ta
4319+# Yes it was empty. Look if we have the expected variable definition.
4320+/^[ ]*VARIABLE[ ]*=/{
4321+ # Seen the first line of the variable definition.
4322+ s/^[ ]*VARIABLE[ ]*=//
4323+ ba
4324+}
4325+bd
4326+:a
4327+# Here we are processing a line from the variable definition.
4328+# Remove comment, more precisely replace it with a space.
4329+s/#.*$/ /
4330+# See if the line ends in a backslash.
4331+tb
4332+:b
4333+s/\\$//
4334+# Print the line, without the trailing backslash.
4335+p
4336+tc
4337+# There was no trailing backslash. The end of the variable definition is
4338+# reached. Clear the hold space.
4339+s/^.*$//
4340+x
4341+bd
4342+:c
4343+# A trailing backslash means that the variable definition continues in the
4344+# next line. Put a nonempty string into the hold space to indicate this.
4345+s/^.*$/P/
4346+x
4347+:d
4348+'
4349+changequote([,])dnl
4350+
4351+ # Set POTFILES to the value of the Makefile variable POTFILES.
4352+ sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
4353+ POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
4354+ # Compute POTFILES_DEPS as
4355+ # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
4356+ POTFILES_DEPS=
4357+ for file in $POTFILES; do
4358+ POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
4359+ done
4360+ POMAKEFILEDEPS=""
4361+
4362+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
4363+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
4364+ fi
4365+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
4366+ # The LINGUAS file contains the set of available languages.
4367+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
4368+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
4369+ else
4370+ # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
4371+ sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
4372+ ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
4373+ fi
4374+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
4375+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
4376+ # Compute POFILES
4377+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
4378+ # Compute UPDATEPOFILES
4379+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
4380+ # Compute DUMMYPOFILES
4381+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
4382+ # Compute GMOFILES
4383+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
4384+ # Compute PROPERTIESFILES
4385+ # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
4386+ # Compute CLASSFILES
4387+ # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
4388+ # Compute QMFILES
4389+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
4390+ # Compute MSGFILES
4391+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
4392+ # Compute RESOURCESDLLFILES
4393+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
4394+ case "$ac_given_srcdir" in
4395+ .) srcdirpre= ;;
4396+ *) srcdirpre='$(srcdir)/' ;;
4397+ esac
4398+ POFILES=
4399+ UPDATEPOFILES=
4400+ DUMMYPOFILES=
4401+ GMOFILES=
4402+ PROPERTIESFILES=
4403+ CLASSFILES=
4404+ QMFILES=
4405+ MSGFILES=
4406+ RESOURCESDLLFILES=
4407+ for lang in $ALL_LINGUAS; do
4408+ POFILES="$POFILES $srcdirpre$lang.po"
4409+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
4410+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
4411+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
4412+ PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
4413+ CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
4414+ QMFILES="$QMFILES $srcdirpre$lang.qm"
4415+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
4416+ MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
4417+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
4418+ RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
4419+ done
4420+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
4421+ # environment variable.
4422+ INST_LINGUAS=
4423+ if test -n "$ALL_LINGUAS"; then
4424+ for presentlang in $ALL_LINGUAS; do
4425+ useit=no
4426+ if test "%UNSET%" != "$LINGUAS"; then
4427+ desiredlanguages="$LINGUAS"
4428+ else
4429+ desiredlanguages="$ALL_LINGUAS"
4430+ fi
4431+ for desiredlang in $desiredlanguages; do
4432+ # Use the presentlang catalog if desiredlang is
4433+ # a. equal to presentlang, or
4434+ # b. a variant of presentlang (because in this case,
4435+ # presentlang can be used as a fallback for messages
4436+ # which are not translated in the desiredlang catalog).
4437+ case "$desiredlang" in
4438+ "$presentlang"*) useit=yes;;
4439+ esac
4440+ done
4441+ if test $useit = yes; then
4442+ INST_LINGUAS="$INST_LINGUAS $presentlang"
4443+ fi
4444+ done
4445+ fi
4446+ CATALOGS=
4447+ JAVACATALOGS=
4448+ QTCATALOGS=
4449+ TCLCATALOGS=
4450+ CSHARPCATALOGS=
4451+ if test -n "$INST_LINGUAS"; then
4452+ for lang in $INST_LINGUAS; do
4453+ CATALOGS="$CATALOGS $lang.gmo"
4454+ JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
4455+ QTCATALOGS="$QTCATALOGS $lang.qm"
4456+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
4457+ TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
4458+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
4459+ CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
4460+ done
4461+ fi
4462+
4463+ sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
4464+ if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
4465+ # Add dependencies that cannot be formulated as a simple suffix rule.
4466+ for lang in $ALL_LINGUAS; do
4467+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
4468+ cat >> "$ac_file.tmp" <<EOF
4469+$frobbedlang.msg: $lang.po
4470+ @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
4471+ \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
4472+EOF
4473+ done
4474+ fi
4475+ if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
4476+ # Add dependencies that cannot be formulated as a simple suffix rule.
4477+ for lang in $ALL_LINGUAS; do
4478+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
4479+ cat >> "$ac_file.tmp" <<EOF
4480+$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
4481+ @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
4482+ \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
4483+EOF
4484+ done
4485+ fi
4486+ if test -n "$POMAKEFILEDEPS"; then
4487+ cat >> "$ac_file.tmp" <<EOF
4488+Makefile: $POMAKEFILEDEPS
4489+EOF
4490+ fi
4491+ mv "$ac_file.tmp" "$ac_file"
4492+])
4493+
4494+dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
4495+AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
4496+[
4497+ XGETTEXT_EXTRA_OPTIONS=
4498+])
4499+
4500+dnl Registers an option to be passed to xgettext in the po subdirectory.
4501+AC_DEFUN([AM_XGETTEXT_OPTION],
4502+[
4503+ AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
4504+ XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
4505+])
4506+
4507+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4508 #
4509 # This file is free software; the Free Software Foundation
4510 # gives unlimited permission to copy and/or distribute it,
4511@@ -21,14 +479,31 @@
4512 # ----------------------------
4513 # Automake X.Y traces this macro to ensure aclocal.m4 has been
4514 # generated from the m4 files accompanying Automake X.Y.
4515-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
4516+# (This private macro should not be called outside this file.)
4517+AC_DEFUN([AM_AUTOMAKE_VERSION],
4518+[am__api_version='1.10'
4519+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
4520+dnl require some minimum version. Point them to the right macro.
4521+m4_if([$1], [1.10.2], [],
4522+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
4523+])
4524+
4525+# _AM_AUTOCONF_VERSION(VERSION)
4526+# -----------------------------
4527+# aclocal traces this macro to find the Autoconf version.
4528+# This is a private macro too. Using m4_define simplifies
4529+# the logic in aclocal, which can simply ignore this definition.
4530+m4_define([_AM_AUTOCONF_VERSION], [])
4531
4532 # AM_SET_CURRENT_AUTOMAKE_VERSION
4533 # -------------------------------
4534-# Call AM_AUTOMAKE_VERSION so it can be traced.
4535-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
4536+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
4537+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
4538 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
4539- [AM_AUTOMAKE_VERSION([1.9.6])])
4540+[AM_AUTOMAKE_VERSION([1.10.2])dnl
4541+m4_ifndef([AC_AUTOCONF_VERSION],
4542+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
4543+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
4544
4545 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
4546
4547@@ -85,14 +560,14 @@
4548
4549 # AM_CONDITIONAL -*- Autoconf -*-
4550
4551-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
4552+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
4553 # Free Software Foundation, Inc.
4554 #
4555 # This file is free software; the Free Software Foundation
4556 # gives unlimited permission to copy and/or distribute it,
4557 # with or without modifications, as long as this notice is preserved.
4558
4559-# serial 7
4560+# serial 8
4561
4562 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
4563 # -------------------------------------
4564@@ -101,8 +576,10 @@
4565 [AC_PREREQ(2.52)dnl
4566 ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
4567 [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
4568-AC_SUBST([$1_TRUE])
4569-AC_SUBST([$1_FALSE])
4570+AC_SUBST([$1_TRUE])dnl
4571+AC_SUBST([$1_FALSE])dnl
4572+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
4573+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
4574 if $2; then
4575 $1_TRUE=
4576 $1_FALSE='#'
4577@@ -116,15 +593,14 @@
4578 Usually this means the macro was only invoked conditionally.]])
4579 fi])])
4580
4581-
4582-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
4583+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
4584 # Free Software Foundation, Inc.
4585 #
4586 # This file is free software; the Free Software Foundation
4587 # gives unlimited permission to copy and/or distribute it,
4588 # with or without modifications, as long as this notice is preserved.
4589
4590-# serial 8
4591+# serial 9
4592
4593 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
4594 # written in clear, in which case automake, when reading aclocal.m4,
4595@@ -152,6 +628,7 @@
4596 ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
4597 [$1], CXX, [depcc="$CXX" am_compiler_list=],
4598 [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
4599+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
4600 [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
4601 [depcc="$$1" am_compiler_list=])
4602
4603@@ -217,6 +694,7 @@
4604 depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
4605 $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
4606 >/dev/null 2>conftest.err &&
4607+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
4608 grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
4609 grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
4610 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
4611@@ -269,24 +747,34 @@
4612 AMDEPBACKSLASH='\'
4613 fi
4614 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
4615-AC_SUBST([AMDEPBACKSLASH])
4616+AC_SUBST([AMDEPBACKSLASH])dnl
4617+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
4618 ])
4619
4620 # Generate code to set up dependency tracking. -*- Autoconf -*-
4621
4622-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
4623+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
4624 # Free Software Foundation, Inc.
4625 #
4626 # This file is free software; the Free Software Foundation
4627 # gives unlimited permission to copy and/or distribute it,
4628 # with or without modifications, as long as this notice is preserved.
4629
4630-#serial 3
4631+#serial 4
4632
4633 # _AM_OUTPUT_DEPENDENCY_COMMANDS
4634 # ------------------------------
4635 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
4636-[for mf in $CONFIG_FILES; do
4637+[# Autoconf 2.62 quotes --file arguments for eval, but not when files
4638+# are listed without --file. Let's play safe and only enable the eval
4639+# if we detect the quoting.
4640+case $CONFIG_FILES in
4641+*\'*) eval set x "$CONFIG_FILES" ;;
4642+*) set x $CONFIG_FILES ;;
4643+esac
4644+shift
4645+for mf
4646+do
4647 # Strip MF so we end up with the name of the file.
4648 mf=`echo "$mf" | sed -e 's/:.*$//'`
4649 # Check whether this is an Automake generated Makefile or not.
4650@@ -294,8 +782,9 @@
4651 # some people rename them; so instead we look at the file content.
4652 # Grep'ing the first line is not enough: some people post-process
4653 # each Makefile.in and add a new line on top of each file to say so.
4654- # So let's grep whole file.
4655- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
4656+ # Grep'ing the whole file is not good either: AIX grep has a line
4657+ # limit of 2048, but all sed's we know have understand at least 4000.
4658+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
4659 dirpart=`AS_DIRNAME("$mf")`
4660 else
4661 continue
4662@@ -354,14 +843,14 @@
4663
4664 # Do all the work for Automake. -*- Autoconf -*-
4665
4666-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
4667-# Free Software Foundation, Inc.
4668+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4669+# 2005, 2006, 2008 Free Software Foundation, Inc.
4670 #
4671 # This file is free software; the Free Software Foundation
4672 # gives unlimited permission to copy and/or distribute it,
4673 # with or without modifications, as long as this notice is preserved.
4674
4675-# serial 12
4676+# serial 13
4677
4678 # This macro actually does too much. Some checks are only needed if
4679 # your package does certain things. But this isn't really a big deal.
4680@@ -378,16 +867,20 @@
4681 # arguments mandatory, and then we can depend on a new Autoconf
4682 # release and drop the old call support.
4683 AC_DEFUN([AM_INIT_AUTOMAKE],
4684-[AC_PREREQ([2.58])dnl
4685+[AC_PREREQ([2.60])dnl
4686 dnl Autoconf wants to disallow AM_ names. We explicitly allow
4687 dnl the ones we care about.
4688 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
4689 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
4690 AC_REQUIRE([AC_PROG_INSTALL])dnl
4691-# test to see if srcdir already configured
4692-if test "`cd $srcdir && pwd`" != "`pwd`" &&
4693- test -f $srcdir/config.status; then
4694- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
4695+if test "`cd $srcdir && pwd`" != "`pwd`"; then
4696+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
4697+ # is not polluted with repeated "-I."
4698+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
4699+ # test to see if srcdir already configured
4700+ if test -f $srcdir/config.status; then
4701+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
4702+ fi
4703 fi
4704
4705 # test whether we have cygpath
4706@@ -407,6 +900,9 @@
4707 AC_SUBST([PACKAGE], [$1])dnl
4708 AC_SUBST([VERSION], [$2])],
4709 [_AM_SET_OPTIONS([$1])dnl
4710+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
4711+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
4712+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
4713 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
4714 AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
4715
4716@@ -442,6 +938,10 @@
4717 [_AM_DEPENDENCIES(CXX)],
4718 [define([AC_PROG_CXX],
4719 defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
4720+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
4721+ [_AM_DEPENDENCIES(OBJC)],
4722+ [define([AC_PROG_OBJC],
4723+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
4724 ])
4725 ])
4726
4727@@ -455,16 +955,17 @@
4728 # our stamp files there.
4729 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
4730 [# Compute $1's index in $config_headers.
4731+_am_arg=$1
4732 _am_stamp_count=1
4733 for _am_header in $config_headers :; do
4734 case $_am_header in
4735- $1 | $1:* )
4736+ $_am_arg | $_am_arg:* )
4737 break ;;
4738 * )
4739 _am_stamp_count=`expr $_am_stamp_count + 1` ;;
4740 esac
4741 done
4742-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
4743+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
4744
4745 # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
4746 #
4747@@ -477,7 +978,7 @@
4748 # Define $install_sh.
4749 AC_DEFUN([AM_PROG_INSTALL_SH],
4750 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
4751-install_sh=${install_sh-"$am_aux_dir/install-sh"}
4752+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
4753 AC_SUBST(install_sh)])
4754
4755 # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
4756@@ -501,6 +1002,35 @@
4757 rmdir .tst 2>/dev/null
4758 AC_SUBST([am__leading_dot])])
4759
4760+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
4761+# From Jim Meyering
4762+
4763+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
4764+# Free Software Foundation, Inc.
4765+#
4766+# This file is free software; the Free Software Foundation
4767+# gives unlimited permission to copy and/or distribute it,
4768+# with or without modifications, as long as this notice is preserved.
4769+
4770+# serial 4
4771+
4772+AC_DEFUN([AM_MAINTAINER_MODE],
4773+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
4774+ dnl maintainer-mode is disabled by default
4775+ AC_ARG_ENABLE(maintainer-mode,
4776+[ --enable-maintainer-mode enable make rules and dependencies not useful
4777+ (and sometimes confusing) to the casual installer],
4778+ USE_MAINTAINER_MODE=$enableval,
4779+ USE_MAINTAINER_MODE=no)
4780+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
4781+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
4782+ MAINT=$MAINTAINER_MODE_TRUE
4783+ AC_SUBST(MAINT)dnl
4784+]
4785+)
4786+
4787+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
4788+
4789 # Check to see how 'make' treats includes. -*- Autoconf -*-
4790
4791 # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
4792@@ -555,14 +1085,14 @@
4793
4794 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
4795
4796-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
4797+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
4798 # Free Software Foundation, Inc.
4799 #
4800 # This file is free software; the Free Software Foundation
4801 # gives unlimited permission to copy and/or distribute it,
4802 # with or without modifications, as long as this notice is preserved.
4803
4804-# serial 4
4805+# serial 5
4806
4807 # AM_MISSING_PROG(NAME, PROGRAM)
4808 # ------------------------------
4809@@ -578,6 +1108,7 @@
4810 # If it does, set am_missing_run to use it, otherwise, to nothing.
4811 AC_DEFUN([AM_MISSING_HAS_RUN],
4812 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
4813+AC_REQUIRE_AUX_FILE([missing])dnl
4814 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
4815 # Use eval to expand $SHELL
4816 if eval "$MISSING --run true"; then
4817@@ -588,7 +1119,7 @@
4818 fi
4819 ])
4820
4821-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
4822+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
4823 #
4824 # This file is free software; the Free Software Foundation
4825 # gives unlimited permission to copy and/or distribute it,
4826@@ -596,70 +1127,33 @@
4827
4828 # AM_PROG_MKDIR_P
4829 # ---------------
4830-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
4831-#
4832-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
4833-# created by `make install' are always world readable, even if the
4834-# installer happens to have an overly restrictive umask (e.g. 077).
4835-# This was a mistake. There are at least two reasons why we must not
4836-# use `-m 0755':
4837-# - it causes special bits like SGID to be ignored,
4838-# - it may be too restrictive (some setups expect 775 directories).
4839-#
4840-# Do not use -m 0755 and let people choose whatever they expect by
4841-# setting umask.
4842-#
4843-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
4844-# Some implementations (such as Solaris 8's) are not thread-safe: if a
4845-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
4846-# concurrently, both version can detect that a/ is missing, but only
4847-# one can create it and the other will error out. Consequently we
4848-# restrict ourselves to GNU make (using the --version option ensures
4849-# this.)
4850+# Check for `mkdir -p'.
4851 AC_DEFUN([AM_PROG_MKDIR_P],
4852-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
4853- # We used to keeping the `.' as first argument, in order to
4854- # allow $(mkdir_p) to be used without argument. As in
4855- # $(mkdir_p) $(somedir)
4856- # where $(somedir) is conditionally defined. However this is wrong
4857- # for two reasons:
4858- # 1. if the package is installed by a user who cannot write `.'
4859- # make install will fail,
4860- # 2. the above comment should most certainly read
4861- # $(mkdir_p) $(DESTDIR)$(somedir)
4862- # so it does not work when $(somedir) is undefined and
4863- # $(DESTDIR) is not.
4864- # To support the latter case, we have to write
4865- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
4866- # so the `.' trick is pointless.
4867- mkdir_p='mkdir -p --'
4868-else
4869- # On NextStep and OpenStep, the `mkdir' command does not
4870- # recognize any option. It will interpret all options as
4871- # directories to create, and then abort because `.' already
4872- # exists.
4873- for d in ./-p ./--version;
4874- do
4875- test -d $d && rmdir $d
4876- done
4877- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
4878- if test -f "$ac_aux_dir/mkinstalldirs"; then
4879- mkdir_p='$(mkinstalldirs)'
4880- else
4881- mkdir_p='$(install_sh) -d'
4882- fi
4883-fi
4884-AC_SUBST([mkdir_p])])
4885+[AC_PREREQ([2.60])dnl
4886+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
4887+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
4888+dnl while keeping a definition of mkdir_p for backward compatibility.
4889+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
4890+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
4891+dnl Makefile.ins that do not define MKDIR_P, so we do our own
4892+dnl adjustment using top_builddir (which is defined more often than
4893+dnl MKDIR_P).
4894+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
4895+case $mkdir_p in
4896+ [[\\/$]]* | ?:[[\\/]]*) ;;
4897+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
4898+esac
4899+])
4900
4901 # Helper functions for option handling. -*- Autoconf -*-
4902
4903-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
4904+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
4905 #
4906 # This file is free software; the Free Software Foundation
4907 # gives unlimited permission to copy and/or distribute it,
4908 # with or without modifications, as long as this notice is preserved.
4909
4910-# serial 3
4911+# serial 4
4912
4913 # _AM_MANGLE_OPTION(NAME)
4914 # -----------------------
4915@@ -676,7 +1170,7 @@
4916 # ----------------------------------
4917 # OPTIONS is a space-separated list of Automake options.
4918 AC_DEFUN([_AM_SET_OPTIONS],
4919-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
4920+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
4921
4922 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
4923 # -------------------------------------------
4924@@ -684,31 +1178,6 @@
4925 AC_DEFUN([_AM_IF_OPTION],
4926 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
4927
4928-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005
4929-# Free Software Foundation, Inc.
4930-#
4931-# This file is free software; the Free Software Foundation
4932-# gives unlimited permission to copy and/or distribute it,
4933-# with or without modifications, as long as this notice is preserved.
4934-
4935-# serial 4
4936-
4937-AC_DEFUN([AM_C_PROTOTYPES],
4938-[AC_REQUIRE([AC_C_PROTOTYPES])
4939-if test "$ac_cv_prog_cc_stdc" != no; then
4940- U= ANSI2KNR=
4941-else
4942- U=_ ANSI2KNR=./ansi2knr
4943-fi
4944-# Ensure some checks needed by ansi2knr itself.
4945-AC_REQUIRE([AC_HEADER_STDC])
4946-AC_CHECK_HEADERS(string.h)
4947-AC_SUBST(U)dnl
4948-AC_SUBST(ANSI2KNR)dnl
4949-])
4950-
4951-AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
4952-
4953 # Check to make sure that the build environment is sane. -*- Autoconf -*-
4954
4955 # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
4956@@ -786,9 +1255,21 @@
4957 if test "$cross_compiling" != no; then
4958 AC_CHECK_TOOL([STRIP], [strip], :)
4959 fi
4960-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
4961+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
4962 AC_SUBST([INSTALL_STRIP_PROGRAM])])
4963
4964+# Copyright (C) 2006 Free Software Foundation, Inc.
4965+#
4966+# This file is free software; the Free Software Foundation
4967+# gives unlimited permission to copy and/or distribute it,
4968+# with or without modifications, as long as this notice is preserved.
4969+
4970+# _AM_SUBST_NOTMAKE(VARIABLE)
4971+# ---------------------------
4972+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
4973+# This macro is traced by Automake.
4974+AC_DEFUN([_AM_SUBST_NOTMAKE])
4975+
4976 # Check how to create a tarball. -*- Autoconf -*-
4977
4978 # Copyright (C) 2004, 2005 Free Software Foundation, Inc.
4979@@ -885,3 +1366,39 @@
4980 AC_SUBST([am__untar])
4981 ]) # _AM_PROG_TAR
4982
4983+m4_include([m4/00gnulib.m4])
4984+m4_include([m4/alloca.m4])
4985+m4_include([m4/dirname.m4])
4986+m4_include([m4/dos.m4])
4987+m4_include([m4/double-slash-root.m4])
4988+m4_include([m4/errno_h.m4])
4989+m4_include([m4/error.m4])
4990+m4_include([m4/exitfail.m4])
4991+m4_include([m4/extensions.m4])
4992+m4_include([m4/getopt.m4])
4993+m4_include([m4/getpagesize.m4])
4994+m4_include([m4/gnulib-common.m4])
4995+m4_include([m4/gnulib-comp.m4])
4996+m4_include([m4/include_next.m4])
4997+m4_include([m4/inline.m4])
4998+m4_include([m4/libtool.m4])
4999+m4_include([m4/ltoptions.m4])
5000+m4_include([m4/ltsugar.m4])
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches