# This is a patch for xemacs-21.5.30 to update it to xemacs-21.5.31
#
# To apply this patch:
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'applypatch' program with this patch file as input.
#
# If you do not have 'applypatch', it is part of the 'makepatch' package
# that you can fetch from the Comprehensive Perl Archive Network:
# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz
# In the above URL, 'x' should be 2 or higher.
#
# To apply this patch without the use of 'applypatch':
# STEP 1: Chdir to the source directory.
# If you have a decent Bourne-type shell:
# STEP 2: Run the shell with this file as input.
# If you don't have such a shell, you may need to manually create/delete
# the files/directories as shown below.
# STEP 3: Run the 'patch' program with this file as input.
#
# These are the commands needed to create/delete files/directories:
#
mkdir './autom4te.cache'
chmod 0755 './autom4te.cache'
rm -f './version.sh'
rm -f './nt/site.def'
rm -f './nt/Win32.cf'
rm -f './modules/auto-autoloads.el'
rm -f './lisp/mule/custom-load.el'
rm -f './lisp/mule/auto-autoloads.el'
rm -f './lisp/finder-inf.el'
rm -f './lisp/custom-load.el'
rm -f './lisp/auto-autoloads.el'
rm -f './etc/emacsstrs.sco'
rm -f './etc/emacskeys.sco'
rm -f './etc/editclient.sh'
rm -f './etc/PROBLEMS'
touch './README.GPLv3'
chmod 0644 './README.GPLv3'
touch './autom4te.cache/output.0'
chmod 0644 './autom4te.cache/output.0'
touch './autom4te.cache/requests'
chmod 0644 './autom4te.cache/requests'
touch './autom4te.cache/traces.0'
chmod 0644 './autom4te.cache/traces.0'
touch './etc/unicode/COPYING'
chmod 0644 './etc/unicode/COPYING'
touch './etc/unicode/ibm/COPYING'
chmod 0644 './etc/unicode/ibm/COPYING'
#
# This command terminates the shell and need not be executed manually.
exit
#
#### End of Preamble ####
#### Patch data follows ####
diff --text -u 'xemacs-21.5.30/.hgtags' 'xemacs-21.5.31/.hgtags'
Index: ./.hgtags
--- ./.hgtags Wed Apr 27 00:57:25 2011
+++ ./.hgtags Fri Apr 29 22:31:05 2011
@@ -240,3 +240,6 @@
5c427ece884b7023a244fba8cad8cf41b37dd5ca r21-5-29
3742ea8250b5fd339d6d797835faf8761f61d0ae ben-lisp-object-final-ws-year-2005
d185fa593d5fcf818ca0d27e53374348d936d7e8 last-version-with-netinstall
+e7991690160358d5dd0a8adbf54e0bb8bfc56891 r21-5-30
+1c87bdc11d65e3bcbe23895b6f585bede5ba4160 last-gplv2
+3600e23880f7ddb7b5d658c4d0421f480e109c36 r21-5-latest-beta
diff --text -u 'xemacs-21.5.30/CHANGES-beta' 'xemacs-21.5.31/CHANGES-beta'
Index: ./CHANGES-beta
--- ./CHANGES-beta Wed Apr 27 00:57:25 2011
+++ ./CHANGES-beta Fri Apr 29 22:31:05 2011
@@ -1,4 +1,12 @@
-# DO NOT PUT A VERSION MARKER HERE, AUTOMATICALLY ADDED AT RELEASE
+# DO NOT PUT A VERSION MARKER HERE, ADDED AT RELEASE
+
+to XEmacs 21.5.31 "ginger"
+
+Internal API and Implementation
+
+-- improve: Verify copyright status and restrict license to GPL version 3 or later. -- Mats Lidell, Mike Sperber, Jerry James, Ben Wing, Stephen Turnbull
+
+to XEmacs 21.5.30 "garlic"
Major Features and Backward Incompatible Changes
diff --text -u 'xemacs-21.5.30/COPYING' 'xemacs-21.5.31/COPYING'
Index: ./COPYING
--- ./COPYING Wed Apr 27 00:57:25 2011
+++ ./COPYING Fri Apr 29 22:31:05 2011
@@ -1,285 +1,626 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
this License.
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
@@ -287,15 +628,15 @@
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
- This program is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -304,37 +645,30 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --text -u 'xemacs-21.5.30/ChangeLog' 'xemacs-21.5.31/ChangeLog'
Index: ./ChangeLog
--- ./ChangeLog Wed Apr 27 00:57:41 2011
+++ ./ChangeLog Fri Apr 29 22:31:38 2011
@@ -1,3 +1,7 @@
+2011-04-29 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.5.31 "ginger" is released.
+
2011-04-26 Stephen J. Turnbull <stephen@xemacs.org>
* XEmacs 21.5.30 "garlic" is released.
@@ -6656,3 +6660,23 @@
Thu Dec 5 11:56:05 1996 Joseph J Nuspl <nuspl@nvwls.cc.purdue.edu>
* configure.in (LIBS): Fix typo in dialog box test.
+
+
+ChangeLog entries synched from GNU Emacs are the property of the FSF.
+Other ChangeLog entries are usually the property of the author of the
+change.
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
diff --text -u 'xemacs-21.5.30/Makefile.in.in' 'xemacs-21.5.31/Makefile.in.in'
Index: ./Makefile.in.in
--- ./Makefile.in.in Wed Apr 27 00:57:25 2011
+++ ./Makefile.in.in Fri Apr 29 22:31:05 2011
@@ -6,10 +6,10 @@
## This file is part of XEmacs.
-## XEmacs is free software; you can redistribute it and/or modify it
+## XEmacs is free software: you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by the
-## Free Software Foundation; either version 2, or (at your option) any
-## later version.
+## Free Software Foundation, either version 3 of the License, or (at your
+## option) any later version.
## XEmacs is distributed in the hope that it will be useful, but WITHOUT
## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
## for more details.
## You should have received a copy of the GNU General Public License
-## along with XEmacs; see the file COPYING. If not, write to
-## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-## Boston, MA 02111-1307, USA.
+## along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
## make all to compile and build XEmacs.
## make install to build and install it.
diff --text -u 'xemacs-21.5.30/PROBLEMS' 'xemacs-21.5.31/PROBLEMS'
Index: ./PROBLEMS
--- ./PROBLEMS Wed Apr 27 00:57:25 2011
+++ ./PROBLEMS Fri Apr 29 22:31:05 2011
@@ -1,5 +1,37 @@
-*- mode:outline -*-
+Copyright (C) 1997, 1998 Steven L Baur
+Copyright (C) 1997 Tor Arntsen
+Copyright (C) 1998, 1999 Gunnar Evermann
+Copyright (C) 1998 Karl M. Hegbloom
+Copyright (C) 1998, 2000 Marcus Thiessel
+Copyright (C) 1998, 2001 Martin Buchholz
+Copyright (C) 1998 Michael Sperber
+Copyright (C) 1999 Andy Piper
+Copyright (C) 2000 Darryl Okahata
+Copyright (C) 2000-2002, 2006, 2007, 2009 Stephen J. Turnbull
+Copyright (C) 2001, 2003, 2005, 2010 Ben Wing
+Copyright (C) 2001 Robert Pluim
+Copyright (C) 2003 Jerry James
+Copyright (C) 2003 Rodney Sparapani
+Copyright (C) 2005, 2006 Malcolm Purvis
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
+
This file describes various problems that have been encountered
in compiling, installing and running XEmacs. It has been updated for
XEmacs 21.5. Note that the issues are by now mainly historic; XEmacs
diff --text -u /dev/null 'xemacs-21.5.31/README.GPLv3'
Index: ./README.GPLv3
--- ./README.GPLv3 Thu Jan 1 09:00:00 1970
+++ ./README.GPLv3 Fri Apr 29 22:31:05 2011
@@ -0,0 +1,8 @@
+Here we have notes about the conversion to GPLv3. Things left to do,
+things to check, etc...
+
+* File with copyright notices that ought to be checked
+
+"etc/gnuserv.1" and "etc/gnuserv.README". Copyright added with date
+1998. If more accurate dates for the respective contributions can be
+deduced it would be good.
diff --text -u 'xemacs-21.5.30/aclocal.m4' 'xemacs-21.5.31/aclocal.m4'
Index: ./aclocal.m4
--- ./aclocal.m4 Wed Apr 27 00:57:25 2011
+++ ./aclocal.m4 Fri Apr 29 22:31:05 2011
@@ -3,20 +3,18 @@
dnl Author: J. Kean Johnston <jkj@sco.com>, based on work in libtool.
dnl This file is part of XEmacs.
dnl
-dnl XEmacs is free software; you can redistribute it and/or modify it
-dnl under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2, or (at your option)
-dnl any later version.
-dnl
-dnl XEmacs is distributed in the hope that it will be useful, but
-dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl General Public License for more details.
+dnl XEmacs is free software: you can redistribute it and/or modify it
+dnl under the terms of the GNU General Public License as published by the
+dnl Free Software Foundation, either version 3 of the License, or (at your
+dnl option) any later version.
+dnl
+dnl XEmacs is distributed in the hope that it will be useful, but WITHOUT
+dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+dnl for more details.
dnl
dnl You should have received a copy of the GNU General Public License
-dnl along with XEmacs; see the file COPYING. If not, write to the Free
-dnl Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-dnl Boston, MA 02110-1301, USA.
+dnl along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
dnl
dnl There are several things we care about here. First, we need to find
dnl out how we create an executable that has its symbols exported, so
diff --text -u /dev/null 'xemacs-21.5.31/autom4te.cache/output.0'
Index: ./autom4te.cache/output.0
--- ./autom4te.cache/output.0 Thu Jan 1 09:00:00 1970
+++ ./autom4te.cache/output.0 Fri Apr 29 22:31:37 2011
@@ -0,0 +1,22858 @@
+@%:@! /bin/sh
+@%:@ Guess values for system-dependent variables and create Makefiles.
+@%:@ Generated by GNU Autoconf 2.68 for XEmacs 21.5.
+@%:@
+@%:@ Report bugs to <xemacs-beta@xemacs.org>.
+@%:@
+@%:@
+@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+@%:@ 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+@%:@ Foundation, Inc.
+@%:@
+@%:@
+@%:@ This configure script is free software; the Free Software Foundation
+@%:@ gives unlimited permission to copy, distribute and modify it.
+@%:@
+@%:@ Configuration script for XEmacs. Largely divergent from FSF.
+@%:@ Guess values for system-dependent variables and create Makefiles.
+@%:@
+@%:@ Copyright (C) 1992-1999, 2001-2006 Free Software Foundation, Inc.
+@%:@ Copyright (C) 1993, 1994, 1995 Board of Trustees, University of Illinois.
+@%:@ Copyright (C) 1996, 1997 Sun Microsystems, Inc.
+@%:@ Copyright (C) 1995, 1996, 2002, 2003, 2004 Ben Wing.
+@%:@ Copyright (C) 2000, 2001 Martin Buchholz.
+@%:@ Copyright (C) 1998, 1999 J. Kean Johnston.
+@%:@ Copyright (C) 2005 Malcolm Purvis
+@%:@
+@%:@ Don't edit this script!
+@%:@ This script was automatically generated by the `autoconf' program
+@%:@ from the file `./configure.ac'. To rebuild it, execute the command:
+@%:@
+@%:@ autoconf
+@%:@
+@%:@ in the this directory. You must have autoconf version 2.59.
+@%:@
+@%:@ This file is part of XEmacs.
+@%:@
+@%:@ XEmacs is free software: you can redistribute it and/or modify it
+@%:@ under the terms of the GNU General Public License as published by the
+@%:@ Free Software Foundation, either version 3 of the License, or (at your
+@%:@ option) any later version.
+@%:@
+@%:@ XEmacs is distributed in the hope that it will be useful, but WITHOUT
+@%:@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+@%:@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+@%:@ for more details.
+@%:@
+@%:@ You should have received a copy of the GNU General Public License
+@%:@ along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+@%:@
+@%:@ For usage, run `./configure --help'
+@%:@ For more detailed information on building and installing XEmacs,
+@%:@ read the file `INSTALL'.
+@%:@
+@%:@ If configure succeeds, it leaves its status in config.status.
+@%:@ A log of configuration tests can be found in config.log.
+@%:@ If configure fails after disturbing the status quo,
+@%:@ config.status is removed.
+@%:@
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in @%:@(
+ *posix*) :
+ set -o posix ;; @%:@(
+ *) :
+ ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
+ else
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in @%:@(
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
+ fi
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" "" $as_nl"
+
+# Find who we are. Look in the path if we contain no directory separator.
+as_myself=
+case $0 in @%:@((
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+ as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test "x$CONFIG_SHELL" = x; then
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
+else
+ case \`(set -o) 2>/dev/null\` in @%:@(
+ *posix*) :
+ set -o posix ;; @%:@(
+ *) :
+ ;;
+esac
+fi
+"
+ as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+ exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
+ as_have_required=yes
+else
+ as_have_required=no
+fi
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ as_found=:
+ case $as_dir in @%:@(
+ /*)
+ for as_base in sh bash ksh sh5; do
+ # Try only shells that exist, to save several forks.
+ as_shell=$as_dir/$as_base
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ CONFIG_SHELL=$as_shell as_have_required=yes
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ break 2
+fi
+fi
+ done;;
+ esac
+ as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+ CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+ if test "x$CONFIG_SHELL" != x; then :
+ # We cannot yet assume a decent shell, so we have to provide a
+ # neutralization value for shells without unset; and this also
+ # works around shells that cannot unset nonexistent variables.
+ # Preserve -v and -x to the replacement shell.
+ BASH_ENV=/dev/null
+ ENV=/dev/null
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+ export CONFIG_SHELL
+ case $- in @%:@ ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+ esac
+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+fi
+
+ if test x$as_have_required = xno; then :
+ $as_echo "$0: This script requires a shell more modern than all"
+ $as_echo "$0: the shells that I found on your system."
+ if test x${ZSH_VERSION+set} = xset ; then
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+ else
+ $as_echo "$0: Please tell bug-autoconf@gnu.org and
+$0: xemacs-beta@xemacs.org about your system, including any
+$0: error possibly output before this message. Then install
+$0: a modern shell, or manually run the script under such a
+$0: shell if you do have one."
+ fi
+ exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+@%:@ as_fn_unset VAR
+@%:@ ---------------
+@%:@ Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+@%:@ as_fn_set_status STATUS
+@%:@ -----------------------
+@%:@ Set @S|@? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} @%:@ as_fn_set_status
+
+@%:@ as_fn_exit STATUS
+@%:@ -----------------
+@%:@ Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} @%:@ as_fn_exit
+
+@%:@ as_fn_mkdir_p
+@%:@ -------------
+@%:@ Create "@S|@as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} @%:@ as_fn_mkdir_p
+@%:@ as_fn_append VAR VALUE
+@%:@ ----------------------
+@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take
+@%:@ advantage of any shell optimizations that allow amortized linear growth over
+@%:@ repeated appends, instead of the typical quadratic growth present in naive
+@%:@ implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+@%:@ as_fn_arith ARG...
+@%:@ ------------------
+@%:@ Perform arithmetic evaluation on the ARGs, and store the result in the
+@%:@ global @S|@as_val. Take advantage of shells that can avoid forks. The arguments
+@%:@ must be portable across @S|@(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
+
+
+@%:@ as_fn_error STATUS ERROR [LINENO LOG_FD]
+@%:@ ----------------------------------------
+@%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+@%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+@%:@ script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} @%:@ as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+else
+ as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
+else
+ as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
+ sed -n '
+ p
+ /[$]LINENO/=
+ ' <$as_myself |
+ sed '
+ s/[$]LINENO.*/&-/
+ t lineno
+ b
+ :lineno
+ N
+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+ t loop
+ s/-\n.*//
+ ' >$as_me.lineno &&
+ chmod +x "$as_me.lineno" ||
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+ # original and so on. Autoconf is especially sensitive to this).
+ . "./$as_me.lineno"
+ # Exit status is that of the last command.
+ exit
+}
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in @%:@(((((
+-n*)
+ case `echo 'xy\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
+ esac;;
+*)
+ ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
+else
+ rm -f conf$$.dir
+ mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+ as_ln_s='cp -p'
+ fi
+else
+ as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+ as_mkdir_p='mkdir -p "$as_dir"'
+else
+ test -d ./-p && rmdir ./-p
+ as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
+else
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in @%:@(
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in @%:@((
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIB@&t@OBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME='XEmacs'
+PACKAGE_TARNAME='xemacs'
+PACKAGE_VERSION='21.5'
+PACKAGE_STRING='XEmacs 21.5'
+PACKAGE_BUGREPORT='xemacs-beta@xemacs.org'
+PACKAGE_URL=''
+
+ac_unique_file="src/lisp.h"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+# include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='LTLIBOBJS
+LIB@&t@OBJS
+internal_makefile_list
+XE_CFLAGS
+XEMACS_CC
+sound_cflags
+native_sound_lib
+RECURSIVE_MAKE_ARGS
+ld_libs_all
+ld_libs_window_system
+ld_libs_general
+ld_switch_all
+ld_switch_window_system
+ld_switch_general
+c_switch_all
+c_switch_window_system
+c_switch_general
+opsysfile
+machfile
+extra_objs
+bitmapdir
+DOCDIR
+DOCDIR_USER_DEFINED
+ARCHLIBDIR
+ARCHLIBDIR_USER_DEFINED
+archlibdir
+ETCDIR
+ETCDIR_USER_DEFINED
+etcdir
+SITEMODULEDIR
+SITEMODULEDIR_USER_DEFINED
+sitemoduledir
+SITELISPDIR
+SITELISPDIR_USER_DEFINED
+sitelispdir
+MODULEDIR
+MODULEDIR_USER_DEFINED
+moduledir
+LISPDIR
+LISPDIR_USER_DEFINED
+lispdir
+PACKAGE_PATH
+PACKAGE_PATH_USER_DEFINED
+package_path
+LAST_PACKAGE_DIRECTORIES
+LAST_PACKAGE_DIRECTORIES_USER_DEFINED
+last_packages
+LATE_PACKAGE_DIRECTORIES
+LATE_PACKAGE_DIRECTORIES_USER_DEFINED
+late_packages
+EARLY_PACKAGE_DIRECTORIES
+EARLY_PACKAGE_DIRECTORIES_USER_DEFINED
+early_packages
+INFOPATH
+INFOPATH_USER_DEFINED
+infopath
+INFODIR
+INFODIR_USER_DEFINED
+EXEC_PREFIX
+EXEC_PREFIX_USER_DEFINED
+PREFIX
+PREFIX_USER_DEFINED
+extra_includes
+srcdir
+instvardir
+verbose_version
+version
+PROGNAME
+SUBDIR_MAKEFILES
+MAKE_SUBDIR
+INSTALL_ARCH_DEP_SUBDIR
+SRC_SUBDIR_DEPS
+ac_ct_CXX
+CXXFLAGS
+CXX
+have_esd_config
+ALLOCA
+canna_libs
+lwlib_objs
+postgresql_libs
+ldap_libs
+OBJECT_TO_BUILD
+MOD_INSTALL_PROGRAM
+INSTALLPATH
+MODCFLAGS
+MAKE_DOCFILE
+MODARCHDIR
+MOD_CC
+with_modules
+ld_dynamic_link_flags
+dll_ldo
+dll_post
+dll_ldflags
+dll_cflags
+dll_ld
+LIBSTDCPP
+dnd_objs
+libs_xauth
+install_pp
+X_EXTRA_LIBS
+X_LIBS
+X_PRE_LIBS
+X_CFLAGS
+XMKMF
+GTK_CONFIG
+SET_MAKE
+YFLAGS
+YACC
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+RANLIB
+AR
+lib_gcc
+ld
+start_files
+ld_switch_shared
+start_flags
+EGREP
+GREP
+CPP
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+configuration
+SHEBANG_PROGNAME
+build_os
+build_vendor
+build_cpu
+build
+blddir
+LN_S
+statedir
+inststaticdir
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_compiler
+with_compiler
+enable_xemacs_compiler
+with_xemacs_compiler
+enable_gcc
+with_gcc
+enable_cflags
+with_cflags
+enable_cflags_warning
+with_cflags_warning
+enable_optimization
+with_optimization
+enable_cflags_optimization
+with_cflags_optimization
+enable_cflags_debugging
+with_cflags_debugging
+enable_cpp
+with_cpp
+enable_cppflags
+with_cppflags
+enable_libs=LIBS
+with_libs=LIBS
+enable_ldflags=FLAGS
+with_ldflags=FLAGS
+enable_site_includes
+with_site_includes
+enable_site_libraries
+with_site_libraries
+enable_site_prefixes
+with_site_prefixes
+enable_site_runtime_libraries
+with_site_runtime_libraries
+enable_dynamic
+with_dynamic
+enable_prefix
+with_prefix
+enable_netinstall
+with_netinstall
+enable_statedir
+with_statedir
+enable_lispdir
+with_lispdir
+enable_archlibdir
+with_archlibdir
+enable_moduledir
+with_moduledir
+enable_etcdir
+with_etcdir
+enable_docdir
+with_docdir
+enable_site_lisp
+with_site_lisp
+enable_site_modules
+with_site_modules
+enable_early_packages
+with_early_packages
+enable_user_packages
+with_user_packages
+enable_late_packages
+with_late_packages
+enable_system_packages
+with_system_packages
+enable_last_packages
+with_last_packages
+enable_legacy_packages
+with_legacy_packages
+enable_package_path
+with_package_path
+enable_infopath
+with_infopath
+enable_xft
+with_xft
+enable_gtk
+with_gtk
+enable_gnome
+with_gnome
+enable_msw
+with_msw
+enable_toolbars
+with_toolbars
+enable_wmcommand
+with_wmcommand
+enable_athena
+with_athena
+enable_menubars
+with_menubars
+enable_scrollbars
+with_scrollbars
+enable_dialogs
+with_dialogs
+enable_widgets
+with_widgets
+enable_dragndrop
+with_dragndrop
+enable_cde
+with_cde
+enable_external_widget
+with_external_widget
+enable_tty
+with_tty
+enable_ncurses
+with_ncurses
+enable_gpm
+with_gpm
+enable_xpm
+with_xpm
+enable_png
+with_png
+enable_jpeg
+with_jpeg
+enable_tiff
+with_tiff
+enable_xface
+with_xface
+enable_gif
+with_gif
+enable_sound
+with_sound
+enable_native_sound_lib
+with_native_sound_lib
+enable_mule
+with_mule
+enable_xim
+with_xim
+enable_canna
+with_canna
+enable_wnn
+with_wnn
+enable_wnn6
+with_wnn6
+enable_xfs
+with_xfs
+enable_default_eol_detection
+with_default_eol_detection
+enable_clash_detection
+with_clash_detection
+enable_zlib
+with_zlib
+enable_database
+with_database
+enable_ldap
+with_ldap
+enable_postgresql
+with_postgresql
+enable_mail_locking
+with_mail_locking
+enable_pop
+with_pop
+enable_kerberos
+with_kerberos
+enable_hesiod
+with_hesiod
+enable_tooltalk
+with_tooltalk
+enable_socks
+with_socks
+enable_dnet
+with_dnet
+enable_ipv6_cname
+with_ipv6_cname
+enable_rel_alloc
+with_rel_alloc
+enable_dlmalloc
+with_dlmalloc
+enable_system_malloc
+with_system_malloc
+enable_debug_malloc
+with_debug_malloc
+enable_pdump
+with_pdump
+enable_dump_in_exec
+with_dump_in_exec
+enable_kkcc
+with_kkcc
+enable_newgc
+with_newgc
+enable_vdb
+with_vdb
+enable_modules
+with_modules
+enable_bignum
+with_bignum
+enable_workshop
+with_workshop
+enable_sparcworks
+with_sparcworks
+enable_debug
+with_debug
+enable_error_checking
+with_error_checking
+enable_assertions
+with_assertions
+enable_memory_usage_stats
+with_memory_usage_stats
+enable_quick_build
+with_quick_build
+enable_union_type
+with_union_type
+enable_quantify
+with_quantify
+enable_purify
+with_purify
+enable_valgrind
+with_valgrind
+with_x
+'
+ ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP
+YACC
+YFLAGS
+XMKMF
+CXX
+CXXFLAGS
+CCC'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+ # If the previous option needs an argument, assign it.
+ if test -n "$ac_prev"; then
+ eval $ac_prev=\$ac_option
+ ac_prev=
+ continue
+ fi
+
+ case $ac_option in
+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *=) ac_optarg= ;;
+ *) ac_optarg=yes ;;
+ esac
+
+ # Accept the important Cygnus configure options, so we can diagnose typos.
+
+ case $ac_dashdash$ac_option in
+ --)
+ ac_dashdash=yes ;;
+
+ -bindir | --bindir | --bindi | --bind | --bin | --bi)
+ ac_prev=bindir ;;
+ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+ bindir=$ac_optarg ;;
+
+ -build | --build | --buil | --bui | --bu)
+ ac_prev=build_alias ;;
+ -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+ build_alias=$ac_optarg ;;
+
+ -cache-file | --cache-file | --cache-fil | --cache-fi \
+ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+ ac_prev=cache_file ;;
+ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+ cache_file=$ac_optarg ;;
+
+ --config-cache | -C)
+ cache_file=config.cache ;;
+
+ -datadir | --datadir | --datadi | --datad)
+ ac_prev=datadir ;;
+ -datadir=* | --datadir=* | --datadi=* | --datad=*)
+ datadir=$ac_optarg ;;
+
+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+ | --dataroo | --dataro | --datar)
+ ac_prev=datarootdir ;;
+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+ datarootdir=$ac_optarg ;;
+
+ -disable-* | --disable-*)
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error $? "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=no ;;
+
+ -docdir | --docdir | --docdi | --doc | --do)
+ ac_prev=docdir ;;
+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+ docdir=$ac_optarg ;;
+
+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+ ac_prev=dvidir ;;
+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+ dvidir=$ac_optarg ;;
+
+ -enable-* | --enable-*)
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error $? "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=\$ac_optarg ;;
+
+ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+ | --exec | --exe | --ex)
+ ac_prev=exec_prefix ;;
+ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+ | --exec=* | --exe=* | --ex=*)
+ exec_prefix=$ac_optarg ;;
+
+ -gas | --gas | --ga | --g)
+ # Obsolete; use --with-gas.
+ with_gas=yes ;;
+
+ -help | --help | --hel | --he | -h)
+ ac_init_help=long ;;
+ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+ ac_init_help=recursive ;;
+ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+ ac_init_help=short ;;
+
+ -host | --host | --hos | --ho)
+ ac_prev=host_alias ;;
+ -host=* | --host=* | --hos=* | --ho=*)
+ host_alias=$ac_optarg ;;
+
+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+ ac_prev=htmldir ;;
+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+ | --ht=*)
+ htmldir=$ac_optarg ;;
+
+ -includedir | --includedir | --includedi | --included | --include \
+ | --includ | --inclu | --incl | --inc)
+ ac_prev=includedir ;;
+ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+ | --includ=* | --inclu=* | --incl=* | --inc=*)
+ includedir=$ac_optarg ;;
+
+ -infodir | --infodir | --infodi | --infod | --info | --inf)
+ ac_prev=infodir ;;
+ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+ infodir=$ac_optarg ;;
+
+ -libdir | --libdir | --libdi | --libd)
+ ac_prev=libdir ;;
+ -libdir=* | --libdir=* | --libdi=* | --libd=*)
+ libdir=$ac_optarg ;;
+
+ -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+ | --libexe | --libex | --libe)
+ ac_prev=libexecdir ;;
+ -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+ | --libexe=* | --libex=* | --libe=*)
+ libexecdir=$ac_optarg ;;
+
+ -localedir | --localedir | --localedi | --localed | --locale)
+ ac_prev=localedir ;;
+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+ localedir=$ac_optarg ;;
+
+ -localstatedir | --localstatedir | --localstatedi | --localstated \
+ | --localstate | --localstat | --localsta | --localst | --locals)
+ ac_prev=localstatedir ;;
+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+ localstatedir=$ac_optarg ;;
+
+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+ ac_prev=mandir ;;
+ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+ mandir=$ac_optarg ;;
+
+ -nfp | --nfp | --nf)
+ # Obsolete; use --without-fp.
+ with_fp=no ;;
+
+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+ | --no-cr | --no-c | -n)
+ no_create=yes ;;
+
+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+ no_recursion=yes ;;
+
+ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+ | --oldin | --oldi | --old | --ol | --o)
+ ac_prev=oldincludedir ;;
+ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+ oldincludedir=$ac_optarg ;;
+
+ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+ ac_prev=prefix ;;
+ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+ prefix=$ac_optarg ;;
+
+ -program-prefix | --program-prefix | --program-prefi | --program-pref \
+ | --program-pre | --program-pr | --program-p)
+ ac_prev=program_prefix ;;
+ -program-prefix=* | --program-prefix=* | --program-prefi=* \
+ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+ program_prefix=$ac_optarg ;;
+
+ -program-suffix | --program-suffix | --program-suffi | --program-suff \
+ | --program-suf | --program-su | --program-s)
+ ac_prev=program_suffix ;;
+ -program-suffix=* | --program-suffix=* | --program-suffi=* \
+ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+ program_suffix=$ac_optarg ;;
+
+ -program-transform-name | --program-transform-name \
+ | --program-transform-nam | --program-transform-na \
+ | --program-transform-n | --program-transform- \
+ | --program-transform | --program-transfor \
+ | --program-transfo | --program-transf \
+ | --program-trans | --program-tran \
+ | --progr-tra | --program-tr | --program-t)
+ ac_prev=program_transform_name ;;
+ -program-transform-name=* | --program-transform-name=* \
+ | --program-transform-nam=* | --program-transform-na=* \
+ | --program-transform-n=* | --program-transform-=* \
+ | --program-transform=* | --program-transfor=* \
+ | --program-transfo=* | --program-transf=* \
+ | --program-trans=* | --program-tran=* \
+ | --progr-tra=* | --program-tr=* | --program-t=*)
+ program_transform_name=$ac_optarg ;;
+
+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+ ac_prev=pdfdir ;;
+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+ pdfdir=$ac_optarg ;;
+
+ -psdir | --psdir | --psdi | --psd | --ps)
+ ac_prev=psdir ;;
+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+ psdir=$ac_optarg ;;
+
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil)
+ silent=yes ;;
+
+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+ ac_prev=sbindir ;;
+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+ | --sbi=* | --sb=*)
+ sbindir=$ac_optarg ;;
+
+ -sharedstatedir | --sharedstatedir | --sharedstatedi \
+ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+ | --sharedst | --shareds | --shared | --share | --shar \
+ | --sha | --sh)
+ ac_prev=sharedstatedir ;;
+ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+ | --sha=* | --sh=*)
+ sharedstatedir=$ac_optarg ;;
+
+ -site | --site | --sit)
+ ac_prev=site ;;
+ -site=* | --site=* | --sit=*)
+ site=$ac_optarg ;;
+
+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+ ac_prev=srcdir ;;
+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+ srcdir=$ac_optarg ;;
+
+ -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+ | --syscon | --sysco | --sysc | --sys | --sy)
+ ac_prev=sysconfdir ;;
+ -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+ sysconfdir=$ac_optarg ;;
+
+ -target | --target | --targe | --targ | --tar | --ta | --t)
+ ac_prev=target_alias ;;
+ -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+ target_alias=$ac_optarg ;;
+
+ -v | -verbose | --verbose | --verbos | --verbo | --verb)
+ verbose=yes ;;
+
+ -version | --version | --versio | --versi | --vers | -V)
+ ac_init_version=: ;;
+
+ -with-* | --with-*)
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error $? "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=\$ac_optarg ;;
+
+ -without-* | --without-*)
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error $? "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=no ;;
+
+ --x)
+ # Obsolete; use --with-x.
+ with_x=yes ;;
+
+ -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+ | --x-incl | --x-inc | --x-in | --x-i)
+ ac_prev=x_includes ;;
+ -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+ x_includes=$ac_optarg ;;
+
+ -x-libraries | --x-libraries | --x-librarie | --x-librari \
+ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+ ac_prev=x_libraries ;;
+ -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+ x_libraries=$ac_optarg ;;
+
+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
+ ;;
+
+ *=*)
+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+ # Reject names that are not valid shell variable names.
+ case $ac_envvar in #(
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ esac
+ eval $ac_envvar=\$ac_optarg
+ export $ac_envvar ;;
+
+ *)
+ # FIXME: should be removed in autoconf 3.0.
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+ ;;
+
+ esac
+done
+
+if test -n "$ac_prev"; then
+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+ as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+ case $enable_option_checking in
+ no) ;;
+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ datadir sysconfdir sharedstatedir localstatedir includedir \
+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+ libdir localedir mandir
+do
+ eval ac_val=\$$ac_var
+ # Remove trailing slashes.
+ case $ac_val in
+ */ )
+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+ eval $ac_var=\$ac_val;;
+ esac
+ # Be sure to have absolute directory names.
+ case $ac_val in
+ [\\/$]* | ?:[\\/]* ) continue;;
+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+ esac
+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+ if test "x$build_alias" = x; then
+ cross_compiling=maybe
+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used" >&2
+ elif test "x$build_alias" != "x$host_alias"; then
+ cross_compiling=yes
+ fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+ as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+ as_fn_error $? "pwd does not report name of working directory"
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+ ac_srcdir_defaulted=yes
+ # Try the directory containing this script, then the parent directory.
+ ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_myself" : 'X\(//\)[^/]' \| \
+ X"$as_myself" : 'X\(//\)$' \| \
+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ srcdir=$ac_confdir
+ if test ! -r "$srcdir/$ac_unique_file"; then
+ srcdir=..
+ fi
+else
+ ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+ pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+ srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+ eval ac_env_${ac_var}_set=\${${ac_var}+set}
+ eval ac_env_${ac_var}_value=\$${ac_var}
+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+ eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+ # Omit some internal or obsolete options to make the list less imposing.
+ # This message is too long to be a string in the A/UX 3.1 sh.
+ cat <<_ACEOF
+\`configure' configures XEmacs 21.5 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE. See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+ -h, --help display this help and exit
+ --help=short display options specific to this package
+ --help=recursive display the short help of all the included packages
+ -V, --version display version information and exit
+ -q, --quiet, --silent do not print \`checking ...' messages
+ --cache-file=FILE cache test results in FILE [disabled]
+ -C, --config-cache alias for \`--cache-file=config.cache'
+ -n, --no-create do not create output files
+ --srcdir=DIR find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+ --prefix=PREFIX install architecture-independent files in PREFIX
+ @<:@@S|@ac_default_prefix@:>@
+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
+ @<:@PREFIX@:>@
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+ --bindir=DIR user executables [EPREFIX/bin]
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+ --mandir=DIR man documentation [DATAROOTDIR/man]
+ --docdir=DIR documentation root @<:@DATAROOTDIR/doc/xemacs@:>@
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+ --psdir=DIR ps documentation [DOCDIR]
+_ACEOF
+
+ cat <<\_ACEOF
+
+X features:
+ --x-includes=DIR X include files are in DIR
+ --x-libraries=DIR X library files are in DIR
+
+System types:
+ --build=BUILD configure for building on BUILD [guessed]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+ case $ac_init_help in
+ short | recursive ) echo "Configuration of XEmacs 21.5:";;
+ esac
+ cat <<\_ACEOF
+
+Optional Features:
+ --with-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-FEATURE[=ARG] alias for --with-FEATURE
+ --without-FEATURE do not use FEATURE (same as --with-FEATURE=no)
+ --disable-FEATURE alias for --without-FEATURE
+
+Compilation options
+-------------------
+
+ --with-compiler C compiler to use
+ --with-xemacs-compiler compiler to use to compile just the xemacs
+ executable and C modules. If you want to compile
+ XEmacs as C++, use e.g.
+ `--with-xemacs-compiler=g++'. This turns on a lot of
+ additional error-checking.
+ --with-gcc Use GCC to compile XEmacs.
+ --with-cflags=FLAGS Compiler flags. These flags will be placed after any
+ flags inserted for warnings, debugging or
+ optimization; setting this does not disable the
+ insertion of those flags. Use configure settings
+ such as `--with-optimization=no' or `with-debug=no'
+ to turn them off, or override them with
+ `--with-cflags-optimization',
+ `--with-cflags-debugging', or `with-cflags-warning'.
+ --with-cflags-warning=FLAGS
+ Override compiler flags used to control warnings.
+ Normally, don't set this, as XEmacs already turns on
+ the maximum safe warning level.
+ --with-optimization Control whether compilation is optimized. By
+ default, optimization is on in release versions and
+ off in beta versions, since it can interfere with
+ proper stack backtraces.
+ --with-cflags-optimization=FLAGS
+ Override compiler flags used to control
+ optimization. If blank, forces no optimization; if
+ non-blank, forces optimization. Normally, don't set
+ this; XEmacs automatically sets the maximum safe
+ optimization flags appropriate for the compiler
+ being invoked. If you just want to turn optimization
+ on or off, use `with-optimization' instead.
+ --with-cflags-debugging=FLAGS
+ Override compiler flags used to add debugging
+ information to the executable. Normally, debugging
+ information is added whenever possible (i.e. unless
+ optimization is turned on and the compiler does not
+ permit debugging and optimization simultaneously).
+ --with-cpp C preprocessor to use (e.g. /usr/ccs/lib/cpp or cc
+ -E)
+ --with-cppflags C preprocessor flags (e.g. -I/foo or -Dfoo=bar)
+ --with-libs Additional libraries (e.g. -lfoo)
+ --with-ldflags Additional linker flags (e.g. -L/foo)
+ --with-site-includes=PATHS
+ Prepend to include search path.
+ --with-site-libraries=PATHS
+ Prepend to library search path.
+ --with-site-prefixes=PATHS
+ Prepend to include and library search paths, with
+ /include and /lib added. Comes after site-includes
+ and site-libraries, if any.
+ --with-site-runtime-libraries=PATHS
+ Prepend to the runtime library search path
+ --with-dynamic Link dynamically if supported by system. 'No' forces
+ static linking.
+
+Installation options
+--------------------
+
+ --with-prefix=no Don't compile the value for `prefix' into the
+ executable.
+ --with-netinstall Support for installation over the internet. Only
+ functional on the MS Windows platforms.
+ --with-statedir=DIR
+ --with-lispdir=DIR
+ --with-archlibdir=DIR
+ --with-moduledir=DIR
+ --with-etcdir=DIR
+ --with-docdir=DIR
+
+Run-time path-searching options
+-------------------------------
+
+ --with-site-lisp=no Allow for a site-lisp directory in the XEmacs
+ hierarchy searched before the installation packages.
+ --with-site-modules=no Disable site-modules directory in the XEmacs
+ hierarchy, which is searched before the installation
+ modules.
+ --with-early-packages=DIR
+ Specify location of early/user packages (instead of
+ ~/.xemacs; same as --with-user-packages).
+ --with-user-packages=DIR
+ Specify location of early/user packages (instead of
+ ~/.xemacs; same as --with-early-packages).
+ --with-late-packages=DIR
+ Specify location of late/system packages (instead of
+ default location; same as --with-system-packages).
+ --with-system-packages=DIR
+ Specify location of late/system packages (instead of
+ default location; same as --with-late-packages).
+ --with-last-packages=DIR
+ Specify location of last/legacy packages (instead of
+ default location; same as --with-legacy-packages).
+ --with-legacy-packages=DIR
+ Specify location of last/legacy packages (instead of
+ default location; same as --with-last-packages).
+ --with-package-path=PATH
+ Search path for package directories.
+ --with-infopath=PATH Location of info directories
+
+Window-system options
+---------------------
+
+ --with-xft Compile with support for Xft client-side font
+ rendering and anti-aliasing. Components that can use
+ Xft are `emacs' (buffers), `menubars', `tabs', and
+ `gauges'. Prefix component with `no' to disable its
+ use of Xft. Requires X11, Xft, Xrender, freetype,
+ and fontconfig support. Default is `noemacs,
+ nomenubars, notabs, nogauges'. The default when
+ selected is `emacs, nomenubars, notabs, nogauges'.
+ --with-gtk Support GTK on the X Window System. (EXPERIMENTAL)
+ --with-gnome Support GNOME on the X Window System. (EXPERIMENTAL)
+ --with-msw Support MS Windows as a window system (only under
+ Cygwin and MinGW). `--with-msw=no' may be needed on
+ *nix systems with Wine installed.
+ --with-toolbars Enable toolbar support. Default: yes.
+ --with-wmcommand Compile without realized leader window which will
+ keep the WM_COMMAND property.
+ --with-athena=TYPE Use TYPE Athena widgets (`xaw', `3d', `next', `95',
+ or `xpm').
+ --with-menubars=TYPE Use TYPE menubars ('yes', '`no', `lucid', `motif',
+ `athena', `gtk', or `msw'). The Lucid widgets
+ emulate Motif (mostly) but are faster. *WARNING* The
+ Motif menubar is currently broken. Lucid menubars
+ are the default.
+ --with-scrollbars=TYPE Use TYPE scrollbars 'yes', '`no', `lucid', `motif',
+ `athena', `gtk', or `msw'). Lucid scrollbars are the
+ default.
+ --with-dialogs=TYPE Use TYPE dialog boxes 'yes', '`no', `lucid',
+ `motif', `athena', `gtk', or `msw'). There are no
+ true Lucid dialogs; Motif dialogs will be used if
+ Motif can be found, else Athena is used.
+ --with-widgets=TYPE Use TYPE native widgets ('yes', '`no', `lucid',
+ `motif', `athena', `gtk', or `msw'). Other widget
+ types are currently unsupported. There are no true
+ Lucid widgets; Motif widgets will be used if Motif
+ can be found, else Athena is used.
+ --with-dragndrop Compile in the generic drag and drop API. This is
+ automatically added if one of the drag and drop
+ protocols is found (currently CDE, MSWindows, and
+ GTK). *WARNING* The Drag'n'drop support is under
+ development and is considered experimental.
+ --with-cde Compile in support for CDE drag and drop.
+ --with-external-widget Support XEmacs server for text widgets in other
+ applications.
+
+TTY (character terminal) options
+--------------------------------
+
+ --with-tty Enable TTY support. Default: yes.
+ --with-ncurses Use the ncurses library for tty support.
+ --with-gpm Compile in GPM mouse support for ttys.
+
+Image options
+-------------
+
+ --with-xpm Compile with support for XPM images. PRACTICALLY
+ REQUIRED. Although this library is nonstandard and a
+ real hassle to build, many basic things (e.g.
+ toolbars) depend on it, and you will run into many
+ problems without it.
+ --with-png Compile with support for PNG images. Recommended
+ because the images on the About page are not
+ viewable without it.
+ --with-jpeg Compile with support for JPEG images. Useful if you
+ are using a mail, news reader, or web browser in
+ XEmacs, so that JPEG images can be displayed.
+ --with-tiff Compile with support for TIFF images. Possibly
+ useful, for the same reason as JPEG images.
+ --with-xface Compile with support for X-Face mail headers.
+ Requires the compface package.
+ --with-gif Compile with support for GIF images.
+
+Sound options
+-------------
+
+ --with-sound=TYPE Compile with sound support. Valid types are
+ `native', `alsa', `nas' and `esd'. Prefix a type
+ with 'no' to disable. The first type can be `none'
+ or `all'. `none' means
+ `nonative,noalsa,nonas,noesd'. `all' means
+ `native,alsa,nas,esd'. Later options override
+ earlier ones for the same TYPE. The default is to
+ autodetect all sound support except for ESD which
+ defaults to off.
+ --with-native-sound-lib Path to sound library (for systems with name
+ conflicts).
+
+Internationalization options
+----------------------------
+
+ --with-mule Compile with Mule (Multi-Lingual Emacs) support,
+ needed to support non-Latin-1 (including Asian)
+ languages.
+ --with-xim==TYPE Enable XIM support. TYPE is `yes', `no', `xlib', or
+ `motif'
+ --with-canna Support the Canna Japanese input method. Requires
+ Mule.
+ --with-wnn Support the Wnn Asian language input method.
+ Requires Mule.
+ --with-wnn6 Support the Wnn6 Asian language input method
+ (proprietary). Requires Mule.
+ --with-xfs Enable XFontSet support for internationalized
+ menubar. Incompatible with `--with-xim=motif' and
+ `--with-xft'. `--with-menubars=lucid' (the default)
+ is desirable.
+
+File-related options
+--------------------
+
+ --with-default-eol-detection
+ Turns on by default auto-detection of end-of-line
+ type when reading a file. Applies to those platforms
+ where auto-detection is off by default (non-Mule
+ Unix). Has no effect otherwise.
+ --with-clash-detection Disable use of lock files to detect multiple edits
+ of the same file.
+ --with-zlib Support inflate (de)compression internally.
+
+Database options
+----------------
+
+ --with-database=TYPE Compile with database support. Valid types are `no'
+ or a comma-separated list of one or more of `berkdb'
+ and either `dbm' or `gdbm'.
+ --with-ldap Support the LDAP protocol.
+ --with-postgresql Support the PostgreSQL RDBMS.
+
+Mail options
+------------
+
+ --with-mail-locking=TYPE
+ Specify the locking to be used by movemail to
+ prevent concurrent updates of mail spool files.
+ Valid types are `lockf', `flock', `file', `locking',
+ `mmdf' or `pop'.
+ --with-pop Support POP for mail retrieval.
+ --with-kerberos Support Kerberos-authenticated POP.
+ --with-hesiod Support Hesiod to get the POP server host.
+
+Networking options
+------------------
+
+ --with-tooltalk Support the ToolTalk IPC protocol.
+ --with-socks Compile with support for SOCKS (an Internet proxy).
+ --with-dnet Compile with support for DECnet.
+ --with-ipv6-cname Try IPv6 information first when canonicalizing host
+ names. This option has no effect unless system
+ supports getaddrinfo(3) and getnameinfo(3).
+
+Memory allocation options
+-------------------------
+
+ --with-rel-alloc Enable the relocating allocator.
+ --with-dlmalloc Use Doug Lea's malloc implementation.
+ --with-system-malloc Use the system malloc, not the one distributed with
+ XEmacs.
+ --with-debug-malloc Use a debugging malloc.
+ --with-pdump Enable portable LISP preloader.
+ --with-dump-in-exec Enable dumping into executable (enabled by default
+ for `pdump', not enabled by default in combination
+ with `newgc').
+ --with-kkcc Enable experimental new GC mark algorithms.
+ --with-newgc Enable new incremental garbage collector and new
+ allocator.
+ --with-vdb=TYPE Override auto-detection of virtual-dirty-bit
+ write-barrier implementation for the new garbage
+ collector. TYPE must be one of "auto" (for
+ auto-detection), "posix", "win32", "mach", or "fake"
+ (uses the new garbage collector but disables
+ incremental collections). The default is to use
+ auto-detection.
+
+Emacs Lisp options
+------------------
+
+ --with-modules Compile in experimental support for dynamically
+ loaded libraries (Dynamic Shared Objects).
+ --with-bignum=TYPE Compile in support for bignums, ratios, or bigfloats
+ using library support. TYPE must be one of "gmp"
+ (for GNU MP), "mp" (for BSD MP), or "no" (disabled).
+
+Platform Specific options
+-------------------------
+
+ --with-workshop Support the Sun WorkShop (formerly Sparcworks)
+ development environment.
+ --with-sparcworks Alias for --with-workshop
+
+Debugging options
+-----------------
+
+ --with-debug Enable additional debugging information. No
+ noticeable time cost (unlike
+ `--with-error-checking'). This turns adds `-g' to
+ the compiler options so that debug information is
+ compiled into the XEmacs executable. It also turns
+ on assert checks in the source code (i.e. same as
+ `--with-assertions'); enables Lisp commands for
+ determining detailed memory usage statistics (same
+ as `--with-memory-usage-stats'); adds various Lisp
+ variables and functions that allow one to display
+ internal structures, show the internal workings of
+ certain subsystems, and exit to the debugger; causes
+ Lisp errors during building to exit to the debugger
+ or dump core; and adds debugging-related C functions
+ meant to be called from a debugger.
+ --with-error-checking=CLASS|all|none
+ Compile with internal error-checking added. Causes
+ noticeable loss of speed. Valid classes are
+ `byte_code', `display' (redisplay), `extents', `gc'
+ (garbage collection), `glyphs', `malloc' (memory
+ allocation), `structures' (C structures), `text'
+ (text handling and conversion), `types' (correct
+ Lisp-object type for type-specific operations).
+ `all' or `none' can be given to set all or no
+ classes, respectively. Any of the classes can be
+ prefixed with `no' to turn the class off. A
+ comma-separated list of classes can also be given.
+ For example, `all,nogc' turns on all but
+ garbage-collection-related checking. Omitting any
+ argument or specifying just `yes' is the same as
+ `all'.
+ --with-assertions Compile in runtime assertions.
+ --with-memory-usage-stats
+ Enable LISP memory usage API.
+ --with-quick-build Speed up the build cycle by leaving out steps where
+ XEmacs will still work (more or less) without them.
+ Potentially dangerous if you don't know what you're
+ doing. This (1) Doesn't garbage-collect after
+ loading each file during dumping, (2) Doesn't
+ automatically rebuild the DOC file (remove it by
+ hand to get it rebuilt), (3) Removes config.h,
+ lisp.h and associated files from the dependency
+ lists, so changes to these files don't automatically
+ cause all .c files to be rebuilt, (4) Doesn't check
+ for Lisp shadows.
+ --with-union-type Use union definition of Lisp_Object type. Known to
+ trigger bugs in some compilers.
+ --with-quantify Support performance debugging using Quantify.
+ --with-purify Support memory debugging using Purify.
+ --with-valgrind Support memory debugging using Valgrind.
+
+Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-x use the X Window System
+
+Some influential environment variables:
+ CC C compiler command
+ CFLAGS C compiler flags
+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
+ nonstandard directory <lib dir>
+ LIBS libraries to pass to the linker, e.g. -l<library>
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
+ CPP C preprocessor
+ YACC The `Yet Another Compiler Compiler' implementation to use.
+ Defaults to the first program found out of: `bison -y', `byacc',
+ `yacc'.
+ YFLAGS The list of arguments that will be passed by default to @S|@YACC.
+ This script will default YFLAGS to the empty string to avoid a
+ default value of `-d' given by some make applications.
+ XMKMF Path to xmkmf, Makefile generator for X Window System
+ CXX C++ compiler command
+ CXXFLAGS C++ compiler flags
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to <xemacs-beta@xemacs.org>.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+ # If there are subdirs, report their specific --help.
+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+ test -d "$ac_dir" ||
+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+ continue
+ ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+ .) # We are building in place.
+ ac_srcdir=.
+ ac_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+ cd "$ac_dir" || { ac_status=$?; continue; }
+ # Check for guested configure.
+ if test -f "$ac_srcdir/configure.gnu"; then
+ echo &&
+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+ elif test -f "$ac_srcdir/configure"; then
+ echo &&
+ $SHELL "$ac_srcdir/configure" --help=recursive
+ else
+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ fi || ac_status=$?
+ cd "$ac_pwd" || { ac_status=$?; break; }
+ done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+ cat <<\_ACEOF
+XEmacs configure 21.5
+generated by GNU Autoconf 2.68
+
+Copyright (C) 2010 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+
+Configuration script for XEmacs. Largely divergent from FSF.
+Guess values for system-dependent variables and create Makefiles.
+
+Copyright (C) 1992-1999, 2001-2006 Free Software Foundation, Inc.
+Copyright (C) 1993, 1994, 1995 Board of Trustees, University of Illinois.
+Copyright (C) 1996, 1997 Sun Microsystems, Inc.
+Copyright (C) 1995, 1996, 2002, 2003, 2004 Ben Wing.
+Copyright (C) 2000, 2001 Martin Buchholz.
+Copyright (C) 1998, 1999 J. Kean Johnston.
+Copyright (C) 2005 Malcolm Purvis
+
+Don't edit this script!
+This script was automatically generated by the `autoconf' program
+from the file `./configure.ac'. To rebuild it, execute the command:
+
+ autoconf
+
+in the this directory. You must have autoconf version 2.59.
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
+For usage, run `./configure --help'
+For more detailed information on building and installing XEmacs,
+read the file `INSTALL'.
+
+If configure succeeds, it leaves its status in config.status.
+A log of configuration tests can be found in config.log.
+If configure fails after disturbing the status quo,
+ config.status is removed.
+
+_ACEOF
+ exit
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+@%:@ ac_fn_c_try_compile LINENO
+@%:@ --------------------------
+@%:@ Try to compile conftest.@S|@ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext
+ if { { ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} @%:@ ac_fn_c_try_compile
+
+@%:@ ac_fn_c_try_cpp LINENO
+@%:@ ----------------------
+@%:@ Try to preprocess conftest.@S|@ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} @%:@ ac_fn_c_try_cpp
+
+@%:@ ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+@%:@ -------------------------------------------------------
+@%:@ Tests whether HEADER exists, giving a warning if it cannot be compiled using
+@%:@ the include files in INCLUDES and setting the cache variable VAR
+@%:@ accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if eval \${$3+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+@%:@include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_header_compiler=yes
+else
+ ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+@%:@include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ ac_header_preproc=yes
+else
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+ yes:no: )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##"
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} @%:@ ac_fn_c_check_header_mongrel
+
+@%:@ ac_fn_c_try_run LINENO
+@%:@ ----------------------
+@%:@ Try to link conftest.@S|@ac_ext, and return whether this succeeded. Assumes
+@%:@ that executables *can* be run.
+ac_fn_c_try_run ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=$ac_status
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} @%:@ ac_fn_c_try_run
+
+@%:@ ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+@%:@ -------------------------------------------------------
+@%:@ Tests whether HEADER exists and can be compiled using the include files in
+@%:@ INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+@%:@include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} @%:@ ac_fn_c_check_header_compile
+
+@%:@ ac_fn_c_try_link LINENO
+@%:@ -----------------------
+@%:@ Try to link conftest.@S|@ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} @%:@ ac_fn_c_try_link
+
+@%:@ ac_fn_c_check_func LINENO FUNC VAR
+@%:@ ----------------------------------
+@%:@ Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $2 (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} @%:@ ac_fn_c_check_func
+
+@%:@ ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+@%:@ ---------------------------------------------
+@%:@ Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+@%:@ accordingly.
+ac_fn_c_check_decl ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ as_decl_name=`echo $2|sed 's/ *(.*//'`
+ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+@%:@ifndef $as_decl_name
+@%:@ifdef __cplusplus
+ (void) $as_decl_use;
+@%:@else
+ (void) $as_decl_name;
+@%:@endif
+@%:@endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} @%:@ ac_fn_c_check_decl
+
+@%:@ ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+@%:@ -------------------------------------------
+@%:@ Tests whether TYPE exists after having included INCLUDES, setting cache
+@%:@ variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=no"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} @%:@ ac_fn_c_check_type
+
+@%:@ ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
+@%:@ ----------------------------------------------------
+@%:@ Tries to find if the field MEMBER exists in type AGGR, after including
+@%:@ INCLUDES, setting cache variable VAR accordingly.
+ac_fn_c_check_member ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+$as_echo_n "checking for $2.$3... " >&6; }
+if eval \${$4+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (ac_aggr.$3)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$4=yes"
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (sizeof ac_aggr.$3)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$4=yes"
+else
+ eval "$4=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$4
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} @%:@ ac_fn_c_check_member
+
+@%:@ ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
+@%:@ --------------------------------------------
+@%:@ Tries to find the compile-time value of EXPR in a program that includes
+@%:@ INCLUDES, setting VAR accordingly. Returns whether the value could be
+@%:@ computed
+ac_fn_c_compute_int ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+static int test_array @<:@1 - 2 * !(($2) >= 0)@:>@;
+test_array @<:@0@:>@ = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+static int test_array @<:@1 - 2 * !(($2) <= $ac_mid)@:>@;
+test_array @<:@0@:>@ = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_hi=$ac_mid; break
+else
+ as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+static int test_array @<:@1 - 2 * !(($2) < 0)@:>@;
+test_array @<:@0@:>@ = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+static int test_array @<:@1 - 2 * !(($2) >= $ac_mid)@:>@;
+test_array @<:@0@:>@ = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_lo=$ac_mid; break
+else
+ as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ ac_lo= ac_hi=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+static int test_array @<:@1 - 2 * !(($2) <= $ac_mid)@:>@;
+test_array @<:@0@:>@ = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_hi=$ac_mid
+else
+ as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in @%:@((
+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
+'') ac_retval=1 ;;
+esac
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+static long int longval () { return $2; }
+static unsigned long int ulongval () { return $2; }
+@%:@include <stdio.h>
+@%:@include <stdlib.h>
+int
+main ()
+{
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ return 1;
+ if (($2) < 0)
+ {
+ long int i = longval ();
+ if (i != ($2))
+ return 1;
+ fprintf (f, "%ld", i);
+ }
+ else
+ {
+ unsigned long int i = ulongval ();
+ if (i != ($2))
+ return 1;
+ fprintf (f, "%lu", i);
+ }
+ /* Do not output a trailing newline, as this causes \r\n confusion
+ on some platforms. */
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+else
+ ac_retval=1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f conftest.val
+
+ fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} @%:@ ac_fn_c_compute_int
+
+@%:@ ac_fn_cxx_try_compile LINENO
+@%:@ ----------------------------
+@%:@ Try to compile conftest.@S|@ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext
+ if { { ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} @%:@ ac_fn_cxx_try_compile
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by XEmacs $as_me 21.5, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
+
+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ $as_echo "PATH: $as_dir"
+ done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+ for ac_arg
+ do
+ case $ac_arg in
+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil)
+ continue ;;
+ *\'*)
+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ case $ac_pass in
+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+ 2)
+ as_fn_append ac_configure_args1 " '$ac_arg'"
+ if test $ac_must_keep_next = true; then
+ ac_must_keep_next=false # Got value, back to normal.
+ else
+ case $ac_arg in
+ *=* | --config-cache | -C | -disable-* | --disable-* \
+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+ | -with-* | --with-* | -without-* | --without-* | --x)
+ case "$ac_configure_args0 " in
+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+ esac
+ ;;
+ -* ) ac_must_keep_next=true ;;
+ esac
+ fi
+ as_fn_append ac_configure_args " '$ac_arg'"
+ ;;
+ esac
+ done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log. We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+ # Save into config.log some information that might help in debugging.
+ {
+ echo
+
+ $as_echo "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+ echo
+ # The following way of writing the cache mishandles newlines in values,
+(
+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+ eval ac_val=\$$ac_var
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) { eval $ac_var=; unset $ac_var;} ;;
+ esac ;;
+ esac
+ done
+ (set) 2>&1 |
+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
+ sed -n \
+ "s/'\''/'\''\\\\'\'''\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+ ;; #(
+ *)
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+ ;;
+ esac |
+ sort
+)
+ echo
+
+ $as_echo "## ----------------- ##
+## Output variables. ##
+## ----------------- ##"
+ echo
+ for ac_var in $ac_subst_vars
+ do
+ eval ac_val=\$$ac_var
+ case $ac_val in
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+ $as_echo "$ac_var='\''$ac_val'\''"
+ done | sort
+ echo
+
+ if test -n "$ac_subst_files"; then
+ $as_echo "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
+ echo
+ for ac_var in $ac_subst_files
+ do
+ eval ac_val=\$$ac_var
+ case $ac_val in
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+ $as_echo "$ac_var='\''$ac_val'\''"
+ done | sort
+ echo
+ fi
+
+ if test -s confdefs.h; then
+ $as_echo "## ----------- ##
+## confdefs.h. ##
+## ----------- ##"
+ echo
+ cat confdefs.h
+ echo
+ fi
+ test "$ac_signal" != 0 &&
+ $as_echo "$as_me: caught signal $ac_signal"
+ $as_echo "$as_me: exit $exit_status"
+ } >&5
+ rm -f core *.core core.conftest.* &&
+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+ exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+@%:@define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+@%:@define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+@%:@define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+@%:@define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+@%:@define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+@%:@define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+ # We do not want a PATH search for config.site.
+ case $CONFIG_SITE in @%:@((
+ -*) ac_site_file1=./$CONFIG_SITE;;
+ */*) ac_site_file1=$CONFIG_SITE;;
+ *) ac_site_file1=./$CONFIG_SITE;;
+ esac
+elif test "x$prefix" != xNONE; then
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
+else
+ ac_site_file1=$ac_default_prefix/share/config.site
+ ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+ test "x$ac_site_file" = xNONE && continue
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+ sed 's/^/| /' "$ac_site_file" >&5
+ . "$ac_site_file" \
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+done
+
+if test -r "$cache_file"; then
+ # Some versions of bash will fail to source /dev/null (special files
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
+ *) . "./$cache_file";;
+ esac
+ fi
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+ >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+ eval ac_old_set=\$ac_cv_env_${ac_var}_set
+ eval ac_new_set=\$ac_env_${ac_var}_set
+ eval ac_old_val=\$ac_cv_env_${ac_var}_value
+ eval ac_new_val=\$ac_env_${ac_var}_value
+ case $ac_old_set,$ac_new_set in
+ set,)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ ac_cache_corrupted=: ;;
+ ,set)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ ac_cache_corrupted=: ;;
+ ,);;
+ *)
+ if test "x$ac_old_val" != "x$ac_new_val"; then
+ # differences in whitespace do not lead to failure.
+ ac_old_val_w=`echo x $ac_old_val`
+ ac_new_val_w=`echo x $ac_new_val`
+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ ac_cache_corrupted=:
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+ eval $ac_var=\$ac_old_val
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
+ fi;;
+ esac
+ # Pass precious variables to config.status.
+ if test "$ac_new_set" = set; then
+ case $ac_new_val in
+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *) ac_arg=$ac_var=$ac_new_val ;;
+ esac
+ case " $ac_configure_args " in
+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+ esac
+ fi
+done
+if $ac_cache_corrupted; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+progname="`echo $0 | sed 's:^\./\./:\./:'`"
+
+MAKE_SUBDIR="$MAKE_SUBDIR lib-src" && if test "$verbose" = "yes"; then echo " Appending \"lib-src\" to \$MAKE_SUBDIR"; fi
+INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR lib-src" && if test "$verbose" = "yes"; then echo " Appending \"lib-src\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
+with_dragndrop_default="no"
+
+# If --with-compiler or --without-compiler were given then copy the value to the
+# equivalent enable_compiler variable.
+if test "${with_compiler+set}" = set; then
+ enable_compiler="$with_compiler"
+fi;
+# If -enable-compiler or --disable-compiler were given then copy the value to the
+# equivalent with_compiler variable.
+if test "${enable_compiler+set}" = set; then
+ with_compiler="$enable_compiler"
+fi;
+# Check whether --with-compiler or --without-compiler was given.
+if test "${with_compiler+set}" = set; then
+ enableval="$with_compiler"
+ withval="$with_compiler"
+
+fi;
+# If --with-xemacs-compiler or --without-xemacs-compiler were given then copy the value to the
+# equivalent enable_xemacs-compiler variable.
+if test "${with_xemacs_compiler+set}" = set; then
+ enable_xemacs_compiler="$with_xemacs_compiler"
+fi;
+# If -enable-xemacs-compiler or --disable-xemacs-compiler were given then copy the value to the
+# equivalent with_xemacs-compiler variable.
+if test "${enable_xemacs_compiler+set}" = set; then
+ with_xemacs_compiler="$enable_xemacs_compiler"
+fi;
+# Check whether --with-xemacs-compiler or --without-xemacs-compiler was given.
+if test "${with_xemacs_compiler+set}" = set; then
+ enableval="$with_xemacs_compiler"
+ withval="$with_xemacs_compiler"
+
+fi;
+# If --with-gcc or --without-gcc were given then copy the value to the
+# equivalent enable_gcc variable.
+if test "${with_gcc+set}" = set; then
+ enable_gcc="$with_gcc"
+fi;
+# If -enable-gcc or --disable-gcc were given then copy the value to the
+# equivalent with_gcc variable.
+if test "${enable_gcc+set}" = set; then
+ with_gcc="$enable_gcc"
+fi;
+# Check whether --with-gcc or --without-gcc was given.
+if test "${with_gcc+set}" = set; then
+ enableval="$with_gcc"
+ withval="$with_gcc"
+
+fi;
+# If --with-cflags or --without-cflags were given then copy the value to the
+# equivalent enable_cflags variable.
+if test "${with_cflags+set}" = set; then
+ enable_cflags="$with_cflags"
+fi;
+# If -enable-cflags or --disable-cflags were given then copy the value to the
+# equivalent with_cflags variable.
+if test "${enable_cflags+set}" = set; then
+ with_cflags="$enable_cflags"
+fi;
+# Check whether --with-cflags or --without-cflags was given.
+if test "${with_cflags+set}" = set; then
+ enableval="$with_cflags"
+ withval="$with_cflags"
+
+fi;
+# If --with-cflags-warning or --without-cflags-warning were given then copy the value to the
+# equivalent enable_cflags-warning variable.
+if test "${with_cflags_warning+set}" = set; then
+ enable_cflags_warning="$with_cflags_warning"
+fi;
+# If -enable-cflags-warning or --disable-cflags-warning were given then copy the value to the
+# equivalent with_cflags-warning variable.
+if test "${enable_cflags_warning+set}" = set; then
+ with_cflags_warning="$enable_cflags_warning"
+fi;
+# Check whether --with-cflags-warning or --without-cflags-warning was given.
+if test "${with_cflags_warning+set}" = set; then
+ enableval="$with_cflags_warning"
+ withval="$with_cflags_warning"
+
+fi;
+# If --with-optimization or --without-optimization were given then copy the value to the
+# equivalent enable_optimization variable.
+if test "${with_optimization+set}" = set; then
+ enable_optimization="$with_optimization"
+fi;
+# If -enable-optimization or --disable-optimization were given then copy the value to the
+# equivalent with_optimization variable.
+if test "${enable_optimization+set}" = set; then
+ with_optimization="$enable_optimization"
+fi;
+# Check whether --with-optimization or --without-optimization was given.
+if test "${with_optimization+set}" = set; then
+ enableval="$with_optimization"
+ withval="$with_optimization"
+
+fi;
+# If --with-cflags-optimization or --without-cflags-optimization were given then copy the value to the
+# equivalent enable_cflags-optimization variable.
+if test "${with_cflags_optimization+set}" = set; then
+ enable_cflags_optimization="$with_cflags_optimization"
+fi;
+# If -enable-cflags-optimization or --disable-cflags-optimization were given then copy the value to the
+# equivalent with_cflags-optimization variable.
+if test "${enable_cflags_optimization+set}" = set; then
+ with_cflags_optimization="$enable_cflags_optimization"
+fi;
+# Check whether --with-cflags-optimization or --without-cflags-optimization was given.
+if test "${with_cflags_optimization+set}" = set; then
+ enableval="$with_cflags_optimization"
+ withval="$with_cflags_optimization"
+
+fi;
+# If --with-cflags-debugging or --without-cflags-debugging were given then copy the value to the
+# equivalent enable_cflags-debugging variable.
+if test "${with_cflags_debugging+set}" = set; then
+ enable_cflags_debugging="$with_cflags_debugging"
+fi;
+# If -enable-cflags-debugging or --disable-cflags-debugging were given then copy the value to the
+# equivalent with_cflags-debugging variable.
+if test "${enable_cflags_debugging+set}" = set; then
+ with_cflags_debugging="$enable_cflags_debugging"
+fi;
+# Check whether --with-cflags-debugging or --without-cflags-debugging was given.
+if test "${with_cflags_debugging+set}" = set; then
+ enableval="$with_cflags_debugging"
+ withval="$with_cflags_debugging"
+
+fi;
+# If --with-cpp or --without-cpp were given then copy the value to the
+# equivalent enable_cpp variable.
+if test "${with_cpp+set}" = set; then
+ enable_cpp="$with_cpp"
+fi;
+# If -enable-cpp or --disable-cpp were given then copy the value to the
+# equivalent with_cpp variable.
+if test "${enable_cpp+set}" = set; then
+ with_cpp="$enable_cpp"
+fi;
+# Check whether --with-cpp or --without-cpp was given.
+if test "${with_cpp+set}" = set; then
+ enableval="$with_cpp"
+ withval="$with_cpp"
+ CPP="$with_cpp"
+fi;
+# If --with-cppflags or --without-cppflags were given then copy the value to the
+# equivalent enable_cppflags variable.
+if test "${with_cppflags+set}" = set; then
+ enable_cppflags="$with_cppflags"
+fi;
+# If -enable-cppflags or --disable-cppflags were given then copy the value to the
+# equivalent with_cppflags variable.
+if test "${enable_cppflags+set}" = set; then
+ with_cppflags="$enable_cppflags"
+fi;
+# Check whether --with-cppflags or --without-cppflags was given.
+if test "${with_cppflags+set}" = set; then
+ enableval="$with_cppflags"
+ withval="$with_cppflags"
+ CPPFLAGS="$with_cppflags"
+fi;
+# If --with-libs=LIBS or --without-libs=LIBS were given then copy the value to the
+# equivalent enable_libs=LIBS variable.
+if test "${with_libs=LIBS+set}" = set; then
+ enable_libs=LIBS="$with_libs=LIBS"
+fi;
+# If -enable-libs=LIBS or --disable-libs=LIBS were given then copy the value to the
+# equivalent with_libs=LIBS variable.
+if test "${enable_libs=LIBS+set}" = set; then
+ with_libs=LIBS="$enable_libs=LIBS"
+fi;
+# Check whether --with-libs=LIBS or --without-libs=LIBS was given.
+if test "${with_libs=LIBS+set}" = set; then
+ enableval="$with_libs=LIBS"
+ withval="$with_libs=LIBS"
+ LIBS="$with_libs"
+fi;
+# If --with-ldflags=FLAGS or --without-ldflags=FLAGS were given then copy the value to the
+# equivalent enable_ldflags=FLAGS variable.
+if test "${with_ldflags=FLAGS+set}" = set; then
+ enable_ldflags=FLAGS="$with_ldflags=FLAGS"
+fi;
+# If -enable-ldflags=FLAGS or --disable-ldflags=FLAGS were given then copy the value to the
+# equivalent with_ldflags=FLAGS variable.
+if test "${enable_ldflags=FLAGS+set}" = set; then
+ with_ldflags=FLAGS="$enable_ldflags=FLAGS"
+fi;
+# Check whether --with-ldflags=FLAGS or --without-ldflags=FLAGS was given.
+if test "${with_ldflags=FLAGS+set}" = set; then
+ enableval="$with_ldflags=FLAGS"
+ withval="$with_ldflags=FLAGS"
+ LDFLAGS="$with_ldflags"
+fi;
+# If --with-site-includes or --without-site-includes were given then copy the value to the
+# equivalent enable_site-includes variable.
+if test "${with_site_includes+set}" = set; then
+ enable_site_includes="$with_site_includes"
+fi;
+# If -enable-site-includes or --disable-site-includes were given then copy the value to the
+# equivalent with_site-includes variable.
+if test "${enable_site_includes+set}" = set; then
+ with_site_includes="$enable_site_includes"
+fi;
+# Check whether --with-site-includes or --without-site-includes was given.
+if test "${with_site_includes+set}" = set; then
+ enableval="$with_site_includes"
+ withval="$with_site_includes"
+
+fi;
+# If --with-site-libraries or --without-site-libraries were given then copy the value to the
+# equivalent enable_site-libraries variable.
+if test "${with_site_libraries+set}" = set; then
+ enable_site_libraries="$with_site_libraries"
+fi;
+# If -enable-site-libraries or --disable-site-libraries were given then copy the value to the
+# equivalent with_site-libraries variable.
+if test "${enable_site_libraries+set}" = set; then
+ with_site_libraries="$enable_site_libraries"
+fi;
+# Check whether --with-site-libraries or --without-site-libraries was given.
+if test "${with_site_libraries+set}" = set; then
+ enableval="$with_site_libraries"
+ withval="$with_site_libraries"
+
+fi;
+# If --with-site-prefixes or --without-site-prefixes were given then copy the value to the
+# equivalent enable_site-prefixes variable.
+if test "${with_site_prefixes+set}" = set; then
+ enable_site_prefixes="$with_site_prefixes"
+fi;
+# If -enable-site-prefixes or --disable-site-prefixes were given then copy the value to the
+# equivalent with_site-prefixes variable.
+if test "${enable_site_prefixes+set}" = set; then
+ with_site_prefixes="$enable_site_prefixes"
+fi;
+# Check whether --with-site-prefixes or --without-site-prefixes was given.
+if test "${with_site_prefixes+set}" = set; then
+ enableval="$with_site_prefixes"
+ withval="$with_site_prefixes"
+
+fi;
+# If --with-site-runtime-libraries or --without-site-runtime-libraries were given then copy the value to the
+# equivalent enable_site-runtime-libraries variable.
+if test "${with_site_runtime_libraries+set}" = set; then
+ enable_site_runtime_libraries="$with_site_runtime_libraries"
+fi;
+# If -enable-site-runtime-libraries or --disable-site-runtime-libraries were given then copy the value to the
+# equivalent with_site-runtime-libraries variable.
+if test "${enable_site_runtime_libraries+set}" = set; then
+ with_site_runtime_libraries="$enable_site_runtime_libraries"
+fi;
+# Check whether --with-site-runtime-libraries or --without-site-runtime-libraries was given.
+if test "${with_site_runtime_libraries+set}" = set; then
+ enableval="$with_site_runtime_libraries"
+ withval="$with_site_runtime_libraries"
+
+fi;
+# If --with-dynamic or --without-dynamic were given then copy the value to the
+# equivalent enable_dynamic variable.
+if test "${with_dynamic+set}" = set; then
+ enable_dynamic="$with_dynamic"
+fi;
+# If -enable-dynamic or --disable-dynamic were given then copy the value to the
+# equivalent with_dynamic variable.
+if test "${enable_dynamic+set}" = set; then
+ with_dynamic="$enable_dynamic"
+fi;
+# Check whether --with-dynamic or --without-dynamic was given.
+if test "${with_dynamic+set}" = set; then
+ enableval="$with_dynamic"
+ withval="$with_dynamic"
+
+fi;
+
+# If --with-prefix or --without-prefix were given then copy the value to the
+# equivalent enable_prefix variable.
+if test "${with_prefix+set}" = set; then
+ enable_prefix="$with_prefix"
+fi;
+# If -enable-prefix or --disable-prefix were given then copy the value to the
+# equivalent with_prefix variable.
+if test "${enable_prefix+set}" = set; then
+ with_prefix="$enable_prefix"
+fi;
+# Check whether --with-prefix or --without-prefix was given.
+if test "${with_prefix+set}" = set; then
+ enableval="$with_prefix"
+ withval="$with_prefix"
+ true
+else
+ with_prefix=yes
+fi;
+# If --with-netinstall or --without-netinstall were given then copy the value to the
+# equivalent enable_netinstall variable.
+if test "${with_netinstall+set}" = set; then
+ enable_netinstall="$with_netinstall"
+fi;
+# If -enable-netinstall or --disable-netinstall were given then copy the value to the
+# equivalent with_netinstall variable.
+if test "${enable_netinstall+set}" = set; then
+ with_netinstall="$enable_netinstall"
+fi;
+# Check whether --with-netinstall or --without-netinstall was given.
+if test "${with_netinstall+set}" = set; then
+ enableval="$with_netinstall"
+ withval="$with_netinstall"
+
+else
+ with_netinstall="no"
+fi;
+# If --with-statedir or --without-statedir were given then copy the value to the
+# equivalent enable_statedir variable.
+if test "${with_statedir+set}" = set; then
+ enable_statedir="$with_statedir"
+fi;
+# If -enable-statedir or --disable-statedir were given then copy the value to the
+# equivalent with_statedir variable.
+if test "${enable_statedir+set}" = set; then
+ with_statedir="$enable_statedir"
+fi;
+# Check whether --with-statedir or --without-statedir was given.
+if test "${with_statedir+set}" = set; then
+ enableval="$with_statedir"
+ withval="$with_statedir"
+
+else
+ with_statedir='${prefix}/lib'
+fi;
+# If --with-lispdir or --without-lispdir were given then copy the value to the
+# equivalent enable_lispdir variable.
+if test "${with_lispdir+set}" = set; then
+ enable_lispdir="$with_lispdir"
+fi;
+# If -enable-lispdir or --disable-lispdir were given then copy the value to the
+# equivalent with_lispdir variable.
+if test "${enable_lispdir+set}" = set; then
+ with_lispdir="$enable_lispdir"
+fi;
+# Check whether --with-lispdir or --without-lispdir was given.
+if test "${with_lispdir+set}" = set; then
+ enableval="$with_lispdir"
+ withval="$with_lispdir"
+ $as_echo "@%:@define LISPDIR_USER_DEFINED 1" >>confdefs.h
+
+else
+ with_lispdir='${datadir}/${instvardir}/lisp'
+fi;
+# If --with-archlibdir or --without-archlibdir were given then copy the value to the
+# equivalent enable_archlibdir variable.
+if test "${with_archlibdir+set}" = set; then
+ enable_archlibdir="$with_archlibdir"
+fi;
+# If -enable-archlibdir or --disable-archlibdir were given then copy the value to the
+# equivalent with_archlibdir variable.
+if test "${enable_archlibdir+set}" = set; then
+ with_archlibdir="$enable_archlibdir"
+fi;
+# Check whether --with-archlibdir or --without-archlibdir was given.
+if test "${with_archlibdir+set}" = set; then
+ enableval="$with_archlibdir"
+ withval="$with_archlibdir"
+ $as_echo "@%:@define ARCHLIBDIR_USER_DEFINED 1" >>confdefs.h
+
+else
+ with_archlibdir='${libdir}/${instvardir}/${configuration}'
+fi;
+# If --with-moduledir or --without-moduledir were given then copy the value to the
+# equivalent enable_moduledir variable.
+if test "${with_moduledir+set}" = set; then
+ enable_moduledir="$with_moduledir"
+fi;
+# If -enable-moduledir or --disable-moduledir were given then copy the value to the
+# equivalent with_moduledir variable.
+if test "${enable_moduledir+set}" = set; then
+ with_moduledir="$enable_moduledir"
+fi;
+# Check whether --with-moduledir or --without-moduledir was given.
+if test "${with_moduledir+set}" = set; then
+ enableval="$with_moduledir"
+ withval="$with_moduledir"
+ $as_echo "@%:@define MODULEDIR_USER_DEFINED 1" >>confdefs.h
+
+else
+ with_moduledir='${libdir}/${instvardir}/${configuration}/modules'
+fi;
+# If --with-etcdir or --without-etcdir were given then copy the value to the
+# equivalent enable_etcdir variable.
+if test "${with_etcdir+set}" = set; then
+ enable_etcdir="$with_etcdir"
+fi;
+# If -enable-etcdir or --disable-etcdir were given then copy the value to the
+# equivalent with_etcdir variable.
+if test "${enable_etcdir+set}" = set; then
+ with_etcdir="$enable_etcdir"
+fi;
+# Check whether --with-etcdir or --without-etcdir was given.
+if test "${with_etcdir+set}" = set; then
+ enableval="$with_etcdir"
+ withval="$with_etcdir"
+ $as_echo "@%:@define ETCDIR_USER_DEFINED 1" >>confdefs.h
+
+else
+ with_etcdir='${datadir}/${instvardir}/etc'
+fi;
+# If --with-docdir or --without-docdir were given then copy the value to the
+# equivalent enable_docdir variable.
+if test "${with_docdir+set}" = set; then
+ enable_docdir="$with_docdir"
+fi;
+# If -enable-docdir or --disable-docdir were given then copy the value to the
+# equivalent with_docdir variable.
+if test "${enable_docdir+set}" = set; then
+ with_docdir="$enable_docdir"
+fi;
+# Check whether --with-docdir or --without-docdir was given.
+if test "${with_docdir+set}" = set; then
+ enableval="$with_docdir"
+ withval="$with_docdir"
+ $as_echo "@%:@define DOCDIR_USER_DEFINED 1" >>confdefs.h
+
+else
+ with_docdir='${archlibdir}'
+fi;
+
+# If --with-site-lisp or --without-site-lisp were given then copy the value to the
+# equivalent enable_site-lisp variable.
+if test "${with_site_lisp+set}" = set; then
+ enable_site_lisp="$with_site_lisp"
+fi;
+# If -enable-site-lisp or --disable-site-lisp were given then copy the value to the
+# equivalent with_site-lisp variable.
+if test "${enable_site_lisp+set}" = set; then
+ with_site_lisp="$enable_site_lisp"
+fi;
+# Check whether --with-site-lisp or --without-site-lisp was given.
+if test "${with_site_lisp+set}" = set; then
+ enableval="$with_site_lisp"
+ withval="$with_site_lisp"
+ true
+else
+ with_site_lisp=no
+fi;
+# If --with-site-modules or --without-site-modules were given then copy the value to the
+# equivalent enable_site-modules variable.
+if test "${with_site_modules+set}" = set; then
+ enable_site_modules="$with_site_modules"
+fi;
+# If -enable-site-modules or --disable-site-modules were given then copy the value to the
+# equivalent with_site-modules variable.
+if test "${enable_site_modules+set}" = set; then
+ with_site_modules="$enable_site_modules"
+fi;
+# Check whether --with-site-modules or --without-site-modules was given.
+if test "${with_site_modules+set}" = set; then
+ enableval="$with_site_modules"
+ withval="$with_site_modules"
+
+fi;
+# If --with-early-packages or --without-early-packages were given then copy the value to the
+# equivalent enable_early-packages variable.
+if test "${with_early_packages+set}" = set; then
+ enable_early_packages="$with_early_packages"
+fi;
+# If -enable-early-packages or --disable-early-packages were given then copy the value to the
+# equivalent with_early-packages variable.
+if test "${enable_early_packages+set}" = set; then
+ with_early_packages="$enable_early_packages"
+fi;
+# Check whether --with-early-packages or --without-early-packages was given.
+if test "${with_early_packages+set}" = set; then
+ enableval="$with_early_packages"
+ withval="$with_early_packages"
+ $as_echo "@%:@define EARLY_PACKAGE_DIRECTORIES_USER_DEFINED 1" >>confdefs.h
+
+fi;
+# If --with-user-packages or --without-user-packages were given then copy the value to the
+# equivalent enable_user-packages variable.
+if test "${with_user_packages+set}" = set; then
+ enable_user_packages="$with_user_packages"
+fi;
+# If -enable-user-packages or --disable-user-packages were given then copy the value to the
+# equivalent with_user-packages variable.
+if test "${enable_user_packages+set}" = set; then
+ with_user_packages="$enable_user_packages"
+fi;
+# Check whether --with-user-packages or --without-user-packages was given.
+if test "${with_user_packages+set}" = set; then
+ enableval="$with_user_packages"
+ withval="$with_user_packages"
+ $as_echo "@%:@define EARLY_PACKAGE_DIRECTORIES_USER_DEFINED 1" >>confdefs.h
+
+fi;
+# If --with-late-packages or --without-late-packages were given then copy the value to the
+# equivalent enable_late-packages variable.
+if test "${with_late_packages+set}" = set; then
+ enable_late_packages="$with_late_packages"
+fi;
+# If -enable-late-packages or --disable-late-packages were given then copy the value to the
+# equivalent with_late-packages variable.
+if test "${enable_late_packages+set}" = set; then
+ with_late_packages="$enable_late_packages"
+fi;
+# Check whether --with-late-packages or --without-late-packages was given.
+if test "${with_late_packages+set}" = set; then
+ enableval="$with_late_packages"
+ withval="$with_late_packages"
+ $as_echo "@%:@define LATE_PACKAGE_DIRECTORIES_USER_DEFINED 1" >>confdefs.h
+
+fi;
+# If --with-system-packages or --without-system-packages were given then copy the value to the
+# equivalent enable_system-packages variable.
+if test "${with_system_packages+set}" = set; then
+ enable_system_packages="$with_system_packages"
+fi;
+# If -enable-system-packages or --disable-system-packages were given then copy the value to the
+# equivalent with_system-packages variable.
+if test "${enable_system_packages+set}" = set; then
+ with_system_packages="$enable_system_packages"
+fi;
+# Check whether --with-system-packages or --without-system-packages was given.
+if test "${with_system_packages+set}" = set; then
+ enableval="$with_system_packages"
+ withval="$with_system_packages"
+ $as_echo "@%:@define LATE_PACKAGE_DIRECTORIES_USER_DEFINED 1" >>confdefs.h
+
+fi;
+# If --with-last-packages or --without-last-packages were given then copy the value to the
+# equivalent enable_last-packages variable.
+if test "${with_last_packages+set}" = set; then
+ enable_last_packages="$with_last_packages"
+fi;
+# If -enable-last-packages or --disable-last-packages were given then copy the value to the
+# equivalent with_last-packages variable.
+if test "${enable_last_packages+set}" = set; then
+ with_last_packages="$enable_last_packages"
+fi;
+# Check whether --with-last-packages or --without-last-packages was given.
+if test "${with_last_packages+set}" = set; then
+ enableval="$with_last_packages"
+ withval="$with_last_packages"
+ $as_echo "@%:@define LAST_PACKAGE_DIRECTORIES_USER_DEFINED 1" >>confdefs.h
+
+fi;
+# If --with-legacy-packages or --without-legacy-packages were given then copy the value to the
+# equivalent enable_legacy-packages variable.
+if test "${with_legacy_packages+set}" = set; then
+ enable_legacy_packages="$with_legacy_packages"
+fi;
+# If -enable-legacy-packages or --disable-legacy-packages were given then copy the value to the
+# equivalent with_legacy-packages variable.
+if test "${enable_legacy_packages+set}" = set; then
+ with_legacy_packages="$enable_legacy_packages"
+fi;
+# Check whether --with-legacy-packages or --without-legacy-packages was given.
+if test "${with_legacy_packages+set}" = set; then
+ enableval="$with_legacy_packages"
+ withval="$with_legacy_packages"
+ $as_echo "@%:@define LAST_PACKAGE_DIRECTORIES_USER_DEFINED 1" >>confdefs.h
+
+fi;
+# If --with-package-path or --without-package-path were given then copy the value to the
+# equivalent enable_package-path variable.
+if test "${with_package_path+set}" = set; then
+ enable_package_path="$with_package_path"
+fi;
+# If -enable-package-path or --disable-package-path were given then copy the value to the
+# equivalent with_package-path variable.
+if test "${enable_package_path+set}" = set; then
+ with_package_path="$enable_package_path"
+fi;
+# Check whether --with-package-path or --without-package-path was given.
+if test "${with_package_path+set}" = set; then
+ enableval="$with_package_path"
+ withval="$with_package_path"
+ $as_echo "@%:@define PACKAGE_PATH_USER_DEFINED 1" >>confdefs.h
+
+fi;
+# If --with-infopath or --without-infopath were given then copy the value to the
+# equivalent enable_infopath variable.
+if test "${with_infopath+set}" = set; then
+ enable_infopath="$with_infopath"
+fi;
+# If -enable-infopath or --disable-infopath were given then copy the value to the
+# equivalent with_infopath variable.
+if test "${enable_infopath+set}" = set; then
+ with_infopath="$enable_infopath"
+fi;
+# Check whether --with-infopath or --without-infopath was given.
+if test "${with_infopath+set}" = set; then
+ enableval="$with_infopath"
+ withval="$with_infopath"
+ $as_echo "@%:@define INFOPATH_USER_DEFINED 1" >>confdefs.h
+
+fi;
+
+_xft_notfirst=""
+_xft_emacs_default=yes
+_xft_menubars_default=no
+_xft_tabs_default=no
+_xft_gauges_default=no
+_xft_types="emacs menubars tabs gauges"
+_xft_default="emacs,nomenubars,notabs,nogauges"
+
+# If --with-xft or --without-xft were given then copy the value to the
+# equivalent enable_xft variable.
+if test "${with_xft+set}" = set; then
+ enable_xft="$with_xft"
+fi;
+# If -enable-xft or --disable-xft were given then copy the value to the
+# equivalent with_xft variable.
+if test "${enable_xft+set}" = set; then
+ with_xft="$enable_xft"
+fi;
+# Check whether --with-xft or --without-xft was given.
+if test "${with_xft+set}" = set; then
+ enableval="$with_xft"
+ withval="$with_xft"
+ _xft_all_default=""
+_require_xft=""
+case "$with_xft" in
+ n | no | non | none ) _xft_all_default=no ;;
+ n,* | no,* | non,* | none,* ) _xft_all_default=no ;;
+ a | al | all | both ) _xft_all_default=yes ;;
+ a,* | al,* | all,* | both,* ) _xft_all_default=yes ;;
+ y | yes ) _require_xft=yes ;;
+esac
+if test -n "$_xft_all_default$_require_xft"; then
+ _with_xft_args=`echo $with_xft | sed -e 's/^[a-z]*\(,\(.*\)\)\{0,1\}$/\2/'`
+else
+ _with_xft_args=$with_xft
+fi
+for y in $_xft_types; do
+ if test -n "$_xft_all_default" ; then
+ eval "with_xft_${y}=$_xft_all_default"
+ else
+ eval "with_xft_$y=\$_xft_${y}_default"
+ fi
+done
+for x in `echo "$_with_xft_args" | sed -e 's/,/ /g'` ; do
+ _xft_found=""
+ for y in $_xft_types; do
+ if test "$x" = "$y"; then
+ _xft_found=yes
+ eval "with_xft_$y=yes"
+ elif test "$x" = "no$y"; then
+ _xft_found=yes
+ eval "with_xft_$y=no"
+ fi
+ done
+ test -z "$_xft_found" && \
+ (echo "$progname: Usage error:"
+echo " " "\
+Invalid type list supplied. Valid types for the --with-xft option are:
+ $_xft_types.
+ A prefix of \"no\" (eg, \"notype\" for \"type\") turns a type off.
+ Types not explicitly specified or negated take their defaults.
+ The list of defaults is \"$_xft_default\". Prefixing \`all' or
+ \`none' to the list sets all defaults to on and off respectively.
+ \`yes' as the sole argument is equivalent to omitting the argument."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+done
+for y in $_xft_types; do
+ eval "enable_xft_$y=\$with_xft_$y"
+ unset _xft_${y}_default
+done
+unset _xft_types _xft_default _xft_all_default _xft_use_defaults
+unset _with_xft_args _xft_found x y _require_xft
+
+
+
+else
+
+# set default for each type
+for y in $_xft_types; do
+ eval "with_xft_$y=\$_xft_${y}_default"
+ eval "enable_xft_$y=\$_xft_${y}_default"
+ unset _xft_${y}_default
+done
+with_xft_emacs=no
+fi;
+# If --with-gtk or --without-gtk were given then copy the value to the
+# equivalent enable_gtk variable.
+if test "${with_gtk+set}" = set; then
+ enable_gtk="$with_gtk"
+fi;
+# If -enable-gtk or --disable-gtk were given then copy the value to the
+# equivalent with_gtk variable.
+if test "${enable_gtk+set}" = set; then
+ with_gtk="$enable_gtk"
+fi;
+# Check whether --with-gtk or --without-gtk was given.
+if test "${with_gtk+set}" = set; then
+ enableval="$with_gtk"
+ withval="$with_gtk"
+ true
+else
+ with_gtk=no
+fi;
+# If --with-gnome or --without-gnome were given then copy the value to the
+# equivalent enable_gnome variable.
+if test "${with_gnome+set}" = set; then
+ enable_gnome="$with_gnome"
+fi;
+# If -enable-gnome or --disable-gnome were given then copy the value to the
+# equivalent with_gnome variable.
+if test "${enable_gnome+set}" = set; then
+ with_gnome="$enable_gnome"
+fi;
+# Check whether --with-gnome or --without-gnome was given.
+if test "${with_gnome+set}" = set; then
+ enableval="$with_gnome"
+ withval="$with_gnome"
+ true
+else
+ with_gnome=no
+fi;
+# If --with-msw or --without-msw were given then copy the value to the
+# equivalent enable_msw variable.
+if test "${with_msw+set}" = set; then
+ enable_msw="$with_msw"
+fi;
+# If -enable-msw or --disable-msw were given then copy the value to the
+# equivalent with_msw variable.
+if test "${enable_msw+set}" = set; then
+ with_msw="$enable_msw"
+fi;
+# Check whether --with-msw or --without-msw was given.
+if test "${with_msw+set}" = set; then
+ enableval="$with_msw"
+ withval="$with_msw"
+
+fi;
+# If --with-toolbars or --without-toolbars were given then copy the value to the
+# equivalent enable_toolbars variable.
+if test "${with_toolbars+set}" = set; then
+ enable_toolbars="$with_toolbars"
+fi;
+# If -enable-toolbars or --disable-toolbars were given then copy the value to the
+# equivalent with_toolbars variable.
+if test "${enable_toolbars+set}" = set; then
+ with_toolbars="$enable_toolbars"
+fi;
+# Check whether --with-toolbars or --without-toolbars was given.
+if test "${with_toolbars+set}" = set; then
+ enableval="$with_toolbars"
+ withval="$with_toolbars"
+
+fi;
+# If --with-wmcommand or --without-wmcommand were given then copy the value to the
+# equivalent enable_wmcommand variable.
+if test "${with_wmcommand+set}" = set; then
+ enable_wmcommand="$with_wmcommand"
+fi;
+# If -enable-wmcommand or --disable-wmcommand were given then copy the value to the
+# equivalent with_wmcommand variable.
+if test "${enable_wmcommand+set}" = set; then
+ with_wmcommand="$enable_wmcommand"
+fi;
+# Check whether --with-wmcommand or --without-wmcommand was given.
+if test "${with_wmcommand+set}" = set; then
+ enableval="$with_wmcommand"
+ withval="$with_wmcommand"
+
+fi;
+
+# If --with-athena or --without-athena were given then copy the value to the
+# equivalent enable_athena variable.
+if test "${with_athena+set}" = set; then
+ enable_athena="$with_athena"
+fi;
+# If -enable-athena or --disable-athena were given then copy the value to the
+# equivalent with_athena variable.
+if test "${enable_athena+set}" = set; then
+ with_athena="$enable_athena"
+fi;
+# Check whether --with-athena or --without-athena was given.
+if test "${with_athena+set}" = set; then
+ enableval="$with_athena"
+ withval="$with_athena"
+ _athena_bogus=yes
+ for x in xaw 3d next 95 xpm ; do
+ if test $x = $with_athena ; then
+ _athena_bogus=no
+ fi
+ done
+ if test "$_athena_bogus" = "yes" ; then
+ (echo "$progname: Usage error:"
+echo " " "The --with-athena option must have one of these values: \`xaw',\`3d',\`next',\`95',\`xpm'."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+ fi
+unset _athena_bogus
+
+
+
+fi;
+# If --with-menubars or --without-menubars were given then copy the value to the
+# equivalent enable_menubars variable.
+if test "${with_menubars+set}" = set; then
+ enable_menubars="$with_menubars"
+fi;
+# If -enable-menubars or --disable-menubars were given then copy the value to the
+# equivalent with_menubars variable.
+if test "${enable_menubars+set}" = set; then
+ with_menubars="$enable_menubars"
+fi;
+# Check whether --with-menubars or --without-menubars was given.
+if test "${with_menubars+set}" = set; then
+ enableval="$with_menubars"
+ withval="$with_menubars"
+ _menubars_bogus=yes
+ for x in yes no lucid motif athena gtk msw ; do
+ if test $x = $with_menubars ; then
+ _menubars_bogus=no
+ fi
+ done
+ if test "$_menubars_bogus" = "yes" ; then
+ (echo "$progname: Usage error:"
+echo " " "The --with-menubars option must have one of these values: \`yes',\`no',\`lucid',\`motif',\`athena',\`gtk',\`msw'."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+ fi
+unset _menubars_bogus
+
+
+
+fi;
+
+# If --with-scrollbars or --without-scrollbars were given then copy the value to the
+# equivalent enable_scrollbars variable.
+if test "${with_scrollbars+set}" = set; then
+ enable_scrollbars="$with_scrollbars"
+fi;
+# If -enable-scrollbars or --disable-scrollbars were given then copy the value to the
+# equivalent with_scrollbars variable.
+if test "${enable_scrollbars+set}" = set; then
+ with_scrollbars="$enable_scrollbars"
+fi;
+# Check whether --with-scrollbars or --without-scrollbars was given.
+if test "${with_scrollbars+set}" = set; then
+ enableval="$with_scrollbars"
+ withval="$with_scrollbars"
+ _scrollbars_bogus=yes
+ for x in yes no lucid motif athena gtk msw ; do
+ if test $x = $with_scrollbars ; then
+ _scrollbars_bogus=no
+ fi
+ done
+ if test "$_scrollbars_bogus" = "yes" ; then
+ (echo "$progname: Usage error:"
+echo " " "The --with-scrollbars option must have one of these values: \`yes',\`no',\`lucid',\`motif',\`athena',\`gtk',\`msw'."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+ fi
+unset _scrollbars_bogus
+
+
+
+fi;
+
+# If --with-dialogs or --without-dialogs were given then copy the value to the
+# equivalent enable_dialogs variable.
+if test "${with_dialogs+set}" = set; then
+ enable_dialogs="$with_dialogs"
+fi;
+# If -enable-dialogs or --disable-dialogs were given then copy the value to the
+# equivalent with_dialogs variable.
+if test "${enable_dialogs+set}" = set; then
+ with_dialogs="$enable_dialogs"
+fi;
+# Check whether --with-dialogs or --without-dialogs was given.
+if test "${with_dialogs+set}" = set; then
+ enableval="$with_dialogs"
+ withval="$with_dialogs"
+ _dialogs_bogus=yes
+ for x in yes no lucid motif athena gtk msw ; do
+ if test $x = $with_dialogs ; then
+ _dialogs_bogus=no
+ fi
+ done
+ if test "$_dialogs_bogus" = "yes" ; then
+ (echo "$progname: Usage error:"
+echo " " "The --with-dialogs option must have one of these values: \`yes',\`no',\`lucid',\`motif',\`athena',\`gtk',\`msw'."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+ fi
+unset _dialogs_bogus
+
+
+
+fi;
+
+# If --with-widgets or --without-widgets were given then copy the value to the
+# equivalent enable_widgets variable.
+if test "${with_widgets+set}" = set; then
+ enable_widgets="$with_widgets"
+fi;
+# If -enable-widgets or --disable-widgets were given then copy the value to the
+# equivalent with_widgets variable.
+if test "${enable_widgets+set}" = set; then
+ with_widgets="$enable_widgets"
+fi;
+# Check whether --with-widgets or --without-widgets was given.
+if test "${with_widgets+set}" = set; then
+ enableval="$with_widgets"
+ withval="$with_widgets"
+ _widgets_bogus=yes
+ for x in yes no lucid motif athena gtk msw ; do
+ if test $x = $with_widgets ; then
+ _widgets_bogus=no
+ fi
+ done
+ if test "$_widgets_bogus" = "yes" ; then
+ (echo "$progname: Usage error:"
+echo " " "The --with-widgets option must have one of these values: \`yes',\`no',\`lucid',\`motif',\`athena',\`gtk',\`msw'."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+ fi
+unset _widgets_bogus
+
+
+
+fi;
+# If --with-dragndrop or --without-dragndrop were given then copy the value to the
+# equivalent enable_dragndrop variable.
+if test "${with_dragndrop+set}" = set; then
+ enable_dragndrop="$with_dragndrop"
+fi;
+# If -enable-dragndrop or --disable-dragndrop were given then copy the value to the
+# equivalent with_dragndrop variable.
+if test "${enable_dragndrop+set}" = set; then
+ with_dragndrop="$enable_dragndrop"
+fi;
+# Check whether --with-dragndrop or --without-dragndrop was given.
+if test "${with_dragndrop+set}" = set; then
+ enableval="$with_dragndrop"
+ withval="$with_dragndrop"
+
+fi;
+# If --with-cde or --without-cde were given then copy the value to the
+# equivalent enable_cde variable.
+if test "${with_cde+set}" = set; then
+ enable_cde="$with_cde"
+fi;
+# If -enable-cde or --disable-cde were given then copy the value to the
+# equivalent with_cde variable.
+if test "${enable_cde+set}" = set; then
+ with_cde="$enable_cde"
+fi;
+# Check whether --with-cde or --without-cde was given.
+if test "${with_cde+set}" = set; then
+ enableval="$with_cde"
+ withval="$with_cde"
+
+fi;
+# If --with-external-widget or --without-external-widget were given then copy the value to the
+# equivalent enable_external-widget variable.
+if test "${with_external_widget+set}" = set; then
+ enable_external_widget="$with_external_widget"
+fi;
+# If -enable-external-widget or --disable-external-widget were given then copy the value to the
+# equivalent with_external-widget variable.
+if test "${enable_external_widget+set}" = set; then
+ with_external_widget="$enable_external_widget"
+fi;
+# Check whether --with-external-widget or --without-external-widget was given.
+if test "${with_external_widget+set}" = set; then
+ enableval="$with_external_widget"
+ withval="$with_external_widget"
+
+fi;
+
+# If --with-tty or --without-tty were given then copy the value to the
+# equivalent enable_tty variable.
+if test "${with_tty+set}" = set; then
+ enable_tty="$with_tty"
+fi;
+# If -enable-tty or --disable-tty were given then copy the value to the
+# equivalent with_tty variable.
+if test "${enable_tty+set}" = set; then
+ with_tty="$enable_tty"
+fi;
+# Check whether --with-tty or --without-tty was given.
+if test "${with_tty+set}" = set; then
+ enableval="$with_tty"
+ withval="$with_tty"
+
+fi;
+# If --with-ncurses or --without-ncurses were given then copy the value to the
+# equivalent enable_ncurses variable.
+if test "${with_ncurses+set}" = set; then
+ enable_ncurses="$with_ncurses"
+fi;
+# If -enable-ncurses or --disable-ncurses were given then copy the value to the
+# equivalent with_ncurses variable.
+if test "${enable_ncurses+set}" = set; then
+ with_ncurses="$enable_ncurses"
+fi;
+# Check whether --with-ncurses or --without-ncurses was given.
+if test "${with_ncurses+set}" = set; then
+ enableval="$with_ncurses"
+ withval="$with_ncurses"
+
+fi;
+# If --with-gpm or --without-gpm were given then copy the value to the
+# equivalent enable_gpm variable.
+if test "${with_gpm+set}" = set; then
+ enable_gpm="$with_gpm"
+fi;
+# If -enable-gpm or --disable-gpm were given then copy the value to the
+# equivalent with_gpm variable.
+if test "${enable_gpm+set}" = set; then
+ with_gpm="$enable_gpm"
+fi;
+# Check whether --with-gpm or --without-gpm was given.
+if test "${with_gpm+set}" = set; then
+ enableval="$with_gpm"
+ withval="$with_gpm"
+
+fi;
+
+# If --with-xpm or --without-xpm were given then copy the value to the
+# equivalent enable_xpm variable.
+if test "${with_xpm+set}" = set; then
+ enable_xpm="$with_xpm"
+fi;
+# If -enable-xpm or --disable-xpm were given then copy the value to the
+# equivalent with_xpm variable.
+if test "${enable_xpm+set}" = set; then
+ with_xpm="$enable_xpm"
+fi;
+# Check whether --with-xpm or --without-xpm was given.
+if test "${with_xpm+set}" = set; then
+ enableval="$with_xpm"
+ withval="$with_xpm"
+
+fi;
+# If --with-png or --without-png were given then copy the value to the
+# equivalent enable_png variable.
+if test "${with_png+set}" = set; then
+ enable_png="$with_png"
+fi;
+# If -enable-png or --disable-png were given then copy the value to the
+# equivalent with_png variable.
+if test "${enable_png+set}" = set; then
+ with_png="$enable_png"
+fi;
+# Check whether --with-png or --without-png was given.
+if test "${with_png+set}" = set; then
+ enableval="$with_png"
+ withval="$with_png"
+
+fi;
+# If --with-jpeg or --without-jpeg were given then copy the value to the
+# equivalent enable_jpeg variable.
+if test "${with_jpeg+set}" = set; then
+ enable_jpeg="$with_jpeg"
+fi;
+# If -enable-jpeg or --disable-jpeg were given then copy the value to the
+# equivalent with_jpeg variable.
+if test "${enable_jpeg+set}" = set; then
+ with_jpeg="$enable_jpeg"
+fi;
+# Check whether --with-jpeg or --without-jpeg was given.
+if test "${with_jpeg+set}" = set; then
+ enableval="$with_jpeg"
+ withval="$with_jpeg"
+
+fi;
+# If --with-tiff or --without-tiff were given then copy the value to the
+# equivalent enable_tiff variable.
+if test "${with_tiff+set}" = set; then
+ enable_tiff="$with_tiff"
+fi;
+# If -enable-tiff or --disable-tiff were given then copy the value to the
+# equivalent with_tiff variable.
+if test "${enable_tiff+set}" = set; then
+ with_tiff="$enable_tiff"
+fi;
+# Check whether --with-tiff or --without-tiff was given.
+if test "${with_tiff+set}" = set; then
+ enableval="$with_tiff"
+ withval="$with_tiff"
+
+fi;
+# If --with-xface or --without-xface were given then copy the value to the
+# equivalent enable_xface variable.
+if test "${with_xface+set}" = set; then
+ enable_xface="$with_xface"
+fi;
+# If -enable-xface or --disable-xface were given then copy the value to the
+# equivalent with_xface variable.
+if test "${enable_xface+set}" = set; then
+ with_xface="$enable_xface"
+fi;
+# Check whether --with-xface or --without-xface was given.
+if test "${with_xface+set}" = set; then
+ enableval="$with_xface"
+ withval="$with_xface"
+
+fi;
+# If --with-gif or --without-gif were given then copy the value to the
+# equivalent enable_gif variable.
+if test "${with_gif+set}" = set; then
+ enable_gif="$with_gif"
+fi;
+# If -enable-gif or --disable-gif were given then copy the value to the
+# equivalent with_gif variable.
+if test "${enable_gif+set}" = set; then
+ with_gif="$enable_gif"
+fi;
+# Check whether --with-gif or --without-gif was given.
+if test "${with_gif+set}" = set; then
+ enableval="$with_gif"
+ withval="$with_gif"
+
+fi;
+
+_sound_notfirst=""
+_sound_native_default=""
+_sound_alsa_default=""
+_sound_nas_default=""
+_sound_esd_default=no
+_sound_types="native alsa nas esd"
+_sound_default="native,alsa,nas,noesd"
+
+# If --with-sound or --without-sound were given then copy the value to the
+# equivalent enable_sound variable.
+if test "${with_sound+set}" = set; then
+ enable_sound="$with_sound"
+fi;
+# If -enable-sound or --disable-sound were given then copy the value to the
+# equivalent with_sound variable.
+if test "${enable_sound+set}" = set; then
+ with_sound="$enable_sound"
+fi;
+# Check whether --with-sound or --without-sound was given.
+if test "${with_sound+set}" = set; then
+ enableval="$with_sound"
+ withval="$with_sound"
+ _sound_all_default=""
+_require_sound=""
+case "$with_sound" in
+ n | no | non | none ) _sound_all_default=no ;;
+ n,* | no,* | non,* | none,* ) _sound_all_default=no ;;
+ a | al | all | both ) _sound_all_default=yes ;;
+ a,* | al,* | all,* | both,* ) _sound_all_default=yes ;;
+ y | yes ) _require_sound=yes ;;
+esac
+if test -n "$_sound_all_default$_require_sound"; then
+ _with_sound_args=`echo $with_sound | sed -e 's/^[a-z]*\(,\(.*\)\)\{0,1\}$/\2/'`
+else
+ _with_sound_args=$with_sound
+fi
+for y in $_sound_types; do
+ if test -n "$_sound_all_default" ; then
+ eval "with_sound_${y}=$_sound_all_default"
+ else
+ eval "with_sound_$y=\$_sound_${y}_default"
+ fi
+done
+for x in `echo "$_with_sound_args" | sed -e 's/,/ /g'` ; do
+ _sound_found=""
+ for y in $_sound_types; do
+ if test "$x" = "$y"; then
+ _sound_found=yes
+ eval "with_sound_$y=yes"
+ elif test "$x" = "no$y"; then
+ _sound_found=yes
+ eval "with_sound_$y=no"
+ fi
+ done
+ test -z "$_sound_found" && \
+ (echo "$progname: Usage error:"
+echo " " "\
+Invalid type list supplied. Valid types for the --with-sound option are:
+ $_sound_types.
+ A prefix of \"no\" (eg, \"notype\" for \"type\") turns a type off.
+ Types not explicitly specified or negated take their defaults.
+ The list of defaults is \"$_sound_default\". Prefixing \`all' or
+ \`none' to the list sets all defaults to on and off respectively.
+ \`yes' as the sole argument is equivalent to omitting the argument."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+done
+for y in $_sound_types; do
+ eval "enable_sound_$y=\$with_sound_$y"
+ unset _sound_${y}_default
+done
+unset _sound_types _sound_default _sound_all_default _sound_use_defaults
+unset _with_sound_args _sound_found x y _require_sound
+
+
+
+else
+
+# set default for each type
+for y in $_sound_types; do
+ eval "with_sound_$y=\$_sound_${y}_default"
+ eval "enable_sound_$y=\$_sound_${y}_default"
+ unset _sound_${y}_default
+done
+with_sound_nas=""
+fi;
+# If --with-native-sound-lib or --without-native-sound-lib were given then copy the value to the
+# equivalent enable_native-sound-lib variable.
+if test "${with_native_sound_lib+set}" = set; then
+ enable_native_sound_lib="$with_native_sound_lib"
+fi;
+# If -enable-native-sound-lib or --disable-native-sound-lib were given then copy the value to the
+# equivalent with_native-sound-lib variable.
+if test "${enable_native_sound_lib+set}" = set; then
+ with_native_sound_lib="$enable_native_sound_lib"
+fi;
+# Check whether --with-native-sound-lib or --without-native-sound-lib was given.
+if test "${with_native_sound_lib+set}" = set; then
+ enableval="$with_native_sound_lib"
+ withval="$with_native_sound_lib"
+
+fi;
+
+# If --with-mule or --without-mule were given then copy the value to the
+# equivalent enable_mule variable.
+if test "${with_mule+set}" = set; then
+ enable_mule="$with_mule"
+fi;
+# If -enable-mule or --disable-mule were given then copy the value to the
+# equivalent with_mule variable.
+if test "${enable_mule+set}" = set; then
+ with_mule="$enable_mule"
+fi;
+# Check whether --with-mule or --without-mule was given.
+if test "${with_mule+set}" = set; then
+ enableval="$with_mule"
+ withval="$with_mule"
+
+fi;
+
+# If --with-xim or --without-xim were given then copy the value to the
+# equivalent enable_xim variable.
+if test "${with_xim+set}" = set; then
+ enable_xim="$with_xim"
+fi;
+# If -enable-xim or --disable-xim were given then copy the value to the
+# equivalent with_xim variable.
+if test "${enable_xim+set}" = set; then
+ with_xim="$enable_xim"
+fi;
+# Check whether --with-xim or --without-xim was given.
+if test "${with_xim+set}" = set; then
+ enableval="$with_xim"
+ withval="$with_xim"
+ _xim_bogus=yes
+ for x in yes no xlib motif ; do
+ if test $x = $with_xim ; then
+ _xim_bogus=no
+ fi
+ done
+ if test "$_xim_bogus" = "yes" ; then
+ (echo "$progname: Usage error:"
+echo " " "The --with-xim option must have one of these values: \`yes',\`no',\`xlib',\`motif'."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+ fi
+unset _xim_bogus
+
+
+
+fi; # If --with-canna or --without-canna were given then copy the value to the
+# equivalent enable_canna variable.
+if test "${with_canna+set}" = set; then
+ enable_canna="$with_canna"
+fi;
+# If -enable-canna or --disable-canna were given then copy the value to the
+# equivalent with_canna variable.
+if test "${enable_canna+set}" = set; then
+ with_canna="$enable_canna"
+fi;
+# Check whether --with-canna or --without-canna was given.
+if test "${with_canna+set}" = set; then
+ enableval="$with_canna"
+ withval="$with_canna"
+
+fi;
+# If --with-wnn or --without-wnn were given then copy the value to the
+# equivalent enable_wnn variable.
+if test "${with_wnn+set}" = set; then
+ enable_wnn="$with_wnn"
+fi;
+# If -enable-wnn or --disable-wnn were given then copy the value to the
+# equivalent with_wnn variable.
+if test "${enable_wnn+set}" = set; then
+ with_wnn="$enable_wnn"
+fi;
+# Check whether --with-wnn or --without-wnn was given.
+if test "${with_wnn+set}" = set; then
+ enableval="$with_wnn"
+ withval="$with_wnn"
+
+fi;
+# If --with-wnn6 or --without-wnn6 were given then copy the value to the
+# equivalent enable_wnn6 variable.
+if test "${with_wnn6+set}" = set; then
+ enable_wnn6="$with_wnn6"
+fi;
+# If -enable-wnn6 or --disable-wnn6 were given then copy the value to the
+# equivalent with_wnn6 variable.
+if test "${enable_wnn6+set}" = set; then
+ with_wnn6="$enable_wnn6"
+fi;
+# Check whether --with-wnn6 or --without-wnn6 was given.
+if test "${with_wnn6+set}" = set; then
+ enableval="$with_wnn6"
+ withval="$with_wnn6"
+
+fi;
+# If --with-xfs or --without-xfs were given then copy the value to the
+# equivalent enable_xfs variable.
+if test "${with_xfs+set}" = set; then
+ enable_xfs="$with_xfs"
+fi;
+# If -enable-xfs or --disable-xfs were given then copy the value to the
+# equivalent with_xfs variable.
+if test "${enable_xfs+set}" = set; then
+ with_xfs="$enable_xfs"
+fi;
+# Check whether --with-xfs or --without-xfs was given.
+if test "${with_xfs+set}" = set; then
+ enableval="$with_xfs"
+ withval="$with_xfs"
+
+fi;
+
+# If --with-default-eol-detection or --without-default-eol-detection were given then copy the value to the
+# equivalent enable_default-eol-detection variable.
+if test "${with_default_eol_detection+set}" = set; then
+ enable_default_eol_detection="$with_default_eol_detection"
+fi;
+# If -enable-default-eol-detection or --disable-default-eol-detection were given then copy the value to the
+# equivalent with_default-eol-detection variable.
+if test "${enable_default_eol_detection+set}" = set; then
+ with_default_eol_detection="$enable_default_eol_detection"
+fi;
+# Check whether --with-default-eol-detection or --without-default-eol-detection was given.
+if test "${with_default_eol_detection+set}" = set; then
+ enableval="$with_default_eol_detection"
+ withval="$with_default_eol_detection"
+
+fi;
+# If --with-clash-detection or --without-clash-detection were given then copy the value to the
+# equivalent enable_clash-detection variable.
+if test "${with_clash_detection+set}" = set; then
+ enable_clash_detection="$with_clash_detection"
+fi;
+# If -enable-clash-detection or --disable-clash-detection were given then copy the value to the
+# equivalent with_clash-detection variable.
+if test "${enable_clash_detection+set}" = set; then
+ with_clash_detection="$enable_clash_detection"
+fi;
+# Check whether --with-clash-detection or --without-clash-detection was given.
+if test "${with_clash_detection+set}" = set; then
+ enableval="$with_clash_detection"
+ withval="$with_clash_detection"
+
+fi;
+# If --with-zlib or --without-zlib were given then copy the value to the
+# equivalent enable_zlib variable.
+if test "${with_zlib+set}" = set; then
+ enable_zlib="$with_zlib"
+fi;
+# If -enable-zlib or --disable-zlib were given then copy the value to the
+# equivalent with_zlib variable.
+if test "${enable_zlib+set}" = set; then
+ with_zlib="$enable_zlib"
+fi;
+# Check whether --with-zlib or --without-zlib was given.
+if test "${with_zlib+set}" = set; then
+ enableval="$with_zlib"
+ withval="$with_zlib"
+
+fi;
+
+_database_notfirst=""
+_database_berkdb_default=""
+_database_dbm_default=""
+_database_gdbm_default=""
+_database_types="berkdb dbm gdbm"
+_database_default="berkdb,dbm,gdbm"
+
+# If --with-database or --without-database were given then copy the value to the
+# equivalent enable_database variable.
+if test "${with_database+set}" = set; then
+ enable_database="$with_database"
+fi;
+# If -enable-database or --disable-database were given then copy the value to the
+# equivalent with_database variable.
+if test "${enable_database+set}" = set; then
+ with_database="$enable_database"
+fi;
+# Check whether --with-database or --without-database was given.
+if test "${with_database+set}" = set; then
+ enableval="$with_database"
+ withval="$with_database"
+ _database_all_default=""
+_require_database=""
+case "$with_database" in
+ n | no | non | none ) _database_all_default=no ;;
+ n,* | no,* | non,* | none,* ) _database_all_default=no ;;
+ a | al | all | both ) _database_all_default=yes ;;
+ a,* | al,* | all,* | both,* ) _database_all_default=yes ;;
+ y | yes ) _require_database=yes ;;
+esac
+if test -n "$_database_all_default$_require_database"; then
+ _with_database_args=`echo $with_database | sed -e 's/^[a-z]*\(,\(.*\)\)\{0,1\}$/\2/'`
+else
+ _with_database_args=$with_database
+fi
+for y in $_database_types; do
+ if test -n "$_database_all_default" ; then
+ eval "with_database_${y}=$_database_all_default"
+ else
+ eval "with_database_$y=\$_database_${y}_default"
+ fi
+done
+for x in `echo "$_with_database_args" | sed -e 's/,/ /g'` ; do
+ _database_found=""
+ for y in $_database_types; do
+ if test "$x" = "$y"; then
+ _database_found=yes
+ eval "with_database_$y=yes"
+ elif test "$x" = "no$y"; then
+ _database_found=yes
+ eval "with_database_$y=no"
+ fi
+ done
+ test -z "$_database_found" && \
+ (echo "$progname: Usage error:"
+echo " " "\
+Invalid type list supplied. Valid types for the --with-database option are:
+ $_database_types.
+ A prefix of \"no\" (eg, \"notype\" for \"type\") turns a type off.
+ Types not explicitly specified or negated take their defaults.
+ The list of defaults is \"$_database_default\". Prefixing \`all' or
+ \`none' to the list sets all defaults to on and off respectively.
+ \`yes' as the sole argument is equivalent to omitting the argument."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+done
+for y in $_database_types; do
+ eval "enable_database_$y=\$with_database_$y"
+ unset _database_${y}_default
+done
+unset _database_types _database_default _database_all_default _database_use_defaults
+unset _with_database_args _database_found x y _require_database
+
+
+if test "$with_database_dbm" = "yes" -a "$with_database_gdbm" = "yes"; then
+ (echo "$progname: Usage error:"
+echo " " "Only one of \`dbm' and \`gdbm' may be specified
+with the \`--with-database' option."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+fi
+
+
+else
+
+# set default for each type
+for y in $_database_types; do
+ eval "with_database_$y=\$_database_${y}_default"
+ eval "enable_database_$y=\$_database_${y}_default"
+ unset _database_${y}_default
+done
+
+fi;
+# If --with-ldap or --without-ldap were given then copy the value to the
+# equivalent enable_ldap variable.
+if test "${with_ldap+set}" = set; then
+ enable_ldap="$with_ldap"
+fi;
+# If -enable-ldap or --disable-ldap were given then copy the value to the
+# equivalent with_ldap variable.
+if test "${enable_ldap+set}" = set; then
+ with_ldap="$enable_ldap"
+fi;
+# Check whether --with-ldap or --without-ldap was given.
+if test "${with_ldap+set}" = set; then
+ enableval="$with_ldap"
+ withval="$with_ldap"
+
+fi;
+# If --with-postgresql or --without-postgresql were given then copy the value to the
+# equivalent enable_postgresql variable.
+if test "${with_postgresql+set}" = set; then
+ enable_postgresql="$with_postgresql"
+fi;
+# If -enable-postgresql or --disable-postgresql were given then copy the value to the
+# equivalent with_postgresql variable.
+if test "${enable_postgresql+set}" = set; then
+ with_postgresql="$enable_postgresql"
+fi;
+# Check whether --with-postgresql or --without-postgresql was given.
+if test "${with_postgresql+set}" = set; then
+ enableval="$with_postgresql"
+ withval="$with_postgresql"
+
+fi;
+
+
+# If --with-mail-locking or --without-mail-locking were given then copy the value to the
+# equivalent enable_mail-locking variable.
+if test "${with_mail_locking+set}" = set; then
+ enable_mail_locking="$with_mail_locking"
+fi;
+# If -enable-mail-locking or --disable-mail-locking were given then copy the value to the
+# equivalent with_mail-locking variable.
+if test "${enable_mail_locking+set}" = set; then
+ with_mail_locking="$enable_mail_locking"
+fi;
+# Check whether --with-mail-locking or --without-mail-locking was given.
+if test "${with_mail_locking+set}" = set; then
+ enableval="$with_mail_locking"
+ withval="$with_mail_locking"
+ _mail_locking_bogus=yes
+ for x in lockf flock file locking mmdf pop ; do
+ if test $x = $with_mail_locking ; then
+ _mail_locking_bogus=no
+ fi
+ done
+ if test "$_mail_locking_bogus" = "yes" ; then
+ (echo "$progname: Usage error:"
+echo " " "The --with-mail-locking option must have one of these values: \`lockf',\`flock',\`file',\`locking',\`mmdf',\`pop'."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+ fi
+unset _mail_locking_bogus
+
+
+
+fi; # If --with-pop or --without-pop were given then copy the value to the
+# equivalent enable_pop variable.
+if test "${with_pop+set}" = set; then
+ enable_pop="$with_pop"
+fi;
+# If -enable-pop or --disable-pop were given then copy the value to the
+# equivalent with_pop variable.
+if test "${enable_pop+set}" = set; then
+ with_pop="$enable_pop"
+fi;
+# Check whether --with-pop or --without-pop was given.
+if test "${with_pop+set}" = set; then
+ enableval="$with_pop"
+ withval="$with_pop"
+
+fi;
+# If --with-kerberos or --without-kerberos were given then copy the value to the
+# equivalent enable_kerberos variable.
+if test "${with_kerberos+set}" = set; then
+ enable_kerberos="$with_kerberos"
+fi;
+# If -enable-kerberos or --disable-kerberos were given then copy the value to the
+# equivalent with_kerberos variable.
+if test "${enable_kerberos+set}" = set; then
+ with_kerberos="$enable_kerberos"
+fi;
+# Check whether --with-kerberos or --without-kerberos was given.
+if test "${with_kerberos+set}" = set; then
+ enableval="$with_kerberos"
+ withval="$with_kerberos"
+
+fi;
+# If --with-hesiod or --without-hesiod were given then copy the value to the
+# equivalent enable_hesiod variable.
+if test "${with_hesiod+set}" = set; then
+ enable_hesiod="$with_hesiod"
+fi;
+# If -enable-hesiod or --disable-hesiod were given then copy the value to the
+# equivalent with_hesiod variable.
+if test "${enable_hesiod+set}" = set; then
+ with_hesiod="$enable_hesiod"
+fi;
+# Check whether --with-hesiod or --without-hesiod was given.
+if test "${with_hesiod+set}" = set; then
+ enableval="$with_hesiod"
+ withval="$with_hesiod"
+
+fi;
+
+# If --with-tooltalk or --without-tooltalk were given then copy the value to the
+# equivalent enable_tooltalk variable.
+if test "${with_tooltalk+set}" = set; then
+ enable_tooltalk="$with_tooltalk"
+fi;
+# If -enable-tooltalk or --disable-tooltalk were given then copy the value to the
+# equivalent with_tooltalk variable.
+if test "${enable_tooltalk+set}" = set; then
+ with_tooltalk="$enable_tooltalk"
+fi;
+# Check whether --with-tooltalk or --without-tooltalk was given.
+if test "${with_tooltalk+set}" = set; then
+ enableval="$with_tooltalk"
+ withval="$with_tooltalk"
+
+fi;
+# If --with-socks or --without-socks were given then copy the value to the
+# equivalent enable_socks variable.
+if test "${with_socks+set}" = set; then
+ enable_socks="$with_socks"
+fi;
+# If -enable-socks or --disable-socks were given then copy the value to the
+# equivalent with_socks variable.
+if test "${enable_socks+set}" = set; then
+ with_socks="$enable_socks"
+fi;
+# Check whether --with-socks or --without-socks was given.
+if test "${with_socks+set}" = set; then
+ enableval="$with_socks"
+ withval="$with_socks"
+
+fi;
+# If --with-dnet or --without-dnet were given then copy the value to the
+# equivalent enable_dnet variable.
+if test "${with_dnet+set}" = set; then
+ enable_dnet="$with_dnet"
+fi;
+# If -enable-dnet or --disable-dnet were given then copy the value to the
+# equivalent with_dnet variable.
+if test "${enable_dnet+set}" = set; then
+ with_dnet="$enable_dnet"
+fi;
+# Check whether --with-dnet or --without-dnet was given.
+if test "${with_dnet+set}" = set; then
+ enableval="$with_dnet"
+ withval="$with_dnet"
+
+fi;
+# If --with-ipv6-cname or --without-ipv6-cname were given then copy the value to the
+# equivalent enable_ipv6-cname variable.
+if test "${with_ipv6_cname+set}" = set; then
+ enable_ipv6_cname="$with_ipv6_cname"
+fi;
+# If -enable-ipv6-cname or --disable-ipv6-cname were given then copy the value to the
+# equivalent with_ipv6-cname variable.
+if test "${enable_ipv6_cname+set}" = set; then
+ with_ipv6_cname="$enable_ipv6_cname"
+fi;
+# Check whether --with-ipv6-cname or --without-ipv6-cname was given.
+if test "${with_ipv6_cname+set}" = set; then
+ enableval="$with_ipv6_cname"
+ withval="$with_ipv6_cname"
+
+else
+ with_ipv6_cname="no"
+fi;
+
+# If --with-rel-alloc or --without-rel-alloc were given then copy the value to the
+# equivalent enable_rel-alloc variable.
+if test "${with_rel_alloc+set}" = set; then
+ enable_rel_alloc="$with_rel_alloc"
+fi;
+# If -enable-rel-alloc or --disable-rel-alloc were given then copy the value to the
+# equivalent with_rel-alloc variable.
+if test "${enable_rel_alloc+set}" = set; then
+ with_rel_alloc="$enable_rel_alloc"
+fi;
+# Check whether --with-rel-alloc or --without-rel-alloc was given.
+if test "${with_rel_alloc+set}" = set; then
+ enableval="$with_rel_alloc"
+ withval="$with_rel_alloc"
+
+else
+ with_rel_alloc='default'
+fi;
+# If --with-dlmalloc or --without-dlmalloc were given then copy the value to the
+# equivalent enable_dlmalloc variable.
+if test "${with_dlmalloc+set}" = set; then
+ enable_dlmalloc="$with_dlmalloc"
+fi;
+# If -enable-dlmalloc or --disable-dlmalloc were given then copy the value to the
+# equivalent with_dlmalloc variable.
+if test "${enable_dlmalloc+set}" = set; then
+ with_dlmalloc="$enable_dlmalloc"
+fi;
+# Check whether --with-dlmalloc or --without-dlmalloc was given.
+if test "${with_dlmalloc+set}" = set; then
+ enableval="$with_dlmalloc"
+ withval="$with_dlmalloc"
+
+else
+ with_dlmalloc='default'
+fi;
+# If --with-system-malloc or --without-system-malloc were given then copy the value to the
+# equivalent enable_system-malloc variable.
+if test "${with_system_malloc+set}" = set; then
+ enable_system_malloc="$with_system_malloc"
+fi;
+# If -enable-system-malloc or --disable-system-malloc were given then copy the value to the
+# equivalent with_system-malloc variable.
+if test "${enable_system_malloc+set}" = set; then
+ with_system_malloc="$enable_system_malloc"
+fi;
+# Check whether --with-system-malloc or --without-system-malloc was given.
+if test "${with_system_malloc+set}" = set; then
+ enableval="$with_system_malloc"
+ withval="$with_system_malloc"
+
+else
+ with_system_malloc='default'
+fi;
+# If --with-debug-malloc or --without-debug-malloc were given then copy the value to the
+# equivalent enable_debug-malloc variable.
+if test "${with_debug_malloc+set}" = set; then
+ enable_debug_malloc="$with_debug_malloc"
+fi;
+# If -enable-debug-malloc or --disable-debug-malloc were given then copy the value to the
+# equivalent with_debug-malloc variable.
+if test "${enable_debug_malloc+set}" = set; then
+ with_debug_malloc="$enable_debug_malloc"
+fi;
+# Check whether --with-debug-malloc or --without-debug-malloc was given.
+if test "${with_debug_malloc+set}" = set; then
+ enableval="$with_debug_malloc"
+ withval="$with_debug_malloc"
+
+fi;
+# If --with-pdump or --without-pdump were given then copy the value to the
+# equivalent enable_pdump variable.
+if test "${with_pdump+set}" = set; then
+ enable_pdump="$with_pdump"
+fi;
+# If -enable-pdump or --disable-pdump were given then copy the value to the
+# equivalent with_pdump variable.
+if test "${enable_pdump+set}" = set; then
+ with_pdump="$enable_pdump"
+fi;
+# Check whether --with-pdump or --without-pdump was given.
+if test "${with_pdump+set}" = set; then
+ enableval="$with_pdump"
+ withval="$with_pdump"
+
+fi;
+# If --with-dump-in-exec or --without-dump-in-exec were given then copy the value to the
+# equivalent enable_dump-in-exec variable.
+if test "${with_dump_in_exec+set}" = set; then
+ enable_dump_in_exec="$with_dump_in_exec"
+fi;
+# If -enable-dump-in-exec or --disable-dump-in-exec were given then copy the value to the
+# equivalent with_dump-in-exec variable.
+if test "${enable_dump_in_exec+set}" = set; then
+ with_dump_in_exec="$enable_dump_in_exec"
+fi;
+# Check whether --with-dump-in-exec or --without-dump-in-exec was given.
+if test "${with_dump_in_exec+set}" = set; then
+ enableval="$with_dump_in_exec"
+ withval="$with_dump_in_exec"
+
+fi;
+# If --with-kkcc or --without-kkcc were given then copy the value to the
+# equivalent enable_kkcc variable.
+if test "${with_kkcc+set}" = set; then
+ enable_kkcc="$with_kkcc"
+fi;
+# If -enable-kkcc or --disable-kkcc were given then copy the value to the
+# equivalent with_kkcc variable.
+if test "${enable_kkcc+set}" = set; then
+ with_kkcc="$enable_kkcc"
+fi;
+# Check whether --with-kkcc or --without-kkcc was given.
+if test "${with_kkcc+set}" = set; then
+ enableval="$with_kkcc"
+ withval="$with_kkcc"
+
+else
+ with_kkcc=yes
+fi;
+
+# If --with-newgc or --without-newgc were given then copy the value to the
+# equivalent enable_newgc variable.
+if test "${with_newgc+set}" = set; then
+ enable_newgc="$with_newgc"
+fi;
+# If -enable-newgc or --disable-newgc were given then copy the value to the
+# equivalent with_newgc variable.
+if test "${enable_newgc+set}" = set; then
+ with_newgc="$enable_newgc"
+fi;
+# Check whether --with-newgc or --without-newgc was given.
+if test "${with_newgc+set}" = set; then
+ enableval="$with_newgc"
+ withval="$with_newgc"
+
+fi;
+_vdb_notfirst=""
+_vdb_auto_default=
+_vdb_posix_default=
+_vdb_win32_default=
+_vdb_mach_default=
+_vdb_fake_default=
+_vdb_no_default=
+_vdb_types="auto posix win32 mach fake no"
+_vdb_default="auto,posix,win32,mach,fake,no"
+
+# If --with-vdb or --without-vdb were given then copy the value to the
+# equivalent enable_vdb variable.
+if test "${with_vdb+set}" = set; then
+ enable_vdb="$with_vdb"
+fi;
+# If -enable-vdb or --disable-vdb were given then copy the value to the
+# equivalent with_vdb variable.
+if test "${enable_vdb+set}" = set; then
+ with_vdb="$enable_vdb"
+fi;
+# Check whether --with-vdb or --without-vdb was given.
+if test "${with_vdb+set}" = set; then
+ enableval="$with_vdb"
+ withval="$with_vdb"
+ _vdb_all_default=""
+_require_vdb=""
+case "$with_vdb" in
+ n | no | non | none ) _vdb_all_default=no ;;
+ n,* | no,* | non,* | none,* ) _vdb_all_default=no ;;
+ a | al | all | both ) _vdb_all_default=yes ;;
+ a,* | al,* | all,* | both,* ) _vdb_all_default=yes ;;
+ y | yes ) _require_vdb=yes ;;
+esac
+if test -n "$_vdb_all_default$_require_vdb"; then
+ _with_vdb_args=`echo $with_vdb | sed -e 's/^[a-z]*\(,\(.*\)\)\{0,1\}$/\2/'`
+else
+ _with_vdb_args=$with_vdb
+fi
+for y in $_vdb_types; do
+ if test -n "$_vdb_all_default" ; then
+ eval "with_vdb_${y}=$_vdb_all_default"
+ else
+ eval "with_vdb_$y=\$_vdb_${y}_default"
+ fi
+done
+for x in `echo "$_with_vdb_args" | sed -e 's/,/ /g'` ; do
+ _vdb_found=""
+ for y in $_vdb_types; do
+ if test "$x" = "$y"; then
+ _vdb_found=yes
+ eval "with_vdb_$y=yes"
+ elif test "$x" = "no$y"; then
+ _vdb_found=yes
+ eval "with_vdb_$y=no"
+ fi
+ done
+ test -z "$_vdb_found" && \
+ (echo "$progname: Usage error:"
+echo " " "\
+Invalid type list supplied. Valid types for the --with-vdb option are:
+ $_vdb_types.
+ A prefix of \"no\" (eg, \"notype\" for \"type\") turns a type off.
+ Types not explicitly specified or negated take their defaults.
+ The list of defaults is \"$_vdb_default\". Prefixing \`all' or
+ \`none' to the list sets all defaults to on and off respectively.
+ \`yes' as the sole argument is equivalent to omitting the argument."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+done
+for y in $_vdb_types; do
+ eval "enable_vdb_$y=\$with_vdb_$y"
+ unset _vdb_${y}_default
+done
+unset _vdb_types _vdb_default _vdb_all_default _vdb_use_defaults
+unset _with_vdb_args _vdb_found x y _require_vdb
+
+
+
+else
+
+# set default for each type
+for y in $_vdb_types; do
+ eval "with_vdb_$y=\$_vdb_${y}_default"
+ eval "enable_vdb_$y=\$_vdb_${y}_default"
+ unset _vdb_${y}_default
+done
+with_vdb="auto"
+fi;
+
+# If --with-modules or --without-modules were given then copy the value to the
+# equivalent enable_modules variable.
+if test "${with_modules+set}" = set; then
+ enable_modules="$with_modules"
+fi;
+# If -enable-modules or --disable-modules were given then copy the value to the
+# equivalent with_modules variable.
+if test "${enable_modules+set}" = set; then
+ with_modules="$enable_modules"
+fi;
+# Check whether --with-modules or --without-modules was given.
+if test "${with_modules+set}" = set; then
+ enableval="$with_modules"
+ withval="$with_modules"
+
+fi;
+
+# If --with-bignum or --without-bignum were given then copy the value to the
+# equivalent enable_bignum variable.
+if test "${with_bignum+set}" = set; then
+ enable_bignum="$with_bignum"
+fi;
+# If -enable-bignum or --disable-bignum were given then copy the value to the
+# equivalent with_bignum variable.
+if test "${enable_bignum+set}" = set; then
+ with_bignum="$enable_bignum"
+fi;
+# Check whether --with-bignum or --without-bignum was given.
+if test "${with_bignum+set}" = set; then
+ enableval="$with_bignum"
+ withval="$with_bignum"
+ _bignum_bogus=yes
+ for x in no gmp mp ; do
+ if test $x = $with_bignum ; then
+ _bignum_bogus=no
+ fi
+ done
+ if test "$_bignum_bogus" = "yes" ; then
+ (echo "$progname: Usage error:"
+echo " " "The --with-bignum option must have one of these values: \`no',\`gmp',\`mp'."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+ fi
+unset _bignum_bogus
+
+
+
+else
+ with_bignum="no"
+fi;
+
+# If --with-workshop or --without-workshop were given then copy the value to the
+# equivalent enable_workshop variable.
+if test "${with_workshop+set}" = set; then
+ enable_workshop="$with_workshop"
+fi;
+# If -enable-workshop or --disable-workshop were given then copy the value to the
+# equivalent with_workshop variable.
+if test "${enable_workshop+set}" = set; then
+ with_workshop="$enable_workshop"
+fi;
+# Check whether --with-workshop or --without-workshop was given.
+if test "${with_workshop+set}" = set; then
+ enableval="$with_workshop"
+ withval="$with_workshop"
+
+fi;
+# If --with-sparcworks or --without-sparcworks were given then copy the value to the
+# equivalent enable_sparcworks variable.
+if test "${with_sparcworks+set}" = set; then
+ enable_sparcworks="$with_sparcworks"
+fi;
+# If -enable-sparcworks or --disable-sparcworks were given then copy the value to the
+# equivalent with_sparcworks variable.
+if test "${enable_sparcworks+set}" = set; then
+ with_sparcworks="$enable_sparcworks"
+fi;
+# Check whether --with-sparcworks or --without-sparcworks was given.
+if test "${with_sparcworks+set}" = set; then
+ enableval="$with_sparcworks"
+ withval="$with_sparcworks"
+
+fi;
+
+# If --with-debug or --without-debug were given then copy the value to the
+# equivalent enable_debug variable.
+if test "${with_debug+set}" = set; then
+ enable_debug="$with_debug"
+fi;
+# If -enable-debug or --disable-debug were given then copy the value to the
+# equivalent with_debug variable.
+if test "${enable_debug+set}" = set; then
+ with_debug="$enable_debug"
+fi;
+# Check whether --with-debug or --without-debug was given.
+if test "${with_debug+set}" = set; then
+ enableval="$with_debug"
+ withval="$with_debug"
+
+fi;
+if test "$with_error_checking" = "yes"; then
+ with_error_checking=all
+fi
+_error_checking_notfirst=""
+_error_checking_byte_code_default=""
+_error_checking_display_default=""
+_error_checking_extents_default=""
+_error_checking_gc_default=""
+_error_checking_glyphs_default=""
+_error_checking_malloc_default=""
+_error_checking_structures_default=""
+_error_checking_text_default=""
+_error_checking_types_default=""
+_error_checking_types="byte_code display extents gc glyphs malloc structures text types"
+_error_checking_default="byte_code,display,extents,gc,glyphs,malloc,structures,text,types"
+
+# If --with-error-checking or --without-error-checking were given then copy the value to the
+# equivalent enable_error-checking variable.
+if test "${with_error_checking+set}" = set; then
+ enable_error_checking="$with_error_checking"
+fi;
+# If -enable-error-checking or --disable-error-checking were given then copy the value to the
+# equivalent with_error-checking variable.
+if test "${enable_error_checking+set}" = set; then
+ with_error_checking="$enable_error_checking"
+fi;
+# Check whether --with-error-checking or --without-error-checking was given.
+if test "${with_error_checking+set}" = set; then
+ enableval="$with_error_checking"
+ withval="$with_error_checking"
+ _error_checking_all_default=""
+_require_error_checking=""
+case "$with_error_checking" in
+ n | no | non | none ) _error_checking_all_default=no ;;
+ n,* | no,* | non,* | none,* ) _error_checking_all_default=no ;;
+ a | al | all | both ) _error_checking_all_default=yes ;;
+ a,* | al,* | all,* | both,* ) _error_checking_all_default=yes ;;
+ y | yes ) _require_error_checking=yes ;;
+esac
+if test -n "$_error_checking_all_default$_require_error_checking"; then
+ _with_error_checking_args=`echo $with_error_checking | sed -e 's/^[a-z]*\(,\(.*\)\)\{0,1\}$/\2/'`
+else
+ _with_error_checking_args=$with_error_checking
+fi
+for y in $_error_checking_types; do
+ if test -n "$_error_checking_all_default" ; then
+ eval "with_error_checking_${y}=$_error_checking_all_default"
+ else
+ eval "with_error_checking_$y=\$_error_checking_${y}_default"
+ fi
+done
+for x in `echo "$_with_error_checking_args" | sed -e 's/,/ /g'` ; do
+ _error_checking_found=""
+ for y in $_error_checking_types; do
+ if test "$x" = "$y"; then
+ _error_checking_found=yes
+ eval "with_error_checking_$y=yes"
+ elif test "$x" = "no$y"; then
+ _error_checking_found=yes
+ eval "with_error_checking_$y=no"
+ fi
+ done
+ test -z "$_error_checking_found" && \
+ (echo "$progname: Usage error:"
+echo " " "\
+Invalid type list supplied. Valid types for the --with-error-checking option are:
+ $_error_checking_types.
+ A prefix of \"no\" (eg, \"notype\" for \"type\") turns a type off.
+ Types not explicitly specified or negated take their defaults.
+ The list of defaults is \"$_error_checking_default\". Prefixing \`all' or
+ \`none' to the list sets all defaults to on and off respectively.
+ \`yes' as the sole argument is equivalent to omitting the argument."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+done
+for y in $_error_checking_types; do
+ eval "enable_error_checking_$y=\$with_error_checking_$y"
+ unset _error_checking_${y}_default
+done
+unset _error_checking_types _error_checking_default _error_checking_all_default _error_checking_use_defaults
+unset _with_error_checking_args _error_checking_found x y _require_error_checking
+
+
+
+else
+
+# set default for each type
+for y in $_error_checking_types; do
+ eval "with_error_checking_$y=\$_error_checking_${y}_default"
+ eval "enable_error_checking_$y=\$_error_checking_${y}_default"
+ unset _error_checking_${y}_default
+done
+
+fi;
+# If --with-assertions or --without-assertions were given then copy the value to the
+# equivalent enable_assertions variable.
+if test "${with_assertions+set}" = set; then
+ enable_assertions="$with_assertions"
+fi;
+# If -enable-assertions or --disable-assertions were given then copy the value to the
+# equivalent with_assertions variable.
+if test "${enable_assertions+set}" = set; then
+ with_assertions="$enable_assertions"
+fi;
+# Check whether --with-assertions or --without-assertions was given.
+if test "${with_assertions+set}" = set; then
+ enableval="$with_assertions"
+ withval="$with_assertions"
+
+fi;
+# If --with-memory-usage-stats or --without-memory-usage-stats were given then copy the value to the
+# equivalent enable_memory-usage-stats variable.
+if test "${with_memory_usage_stats+set}" = set; then
+ enable_memory_usage_stats="$with_memory_usage_stats"
+fi;
+# If -enable-memory-usage-stats or --disable-memory-usage-stats were given then copy the value to the
+# equivalent with_memory-usage-stats variable.
+if test "${enable_memory_usage_stats+set}" = set; then
+ with_memory_usage_stats="$enable_memory_usage_stats"
+fi;
+# Check whether --with-memory-usage-stats or --without-memory-usage-stats was given.
+if test "${with_memory_usage_stats+set}" = set; then
+ enableval="$with_memory_usage_stats"
+ withval="$with_memory_usage_stats"
+
+fi;
+# If --with-quick-build or --without-quick-build were given then copy the value to the
+# equivalent enable_quick-build variable.
+if test "${with_quick_build+set}" = set; then
+ enable_quick_build="$with_quick_build"
+fi;
+# If -enable-quick-build or --disable-quick-build were given then copy the value to the
+# equivalent with_quick-build variable.
+if test "${enable_quick_build+set}" = set; then
+ with_quick_build="$enable_quick_build"
+fi;
+# Check whether --with-quick-build or --without-quick-build was given.
+if test "${with_quick_build+set}" = set; then
+ enableval="$with_quick_build"
+ withval="$with_quick_build"
+
+fi;
+# If --with-union-type or --without-union-type were given then copy the value to the
+# equivalent enable_union-type variable.
+if test "${with_union_type+set}" = set; then
+ enable_union_type="$with_union_type"
+fi;
+# If -enable-union-type or --disable-union-type were given then copy the value to the
+# equivalent with_union-type variable.
+if test "${enable_union_type+set}" = set; then
+ with_union_type="$enable_union_type"
+fi;
+# Check whether --with-union-type or --without-union-type was given.
+if test "${with_union_type+set}" = set; then
+ enableval="$with_union_type"
+ withval="$with_union_type"
+
+fi;
+# If --with-quantify or --without-quantify were given then copy the value to the
+# equivalent enable_quantify variable.
+if test "${with_quantify+set}" = set; then
+ enable_quantify="$with_quantify"
+fi;
+# If -enable-quantify or --disable-quantify were given then copy the value to the
+# equivalent with_quantify variable.
+if test "${enable_quantify+set}" = set; then
+ with_quantify="$enable_quantify"
+fi;
+# Check whether --with-quantify or --without-quantify was given.
+if test "${with_quantify+set}" = set; then
+ enableval="$with_quantify"
+ withval="$with_quantify"
+
+fi;
+# If --with-purify or --without-purify were given then copy the value to the
+# equivalent enable_purify variable.
+if test "${with_purify+set}" = set; then
+ enable_purify="$with_purify"
+fi;
+# If -enable-purify or --disable-purify were given then copy the value to the
+# equivalent with_purify variable.
+if test "${enable_purify+set}" = set; then
+ with_purify="$enable_purify"
+fi;
+# Check whether --with-purify or --without-purify was given.
+if test "${with_purify+set}" = set; then
+ enableval="$with_purify"
+ withval="$with_purify"
+
+fi;
+# If --with-valgrind or --without-valgrind were given then copy the value to the
+# equivalent enable_valgrind variable.
+if test "${with_valgrind+set}" = set; then
+ enable_valgrind="$with_valgrind"
+fi;
+# If -enable-valgrind or --disable-valgrind were given then copy the value to the
+# equivalent with_valgrind variable.
+if test "${enable_valgrind+set}" = set; then
+ with_valgrind="$enable_valgrind"
+fi;
+# Check whether --with-valgrind or --without-valgrind was given.
+if test "${with_valgrind+set}" = set; then
+ enableval="$with_valgrind"
+ withval="$with_valgrind"
+
+fi;
+
+if test "$with_purify" = "yes" -o "$with_quantify" = "yes"; then
+ test "$with_system_malloc" = "default" && with_system_malloc=yes
+fi
+
+if test "$with_cde $with_tooltalk" = "yes no"; then
+ (echo "$progname: Usage error:"
+echo " " "--with-cde requires --with-tooltalk"
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+elif test "$with_tooltalk" = "no" ; then with_cde=no
+elif test "$with_cde" = "yes"; then with_tooltalk=yes
+fi
+
+
+if test \( "$with_xft_menubars" = "yes" -o "$with_xft_tabs" = "yes" \
+ -o "$with_xft_gauges" = "yes" \) -a "$with_xft_emacs" = "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Forcing --with-xft=emacs because Xft is enabled" >&5
+$as_echo "$as_me: WARNING: Forcing --with-xft=emacs because Xft is enabled" >&2;}
+ with_xft_emacs=yes
+fi
+
+if test "$with_xfs" = "yes" -a "$with_xft_menubars" = "yes"; then
+ (echo "$progname: Usage error:"
+echo " " "XFS and Xft in the menubars are incompatible!"
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+fi
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+if test "x$exec_prefix" = xNONE
+then
+ exec_prefix='${prefix}'
+else
+ $as_echo "@%:@define EXEC_PREFIX_USER_DEFINED 1" >>confdefs.h
+
+fi
+
+
+prefix_expanded=$prefix
+while true; do
+ case "$prefix_expanded" in
+ *\$* ) eval "prefix_expanded=$prefix_expanded" ;;
+ *) break ;;
+ esac
+done
+datadir_expanded=$datadir
+while true; do
+ case "$datadir_expanded" in
+ *\$* ) eval "datadir_expanded=$datadir_expanded" ;;
+ *) break ;;
+ esac
+done
+exec_prefix_expanded=$exec_prefix
+while true; do
+ case "$exec_prefix_expanded" in
+ *\$* ) eval "exec_prefix_expanded=$exec_prefix_expanded" ;;
+ *) break ;;
+ esac
+done
+libdir_expanded=$libdir
+while true; do
+ case "$libdir_expanded" in
+ *\$* ) eval "libdir_expanded=$libdir_expanded" ;;
+ *) break ;;
+ esac
+done
+infodir_expanded=$infodir
+while true; do
+ case "$infodir_expanded" in
+ *\$* ) eval "infodir_expanded=$infodir_expanded" ;;
+ *) break ;;
+ esac
+done
+
+if test "x$datadir" != "x\${datarootdir}"
+then
+ $as_echo "@%:@define INFODIR_USER_DEFINED 1" >>confdefs.h
+
+ $as_echo "@%:@define LISPDIR_USER_DEFINED 1" >>confdefs.h
+
+ $as_echo "@%:@define ETCDIR_USER_DEFINED 1" >>confdefs.h
+
+ $as_echo "@%:@define LATE_PACKAGE_DIRECTORIES_USER_DEFINED 1" >>confdefs.h
+
+fi
+
+if test "x$libdir" != "x\${exec_prefix}/lib"
+then
+ $as_echo "@%:@define MODULEDIR_USER_DEFINED 1" >>confdefs.h
+
+ $as_echo "@%:@define ARCHLIBDIR_USER_DEFINED 1" >>confdefs.h
+
+ $as_echo "@%:@define DOCDIR_USER_DEFINED 1" >>confdefs.h
+
+fi
+
+if test "x$infodir" != "x\${datarootdir}/info"
+then
+ $as_echo "@%:@define INFODIR_USER_DEFINED 1" >>confdefs.h
+
+else
+ infodir='${datarootdir}/${instvardir}/info'
+fi
+
+with_sitelispdir='${datadir}/${inststaticdir}/site-lisp'
+inststaticdir='${PROGNAME}'
+instvardir='${PROGNAME}-${version}'
+sitemoduledir='${libdir}/${inststaticdir}/site-modules'
+with_late_packages='${datadir}/${PROGNAME}'
+
+
+statedir=$with_statedir
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+
+for dir in lisp etc man info tests; do
+ if test ! -d "$dir" ; then
+ echo Making symbolic link to "$srcdir/$dir"
+ ${LN_S} "$srcdir/$dir" "$dir"
+ fi
+done
+
+absolute_pwd="`pwd`";
+if test -n "$PWD" -a "`cd $PWD && pwd`" = "$absolute_pwd"
+then blddir="$PWD"
+else blddir="$absolute_pwd"; if test -d "/net"; then
+ if test -d "/tmp_mnt/net"; then tdir="tmp_mnt/net"; else tdir="tmp_mnt"; fi
+ blddir=`echo "$blddir" | \
+ sed -e "s|^${tdir}/|/net/|" -e "s|^/a/|/net/|" -e "s|^/amd/|/net/|"`
+fi
+fi
+
+
+case "$srcdir" in
+ /* ) ;;
+ . ) srcdir="$blddir" ;;
+ * ) srcdir="`cd $srcdir && pwd`"; if test -d "/net"; then
+ if test -d "/tmp_mnt/net"; then tdir="tmp_mnt/net"; else tdir="tmp_mnt"; fi
+ srcdir=`echo "$srcdir" | \
+ sed -e "s|^${tdir}/|/net/|" -e "s|^/a/|/net/|" -e "s|^/amd/|/net/|"`
+fi ;;
+esac
+
+if test `pwd` != `sh -c cd $srcdir && pwd` \
+ && test -f "$srcdir/src/config.h"; then
+ (echo "$progname: WARNING: The directory tree \`$srcdir' is being used"
+ echo " as a build directory right now; it has been configured in its own"
+ echo " right. To configure in another directory as well, you MUST"
+ echo " use GNU make. If you do not have GNU make, then you must"
+ echo " now do \`make distclean' in $srcdir,"
+ echo " and then run $progname again.") >&2
+ extrasub='/^VPATH[ ]*=/c\
+vpath %.c $(srcdir)\
+vpath %.h $(srcdir)\
+vpath %.y $(srcdir)\
+vpath %.l $(srcdir)\
+vpath %.s $(srcdir)\
+vpath %.in $(srcdir)'
+fi
+
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+ if test -f "$ac_dir/install-sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+ elif test -f "$ac_dir/install.sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+ elif test -f "$ac_dir/shtool"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
+done
+if test -z "$ac_aux_dir"; then
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+
+cp "$srcdir/version.sh.in" "$srcdir/version.sh"
+if test -d "$srcdir/.hg"; then
+ (cd "$srcdir"; hg identify | cut -d " " -f 1 >> version.sh)
+fi
+. "$srcdir/version.sh" || exit 1;
+if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
+: "${verbose=$beta}"
+version="${emacs_major_version}.${emacs_minor_version}"
+cat >>confdefs.h <<_ACEOF
+@%:@define EMACS_MAJOR_VERSION $emacs_major_version
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+@%:@define EMACS_MINOR_VERSION $emacs_minor_version
+_ACEOF
+
+if test -n "$emacs_beta_version" ; then
+ if test "$beta" = "yes"; then
+ version="${version}-b${emacs_beta_version}"
+ cat >>confdefs.h <<_ACEOF
+@%:@define EMACS_BETA_VERSION $emacs_beta_version
+_ACEOF
+
+ else
+ version="${version}.${emacs_beta_version}"
+ cat >>confdefs.h <<_ACEOF
+@%:@define EMACS_PATCH_LEVEL $emacs_beta_version
+_ACEOF
+
+ fi
+fi
+cat >>confdefs.h <<_ACEOF
+@%:@define XEMACS_CODENAME "$xemacs_codename"
+_ACEOF
+
+verbose_version=$version
+if test "$xemacs_extra_name" != ""; then
+ cat >>confdefs.h <<_ACEOF
+@%:@define XEMACS_EXTRA_NAME "$xemacs_extra_name"
+_ACEOF
+
+ verbose_version="$verbose_version $xemacs_extra_name"
+fi
+if test "$xemacs_release_date" != ""; then
+ cat >>confdefs.h <<_ACEOF
+@%:@define XEMACS_RELEASE_DATE "$xemacs_release_date"
+_ACEOF
+
+fi
+cat >>confdefs.h <<_ACEOF
+@%:@define EMACS_VERSION "$version"
+_ACEOF
+
+
+PROGNAME=xemacs
+SHEBANG_PROGNAME=xemacs-script
+
+
+
+cat >>confdefs.h <<_ACEOF
+@%:@define EMACS_PROGNAME "$PROGNAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+@%:@define SHEBANG_PROGNAME "${PROGNAME}-script"
+_ACEOF
+
+
+if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
+test "${with_error_checking_extents:=$beta}" = yes && $as_echo "@%:@define ERROR_CHECK_EXTENTS 1" >>confdefs.h
+
+test "${with_error_checking_types:=$beta}" = yes && $as_echo "@%:@define ERROR_CHECK_TYPES 1" >>confdefs.h
+
+test "${with_error_checking_text:=$beta}" = yes && $as_echo "@%:@define ERROR_CHECK_TEXT 1" >>confdefs.h
+
+test "${with_error_checking_gc:=$beta}" = yes && $as_echo "@%:@define ERROR_CHECK_GC 1" >>confdefs.h
+
+test "${with_error_checking_malloc:=$beta}" = yes && $as_echo "@%:@define ERROR_CHECK_MALLOC 1" >>confdefs.h
+
+test "${with_error_checking_byte_code:=$beta}" = yes && $as_echo "@%:@define ERROR_CHECK_BYTE_CODE 1" >>confdefs.h
+
+test "${with_error_checking_glyphs:=$beta}" = yes && $as_echo "@%:@define ERROR_CHECK_GLYPHS 1" >>confdefs.h
+
+test "${with_error_checking_display:=$beta}" = yes && $as_echo "@%:@define ERROR_CHECK_DISPLAY 1" >>confdefs.h
+
+test "${with_error_checking_structures:=$beta}" = yes && $as_echo "@%:@define ERROR_CHECK_STRUCTURES 1" >>confdefs.h
+
+if test "${with_debug:=$beta}" = "yes"; then
+ with_assertions=yes
+ with_memory_usage_stats=yes
+ $as_echo "@%:@define DEBUG_XEMACS 1" >>confdefs.h
+
+fi
+test "$with_assertions" = "yes" && $as_echo "@%:@define USE_ASSERTIONS 1" >>confdefs.h
+
+test "$with_memory_usage_stats" = "yes" && $as_echo "@%:@define MEMORY_USAGE_STATS 1" >>confdefs.h
+
+
+
+ac_cv_build_alias=`echo "$ac_cv_build_alias" | sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'`
+ac_cv_build=`echo "$ac_cv_build" | sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'`
+configuration=$ac_cv_build
+
+
+
+
+
+
+machine='' opsys=''
+
+case "$ac_cv_build" in
+ sparc-*-* ) machine=sparc ;;
+ alpha*-*-* ) machine=alpha ;;
+ mips*-linux ) machine=mips ;;
+ rs6000-ibm-aix* ) machine=ibmrs6000 ;;
+ powerpc-ibm-aix* ) machine=ibmrs6000 ;;
+ powerpc*-* ) machine=powerpc ;;
+ hppa-*-* ) machine=hp800 ;;
+ arm* ) machine=arm ;;
+esac
+
+case "$ac_cv_build" in
+ *-*-netbsd* ) opsys=netbsd ;;
+ *-*-openbsd* ) opsys=openbsd ;;
+
+ *-*-aix[4-9]* ) opsys=aix4-2 ;;
+
+ *-gnu* ) opsys=gnu ;;
+ *-*-bsd4.3 ) opsys=bsd4-3 ;;
+ *-*-aos* ) opsys=bsd4-3 ;;
+ *-*-sysv4.1* | *-*-sysvr4.1* )opsys=usg5-4 NON_GNU_CPP=/usr/lib/cpp ;;
+ *-*-sysv4.[2-9]* | *-sysvr4.[2-9]* )
+ if test -z "$NON_GNU_CPP" ; then
+ for prog in "/usr/ccs/lib/cpp" "/lib/cpp"; do
+ if test -f "$prog"; then NON_GNU_CPP="$prog"; break; fi
+ done
+ fi
+ opsys=usg5-4-2 ;;
+ *-sysv4* | *-sysvr4* ) opsys=usg5-4 ;;
+ *-*-mach_bsd4.3* ) opsys=mach-bsd4-3 ;;
+esac
+
+case "$ac_cv_build" in
+
+ *-*-netbsd* )
+ case "${ac_cv_build}" in
+ i[3-9]86-*-netbsd*) machine=intel386 ;;
+ esac
+ ;;
+
+ *-*-openbsd* )
+ case "${ac_cv_build}" in
+ i386-*-openbsd*) machine=intel386 ;;
+ esac
+ ;;
+
+ *-*-darwin*)
+ opsys=darwin
+ $as_echo "@%:@define USE_PARAM_H 1" >>confdefs.h
+
+ ;;
+
+ *-hp-hpux* ) machine=hp800 opsys=hpux11
+ NON_GNU_CC="cc -Ae" NON_GNU_CPP="cc -Ae -E"
+
+ case "$ac_cv_build" in *-hp-hpux*shr* ) opsys="${opsys}-shr" ;; esac
+ ;;
+
+ mips-mips-bsd* ) machine=mips opsys=bsd4-3 ;;
+ mips-mips-* ) machine=mips opsys=usg5-4-2 ;;
+
+ mips-sgi-irix6* ) opsys=irix6-0 ;;
+
+ *-*-solaris* | *-sun-mach* | *-sun-bsd* )
+ case "$ac_cv_build" in
+ i*86-*-* ) machine=intel386 ;;
+ esac
+
+ case "$ac_cv_build" in *-sunos5*)
+ ac_cv_build=`echo $ac_cv_build | sed -e s/sunos5/solaris2/`;;
+ esac
+
+ case "$ac_cv_build" in
+ *-solaris2* )
+ #test -f /usr/ccs/lib/cpp && NON_GNU_CPP=/usr/ccs/lib/cpp
+ RANLIB=':' ;;
+ esac
+
+ case "$ac_cv_build" in
+ *-solaris* )
+ opsys=sol2
+ os_release_major=`uname -r | sed -e 's/^\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*/\1/'`
+ os_release_minor=`uname -r | sed -e 's/^\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*/\2/'`
+ case "$os_release_minor" in [0-9])
+ os_release_minor="0${os_release_minor}";;
+ esac
+ os_release="${os_release_major}${os_release_minor}"
+ cat >>confdefs.h <<_ACEOF
+@%:@define OS_RELEASE $os_release
+_ACEOF
+ ;;
+
+ *-mach* ) opsys=mach-bsd4-3 ;;
+ * ) opsys=bsd4-3 ;;
+ esac
+
+ test "$opsys $CC" = "sol2 /usr/ucb/cc" && CC=""
+ ;;
+
+ i[3-9]86-*-* )
+ machine=intel386
+ case "$ac_cv_build" in
+ *-mach* ) opsys=mach-bsd4-3 ;;
+ *-sysv5* ) opsys=sco7 ;;
+ *-freebsd* ) opsys=freebsd ;;
+ *-pc-cygwin* ) opsys=cygwin32 ;;
+ *-pc-mingw* ) opsys=mingw32 ;
+ test -z "$with_tty" && with_tty="no";;
+ esac
+ ;;
+
+esac
+
+test -z "$machine" && machine=`echo $ac_cv_build | sed 's/-.*$//'`
+
+test -z "$opsys" && opsys=`uname -s | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+
+if test -r "${srcdir}/src/m/${machine}.h"; then
+ machfile="m/${machine}.h"
+ cat >>confdefs.h <<_ACEOF
+@%:@define config_machfile "$machfile"
+_ACEOF
+
+else
+ echo "XEmacs has no builtin knowledge of \`$machine' machines."
+ echo "Using configure-time autodetection only."
+fi
+
+if test -r "${srcdir}/src/s/${opsys}.h"; then
+ opsysfile="s/${opsys}.h"
+ cat >>confdefs.h <<_ACEOF
+@%:@define config_opsysfile "$opsysfile"
+_ACEOF
+
+else
+ echo "XEmacs has no builtin knowledge of \`$opsys' operating systems."
+ echo "Using configure-time autodetection only."
+fi
+
+
+
+if test -z "$with_pdump"; then
+ case "$opsys" in
+ linux* ) with_pdump=yes ;; darwin ) with_pdump=yes ;; cygwin* ) with_pdump=yes ;; * ) with_pdump=no ;;
+ esac
+fi
+
+if test "$with_newgc" = "yes"; then
+ if test "$with_vdb" = "auto"; then
+ case "$opsys" in
+ darwin ) case "$machine" in
+ i[3-9]86 ) check_vdb_posix=yes ;;
+ * ) $as_echo "@%:@define VDB_MACH 1" >>confdefs.h
+ have_vdb_mach=yes ;;
+ esac ;;
+ cygwin* ) $as_echo "@%:@define VDB_WIN32 1" >>confdefs.h
+ have_vdb_win32=yes ;;
+ linux* ) check_vdb_posix=yes ;;
+ freebsd ) check_vdb_posix=yes ;;
+ * ) check_vdb_posix=yes ;;
+ esac
+ else
+ case "$with_vdb" in
+ mach ) $as_echo "@%:@define VDB_MACH 1" >>confdefs.h
+ have_vdb_mach=yes ;;
+ win32 ) $as_echo "@%:@define VDB_WIN32 1" >>confdefs.h
+ have_vdb_win32=yes ;;
+ posix ) check_vdb_posix=yes ;;
+ fake ) have_vdb_fake=yes ;;
+ no ) have_vdb_fake=yes ;;
+ esac
+ fi
+fi
+
+if test -z "$with_dynamic"; then
+ case "$opsys" in
+ hpux* ) with_dynamic=no ;;
+ *) with_dynamic=yes ;;
+ esac
+fi
+if test "$with_dynamic" = "yes"; then
+ case "$opsys" in
+ hpux* ) opsys="${opsys}-shr" ;;
+ darwin ) $as_echo "@%:@define DLSYM_NEEDS_UNDERSCORE 1" >>confdefs.h
+ ;;
+ esac
+else case "$opsys" in
+ sol2 )
+ echo "Static linking is not supported on Solaris 2."
+ echo "Rerun configure without specifying --without-dynamic."
+ exit 1 ;;
+ linux ) ld_call_shared="-Bstatic" ;;
+ esac
+fi
+
+case "$opsys" in
+ aix* ) NON_GNU_CC=xlc ;; darwin ) RANLIB="ranlib -c" ;; esac
+
+stack_trace_eye_catcher=`echo ${PROGNAME}_${version}_${ac_cv_build} | sed 'y/.-/__/'`
+cat >>confdefs.h <<_ACEOF
+@%:@define STACK_TRACE_EYE_CATCHER $stack_trace_eye_catcher
+_ACEOF
+
+
+
+test "$with_sparcworks" = "yes" && with_workshop=yes # compatibility alias
+if test "$with_workshop $with_tooltalk" = "yes no"; then
+ (echo "$progname: Usage error:"
+echo " " "--with-workshop requires --with-tooltalk"
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+elif test "$with_tooltalk" = "no" ; then with_workshop=no
+elif test "$with_workshop" = "yes"; then with_tooltalk=yes
+fi
+
+if test "$with_workshop" = "yes"; then
+ $as_echo "@%:@define SUNPRO 1" >>confdefs.h
+
+fi
+
+if test "$with_clash_detection" != "no"; then
+ $as_echo "@%:@define CLASH_DETECTION 1" >>confdefs.h
+
+fi
+
+test -n "$with_compiler" && CC="$with_compiler"
+if test "$with_gcc" = "no"; then case "$CC" in "" | *gcc* ) CC="${NON_GNU_CC-cc}" ;; esac
+fi
+
+test "${with_cflags-unset}" != unset && CFLAGS="$with_cflags"
+if test "${CFLAGS-unset}" != unset
+ then cflags_specified=yes;
+ else cflags_specified=no;
+fi
+
+if test "${with_cflags_warning-unset}" != unset
+ then cflags_warning_specified=yes;
+ else cflags_warning_specified=no;
+fi
+
+if test "${with_cflags_optimization-unset}" != unset
+ then cflags_optimization_specified=yes;
+ else cflags_optimization_specified=no;
+fi
+
+if test "${with_cflags_debugging-unset}" != unset
+ then cflags_debugging_specified=yes;
+ else cflags_debugging_specified=no;
+fi
+
+xe_save_CFLAGS="$CFLAGS"
+
+ac_ext=c
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+else
+ CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ fi
+fi
+if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $@%:@ != 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+ fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in cl.exe
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$CC" && break
+ done
+fi
+if test -z "$CC"; then
+ ac_ct_CC=$CC
+ for ac_prog in cl.exe
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_CC" && break
+done
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+ esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link_default") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile. We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+ test -f "$ac_file" || continue
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+ ;;
+ [ab].out )
+ # We found the default executable, but exeext='' is most
+ # certainly right.
+ break;;
+ *.* )
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ then :; else
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ fi
+ # We set ac_cv_exeext here because the later test for it is not
+ # safe: cross compilers may not add the suffix if given an `-o'
+ # argument, so we may need to know it at that point already.
+ # Even if this section looks crufty: it has the advantage of
+ # actually working.
+ break;;
+ * )
+ break;;
+ esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+ ac_file=''
+fi
+if test -z "$ac_file"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
+ # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+ test -f "$ac_file" || continue
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ break;;
+ * ) break;;
+ esac
+done
+else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+@%:@include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+ { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if { ac_try='./conftest$ac_cv_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
+ for ac_file in conftest.o conftest.obj conftest.*; do
+ test -f "$ac_file" || continue;
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+ break;;
+ esac
+done
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+#ifndef __GNUC__
+ choke me
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_compiler_gnu=yes
+else
+ ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GCC=yes
+else
+ GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+else
+ CFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
+ CFLAGS="-g -O2"
+ else
+ CFLAGS="-g"
+ fi
+else
+ if test "$GCC" = yes; then
+ CFLAGS="-O2"
+ else
+ CFLAGS=
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+ char **p;
+ int i;
+{
+ return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+ char *s;
+ va_list v;
+ va_start (v,p);
+ s = g (p, va_arg (v,int));
+ va_end (v);
+ return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+ CC="$ac_save_CC $ac_arg"
+ if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+ x)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+ xno)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ac_ext=c
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+fi
+if test -z "$CPP"; then
+ if ${ac_cv_prog_CPP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ # Double quotes because CPP needs to be expanded
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+@%:@ifdef __STDC__
+@%:@ include <limits.h>
+@%:@else
+@%:@ include <assert.h>
+@%:@endif
+ Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+@%:@include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+continue
+else
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+ break
+fi
+
+ done
+ ac_cv_prog_CPP=$CPP
+
+fi
+ CPP=$ac_cv_prog_CPP
+else
+ ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+@%:@ifdef __STDC__
+@%:@ include <limits.h>
+@%:@else
+@%:@ include <assert.h>
+@%:@endif
+ Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+@%:@include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+continue
+else
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -z "$GREP"; then
+ ac_path_GREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in grep ggrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+ # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo 'GREP' >> "conftest.nl"
+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_GREP="$ac_path_GREP"
+ ac_path_GREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_GREP_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_GREP"; then
+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+else
+ ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
+ if test -z "$EGREP"; then
+ ac_path_EGREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in egrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+ # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo 'EGREP' >> "conftest.nl"
+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_EGREP="$ac_path_EGREP"
+ ac_path_EGREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_EGREP_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_EGREP"; then
+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+else
+ ac_cv_path_EGREP=$EGREP
+fi
+
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_header_stdc=yes
+else
+ ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "free" >/dev/null 2>&1; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test "$cross_compiling" = yes; then :
+ :
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+ return 2;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "@%:@define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+ ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
+if test "x$ac_cv_header_minix_config_h" = xyes; then :
+ MINIX=yes
+else
+ MINIX=
+fi
+
+
+ if test "$MINIX" = yes; then
+
+$as_echo "@%:@define _POSIX_SOURCE 1" >>confdefs.h
+
+
+$as_echo "@%:@define _POSIX_1_SOURCE 2" >>confdefs.h
+
+
+$as_echo "@%:@define _MINIX 1" >>confdefs.h
+
+ fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if ${ac_cv_safe_to_define___extensions__+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+# define __EXTENSIONS__ 1
+ $ac_includes_default
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_safe_to_define___extensions__=yes
+else
+ ac_cv_safe_to_define___extensions__=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+ test $ac_cv_safe_to_define___extensions__ = yes &&
+ $as_echo "@%:@define __EXTENSIONS__ 1" >>confdefs.h
+
+ $as_echo "@%:@define _ALL_SOURCE 1" >>confdefs.h
+
+ $as_echo "@%:@define _GNU_SOURCE 1" >>confdefs.h
+
+ $as_echo "@%:@define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+ $as_echo "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
+
+
+
+ac_ext=c
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+else
+ CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ fi
+fi
+if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $@%:@ != 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+ fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in cl.exe
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$CC" && break
+ done
+fi
+if test -z "$CC"; then
+ ac_ct_CC=$CC
+ for ac_prog in cl.exe
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_CC" && break
+done
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+#ifndef __GNUC__
+ choke me
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_compiler_gnu=yes
+else
+ ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GCC=yes
+else
+ GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+else
+ CFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
+ CFLAGS="-g -O2"
+ else
+ CFLAGS="-g"
+ fi
+else
+ if test "$GCC" = yes; then
+ CFLAGS="-O2"
+ else
+ CFLAGS=
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+ char **p;
+ int i;
+{
+ return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+ char *s;
+ va_list v;
+ va_start (v,p);
+ s = g (p, va_arg (v,int));
+ va_end (v);
+ return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+ CC="$ac_save_CC $ac_arg"
+ if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+ x)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+ xno)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+if test "$with_gcc" = "no" -a "$GCC" = "yes"; then
+ CC=${NON_GNU_CC-cc}
+ ac_ext=c
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+else
+ CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ fi
+fi
+if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $@%:@ != 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+ fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in cl.exe
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$CC" && break
+ done
+fi
+if test -z "$CC"; then
+ ac_ct_CC=$CC
+ for ac_prog in cl.exe
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_CC" && break
+done
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+#ifndef __GNUC__
+ choke me
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_compiler_gnu=yes
+else
+ ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GCC=yes
+else
+ GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+else
+ CFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
+ CFLAGS="-g -O2"
+ else
+ CFLAGS="-g"
+ fi
+else
+ if test "$GCC" = yes; then
+ CFLAGS="-O2"
+ else
+ CFLAGS=
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+ char **p;
+ int i;
+{
+ return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+ char *s;
+ va_list v;
+ va_start (v,p);
+ s = g (p, va_arg (v,int));
+ va_end (v);
+ return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+ CC="$ac_save_CC $ac_arg"
+ if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+ x)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+ xno)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+elif test "$with_gcc" = "yes" -a "$GCC" != "yes" ; then
+ CC=gcc
+ ac_ext=c
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+else
+ CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ fi
+fi
+if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $@%:@ != 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+ fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in cl.exe
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$CC" && break
+ done
+fi
+if test -z "$CC"; then
+ ac_ct_CC=$CC
+ for ac_prog in cl.exe
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_CC" && break
+done
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+#ifndef __GNUC__
+ choke me
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_compiler_gnu=yes
+else
+ ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GCC=yes
+else
+ GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+else
+ CFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
+ CFLAGS="-g -O2"
+ else
+ CFLAGS="-g"
+ fi
+else
+ if test "$GCC" = yes; then
+ CFLAGS="-O2"
+ else
+ CFLAGS=
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+ char **p;
+ int i;
+{
+ return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+ char *s;
+ va_list v;
+ va_start (v,p);
+ s = g (p, va_arg (v,int));
+ va_end (v);
+ return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+ CC="$ac_save_CC $ac_arg"
+ if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+ x)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+ xno)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+CFLAGS="$xe_save_CFLAGS"
+
+if test "$GCC" = "yes"; then
+if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int main () {
+return __GNUC__;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ :
+else
+ __GCC="$?"
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int main () {
+return __GNUC_MINOR__;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ :
+else
+ __GCC_MINOR="$?"
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+__GCC_VERSION=$__GCC"."$__GCC_MINOR
+echo "You appear to be using GCC version" $__GCC_VERSION
+fi
+
+
+
+test -n "$with_xemacs_compiler" && XEMACS_CC="$with_xemacs_compiler"
+: ${XEMACS_CC:="$CC"}
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using g++" >&5
+$as_echo_n "checking whether we are using g++... " >&6; }
+
+XEMACS_CC_GPP=no
+case "$XEMACS_CC" in
+ *g++* ) XEMACS_CC_GPP=yes ;;
+esac
+
+if test "$XEMACS_CC_GPP" = "no" -a "$GCC" = "yes"; then
+ case "`$XEMACS_CC --version`" in
+ g++* ) XEMACS_CC_GPP=yes ;;
+ esac
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XEMACS_CC_GPP" >&5
+$as_echo "$XEMACS_CC_GPP" >&6; }
+
+
+test -n "$CPP" -a -d "$CPP" && CPP=
+
+test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP"
+
+ac_ext=c
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+fi
+if test -z "$CPP"; then
+ if ${ac_cv_prog_CPP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ # Double quotes because CPP needs to be expanded
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+@%:@ifdef __STDC__
+@%:@ include <limits.h>
+@%:@else
+@%:@ include <assert.h>
+@%:@endif
+ Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+@%:@include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+continue
+else
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+ break
+fi
+
+ done
+ ac_cv_prog_CPP=$CPP
+
+fi
+ CPP=$ac_cv_prog_CPP
+else
+ ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+@%:@ifdef __STDC__
+@%:@ include <limits.h>
+@%:@else
+@%:@ include <assert.h>
+@%:@endif
+ Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+@%:@include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+continue
+else
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc" >&5
+$as_echo_n "checking for GNU libc... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <features.h>
+int
+main ()
+{
+
+#if ! (defined __GLIBC__ || defined __GNU_LIBRARY__)
+#error Not a GNU libc system :-(
+******* ======= ******** &&&&&&&&
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ have_glibc=yes
+else
+ have_glibc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_glibc" >&5
+$as_echo "$have_glibc" >&6; }
+test "$have_glibc" = "yes" && $as_echo "@%:@define _GNU_SOURCE 1" >>confdefs.h
+
+
+case "$opsys" in
+ sol2)
+ $as_echo "@%:@define __EXTENSIONS__ 1" >>confdefs.h
+
+ if test "$os_release" -ge 505; then
+ $as_echo "@%:@define _XOPEN_SOURCE 500" >>confdefs.h
+
+ $as_echo "@%:@define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h
+
+ fi ;;
+ linux)
+ $as_echo "@%:@define _POSIX_C_SOURCE 199506L" >>confdefs.h
+
+ $as_echo "@%:@define _XOPEN_SOURCE 500" >>confdefs.h
+
+ $as_echo "@%:@define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h
+
+ ;;
+ freebsd4*)
+ $as_echo "@%:@define _POSIX_C_SOURCE 199506L" >>confdefs.h
+
+ $as_echo "@%:@define _XOPEN_SOURCE 500" >>confdefs.h
+
+ ;;
+esac
+
+if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int main () {
+#if defined __SUNPRO_C
+return 11;
+#elif defined __DECC
+return 12;
+#elif defined __USLC__ && defined __SCO_VERSION__
+return 13;
+#elif defined __INTEL_COMPILER
+return 14;
+#else
+return 0;
+#endif
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+ case "$?" in
+ 11) echo "You appear to be using the SunPro C compiler." ; __SUNPRO_C=yes ;;
+ 12) echo "You appear to be using the DEC C compiler." ; __DECC=yes ;;
+ 13) echo "You appear to be using the SCO C compiler." ; __USLC__=yes ;;
+ 14) echo "You appear to be using the Intel C++ compiler."; __ICC=yes
+ GCC=no ;;
+esac
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+
+echo "Extracting information from the machine- and system-dependent headers..."
+
+tempcname="conftest.c"
+
+
+
+cat > $tempcname < confdefs.h
+cat >> $tempcname <<EOF
+#define NOT_C_CODE
+#define C_SWITCH_SITE
+#define C_SWITCH_X_SITE
+#define LD_SWITCH_SITE
+#define LD_SWITCH_X_SITE
+#define LD_SWITCH_X_SITE_AUX
+#define OS_RELEASE $os_release
+
+#ifdef config_opsysfile
+#include "$srcdir/src/$opsysfile"
+#endif
+
+#ifdef config_machfile
+#include "$srcdir/src/$machfile"
+#endif
+
+#ifndef LIBS_MACHINE
+#define LIBS_MACHINE
+#endif
+configure___ libs_machine=LIBS_MACHINE
+
+#ifndef LIBS_SYSTEM
+#define LIBS_SYSTEM
+#endif
+configure___ libs_system=LIBS_SYSTEM
+
+#ifndef LIBS_TERMCAP
+#define LIBS_TERMCAP
+#endif
+configure___ libs_termcap=LIBS_TERMCAP
+
+#ifndef LIB_STANDARD
+#define LIB_STANDARD
+#endif
+configure___ libs_standard=LIB_STANDARD
+
+
+#ifndef OBJECTS_MACHINE
+#define OBJECTS_MACHINE
+#endif
+configure___ objects_machine=OBJECTS_MACHINE
+
+#ifndef OBJECTS_SYSTEM
+#define OBJECTS_SYSTEM
+#endif
+configure___ objects_system=OBJECTS_SYSTEM
+
+
+#ifndef C_SWITCH_MACHINE
+#define C_SWITCH_MACHINE
+#endif
+configure___ c_switch_machine=C_SWITCH_MACHINE
+
+#ifndef C_SWITCH_SYSTEM
+#define C_SWITCH_SYSTEM
+#endif
+configure___ c_switch_system=C_SWITCH_SYSTEM
+
+
+#ifndef LD_SWITCH_MACHINE
+#define LD_SWITCH_MACHINE
+#endif
+configure___ ld_switch_machine=LD_SWITCH_MACHINE
+
+#ifndef LD_SWITCH_SYSTEM
+#define LD_SWITCH_SYSTEM
+#endif
+configure___ ld_switch_system=LD_SWITCH_SYSTEM
+
+
+#ifndef UNEXEC
+#define UNEXEC
+#endif
+configure___ unexec=UNEXEC
+
+
+#ifndef SYSTEM_TYPE
+#define SYSTEM_TYPE
+#endif
+configure___ system_type=SYSTEM_TYPE
+
+
+#ifndef LD_SWITCH_SHARED
+#define LD_SWITCH_SHARED "-c"
+#endif
+configure___ ld_switch_shared=LD_SWITCH_SHARED
+
+
+#define ORDINARY_LD "\$(CC) \$(CFLAGS)"
+configure___ ordinary_ld=ORDINARY_LD
+
+#ifdef ORDINARY_LINK
+#define LD ORDINARY_LD
+#else /* no ORDINARY LINK */
+#ifdef LINKER
+#define LD LINKER
+#else /* ! defined (LINKER) */
+#define LD "ld"
+#endif /* ! defined (LINKER) */
+#endif /* not ORDINARY_LINK */
+configure___ ld=LD
+
+#ifndef LIB_GCC
+#define LIB_GCC
+#endif
+configure___ lib_gcc=LIB_GCC
+
+#ifndef LD_TEXT_START_ADDR
+#define LD_TEXT_START_ADDR
+#endif
+configure___ ld_text_start_addr=LD_TEXT_START_ADDR
+
+
+#if ! defined (ORDINARY_LINK) && !defined (START_FILES)
+#ifdef NO_REMAP
+#define START_FILES "pre-crt0.o /lib/crt0.o"
+#else /* ! defined (NO_REMAP) */
+#define START_FILES "ecrt0.o"
+#endif /* ! defined (NO_REMAP) */
+#endif /* no ORDINARY_LINK */
+#ifndef START_FILES
+#define START_FILES
+#endif
+configure___ start_files=START_FILES
+
+#ifdef ORDINARY_LINK
+configure___ ordinary_link=yes
+#else
+configure___ ordinary_link=no
+#endif
+
+#ifdef SYSTEM_MALLOC
+configure___ system_malloc=yes
+#else
+configure___ system_malloc=no
+#endif
+
+#ifdef TERMINFO
+configure___ have_terminfo=yes
+#else
+configure___ have_terminfo=no
+#endif
+
+#ifdef MAIL_USE_FLOCK
+configure___ mail_use_flock=yes
+#else
+configure___ mail_use_flock=no
+#endif
+
+#ifdef MAIL_USE_LOCKF
+configure___ mail_use_lockf=yes
+#else
+configure___ mail_use_lockf=no
+#endif
+
+#ifdef MAIL_USE_LOCKING
+configure___ mail_use_locking=yes
+#else
+configure___ mail_use_locking=no
+#endif
+
+#ifdef HAVE_WIN32_PROCESSES
+configure___ win32_processes=yes
+#else
+configure___ win32_processes=no
+#endif
+
+EOF
+
+CPP=`eval "echo $CPP $CPPFLAGS"`
+eval `$CPP -Isrc $tempcname \
+ | sed -n -e "s/[ TAB]*=[ TAB\"]*/='/" -e "s/[ TAB\"]*\$/'/" -e "s/^configure___//p"`
+
+rm $tempcname
+
+test -z "$system_type" && \
+ cat >>confdefs.h <<_ACEOF
+@%:@define SYSTEM_TYPE "`uname -s | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
+_ACEOF
+
+
+test -z "$unexec" && with_pdump=yes
+
+if test "$with_pdump" = "yes"; then
+ ordinary_link="yes"
+ ld="${ordinary_ld}"
+ start_files=
+ libs_standard=
+ unexec=
+ lib_gcc=
+fi
+
+test -z "$with_kkcc" && with_kkcc=yes
+
+if test -z "$with_dump_in_exec"; then
+ if test "$with_pdump" = "yes"; then
+ if test "$with_newgc" = "yes"; then
+ with_dump_in_exec=no
+ else
+ with_dump_in_exec=yes
+ fi
+ fi
+fi
+
+if test "$with_newgc" = "yes"; then
+ with_kkcc=yes
+fi
+
+test "$verbose" = "yes" && \
+ for var in libs_machine libs_system libs_termcap libs_standard objects_machine objects_system c_switch_machine c_switch_system ld_switch_machine ld_switch_system unexec ld_switch_shared ld lib_gcc ld_text_start_addr start_files ordinary_link have_terminfo mail_use_flock mail_use_lockf; do eval "echo \"$var = '\$$var'\""; done && echo ""
+
+case "$opsys" in mingw* | cygwin*)
+ cygwin_include=`eval gcc -print-search-dirs | sed -ne s'/install: //p'`
+ cygwin_include=`eval "cd $cygwin_include/../../../..; pwd"`
+ cygwin_include="-I$cygwin_include/include" ;
+ extra_includes="$cygwin_include/mingw $cygwin_include" ;
+ case "$opsys" in mingw*)
+ c_switch_system="$c_switch_system $extra_includes" && if test "$verbose" = "yes"; then echo " Appending \"$extra_includes\" to \$c_switch_system"; fi ;;
+ esac
+ ;;
+esac
+
+test "$ordinary_link" = "no" -a -z "$libs_standard" && libs_standard="-lc"
+
+
+test "$__DECC" = "yes" && c_switch_site="$c_switch_site -std1" && if test "$verbose" = "yes"; then echo " Appending \"-std1\" to \$c_switch_site"; fi
+
+if test "$__USLC__" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for whether the -Kalloca compiler flag is needed" >&5
+$as_echo_n "checking for whether the -Kalloca compiler flag is needed... " >&6; }
+ need_kalloca=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+void *x = alloca(4);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ :
+else
+
+ xe_save_c_switch_system="$c_switch_system"
+ c_switch_system="$c_switch_system -Kalloca"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+void *x = alloca(4);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ need_kalloca=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ c_switch_system="$xe_save_c_switch_system"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $need_kalloca" >&5
+$as_echo "$need_kalloca" >&6; }
+ test "$need_kalloca" = "yes" && c_switch_system="$c_switch_system -Kalloca" && if test "$verbose" = "yes"; then echo " Appending \"-Kalloca\" to \$c_switch_system"; fi
+fi
+
+
+xemacs_cc_cc_mismatch=no
+if test "$CC" != "$XEMACS_CC"; then
+ if test "$XEMACS_CC_GPP" = "yes" -a "$GCC" != "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: CC and g++ are mismatched; XE_CFLAGS may be wrong" >&5
+$as_echo "$as_me: WARNING: CC and g++ are mismatched; XE_CFLAGS may be wrong" >&2;}
+ xemacs_cc_cc_mismatch=yes
+ fi
+ if test -n "$GCC" -a "$XEMACS_CC_GPP" != "yes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gcc and XEMACS_CC are mismatched; XE_CFLAGS may be wrong" >&5
+$as_echo "$as_me: WARNING: gcc and XEMACS_CC are mismatched; XE_CFLAGS may be wrong" >&2;}
+ xemacs_cc_cc_mismatch=yes
+ fi
+ fi
+
+
+if test -z "$with_optimization"; then
+ # If user set --with-cflags-optimization, use it to unilaterally
+ # determine whether optimization should be enabled.
+ if test "$cflags_optimization_specified" = "yes" ; then
+ if test -z "$with_cflags_optimization" ; then
+ with_optimization=no
+ else
+ with_optimization=yes
+ fi
+ elif test -z "$emacs_is_beta" ; then
+ with_optimization=yes
+ else
+ with_optimization=no
+ fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for preferred optimization flags" >&5
+$as_echo_n "checking for preferred optimization flags... " >&6; }
+if test "$cflags_optimization_specified" = "no"; then
+ if test "$with_optimization" = "yes" ; then
+ if test "$GCC" = "yes"; then
+ with_cflags_optimization="-O3 -fno-strict-aliasing"
+ elif test "$__SUNPRO_C" = "yes"; then
+ case "$opsys" in
+ sol2 ) with_cflags_optimization="-xO4" ;;
+ esac
+ elif test "$__DECC" = "yes"; then
+ with_cflags_optimization="-O3"
+ elif test "$CC" = "xlc"; then
+ with_cflags_optimization="-O3 -qstrict -qnoansialias -qlibansi -qmaxmem=20000"
+ elif test "$__ICC" = "yes"; then
+ with_cflags_optimization="-O3 -Ob2"
+ else
+ with_cflags_optimization="-O" ; fi
+ elif test "$XEMACS_CC_GPP" = "yes" ; then
+ with_cflags_optimization="-fno-strict-aliasing"
+ fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_cflags_optimization}" >&5
+$as_echo "${with_cflags_optimization}" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for preferred debugging flags" >&5
+$as_echo_n "checking for preferred debugging flags... " >&6; }
+if test "$cflags_debugging_specified" = "no"; then
+ with_cflags_debugging="-g"
+
+ debugging_ok_with_optimization=no
+ if test "$GCC" = "yes" -o "$CC" = "xlc" -o "$__ICC" = "yes"; then
+ debugging_ok_with_optimization=yes
+ fi
+
+ if test "$with_optimization" = "yes" -a "$debugging_ok_with_optimization" = "no"; then
+ with_cflags_debugging=
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_cflags_debugging}" >&5
+$as_echo "${with_cflags_debugging}" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for preferred warning flags for XEMACS_CC" >&5
+$as_echo_n "checking for preferred warning flags for XEMACS_CC... " >&6; }
+
+xe_cflags_warning=""
+
+if test "$cflags_warning_specified" = "no"; then
+ if test "$__SUNPRO_C" = "yes"; then
+ case "$opsys" in
+ sol2 ) with_cflags_warning="-v" ;;
+ esac
+ elif test "$CC" = "xlc"; then
+ with_cflags_warning="-qinfo"
+ elif test "$GCC" = "yes"; then
+ with_cflags_warning="-Wall -Wno-switch -Wundef"
+
+ with_cflags_warning="$with_cflags_warning -Wsign-compare -Wno-char-subscripts"
+ test "$__GCC" -ge 3 && with_cflags_warning="$with_cflags_warning -Wpacked"
+ test "$have_glibc" != "yes" && \
+ with_cflags_warning="$with_cflags_warning -Wpointer-arith"
+ with_cflags_warning_c="-Wshadow -Wmissing-declarations"
+ with_cflags_warning_c="$with_cflags_warning_c -Wmissing-prototypes -Wstrict-prototypes"
+ with_cflags_warning_cxx="-Weffc++"
+ with_cflags_warning_c_xe=""
+ if test "$__GCC" -ge 3; then
+ with_cflags_warning_c_xe="$with_cflags_warning_c_xe -Wunused-parameter"
+ if test "$__GCC" -gt 3 || test "$__GCC_MINOR" -ge 4; then
+ with_cflags_warning_c="$with_cflags_warning_c -Wdeclaration-after-statement"
+ fi
+ fi
+ if test "$XEMACS_CC_GPP" = "yes"; then
+ xe_cflags_warning="$with_cflags_warning $with_cflags_warning_cxx"
+ else
+ xe_cflags_warning="$with_cflags_warning $with_cflags_warning_c $with_cflags_warning_c_xe"
+ fi
+ with_cflags_warning="$with_cflags_warning $with_cflags_warning_c"
+ elif test "$__ICC" = "yes"; then
+ with_cflags_warning="-Wall -w1 -we147"
+ fi
+fi
+test -z "$xe_cflags_warning" && xe_cflags_warning="$with_cflags_warning"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${xe_cflags_warning}" >&5
+$as_echo "${xe_cflags_warning}" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for preferred warning flags for CC" >&5
+$as_echo_n "checking for preferred warning flags for CC... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_cflags_warning}" >&5
+$as_echo "${with_cflags_warning}" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for remaining CFLAGS" >&5
+$as_echo_n "checking for remaining CFLAGS... " >&6; }
+
+if test "$cflags_specified" = "no"; then
+ if test "$CC" = "xlc"; then
+ CFLAGS="-qro"
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${CFLAGS}" >&5
+$as_echo "${CFLAGS}" >&6; }
+
+
+XE_CFLAGS="$xe_cflags_warning $with_cflags_debugging $with_cflags_optimization $CFLAGS"
+CFLAGS="$with_cflags_warning $with_cflags_debugging $with_cflags_optimization $CFLAGS"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking total value of XE_CFLAGS" >&5
+$as_echo_n "checking total value of XE_CFLAGS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${XE_CFLAGS}" >&5
+$as_echo "${XE_CFLAGS}" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking total value of CFLAGS" >&5
+$as_echo_n "checking total value of CFLAGS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${CFLAGS}" >&5
+$as_echo "${CFLAGS}" >&6; }
+
+if test "$GCC" = "yes"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for buggy gcc versions" >&5
+$as_echo_n "checking for buggy gcc versions... " >&6; }
+GCC_VERSION=`$CC --version`
+case `uname -s`:`uname -m`:$GCC_VERSION in
+ *:sun4*:2.8.1|*:sun4*:egcs-2.90.*)
+ case "$CFLAGS" in
+ *-O2*|*-O3*)
+ case "$CFLAGS" in
+ *-fno-schedule-insns*) ;;
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Don't use -O2 with gcc 2.8.1 and egcs 1.0 under SPARC architectures" >&5
+$as_echo "$as_me: WARNING: Don't use -O2 with gcc 2.8.1 and egcs 1.0 under SPARC architectures" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: without also using -fno-schedule-insns." >&5
+$as_echo "$as_me: WARNING: without also using -fno-schedule-insns." >&2;}
+ as_fn_error $? "Aborting due to known problem" "$LINENO" 5
+ ;;
+ esac
+ ;;
+ esac
+ ;;
+ Linux:alpha:egcs-2.91.*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: There have been reports of egcs-1.1 not compiling XEmacs correctly on" >&5
+$as_echo "$as_me: WARNING: There have been reports of egcs-1.1 not compiling XEmacs correctly on" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Alpha Linux. There have also been reports that egcs-1.0.3a is O.K." >&5
+$as_echo "$as_me: WARNING: Alpha Linux. There have also been reports that egcs-1.0.3a is O.K." >&2;}
+ as_fn_error $? "Aborting due to known problem" "$LINENO" 5
+ ;;
+ *:i*86*:2.7.2*)
+ case "$CFLAGS" in
+ *-O2*|*-O3*)
+ case "$GCC_VERSION" in
+ 2.7.2)
+ case "$CFLAGS" in
+ *-fno-strength-reduce*) ;;
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using" >&5
+$as_echo "$as_me: WARNING: Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: -fno-strength-reduce." >&5
+$as_echo "$as_me: WARNING: -fno-strength-reduce." >&2;}
+ as_fn_error $? "Aborting due to known problem" "$LINENO" 5
+ ;;
+ esac
+ ;;
+ esac
+ case "$CFLAGS" in
+ *-fno-caller-saves*) ;;
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using" >&5
+$as_echo "$as_me: WARNING: Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: -fno-caller-saves." >&5
+$as_echo "$as_me: WARNING: -fno-caller-saves." >&2;}
+ as_fn_error $? "Aborting due to known problem" "$LINENO" 5
+ ;;
+ esac
+ ;;
+ esac
+ ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+if test "$with_pdump" != "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for \"-z nocombreloc\" linker flag" >&5
+$as_echo_n "checking for \"-z nocombreloc\" linker flag... " >&6; }
+ case "`ld --help 2>&1`" in
+ *-z\ nocombreloc* ) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ ld_switch_site="-z nocombreloc $ld_switch_site" && if test "$verbose" = "yes"; then echo " Prepending \"-z nocombreloc\" to \$ld_switch_site"; fi ;;
+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; } ;;
+ esac
+fi
+
+
+if test "$GCC" = "yes"; then
+ set x $ld_switch_system; shift; ld_switch_system=""
+ while test -n "$1"; do
+ case $1 in
+ -L | -l | -u ) ld_switch_system="$ld_switch_system $1 $2"; shift ;;
+ -L* | -l* | -u* | -Wl* | -pg ) ld_switch_system="$ld_switch_system $1" ;;
+ -Xlinker* ) ;;
+ * ) ld_switch_system="$ld_switch_system -Xlinker $1" ;;
+ esac
+ shift
+ done
+fi
+
+if test "$GCC" = "yes"; then
+ set x $ld_switch_machine; shift; ld_switch_machine=""
+ while test -n "$1"; do
+ case $1 in
+ -L | -l | -u ) ld_switch_machine="$ld_switch_machine $1 $2"; shift ;;
+ -L* | -l* | -u* | -Wl* | -pg ) ld_switch_machine="$ld_switch_machine $1" ;;
+ -Xlinker* ) ;;
+ * ) ld_switch_machine="$ld_switch_machine -Xlinker $1" ;;
+ esac
+ shift
+ done
+fi
+
+if test "$GCC" = "yes"; then
+ set x $ld_switch_site; shift; ld_switch_site=""
+ while test -n "$1"; do
+ case $1 in
+ -L | -l | -u ) ld_switch_site="$ld_switch_site $1 $2"; shift ;;
+ -L* | -l* | -u* | -Wl* | -pg ) ld_switch_site="$ld_switch_site $1" ;;
+ -Xlinker* ) ;;
+ * ) ld_switch_site="$ld_switch_site -Xlinker $1" ;;
+ esac
+ shift
+ done
+fi
+
+if test "$GCC" = "yes"; then
+ set x $LDFLAGS; shift; LDFLAGS=""
+ while test -n "$1"; do
+ case $1 in
+ -L | -l | -u ) LDFLAGS="$LDFLAGS $1 $2"; shift ;;
+ -L* | -l* | -u* | -Wl* | -pg ) LDFLAGS="$LDFLAGS $1" ;;
+ -Xlinker* ) ;;
+ * ) LDFLAGS="$LDFLAGS -Xlinker $1" ;;
+ esac
+ shift
+ done
+fi
+
+if test "$GCC" = "yes"; then
+ set x $ld_call_shared; shift; ld_call_shared=""
+ while test -n "$1"; do
+ case $1 in
+ -L | -l | -u ) ld_call_shared="$ld_call_shared $1 $2"; shift ;;
+ -L* | -l* | -u* | -Wl* | -pg ) ld_call_shared="$ld_call_shared $1" ;;
+ -Xlinker* ) ;;
+ * ) ld_call_shared="$ld_call_shared -Xlinker $1" ;;
+ esac
+ shift
+ done
+fi
+
+test -n "$objects_machine" && extra_objs="$extra_objs $objects_machine" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"$objects_machine\""
+ fi
+test -n "$objects_system" && extra_objs="$extra_objs $objects_system" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"$objects_system\""
+ fi
+test -n "$unexec" && test ! "$with_pdump" = "yes" && extra_objs="$extra_objs $unexec" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"$unexec\""
+ fi
+test "$with_pdump" = "yes" && extra_objs="$extra_objs dumper.o" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"dumper.o\""
+ fi
+
+
+
+ac_ext=c
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+if test "$unexec" = "unexaix.o"; then
+ if test "$with_dynamic" = "no"; then
+ start_flags="-Wl,-bnso,-bnodelcsect"
+ test "$GCC" = "yes" && start_flags="-B/bin/ ${start_flags}"
+ for f in "/lib/syscalls.exp" "/lib/threads.exp"; do
+ if test -r "$f"; then start_flags="${start_flags},-bI:${f}"; fi
+ done
+ for f in "/usr/lpp/X11/bin/smt.exp" "/usr/bin/X11/smt.exp"; do
+ if test -r "$f"; then start_flags="${start_flags},-bI:${f}"; break; fi
+ done
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for terminateAndUnload in -lc" >&5
+$as_echo_n "checking for terminateAndUnload in -lc... " >&6; }
+if ${ac_cv_lib_c_terminateAndUnload+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lc $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char terminateAndUnload ();
+int
+main ()
+{
+return terminateAndUnload ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_c_terminateAndUnload=yes
+else
+ ac_cv_lib_c_terminateAndUnload=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_terminateAndUnload" >&5
+$as_echo "$ac_cv_lib_c_terminateAndUnload" >&6; }
+if test "x$ac_cv_lib_c_terminateAndUnload" = xyes; then :
+ libs_system="$libs_system -lC" && if test "$verbose" = "yes"; then echo " Appending \"-lC\" to \$libs_system"; fi
+fi
+
+ fi
+elif test -n "$ld_text_start_addr"; then
+ start_flags="-T $ld_text_start_addr -e __start"
+fi
+
+
+
+
+if test "$ordinary_link" = "no" -a "$GCC" = "yes"; then
+ test -z "$linker" && linker='$(CC) -nostdlib'
+ test -z "$lib_gcc" && lib_gcc='`$(CC) -print-libgcc-file-name`'
+fi
+test "$GCC" != "yes" && lib_gcc=
+
+
+
+
+compiler_version=""
+gcc_compiler_specs=""
+libc_version=""
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler version information" >&5
+$as_echo_n "checking for compiler version information... " >&6; }
+
+if test "$GCC" = "yes"; then
+ compiler_version=`$XEMACS_CC --version | sed 1q`
+ gcc_compiler_specs=`$XEMACS_CC -v 2>&1 | sed 's/.* \([^ ]\)/\1/' | sed 1q`
+else case "$XEMACS_CC" in
+ ic*)
+ compiler_version=`icc -V 2>&1 | sed 1q`
+ ;;
+ *) case "$ac_cv_build" in
+ *-*-aix* )
+ realcc=`which $XEMACS_CC`
+ if test -L $realcc ; then
+ ccdir=`dirname $realcc`
+ ccprog=`/bin/ls -l $realcc | sed 's/.* \([^ ]\)/\1/'`
+ case $ccprog in
+ */*) realcc=$ccprog;;
+ *) realcc=$ccdir/$ccprog;;
+ esac
+ fi
+ lpp=`lslpp -wqc $realcc | cut -f2 -d:`
+ if test ! -z "$lpp" ; then
+ lppstr=`lslpp -Lqc $lpp`
+ lpplev=`echo "$lppstr" | cut -f3 -d:`
+ lppdesc=`echo "$lppstr" | cut -f8 -d:`
+ fi
+ if test ! -z "$lpplev" ; then
+ compiler_version="$lpp $lpplev - $lppdesc"
+ fi
+ ;;
+
+ *-*-solaris*)
+ compiler_version=`$XEMACS_CC -V 2>&1 | sed 1q`
+ ;;
+
+ alpha*-dec-osf*)
+ compiler_version=`$XEMACS_CC -V | tr '\n' ' '`
+ ;;
+
+ mips-sgi-irix*)
+ compiler_version=`$XEMACS_CC -version`
+ ;;
+ esac
+ esac
+fi
+
+if test -z "$compiler_version"; then
+ compiler_version="detection failed (please report this)"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $compiler_version" >&5
+$as_echo "$compiler_version" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for standard C library version information" >&5
+$as_echo_n "checking for standard C library version information... " >&6; }
+
+case "$ac_cv_build" in
+ *-*-linux*)
+ if test -f /etc/redhat-release ; then
+ libc_version=`rpm -q glibc`
+ elif test -f /etc/debian_version ; then
+ libc_version=`dpkg-query --showformat='${version}' --show libc6`
+ libc_version="GNU libc $libc_version (Debian)"
+ fi
+ if test -z "$libc_version"; then
+ libc_version=`ls /lib/libc-*.so | sed -e 's,/lib/libc-\(.*\)\.so,\1,'`
+ fi
+ ;;
+
+ *-*-aix*)
+ libc_version="bos.rte.libc `lslpp -Lqc bos.rte.libc | cut -f3 -d:`"
+ ;;
+
+ *-*-solaris*)
+ libc=`pkginfo -l SUNWcsl | grep VERSION: | awk '{print $2}'`
+ libc_version="SUNWcsl $libc"
+
+ ;;
+
+ mips-sgi-irix*)
+ libc_version="IRIX libc `uname -sRm`"
+ ;;
+
+ alpha*-dec-osf*)
+ (cd /usr/.smdb.;
+ libc_version=` grep -h libc.so *.inv | awk '$9 == "f" {print $12}' | tr '\n' ','`
+ )
+ ;;
+esac
+
+if test -z "libc_version"; then
+ libc_version="detection failed (please report this)"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_version" >&5
+$as_echo "$libc_version" >&6; }
+
+
+case "$with_site_libraries" in *:* ) with_site_libraries="`echo '' $with_site_libraries | sed -e 's/^ //' -e 's/:/ /g'`";; esac
+if test -n "$with_site_libraries"; then
+ for arg in $with_site_libraries; do
+ case "$arg" in
+ -* ) ;;
+ * ) test -d "$arg" || \
+ { echo "Error:" "Invalid site library \`$arg': no such directory" >&2; exit 1; }
+ arg="-L${arg}" ;;
+ esac
+ ld_switch_site="$ld_switch_site $arg" && if test "$verbose" = "yes"; then echo " Appending \"$arg\" to \$ld_switch_site"; fi
+ done
+fi
+
+case "$with_site_includes" in *:* ) with_site_includes="`echo '' $with_site_includes | sed -e 's/^ //' -e 's/:/ /g'`";; esac
+if test -n "$with_site_includes"; then
+ for arg in $with_site_includes; do
+ case "$arg" in
+ -* ) ;;
+ * ) test -d "$arg" || \
+ { echo "Error:" "Invalid site include \`$arg': no such directory" >&2; exit 1; }
+ arg="-I${arg}" ;;
+ esac
+ c_switch_site="$c_switch_site $arg" && if test "$verbose" = "yes"; then echo " Appending \"$arg\" to \$c_switch_site"; fi
+ done
+fi
+
+case "$with_site_prefixes" in *:* ) with_site_prefixes="`echo '' $with_site_prefixes | sed -e 's/^ //' -e 's/:/ /g'`";; esac
+if test -n "$with_site_prefixes"; then
+ for dir in $with_site_prefixes; do
+ lib_dir="${dir}/lib"
+ inc_dir="${dir}/include"
+ if test ! -d "$dir"; then
+ { echo "Error:" "Invalid site prefix \`$dir': no such directory" >&2; exit 1; }
+ elif test ! -d "$lib_dir"; then
+ { echo "Error:" "Invalid site prefix \`$dir': no such directory \`$lib_dir'" >&2; exit 1; }
+ else
+ if test -d "$inc_dir"; then
+ c_switch_site="$c_switch_site "-I$inc_dir"" && if test "$verbose" = "yes"; then echo " Appending \""-I$inc_dir"\" to \$c_switch_site"; fi
+ fi
+ ld_switch_site="$ld_switch_site "-L$lib_dir"" && if test "$verbose" = "yes"; then echo " Appending \""-L$lib_dir"\" to \$ld_switch_site"; fi
+ fi
+ done
+fi
+
+
+for dir in "/usr/ccs/lib"; do
+ test -d "$dir" && ld_switch_system="$ld_switch_system -L${dir}" && if test "$verbose" = "yes"; then echo " Appending \"-L${dir}\" to \$ld_switch_system"; fi
+done
+
+case "$with_site_runtime_libraries" in *:* ) with_site_runtime_libraries="`echo '' $with_site_runtime_libraries | sed -e 's/^ //' -e 's/:/ /g'`";; esac
+if test -n "$with_site_runtime_libraries"; then
+ LD_RUN_PATH="`echo $with_site_runtime_libraries | sed -e 's/ */:/g'`"
+ export LD_RUN_PATH
+fi
+
+
+
+
+
+if test -n "$add_runtime_path"; then :;
+elif test "$with_dynamic" = "no"; then add_runtime_path=no
+elif test -n "$LD_RUN_PATH"; then add_runtime_path=yes
+else case "$opsys" in
+ sol2 | irix* | *bsd* ) add_runtime_path=yes ;;
+ * ) add_runtime_path=no ;;
+ esac
+fi
+
+if test "$add_runtime_path" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for runtime libraries flag" >&5
+$as_echo_n "checking for runtime libraries flag... " >&6; }
+ case "$opsys" in
+ sol2 ) dash_r="-R" ;;
+ linux* | irix*) dash_r="-rpath " ;;
+ *)
+ dash_r=""
+ for try_dash_r in "-R" "-R " "-rpath "; do
+ xe_check_libs="${try_dash_r}/no/such/file-or-directory"
+
+if test "$GCC" = "yes"; then
+ set x $xe_check_libs; shift; xe_check_libs=""
+ while test -n "$1"; do
+ case $1 in
+ -L | -l | -u ) xe_check_libs="$xe_check_libs $1 $2"; shift ;;
+ -L* | -l* | -u* | -Wl* | -pg ) xe_check_libs="$xe_check_libs $1" ;;
+ -Xlinker* ) ;;
+ * ) xe_check_libs="$xe_check_libs -Xlinker $1" ;;
+ esac
+ shift
+ done
+fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ dash_r="$try_dash_r"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ xe_check_libs=""
+ test -n "$dash_r" && break
+ done ;;
+ esac
+ if test -n "$dash_r";
+ then { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"${dash_r}\"" >&5
+$as_echo "\"${dash_r}\"" >&6; }
+ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: NONE" >&5
+$as_echo "NONE" >&6; }
+ fi
+fi
+
+xe_add_unique_runpath_dir='
+ xe_add_p=yes
+ for xe_dir in $runpath_dirs; do test "$xe_dir" = "$xe_runpath_dir" && xe_add_p=no
+ done
+ if test "$xe_add_p" = "yes"; then
+ test -n "$runpath" && runpath="${runpath}:"
+ runpath="${runpath}${xe_runpath_dir}"
+ runpath_dirs="$runpath_dirs $xe_runpath_dir"
+ fi'
+
+
+if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then
+ ld_switch_site=`echo '' $ld_switch_site | sed -e 's:^ ::' -e "s/$dash_r[^ ]*//g"`
+ ld_switch_x_site=`echo '' $ld_switch_x_site | sed -e 's:^ ::' -e "s/$dash_r[^ ]*//g"`
+
+ runpath="" runpath_dirs=""
+ if test -n "$LD_RUN_PATH"; then
+ runpath="$LD_RUN_PATH"
+ elif test "$GCC" = "yes"; then
+ ld_switch_run_save="$ld_switch_run"; ld_switch_run=""
+ echo "int main(int argc, char **argv) {return 0;}" > conftest.c
+ xe_runpath_link='${CC-cc} -o conftest -v $CFLAGS '"$xe_ldflags"' conftest.$ac_ext 2>&1 1>/dev/null'
+ for arg in `eval "$xe_runpath_link" | grep ' -L'`; do
+ case "$arg" in P,* | -L* | -R* )
+ for dir in `echo '' "$arg" | sed -e 's:^ ::' -e 's/^..//' -e 'y/:/ /'`; do
+ {
+xe_runpath_dir="$dir"
+ test "$xe_runpath_dir" != "/lib" -a \
+ "$xe_runpath_dir" != "/usr/lib" -a \
+ -n "`ls ${xe_runpath_dir}/*.s[ol] 2>/dev/null`" && \
+ eval "$xe_add_unique_runpath_dir"
+}
+ done ;;
+ esac
+ done
+ ld_switch_run="$ld_switch_run_save"
+ rm -f conftest*
+ else
+ for arg in $ld_switch_site $ld_switch_x_site; do
+ case "$arg" in -L*) {
+xe_runpath_dir=`echo '' "$arg" | sed -e 's:^ ::' -e 's/^-L//'`
+ test "$xe_runpath_dir" != "/lib" -a \
+ "$xe_runpath_dir" != "/usr/lib" -a \
+ -n "`ls ${xe_runpath_dir}/*.s[ol] 2>/dev/null`" && \
+ eval "$xe_add_unique_runpath_dir"
+};; esac
+ done
+ if test "$opsys $need_motif" = "sol2 yes"; then
+ xe_runpath_dir="/opt/SUNWdt/lib";
+ eval "$xe_add_unique_runpath_dir";
+ fi
+ fi
+ if test -n "$runpath"; then
+ ld_switch_run="${dash_r}${runpath}"
+
+if test "$GCC" = "yes"; then
+ set x $ld_switch_run; shift; ld_switch_run=""
+ while test -n "$1"; do
+ case $1 in
+ -L | -l | -u ) ld_switch_run="$ld_switch_run $1 $2"; shift ;;
+ -L* | -l* | -u* | -Wl* | -pg ) ld_switch_run="$ld_switch_run $1" ;;
+ -Xlinker* ) ;;
+ * ) ld_switch_run="$ld_switch_run -Xlinker $1" ;;
+ esac
+ shift
+ done
+fi
+ test "$verbose" = "yes" && echo "Setting runpath to $runpath"
+ fi
+fi
+
+
+
+case "$opsys" in
+ darwin )
+ if test "$with_system_malloc" = "default"; then
+ system_malloc=yes
+ with_system_malloc=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Forcing system malloc on Darwin." >&5
+$as_echo "$as_me: WARNING: Forcing system malloc on Darwin." >&2;}
+ fi ;;
+esac
+
+GNU_MALLOC=yes
+if test "$with_dlmalloc" != "no"; then
+ doug_lea_malloc=yes
+else
+ doug_lea_malloc=no
+fi
+after_morecore_hook_exists=yes
+ac_fn_c_check_func "$LINENO" "malloc_set_state" "ac_cv_func_malloc_set_state"
+if test "x$ac_cv_func_malloc_set_state" = xyes; then :
+
+else
+ doug_lea_malloc=no
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __after_morecore_hook exists" >&5
+$as_echo_n "checking whether __after_morecore_hook exists... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+extern void (* __after_morecore_hook)();
+int
+main ()
+{
+__after_morecore_hook = 0
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ after_morecore_hook_exists=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+if test "$system_malloc" = "yes" ; then
+ GNU_MALLOC=no
+ GNU_MALLOC_reason="
+ - The GNU allocators don't work with this system configuration."
+elif test "$with_system_malloc" = "yes" ; then
+ GNU_MALLOC=no
+ GNU_MALLOC_reason="
+ - User chose not to use GNU allocators."
+elif test "$with_debug_malloc" = "yes" ; then
+ GNU_MALLOC=no
+ GNU_MALLOC_reason="
+ - User chose to use Debugging Malloc."
+fi
+
+if test "$doug_lea_malloc" = "yes" -a "$GNU_MALLOC" = "yes" ; then
+ GNU_MALLOC_reason="
+ - Using Doug Lea's new malloc from the GNU C Library."
+ $as_echo "@%:@define DOUG_LEA_MALLOC 1" >>confdefs.h
+
+ if test "$after_morecore_hook_exists" = "no" ; then
+ GNU_MALLOC_reason="
+ - Using Doug Lea's new malloc from the Linux C Library."
+ $as_echo "@%:@define _NO_MALLOC_WARNING_ 1" >>confdefs.h
+
+ fi
+fi
+
+
+
+
+# Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$AR"; then
+ ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_AR="ar"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="not_found"
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test "$AR" = "not_found"; then
+ { echo "Error:" "ar not found -- is PATH set correctly?" >&2; exit 1; }
+fi
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$RANLIB"; then
+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+ ac_ct_RANLIB=$RANLIB
+ # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_RANLIB"; then
+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_RANLIB" = x; then
+ RANLIB=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ RANLIB=$ac_ct_RANLIB
+ fi
+else
+ RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+# Find a good install program. We prefer a C program (faster),
+# so one script is as good as another. But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if ${ac_cv_path_install+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in @%:@((
+ ./ | .// | /[cC]/* | \
+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+ /usr/ucb/* ) ;;
+ *)
+ # OSF1 and SCO ODT 3.0 have their own names for install.
+ # Don't use installbsd from OSF since it installs stuff as root
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+ :
+ elif test $ac_prog = install &&
+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+ rm -rf conftest.one conftest.two conftest.dir
+ echo one > conftest.one
+ echo two > conftest.two
+ mkdir conftest.dir
+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+ test -s conftest.one && test -s conftest.two &&
+ test -s conftest.dir/conftest.one &&
+ test -s conftest.dir/conftest.two
+ then
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
+ fi
+ fi
+ done
+ done
+ ;;
+esac
+
+ done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+ if test "${ac_cv_path_install+set}" = set; then
+ INSTALL=$ac_cv_path_install
+ else
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for INSTALL within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ INSTALL=$ac_install_sh
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+for ac_prog in 'bison -y' byacc
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_YACC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$YACC"; then
+ ac_cv_prog_YACC="$YACC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_YACC="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+YACC=$ac_cv_prog_YACC
+if test -n "$YACC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
+$as_echo "$YACC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$YACC" && break
+done
+test -n "$YACC" || YACC="yacc"
+
+
+for ac_header in a.out.h elf.h cygwin/version.h fcntl.h libgen.h locale.h wchar.h mach/mach.h sys/param.h sys/pstat.h sys/resource.h sys/time.h sys/timeb.h sys/times.h sys/un.h sys/vlimit.h ulimit.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
+$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
+if ${ac_cv_header_sys_wait_h+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <sys/wait.h>
+#ifndef WEXITSTATUS
+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
+#endif
+#ifndef WIFEXITED
+# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+#endif
+
+int
+main ()
+{
+ int s;
+ wait (&s);
+ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_header_sys_wait_h=yes
+else
+ ac_cv_header_sys_wait_h=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5
+$as_echo "$ac_cv_header_sys_wait_h" >&6; }
+if test $ac_cv_header_sys_wait_h = yes; then
+
+$as_echo "@%:@define HAVE_SYS_WAIT_H 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_header_stdc=yes
+else
+ ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "free" >/dev/null 2>&1; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test "$cross_compiling" = yes; then :
+ :
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+ return 2;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "@%:@define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+if ${ac_cv_header_time+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <sys/time.h>
+#include <time.h>
+
+int
+main ()
+{
+if ((struct tm *) 0)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_header_time=yes
+else
+ ac_cv_header_time=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
+$as_echo "$ac_cv_header_time" >&6; }
+if test $ac_cv_header_time = yes; then
+
+$as_echo "@%:@define TIME_WITH_SYS_TIME 1" >>confdefs.h
+
+fi
+
+ac_fn_c_check_decl "$LINENO" "sys_siglist" "ac_cv_have_decl_sys_siglist" "#include <signal.h>
+/* NetBSD declares sys_siglist in unistd.h. */
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+"
+if test "x$ac_cv_have_decl_sys_siglist" = xyes; then :
+ ac_have_decl=1
+else
+ ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_DECL_SYS_SIGLIST $ac_have_decl
+_ACEOF
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for utime" >&5
+$as_echo_n "checking for utime... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <utime.h>
+int
+main ()
+{
+struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ $as_echo "@%:@define HAVE_UTIME 1" >>confdefs.h
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ for ac_func in utimes
+do :
+ ac_fn_c_check_func "$LINENO" "utimes" "ac_cv_func_utimes"
+if test "x$ac_cv_func_utimes" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_UTIMES 1
+_ACEOF
+
+fi
+done
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
+$as_echo_n "checking return type of signal handlers... " >&6; }
+if ${ac_cv_type_signal+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <signal.h>
+
+int
+main ()
+{
+return *(signal (0, 0)) (0) == 1;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_type_signal=int
+else
+ ac_cv_type_signal=void
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
+$as_echo "$ac_cv_type_signal" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+@%:@define RETSIGTYPE $ac_cv_type_signal
+_ACEOF
+
+
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+@%:@define size_t unsigned int
+_ACEOF
+
+fi
+
+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+@%:@define pid_t int
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
+$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
+if ${ac_cv_type_uid_t+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "uid_t" >/dev/null 2>&1; then :
+ ac_cv_type_uid_t=yes
+else
+ ac_cv_type_uid_t=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
+$as_echo "$ac_cv_type_uid_t" >&6; }
+if test $ac_cv_type_uid_t = no; then
+
+$as_echo "@%:@define uid_t int" >>confdefs.h
+
+
+$as_echo "@%:@define gid_t int" >>confdefs.h
+
+fi
+
+ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
+if test "x$ac_cv_type_mode_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+@%:@define mode_t int
+_ACEOF
+
+fi
+
+ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
+if test "x$ac_cv_type_off_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+@%:@define off_t long int
+_ACEOF
+
+fi
+
+ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
+if test "x$ac_cv_type_ssize_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+@%:@define ssize_t int
+_ACEOF
+
+fi
+
+
+if test "$ac_cv_header_inttypes_h" != "yes"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for intptr_t in sys/types.h" >&5
+$as_echo_n "checking for intptr_t in sys/types.h... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+intptr_t x;
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ $as_echo "@%:@define HAVE_INTPTR_T_IN_SYS_TYPES_H 1" >>confdefs.h
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5
+$as_echo_n "checking for socklen_t... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <sys/socket.h>
+socklen_t x;
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <sys/socket.h>
+int accept (int, struct sockaddr *, size_t *);
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: size_t" >&5
+$as_echo "size_t" >&6; }
+$as_echo "@%:@define socklen_t size_t" >>confdefs.h
+
+else
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: int" >&5
+$as_echo "int" >&6; }
+$as_echo "@%:@define socklen_t int" >>confdefs.h
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timeval" >&5
+$as_echo_n "checking for struct timeval... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef TIME_WITH_SYS_TIME
+#include <sys/time.h>
+#include <time.h>
+#else
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif
+#endif
+int
+main ()
+{
+static struct timeval x; x.tv_sec = x.tv_usec;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ HAVE_TIMEVAL=yes
+ $as_echo "@%:@define HAVE_TIMEVAL 1" >>confdefs.h
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ HAVE_TIMEVAL=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+if ${ac_cv_struct_tm+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <time.h>
+
+int
+main ()
+{
+struct tm tm;
+ int *p = &tm.tm_sec;
+ return !p;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_struct_tm=time.h
+else
+ ac_cv_struct_tm=sys/time.h
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
+$as_echo "$ac_cv_struct_tm" >&6; }
+if test $ac_cv_struct_tm = sys/time.h; then
+
+$as_echo "@%:@define TM_IN_SYS_TIME 1" >>confdefs.h
+
+fi
+
+ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "#include <sys/types.h>
+#include <$ac_cv_struct_tm>
+
+"
+if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_STRUCT_TM_TM_ZONE 1
+_ACEOF
+
+
+fi
+
+if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
+
+$as_echo "@%:@define HAVE_TM_ZONE 1" >>confdefs.h
+
+else
+ ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
+"
+if test "x$ac_cv_have_decl_tzname" = xyes; then :
+ ac_have_decl=1
+else
+ ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_DECL_TZNAME $ac_have_decl
+_ACEOF
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
+$as_echo_n "checking for tzname... " >&6; }
+if ${ac_cv_var_tzname+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <time.h>
+#if !HAVE_DECL_TZNAME
+extern char *tzname[];
+#endif
+
+int
+main ()
+{
+return tzname[0][0];
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_var_tzname=yes
+else
+ ac_cv_var_tzname=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
+$as_echo "$ac_cv_var_tzname" >&6; }
+ if test $ac_cv_var_tzname = yes; then
+
+$as_echo "@%:@define HAVE_TZNAME 1" >>confdefs.h
+
+ fi
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if ${ac_cv_c_const+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+/* FIXME: Include the comments suggested by Paul. */
+#ifndef __cplusplus
+ /* Ultrix mips cc rejects this. */
+ typedef int charset[2];
+ const charset cs;
+ /* SunOS 4.1.1 cc rejects this. */
+ char const *const *pcpcc;
+ char **ppc;
+ /* NEC SVR4.0.2 mips cc rejects this. */
+ struct point {int x, y;};
+ static struct point const zero = {0,0};
+ /* AIX XL C 1.02.0.0 rejects this.
+ It does not let you subtract one const X* pointer from another in
+ an arm of an if-expression whose if-part is not a constant
+ expression */
+ const char *g = "string";
+ pcpcc = &g + (g ? g-g : 0);
+ /* HPUX 7.0 cc rejects these. */
+ ++pcpcc;
+ ppc = (char**) pcpcc;
+ pcpcc = (char const *const *) ppc;
+ { /* SCO 3.2v4 cc rejects this. */
+ char *t;
+ char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+ *t++ = 0;
+ if (s) return 0;
+ }
+ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
+ int x[] = {25, 17};
+ const int *foo = &x[0];
+ ++foo;
+ }
+ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+ typedef const int *iptr;
+ iptr p = 0;
+ ++p;
+ }
+ { /* AIX XL C 1.02.0.0 rejects this saying
+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+ struct s { int j; const int *ap[3]; };
+ struct s *b; b->j = 5;
+ }
+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+ const int foo = 10;
+ if (!foo) return 0;
+ }
+ return !cs[0] && !zero.x;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_c_const=yes
+else
+ ac_cv_c_const=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
+if test $ac_cv_c_const = no; then
+
+$as_echo "@%:@define const /**/" >>confdefs.h
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+ *)
+ eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ SET_MAKE=
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if ${ac_cv_c_bigendian+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_c_bigendian=unknown
+ # See if we're dealing with a universal compiler.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifndef __APPLE_CC__
+ not a universal capable compiler
+ #endif
+ typedef int dummy;
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+ # Check for potential -arch flags. It is not universal unless
+ # there are at least two -arch flags with different values.
+ ac_arch=
+ ac_prev=
+ for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+ if test -n "$ac_prev"; then
+ case $ac_word in
+ i?86 | x86_64 | ppc | ppc64)
+ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+ ac_arch=$ac_word
+ else
+ ac_cv_c_bigendian=universal
+ break
+ fi
+ ;;
+ esac
+ ac_prev=
+ elif test "x$ac_word" = "x-arch"; then
+ ac_prev=arch
+ fi
+ done
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test $ac_cv_c_bigendian = unknown; then
+ # See if sys/param.h defines the BYTE_ORDER macro.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+ #include <sys/param.h>
+
+int
+main ()
+{
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+ && LITTLE_ENDIAN)
+ bogus endian macros
+ #endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ # It does; now see whether it defined to BIG_ENDIAN or not.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+ #include <sys/param.h>
+
+int
+main ()
+{
+#if BYTE_ORDER != BIG_ENDIAN
+ not big endian
+ #endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_c_bigendian=yes
+else
+ ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ if test $ac_cv_c_bigendian = unknown; then
+ # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <limits.h>
+
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+ bogus endian macros
+ #endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ # It does; now see whether it defined to _BIG_ENDIAN or not.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <limits.h>
+
+int
+main ()
+{
+#ifndef _BIG_ENDIAN
+ not big endian
+ #endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_c_bigendian=yes
+else
+ ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ if test $ac_cv_c_bigendian = unknown; then
+ # Compile a test program.
+ if test "$cross_compiling" = yes; then :
+ # Try to guess by grepping values from an object file.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+short int ascii_mm[] =
+ { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+ short int ascii_ii[] =
+ { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+ int use_ascii (int i) {
+ return ascii_mm[i] + ascii_ii[i];
+ }
+ short int ebcdic_ii[] =
+ { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+ short int ebcdic_mm[] =
+ { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+ int use_ebcdic (int i) {
+ return ebcdic_mm[i] + ebcdic_ii[i];
+ }
+ extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+ ac_cv_c_bigendian=yes
+ fi
+ if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+ if test "$ac_cv_c_bigendian" = unknown; then
+ ac_cv_c_bigendian=no
+ else
+ # finding both strings is unlikely to happen, but who knows?
+ ac_cv_c_bigendian=unknown
+ fi
+ fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+
+ /* Are we little or big endian? From Harbison&Steele. */
+ union
+ {
+ long int l;
+ char c[sizeof (long int)];
+ } u;
+ u.l = 1;
+ return u.c[sizeof (long int) - 1] == 1;
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ ac_cv_c_bigendian=no
+else
+ ac_cv_c_bigendian=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+ yes)
+ $as_echo "@%:@define WORDS_BIGENDIAN 1" >>confdefs.h
+;; #(
+ no)
+ ;; #(
+ universal)
+
+$as_echo "@%:@define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+
+ ;; #(
+ *)
+ as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
+
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
+$as_echo_n "checking size of short... " >&6; }
+if ${ac_cv_sizeof_short+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then :
+
+else
+ if test "$ac_cv_type_short" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (short)
+See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_short=0
+ fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
+$as_echo "$ac_cv_sizeof_short" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+@%:@define SIZEOF_SHORT $ac_cv_sizeof_short
+_ACEOF
+
+
+if test "$ac_cv_sizeof_short" = 0; then
+ echo ""
+ echo "*** PANIC *** Configure tests are not working - compiler is broken."
+ echo "*** PANIC *** Please examine config.log for compilation errors."
+ exit 1
+fi
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+$as_echo_n "checking size of int... " >&6; }
+if ${ac_cv_sizeof_int+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
+
+else
+ if test "$ac_cv_type_int" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (int)
+See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_int=0
+ fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
+$as_echo "$ac_cv_sizeof_int" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+@%:@define SIZEOF_INT $ac_cv_sizeof_int
+_ACEOF
+
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if ${ac_cv_sizeof_long+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
+
+else
+ if test "$ac_cv_type_long" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (long)
+See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_long=0
+ fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+@%:@define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
+
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
+$as_echo_n "checking size of long long... " >&6; }
+if ${ac_cv_sizeof_long_long+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then :
+
+else
+ if test "$ac_cv_type_long_long" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (long long)
+See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_long_long=0
+ fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
+$as_echo "$ac_cv_sizeof_long_long" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+@%:@define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+_ACEOF
+
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
+$as_echo_n "checking size of void *... " >&6; }
+if ${ac_cv_sizeof_void_p+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then :
+
+else
+ if test "$ac_cv_type_void_p" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (void *)
+See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_void_p=0
+ fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
+$as_echo "$ac_cv_sizeof_void_p" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+@%:@define SIZEOF_VOID_P $ac_cv_sizeof_void_p
+_ACEOF
+
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5
+$as_echo_n "checking size of double... " >&6; }
+if ${ac_cv_sizeof_double+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double" "$ac_includes_default"; then :
+
+else
+ if test "$ac_cv_type_double" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (double)
+See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_double=0
+ fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_double" >&5
+$as_echo "$ac_cv_sizeof_double" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+@%:@define SIZEOF_DOUBLE $ac_cv_sizeof_double
+_ACEOF
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5
+$as_echo_n "checking for long file names... " >&6; }
+if ${ac_cv_sys_long_file_names+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_sys_long_file_names=yes
+# Test for long file names in all the places we know might matter:
+# . the current directory, where building will happen
+# $prefix/lib where we will be installing things
+# $exec_prefix/lib likewise
+# $TMPDIR if set, where it might want to write temporary files
+# /tmp where it might want to write temporary files
+# /var/tmp likewise
+# /usr/tmp likewise
+for ac_dir in . "$TMPDIR" /tmp /var/tmp /usr/tmp "$prefix/lib" "$exec_prefix/lib"; do
+ # Skip $TMPDIR if it is empty or bogus, and skip $exec_prefix/lib
+ # in the usual case where exec_prefix is '${prefix}'.
+ case $ac_dir in #(
+ . | /* | ?:[\\/]*) ;; #(
+ *) continue;;
+ esac
+ test -w "$ac_dir/." || continue # It is less confusing to not echo anything here.
+ ac_xdir=$ac_dir/cf$$
+ (umask 077 && mkdir "$ac_xdir" 2>/dev/null) || continue
+ ac_tf1=$ac_xdir/conftest9012345
+ ac_tf2=$ac_xdir/conftest9012346
+ touch "$ac_tf1" 2>/dev/null && test -f "$ac_tf1" && test ! -f "$ac_tf2" ||
+ ac_cv_sys_long_file_names=no
+ rm -f -r "$ac_xdir" 2>/dev/null
+ test $ac_cv_sys_long_file_names = no && break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_long_file_names" >&5
+$as_echo "$ac_cv_sys_long_file_names" >&6; }
+if test $ac_cv_sys_long_file_names = yes; then
+
+$as_echo "@%:@define HAVE_LONG_FILE_NAMES 1" >>confdefs.h
+
+fi
+
+
+ac_fn_c_check_func "$LINENO" "sin" "ac_cv_func_sin"
+if test "x$ac_cv_func_sin" = xyes; then :
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
+$as_echo_n "checking for sin in -lm... " >&6; }
+if ${ac_cv_lib_m_sin+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sin ();
+int
+main ()
+{
+return sin ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_m_sin=yes
+else
+ ac_cv_lib_m_sin=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5
+$as_echo "$ac_cv_lib_m_sin" >&6; }
+if test "x$ac_cv_lib_m_sin" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_LIBM 1
+_ACEOF
+
+ LIBS="-lm $LIBS"
+
+fi
+
+fi
+
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <math.h>
+int
+main ()
+{
+return atanh(1.0) + asinh(1.0) + acosh(1.0);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ $as_echo "@%:@define HAVE_INVERSE_HYPERBOLIC 1" >>confdefs.h
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+for ac_func in mkstemp
+do :
+ ac_fn_c_check_func "$LINENO" "mkstemp" "ac_cv_func_mkstemp"
+if test "x$ac_cv_func_mkstemp" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_MKSTEMP 1
+_ACEOF
+
+fi
+done
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking type of mail spool file locking" >&5
+$as_echo_n "checking type of mail spool file locking... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+for ac_func in lockf flock
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+test -z "$with_mail_locking" -a "$mail_use_flock" = "yes" && with_mail_locking=flock
+test -z "$with_mail_locking" -a "$mail_use_lockf" = "yes" && with_mail_locking=lockf
+test -z "$with_mail_locking" -a "$mail_use_locking" = "yes" && with_mail_locking=locking
+if test -z "$with_mail_locking"; then
+ case "$opsys" in cygwin* | mingw*)
+ with_mail_locking=pop ;;
+ esac
+fi
+
+if test "$with_mail_locking" = "lockf"; then $as_echo "@%:@define MAIL_LOCK_LOCKF 1" >>confdefs.h
+
+elif test "$with_mail_locking" = "flock"; then $as_echo "@%:@define MAIL_LOCK_FLOCK 1" >>confdefs.h
+
+elif test "$with_mail_locking" = "locking"; then $as_echo "@%:@define MAIL_LOCK_LOCKING 1" >>confdefs.h
+
+elif test "$with_mail_locking" = "pop"; then
+ with_pop=yes
+ with_mail_locking=
+elif test "$with_mail_locking" = "mmdf"; then $as_echo "@%:@define MAIL_LOCK_MMDF 1" >>confdefs.h
+
+else with_mail_locking="file"; $as_echo "@%:@define MAIL_LOCK_DOT 1" >>confdefs.h
+
+fi
+test "$with_mail_locking" = "lockf" -a "$ac_cv_func_lockf" != "yes" && \
+ { echo "Error:" "lockf mail locking requested but not available." >&2; exit 1; }
+test "$with_mail_locking" = "flock" -a "$ac_cv_func_flock" != "yes" && \
+ { echo "Error:" "flock mail locking requested but not available." >&2; exit 1; }
+test "$with_mail_locking" = "locking" -a "$ac_cv_func_locking" != "yes" && \
+ { echo "Error:" "locking mail locking requested but not available." >&2; exit 1; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the -xildoff compiler flag is required" >&5
+$as_echo_n "checking whether the -xildoff compiler flag is required... " >&6; }
+if ${CC-cc} '-###' -xildon no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then
+ if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ;
+ then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; };
+ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }; ld_switch_site="$ld_switch_site -xildoff" && if test "$verbose" = "yes"; then echo " Appending \"-xildoff\" to \$ld_switch_site"; fi
+ fi
+ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+if test "$opsys" = "sol2"; then
+ if test "$os_release" -ge 506; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for \"-z ignore\" linker flag" >&5
+$as_echo_n "checking for \"-z ignore\" linker flag... " >&6; }
+ case "`ld -h 2>&1`" in
+ *-z\ ignore\|record* ) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ ld_switch_site="-z ignore $ld_switch_site" && if test "$verbose" = "yes"; then echo " Prepending \"-z ignore\" to \$ld_switch_site"; fi ;;
+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; } ;;
+ esac
+ fi
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for specified window system" >&5
+$as_echo_n "checking for specified window system... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+
+
+GNOME_CONFIG=no
+GTK_CONFIG=no
+
+if test "$with_gnome" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME configuration script" >&5
+$as_echo_n "checking for GNOME configuration script... " >&6; }
+ for possible in gnome-config
+ do
+ possible_version=`${possible} --version 2> /dev/null`
+ if test "x${possible_version}" != "x"; then
+ GNOME_CONFIG="${possible}"
+ with_gnome=yes
+ with_gtk=yes
+ break
+ fi
+ done
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${GNOME_CONFIG}" >&5
+$as_echo "${GNOME_CONFIG}" >&6; }
+fi
+
+if test "${GNOME_CONFIG}" != "no"; then
+ GNOME_LIBS=`${GNOME_CONFIG} --libs gnomeui`
+ GNOME_CFLAGS=`${GNOME_CONFIG} --cflags gnomeui`
+ $as_echo "@%:@define HAVE_GNOME 1" >>confdefs.h
+
+ libs_gtk="$libs_gtk ${GNOME_LIBS}" && if test "$verbose" = "yes"; then echo " Appending \"${GNOME_LIBS}\" to \$libs_gtk"; fi
+ c_switch_gtk="$c_switch_gtk ${GNOME_CFLAGS}" && if test "$verbose" = "yes"; then echo " Appending \"${GNOME_CFLAGS}\" to \$c_switch_gtk"; fi
+fi
+
+if test "$with_gtk" != "no";then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK configuration script" >&5
+$as_echo_n "checking for GTK configuration script... " >&6; }
+ for possible in gtk12-config gtk14-config gtk-config
+ do
+ possible_version=`${possible} --version 2> /dev/null`
+ if test "x${possible_version}" != "x"; then
+ GTK_CONFIG="${possible}"
+ case "${possible_version}" in
+ 1.0.*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GTK 1.2 is required, please upgrade your version of GTK." >&5
+$as_echo "$as_me: WARNING: GTK 1.2 is required, please upgrade your version of GTK." >&2;}; with_gtk=no;;
+ 1.3.*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GTK 1.3 is not supported right now" >&5
+$as_echo "$as_me: WARNING: GTK 1.3 is not supported right now" >&2;}; with_gtk=no;;
+ 1.2.*)
+ with_gtk=yes
+ break
+ ;;
+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found unsupported version of GTK: $possible_version" >&5
+$as_echo "$as_me: WARNING: Found unsupported version of GTK: $possible_version" >&2;};;
+ esac
+ fi
+ done
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${GTK_CONFIG}" >&5
+$as_echo "${GTK_CONFIG}" >&6; }
+fi
+
+if test "${GTK_CONFIG}" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking gtk version" >&5
+$as_echo_n "checking gtk version... " >&6; }
+ GTK_VERSION=`${GTK_CONFIG} --version`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${GTK_VERSION}" >&5
+$as_echo "${GTK_VERSION}" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking gtk libs" >&5
+$as_echo_n "checking gtk libs... " >&6; }
+ GTK_LIBS=`${GTK_CONFIG} --libs`
+ libs_gtk="$libs_gtk ${GTK_LIBS}" && if test "$verbose" = "yes"; then echo " Appending \"${GTK_LIBS}\" to \$libs_gtk"; fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${GTK_LIBS}" >&5
+$as_echo "${GTK_LIBS}" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking gtk cflags" >&5
+$as_echo_n "checking gtk cflags... " >&6; }
+ GTK_CFLAGS=`${GTK_CONFIG} --cflags`
+ if test "$GCC" = "yes"; then
+ GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow"
+ fi
+ c_switch_gtk="$c_switch_gtk ${GTK_CFLAGS}" && if test "$verbose" = "yes"; then echo " Appending \"${GTK_CFLAGS}\" to \$c_switch_gtk"; fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${GTK_CFLAGS}" >&5
+$as_echo "${GTK_CFLAGS}" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgdk_imlib" >&5
+$as_echo_n "checking for main in -lgdk_imlib... " >&6; }
+if ${ac_cv_lib_gdk_imlib_main+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgdk_imlib $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+
+int
+main ()
+{
+return main ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_gdk_imlib_main=yes
+else
+ ac_cv_lib_gdk_imlib_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdk_imlib_main" >&5
+$as_echo "$ac_cv_lib_gdk_imlib_main" >&6; }
+if test "x$ac_cv_lib_gdk_imlib_main" = xyes; then :
+ libs_gtk="-lgdk_imlib $libs_gtk" && if test "$verbose" = "yes"; then echo " Prepending \"-lgdk_imlib\" to \$libs_gtk"; fi
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Imlib_init in -lImlib" >&5
+$as_echo_n "checking for Imlib_init in -lImlib... " >&6; }
+if ${ac_cv_lib_Imlib_Imlib_init+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lImlib $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char Imlib_init ();
+int
+main ()
+{
+return Imlib_init ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_Imlib_Imlib_init=yes
+else
+ ac_cv_lib_Imlib_Imlib_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Imlib_Imlib_init" >&5
+$as_echo "$ac_cv_lib_Imlib_Imlib_init" >&6; }
+if test "x$ac_cv_lib_Imlib_Imlib_init" = xyes; then :
+ libs_gtk="$libs_gtk -lImlib" && if test "$verbose" = "yes"; then echo " Appending \"-lImlib\" to \$libs_gtk"; fi
+fi
+
+ for ac_func in gdk_imlib_init
+do :
+ ac_fn_c_check_func "$LINENO" "gdk_imlib_init" "ac_cv_func_gdk_imlib_init"
+if test "x$ac_cv_func_gdk_imlib_init" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_GDK_IMLIB_INIT 1
+_ACEOF
+
+fi
+done
+
+
+ $as_echo "@%:@define HAVE_XPM 1" >>confdefs.h
+
+ $as_echo "@%:@define HAVE_GTK 1" >>confdefs.h
+
+
+
+ window_system=gtk
+ with_gtk=yes
+ if test "$with_x11" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Configuring GTK, forcing with_x11 to no" >&5
+$as_echo "$as_me: WARNING: Configuring GTK, forcing with_x11 to no" >&2;}
+ with_x11=no
+ fi
+
+ for feature in scrollbars toolbars menubars dialogs widgets
+ do
+ eval "feature_value=\${with_${feature}}"
+ case "${feature_value}" in
+ yes|no|gtk|"" )
+ ;;
+ * )
+ feature_conflict_with_gtk=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-${feature}=${feature_value} is incompatible with --with-gtk" >&5
+$as_echo "$as_me: WARNING: --with-${feature}=${feature_value} is incompatible with --with-gtk" >&2;} ;;
+ esac
+ done
+ if test "${feature_conflict_with_gtk}" = "yes"; then
+ { echo "Error:" "One or more GUI toolkit features conflict with GTK" >&2; exit 1; }
+ fi
+
+ test "${with_scrollbars}" != "no" && with_scrollbars=gtk
+ test "${with_toolbars}" != "no" && with_toolbars=gtk
+ test "${with_menubars}" != "no" && with_menubars=gtk
+ test "${with_dialogs}" != "no" && with_dialogs=gtk
+ test "${with_widgets}" != "no" && with_widgets=gtk
+
+ OLD_CFLAGS="${CFLAGS}"
+ OLD_CPPFLAGS="${CPPFLAGS}"
+ OLD_LDFLAGS="${LDFLAGS}"
+ CFLAGS="${GTK_CFLAGS} ${CFLAGS}"
+ CPPFLAGS="${GTK_CFLAGS} ${CFLAGS}"
+ LDFLAGS="${LDFLAGS} ${GTK_LIBS}"
+ for ac_header in glade/glade.h glade.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lxml" >&5
+$as_echo_n "checking for main in -lxml... " >&6; }
+if ${ac_cv_lib_xml_main+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lxml $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+
+int
+main ()
+{
+return main ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_xml_main=yes
+else
+ ac_cv_lib_xml_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml_main" >&5
+$as_echo "$ac_cv_lib_xml_main" >&6; }
+if test "x$ac_cv_lib_xml_main" = xyes; then :
+ libs_gtk="-lxml $libs_gtk" && if test "$verbose" = "yes"; then echo " Prepending \"-lxml\" to \$libs_gtk"; fi
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lglade" >&5
+$as_echo_n "checking for main in -lglade... " >&6; }
+if ${ac_cv_lib_glade_main+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lglade $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+
+int
+main ()
+{
+return main ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_glade_main=yes
+else
+ ac_cv_lib_glade_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_glade_main" >&5
+$as_echo "$ac_cv_lib_glade_main" >&6; }
+if test "x$ac_cv_lib_glade_main" = xyes; then :
+ libs_gtk="-lglade $libs_gtk" && if test "$verbose" = "yes"; then echo " Prepending \"-lglade\" to \$libs_gtk"; fi
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lglade-gnome" >&5
+$as_echo_n "checking for main in -lglade-gnome... " >&6; }
+if ${ac_cv_lib_glade_gnome_main+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lglade-gnome $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+
+int
+main ()
+{
+return main ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_glade_gnome_main=yes
+else
+ ac_cv_lib_glade_gnome_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_glade_gnome_main" >&5
+$as_echo "$ac_cv_lib_glade_gnome_main" >&6; }
+if test "x$ac_cv_lib_glade_gnome_main" = xyes; then :
+ libs_gtk="-lglade-gnome $libs_gtk" && if test "$verbose" = "yes"; then echo " Prepending \"-lglade-gnome\" to \$libs_gtk"; fi
+fi
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <glade/glade-xml.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "char \*txtdomain;" >/dev/null 2>&1; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ $as_echo "@%:@define LIBGLADE_XML_TXTDOMAIN 1" >>confdefs.h
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f conftest*
+
+ CFLAGS="${OLD_CFLAGS}"
+ CPPFLAGS="${OLD_CPPFLAGS}"
+ LDFLAGS="${OLD_LDFLAGS}"
+fi
+
+
+if test "$with_x11" != "no"; then
+ test "$x_includes $x_libraries" != "NONE NONE" && \
+ window_system=x11 with_x11=yes
+
+
+ if test "$x_includes $x_libraries" = "NONE NONE" \
+ -a -n "$OPENWINHOME" \
+ -a "$OPENWINHOME" != "/usr/openwin" \
+ -a -d "$OPENWINHOME"; then
+ test -d "$OPENWINHOME/lib" && x_libraries="$OPENWINHOME/lib"
+ test -d "$OPENWINHOME/include" && x_includes="$OPENWINHOME/include"
+ test -d "$OPENWINHOME/share/include" && x_includes="$OPENWINHOME/share/include"
+ fi
+
+ if test "$x_includes" = "NONE"; then
+ for dir in "/usr/X11" "/usr/X11R6"; do
+ if test -d "$dir/include/X11"; then x_includes="$dir/include"; break; fi
+ done
+ fi
+
+ if test "$x_libraries" = "NONE"; then
+ for dir in "/usr/X11/lib" "/usr/X11R6/lib" "/usr/lib/X11R6"; do
+ if test -r "$dir/libX11.a"; then x_libraries="$dir"; break; fi
+ done
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
+$as_echo_n "checking for X... " >&6; }
+
+
+@%:@ Check whether --with-x was given.
+if test "${with_x+set}" = set; then :
+ withval=$with_x;
+fi
+
+# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
+if test "x$with_x" = xno; then
+ # The user explicitly disabled X.
+ have_x=disabled
+else
+ case $x_includes,$x_libraries in #(
+ *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
+ *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ # One or both of the vars are not set, and there is no cached value.
+ac_x_includes=no ac_x_libraries=no
+rm -f -r conftest.dir
+if mkdir conftest.dir; then
+ cd conftest.dir
+ cat >Imakefile <<'_ACEOF'
+incroot:
+ @echo incroot='${INCROOT}'
+usrlibdir:
+ @echo usrlibdir='${USRLIBDIR}'
+libdir:
+ @echo libdir='${LIBDIR}'
+_ACEOF
+ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
+ # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+ for ac_var in incroot usrlibdir libdir; do
+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
+ done
+ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+ for ac_extension in a so sl dylib la dll; do
+ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
+ test -f "$ac_im_libdir/libX11.$ac_extension"; then
+ ac_im_usrlibdir=$ac_im_libdir; break
+ fi
+ done
+ # Screen out bogus values from the imake configuration. They are
+ # bogus both because they are the default anyway, and because
+ # using them would break gcc on systems where it needs fixed includes.
+ case $ac_im_incroot in
+ /usr/include) ac_x_includes= ;;
+ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
+ esac
+ case $ac_im_usrlibdir in
+ /usr/lib | /usr/lib64 | /lib | /lib64) ;;
+ *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
+ esac
+ fi
+ cd ..
+ rm -f -r conftest.dir
+fi
+
+# Standard set of common directories for X headers.
+# Check X11 before X11Rn because it is often a symlink to the current release.
+ac_x_header_dirs='
+/usr/X11/include
+/usr/X11R7/include
+/usr/X11R6/include
+/usr/X11R5/include
+/usr/X11R4/include
+
+/usr/include/X11
+/usr/include/X11R7
+/usr/include/X11R6
+/usr/include/X11R5
+/usr/include/X11R4
+
+/usr/local/X11/include
+/usr/local/X11R7/include
+/usr/local/X11R6/include
+/usr/local/X11R5/include
+/usr/local/X11R4/include
+
+/usr/local/include/X11
+/usr/local/include/X11R7
+/usr/local/include/X11R6
+/usr/local/include/X11R5
+/usr/local/include/X11R4
+
+/usr/X386/include
+/usr/x386/include
+/usr/XFree86/include/X11
+
+/usr/include
+/usr/local/include
+/usr/unsupported/include
+/usr/athena/include
+/usr/local/x11r5/include
+/usr/lpp/Xamples/include
+
+/usr/openwin/include
+/usr/openwin/share/include'
+
+if test "$ac_x_includes" = no; then
+ # Guess where to find include files, by looking for Xlib.h.
+ # First, try using that file with no special directory specified.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+@%:@include <X11/Xlib.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ # We can compile using X headers with no special include directory.
+ac_x_includes=
+else
+ for ac_dir in $ac_x_header_dirs; do
+ if test -r "$ac_dir/X11/Xlib.h"; then
+ ac_x_includes=$ac_dir
+ break
+ fi
+done
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+fi # $ac_x_includes = no
+
+if test "$ac_x_libraries" = no; then
+ # Check for the libraries.
+ # See if we find them without any special options.
+ # Don't add to $LIBS permanently.
+ ac_save_LIBS=$LIBS
+ LIBS="-lX11 $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+@%:@include <X11/Xlib.h>
+int
+main ()
+{
+XrmInitialize ()
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ LIBS=$ac_save_LIBS
+# We can link X programs with no special library path.
+ac_x_libraries=
+else
+ LIBS=$ac_save_LIBS
+for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+do
+ # Don't even attempt the hair of trying to link an X program!
+ for ac_extension in a so sl dylib la dll; do
+ if test -r "$ac_dir/libX11.$ac_extension"; then
+ ac_x_libraries=$ac_dir
+ break 2
+ fi
+ done
+done
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi # $ac_x_libraries = no
+
+case $ac_x_includes,$ac_x_libraries in #(
+ no,* | *,no | *\'*)
+ # Didn't find X, or a directory has "'" in its name.
+ ac_cv_have_x="have_x=no";; #(
+ *)
+ # Record where we found X for the cache.
+ ac_cv_have_x="have_x=yes\
+ ac_x_includes='$ac_x_includes'\
+ ac_x_libraries='$ac_x_libraries'"
+esac
+fi
+;; #(
+ *) have_x=yes;;
+ esac
+ eval "$ac_cv_have_x"
+fi # $with_x != no
+
+if test "$have_x" != yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
+$as_echo "$have_x" >&6; }
+ no_x=yes
+else
+ # If each of the values was on the command line, it overrides each guess.
+ test "x$x_includes" = xNONE && x_includes=$ac_x_includes
+ test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
+ # Update the cache value to reflect the command line values.
+ ac_cv_have_x="have_x=yes\
+ ac_x_includes='$x_includes'\
+ ac_x_libraries='$x_libraries'"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
+$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
+fi
+
+if test "$no_x" = yes; then
+ # Not all programs may use this symbol, but it does not hurt to define it.
+
+$as_echo "@%:@define X_DISPLAY_MISSING 1" >>confdefs.h
+
+ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
+else
+ if test -n "$x_includes"; then
+ X_CFLAGS="$X_CFLAGS -I$x_includes"
+ fi
+
+ # It would also be nice to do this for all -L options, not just this one.
+ if test -n "$x_libraries"; then
+ X_LIBS="$X_LIBS -L$x_libraries"
+ # For Solaris; some versions of Sun CC require a space after -R and
+ # others require no space. Words are not sufficient . . . .
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
+$as_echo_n "checking whether -R must be followed by a space... " >&6; }
+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+ ac_xsave_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ X_LIBS="$X_LIBS -R$x_libraries"
+else
+ LIBS="$ac_xsave_LIBS -R $x_libraries"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ X_LIBS="$X_LIBS -R $x_libraries"
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
+$as_echo "neither works" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_c_werror_flag=$ac_xsave_c_werror_flag
+ LIBS=$ac_xsave_LIBS
+ fi
+
+ # Check for system-dependent libraries X programs must link with.
+ # Do this before checking for the system-independent R6 libraries
+ # (-lICE), since we may need -lsocket or whatever for X linking.
+
+ if test "$ISC" = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
+ else
+ # Martyn Johnson says this is needed for Ultrix, if the X
+ # libraries were built with DECnet support. And Karl Berry says
+ # the Alpha needs dnet_stub (dnet does not exist).
+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XOpenDisplay ();
+int
+main ()
+{
+return XOpenDisplay ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
+$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
+if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldnet $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dnet_ntoa ();
+int
+main ()
+{
+return dnet_ntoa ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dnet_dnet_ntoa=yes
+else
+ ac_cv_lib_dnet_dnet_ntoa=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+fi
+
+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
+$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
+if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldnet_stub $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dnet_ntoa ();
+int
+main ()
+{
+return dnet_ntoa ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dnet_stub_dnet_ntoa=yes
+else
+ ac_cv_lib_dnet_stub_dnet_ntoa=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+fi
+
+ fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_xsave_LIBS"
+
+ # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
+ # to get the SysV transport functions.
+ # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
+ # needs -lnsl.
+ # The nsl library prevents programs from opening the X display
+ # on Irix 5.2, according to T.E. Dickey.
+ # The functions gethostbyname, getservbyname, and inet_addr are
+ # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
+if test "x$ac_cv_func_gethostbyname" = xyes; then :
+
+fi
+
+ if test $ac_cv_func_gethostbyname = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lnsl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gethostbyname ();
+int
+main ()
+{
+return gethostbyname ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_nsl_gethostbyname=yes
+else
+ ac_cv_lib_nsl_gethostbyname=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+fi
+
+ if test $ac_cv_lib_nsl_gethostbyname = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
+$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
+if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbsd $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gethostbyname ();
+int
+main ()
+{
+return gethostbyname ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_bsd_gethostbyname=yes
+else
+ ac_cv_lib_bsd_gethostbyname=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
+$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
+if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+fi
+
+ fi
+ fi
+
+ # lieder@skyler.mavd.honeywell.com says without -lsocket,
+ # socket/setsockopt and other routines are undefined under SCO ODT
+ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
+ # on later versions), says Simon Leinen: it contains gethostby*
+ # variants that don't use the name server (or something). -lsocket
+ # must be given before -lnsl if both are needed. We assume that
+ # if connect needs -lnsl, so does gethostbyname.
+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
+if test "x$ac_cv_func_connect" = xyes; then :
+
+fi
+
+ if test $ac_cv_func_connect = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
+$as_echo_n "checking for connect in -lsocket... " >&6; }
+if ${ac_cv_lib_socket_connect+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char connect ();
+int
+main ()
+{
+return connect ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_socket_connect=yes
+else
+ ac_cv_lib_socket_connect=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
+$as_echo "$ac_cv_lib_socket_connect" >&6; }
+if test "x$ac_cv_lib_socket_connect" = xyes; then :
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+fi
+
+ fi
+
+ # Guillermo Gomez says -lposix is necessary on A/UX.
+ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
+if test "x$ac_cv_func_remove" = xyes; then :
+
+fi
+
+ if test $ac_cv_func_remove = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
+$as_echo_n "checking for remove in -lposix... " >&6; }
+if ${ac_cv_lib_posix_remove+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lposix $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char remove ();
+int
+main ()
+{
+return remove ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_posix_remove=yes
+else
+ ac_cv_lib_posix_remove=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
+$as_echo "$ac_cv_lib_posix_remove" >&6; }
+if test "x$ac_cv_lib_posix_remove" = xyes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+fi
+
+ fi
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
+if test "x$ac_cv_func_shmat" = xyes; then :
+
+fi
+
+ if test $ac_cv_func_shmat = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
+$as_echo_n "checking for shmat in -lipc... " >&6; }
+if ${ac_cv_lib_ipc_shmat+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lipc $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shmat ();
+int
+main ()
+{
+return shmat ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ipc_shmat=yes
+else
+ ac_cv_lib_ipc_shmat=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
+$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
+if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+fi
+
+ fi
+ fi
+
+ # Check for libraries that X11R6 Xt/Xaw programs need.
+ ac_save_LDFLAGS=$LDFLAGS
+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
+ # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
+ # check for ICE first), but we must link in the order -lSM -lICE or
+ # we get undefined symbols. So assume we have SM if we have ICE.
+ # These have to be linked with before -lX11, unlike the other
+ # libraries we check for below, so use a different variable.
+ # John Interrante, Karl Berry
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
+$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
+if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char IceConnectionNumber ();
+int
+main ()
+{
+return IceConnectionNumber ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ICE_IceConnectionNumber=yes
+else
+ ac_cv_lib_ICE_IceConnectionNumber=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
+ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+fi
+
+ LDFLAGS=$ac_save_LDFLAGS
+
+fi
+ # Autoconf claims to find X library and include dirs for us.
+ if test "$no_x" = "yes"
+ then with_x11=no window_system=none HAVE_X_WINDOWS=no
+ else with_x11=yes window_system=x11 HAVE_X_WINDOWS=yes
+ fi
+fi
+
+
+if test "$with_x11" = "yes"; then
+ $as_echo "@%:@define HAVE_X_WINDOWS 1" >>confdefs.h
+
+ MAKE_SUBDIR="$MAKE_SUBDIR lwlib" && if test "$verbose" = "yes"; then echo " Appending \"lwlib\" to \$MAKE_SUBDIR"; fi
+ SRC_SUBDIR_DEPS="$SRC_SUBDIR_DEPS lwlib" && if test "$verbose" = "yes"; then echo " Appending \"lwlib\" to \$SRC_SUBDIR_DEPS"; fi
+
+ ac_fn_c_check_header_mongrel "$LINENO" "Xm/Xm.h" "ac_cv_header_Xm_Xm_h" "$ac_includes_default"
+if test "x$ac_cv_header_Xm_Xm_h" = xyes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmStringFree in -lXm" >&5
+$as_echo_n "checking for XmStringFree in -lXm... " >&6; }
+if ${ac_cv_lib_Xm_XmStringFree+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXm $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XmStringFree ();
+int
+main ()
+{
+return XmStringFree ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_Xm_XmStringFree=yes
+else
+ ac_cv_lib_Xm_XmStringFree=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xm_XmStringFree" >&5
+$as_echo "$ac_cv_lib_Xm_XmStringFree" >&6; }
+if test "x$ac_cv_lib_Xm_XmStringFree" = xyes; then :
+ got_motif=yes
+fi
+
+fi
+
+
+
+ if test "$got_motif" != "yes"; then
+ for lib_dir in "/usr/dt/lib" "/usr/lib/Motif2.1" \
+ "/usr/lib/Motif1.2" "/usr/lib/Motif1.1"; do
+ inc_dir=`echo $lib_dir | sed -e 's/lib/include/'`
+ if test -d "$lib_dir" -a -d "$inc_dir"; then
+ case "$x_libraries" in *"$lib_dir"* ) ;; *)
+ x_libraries="$lib_dir $x_libraries"
+ X_LIBS="-L${lib_dir} $X_LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-L${lib_dir}\" to \$X_LIBS"; fi ;;
+ esac
+ case "$x_includes" in "$inc_dir"* ) ;; *)
+ x_includes="$inc_dir $x_includes"
+ X_CFLAGS="-I${inc_dir} $X_CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \"-I${inc_dir}\" to \$X_CFLAGS"; fi ;;
+ esac
+ break; fi
+ done
+ fi
+
+ for rel in "X11R6" "X11R5" "X11R4"; do
+ lib_dir="/usr/contrib/$rel/lib" inc_dir="/usr/contrib/$rel/include"
+ if test -d "$lib_dir" -a -d "$inc_dir"; then
+ case "$x_libraries" in *"$lib_dir"* ) ;; *)
+ x_libraries="$x_libraries $lib_dir"
+ X_LIBS="$X_LIBS -L${lib_dir}" && if test "$verbose" = "yes"; then echo " Appending \"-L${lib_dir}\" to \$X_LIBS"; fi
+ esac
+ case "$x_includes" in "$inc_dir"* ) ;; *)
+ x_includes="$x_includes $inc_dir"
+ X_CFLAGS="$X_CFLAGS -I${inc_dir}" && if test "$verbose" = "yes"; then echo " Appending \"-I${inc_dir}\" to \$X_CFLAGS"; fi
+ esac
+ break; fi
+ done
+
+ ld_switch_x_site="$X_LIBS"
+
+
+if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then
+ ld_switch_site=`echo '' $ld_switch_site | sed -e 's:^ ::' -e "s/$dash_r[^ ]*//g"`
+ ld_switch_x_site=`echo '' $ld_switch_x_site | sed -e 's:^ ::' -e "s/$dash_r[^ ]*//g"`
+
+ runpath="" runpath_dirs=""
+ if test -n "$LD_RUN_PATH"; then
+ runpath="$LD_RUN_PATH"
+ elif test "$GCC" = "yes"; then
+ ld_switch_run_save="$ld_switch_run"; ld_switch_run=""
+ echo "int main(int argc, char **argv) {return 0;}" > conftest.c
+ xe_runpath_link='${CC-cc} -o conftest -v $CFLAGS '"$xe_ldflags"' conftest.$ac_ext 2>&1 1>/dev/null'
+ for arg in `eval "$xe_runpath_link" | grep ' -L'`; do
+ case "$arg" in P,* | -L* | -R* )
+ for dir in `echo '' "$arg" | sed -e 's:^ ::' -e 's/^..//' -e 'y/:/ /'`; do
+ {
+xe_runpath_dir="$dir"
+ test "$xe_runpath_dir" != "/lib" -a \
+ "$xe_runpath_dir" != "/usr/lib" -a \
+ -n "`ls ${xe_runpath_dir}/*.s[ol] 2>/dev/null`" && \
+ eval "$xe_add_unique_runpath_dir"
+}
+ done ;;
+ esac
+ done
+ ld_switch_run="$ld_switch_run_save"
+ rm -f conftest*
+ else
+ for arg in $ld_switch_site $ld_switch_x_site; do
+ case "$arg" in -L*) {
+xe_runpath_dir=`echo '' "$arg" | sed -e 's:^ ::' -e 's/^-L//'`
+ test "$xe_runpath_dir" != "/lib" -a \
+ "$xe_runpath_dir" != "/usr/lib" -a \
+ -n "`ls ${xe_runpath_dir}/*.s[ol] 2>/dev/null`" && \
+ eval "$xe_add_unique_runpath_dir"
+};; esac
+ done
+ if test "$opsys $need_motif" = "sol2 yes"; then
+ xe_runpath_dir="/opt/SUNWdt/lib";
+ eval "$xe_add_unique_runpath_dir";
+ fi
+ fi
+ if test -n "$runpath"; then
+ ld_switch_run="${dash_r}${runpath}"
+
+if test "$GCC" = "yes"; then
+ set x $ld_switch_run; shift; ld_switch_run=""
+ while test -n "$1"; do
+ case $1 in
+ -L | -l | -u ) ld_switch_run="$ld_switch_run $1 $2"; shift ;;
+ -L* | -l* | -u* | -Wl* | -pg ) ld_switch_run="$ld_switch_run $1" ;;
+ -Xlinker* ) ;;
+ * ) ld_switch_run="$ld_switch_run -Xlinker $1" ;;
+ esac
+ shift
+ done
+fi
+ test "$verbose" = "yes" && echo "Setting runpath to $runpath"
+ fi
+fi
+
+
+ if test "$verbose" = "yes"; then
+ echo; echo "X11 compilation variables:"
+ for var in x_libraries x_includes X_CFLAGS X_LIBS X_PRE_LIBS X_EXTRA_LIBS; do eval "echo \"$var = '\$$var'\""; done
+ echo
+ fi
+
+ bitmapdirs=
+ if test "$x_includes" != NONE; then
+ for i in $x_includes; do
+ if test -d "$i/bitmaps"; then
+ bitmapdirs="$i/bitmaps:$bitmapdirs"
+ fi
+ if test -d "$i/X11/bitmaps"; then
+ bitmapdirs="$i/X11/bitmaps:$bitmapdirs"
+ fi
+ done
+ bitmapdirs=`echo "$bitmapdirs" | sed s/.$//`
+ fi
+ test ! -z "$bitmapdirs" && cat >>confdefs.h <<_ACEOF
+@%:@define BITMAPDIR "$bitmapdirs"
+_ACEOF
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X defines extracted by xmkmf" >&5
+$as_echo_n "checking for X defines extracted by xmkmf... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+ rm -fr conftestdir
+ if mkdir conftestdir; then
+ cd conftestdir
+ cat > Imakefile <<'EOF'
+xetest:
+ @echo ${PROTO_DEFINES} ${STD_DEFINES}
+EOF
+ if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ xmkmf_defines=`${MAKE-make} xetest 2>/dev/null | grep -v make`
+ fi
+ cd ..
+ rm -fr conftestdir
+ for word in $xmkmf_defines; do
+ case "$word" in
+ -D__STDC__*) ;;
+ -D* )
+ sym=`echo '' $word | sed -e 's:^ *-D::' -e 's:=.*::'`
+ case "$word" in
+ -D*=* ) val=`echo '' $word | sed -e 's:^.*=::'` ;;
+ * ) val=1 ;;
+ esac
+ if grep "^#define $sym " confdefs.h >/dev/null; then :; else
+ if test "$val" = "1"
+ then cat >>confdefs.h <<_ACEOF
+@%:@define $sym 1
+_ACEOF
+
+ else cat >>confdefs.h <<_ACEOF
+@%:@define $sym $val
+_ACEOF
+
+ fi
+ fi ;;
+ esac
+ done
+ fi
+
+ ac_fn_c_check_header_mongrel "$LINENO" "X11/Intrinsic.h" "ac_cv_header_X11_Intrinsic_h" "$ac_includes_default"
+if test "x$ac_cv_header_X11_Intrinsic_h" = xyes; then :
+
+else
+ as_fn_error $? "Unable to find X11 header files." "$LINENO" 5
+fi
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDisplay in -lX11" >&5
+$as_echo_n "checking for XOpenDisplay in -lX11... " >&6; }
+if ${ac_cv_lib_X11_XOpenDisplay+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lX11 $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XOpenDisplay ();
+int
+main ()
+{
+return XOpenDisplay ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_X11_XOpenDisplay=yes
+else
+ ac_cv_lib_X11_XOpenDisplay=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+$as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; }
+if test "x$ac_cv_lib_X11_XOpenDisplay" = xyes; then :
+ have_lib_x11=yes
+fi
+
+ if test "$have_lib_x11" != "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XGetFontProperty in -lX11" >&5
+$as_echo_n "checking for XGetFontProperty in -lX11... " >&6; }
+if ${ac_cv_lib_X11_XGetFontProperty+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lX11 -b i486-linuxaout $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XGetFontProperty ();
+int
+main ()
+{
+return XGetFontProperty ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_X11_XGetFontProperty=yes
+else
+ ac_cv_lib_X11_XGetFontProperty=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XGetFontProperty" >&5
+$as_echo "$ac_cv_lib_X11_XGetFontProperty" >&6; }
+if test "x$ac_cv_lib_X11_XGetFontProperty" = xyes; then :
+ ld_switch_x_site="-b i486-linuxaout $ld_switch_x_site"
+else
+ as_fn_error $? "Unable to find X11 libraries." "$LINENO" 5
+fi
+
+ fi
+ libs_x="-lX11"
+ test "$verbose" = "yes" && echo " Setting libs_x to \"-lX11\""
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeSelectInput in -lXext" >&5
+$as_echo_n "checking for XShapeSelectInput in -lXext... " >&6; }
+if ${ac_cv_lib_Xext_XShapeSelectInput+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXext $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XShapeSelectInput ();
+int
+main ()
+{
+return XShapeSelectInput ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_Xext_XShapeSelectInput=yes
+else
+ ac_cv_lib_Xext_XShapeSelectInput=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShapeSelectInput" >&5
+$as_echo "$ac_cv_lib_Xext_XShapeSelectInput" >&6; }
+if test "x$ac_cv_lib_Xext_XShapeSelectInput" = xyes; then :
+ libs_x="-lXext $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXext\" to \$libs_x"; fi
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XtOpenDisplay in -lXt" >&5
+$as_echo_n "checking for XtOpenDisplay in -lXt... " >&6; }
+if ${ac_cv_lib_Xt_XtOpenDisplay+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXt $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XtOpenDisplay ();
+int
+main ()
+{
+return XtOpenDisplay ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_Xt_XtOpenDisplay=yes
+else
+ ac_cv_lib_Xt_XtOpenDisplay=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xt_XtOpenDisplay" >&5
+$as_echo "$ac_cv_lib_Xt_XtOpenDisplay" >&6; }
+if test "x$ac_cv_lib_Xt_XtOpenDisplay" = xyes; then :
+ libs_x="-lXt $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXt\" to \$libs_x"; fi
+else
+ as_fn_error $? "Unable to find X11 libraries." "$LINENO" 5
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the version of X11 being used" >&5
+$as_echo_n "checking the version of X11 being used... " >&6; }
+ if test "$cross_compiling" = yes; then :
+ x11_release=4
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <X11/Intrinsic.h>
+ int main(int c, char **v) { return c>1 ? XlibSpecificationRelease : 0; }
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ ./conftest foobar; x11_release=$?
+else
+ x11_release=4
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: R${x11_release}" >&5
+$as_echo "R${x11_release}" >&6; }
+ cat >>confdefs.h <<_ACEOF
+@%:@define THIS_IS_X11R${x11_release} 1
+_ACEOF
+
+
+ if test "${x11_release}" = "4"; then
+ case "$with_widgets" in
+ "" | "no") with_widgets=no ;;
+ *) { echo "Error:" "Widget support requires X11R5 or greater" >&2; exit 1; } ;;
+ esac
+ fi
+
+ for ac_func in XConvertCase XtRegisterDrawable
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+ for ac_header in X11/Xlocale.h X11/Xfuncproto.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+ for ac_func in XRegisterIMInstantiateCallback
+do :
+ ac_fn_c_check_func "$LINENO" "XRegisterIMInstantiateCallback" "ac_cv_func_XRegisterIMInstantiateCallback"
+if test "x$ac_cv_func_XRegisterIMInstantiateCallback" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_XREGISTERIMINSTANTIATECALLBACK 1
+_ACEOF
+
+fi
+done
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for standard XRegisterIMInstantiateCallback prototype" >&5
+$as_echo_n "checking for standard XRegisterIMInstantiateCallback prototype... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#define NeedFunctionPrototypes 1
+#include <X11/Xlib.h>
+extern Bool XRegisterIMInstantiateCallback(
+ Display*, struct _XrmHashBucketRec*, char*, char*, XIMProc, XPointer*);
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ $as_echo "@%:@define XREGISTERIMINSTANTIATECALLBACK_NONSTANDARD_PROTOTYPE 1" >>confdefs.h
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+$as_echo_n "checking for XmuReadBitmapDataFromFile in -lXmu... " >&6; }
+if ${ac_cv_lib_Xmu_XmuReadBitmapDataFromFile+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXmu $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XmuReadBitmapDataFromFile ();
+int
+main ()
+{
+return XmuReadBitmapDataFromFile ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_Xmu_XmuReadBitmapDataFromFile=yes
+else
+ ac_cv_lib_Xmu_XmuReadBitmapDataFromFile=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xmu_XmuReadBitmapDataFromFile" >&5
+$as_echo "$ac_cv_lib_Xmu_XmuReadBitmapDataFromFile" >&6; }
+if test "x$ac_cv_lib_Xmu_XmuReadBitmapDataFromFile" = xyes; then :
+ with_xmu=yes
+else
+ with_xmu=no
+fi
+
+ if test "$with_xmu" = "no"; then
+ as_fn_error $? "We're sorry, but we thought there were no systems without Xmu by now.
+You cannot build this version of XEmacs for X11 without Xmu. Please report
+this to xemacs-beta@xemacs.org. As a workaround, revert to XEmacs 21.5.29." "$LINENO" 5
+ else
+ libs_x="-lXmu $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXmu\" to \$libs_x"; fi
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXbsd" >&5
+$as_echo_n "checking for main in -lXbsd... " >&6; }
+if ${ac_cv_lib_Xbsd_main+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXbsd $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+
+int
+main ()
+{
+return main ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_Xbsd_main=yes
+else
+ ac_cv_lib_Xbsd_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xbsd_main" >&5
+$as_echo "$ac_cv_lib_Xbsd_main" >&6; }
+if test "x$ac_cv_lib_Xbsd_main" = xyes; then :
+ libs_x="-lXbsd $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXbsd\" to \$libs_x"; fi
+fi
+
+
+ if test "$unexec" = "unexaix.o" -a "$x11_release" = "6"; then
+ if test "$GCC" = "yes"; then
+ X_CFLAGS="-mthreads $X_CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \"-mthreads\" to \$X_CFLAGS"; fi
+ libs_x="-mthreads $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-mthreads\" to \$libs_x"; fi
+ else
+ case "$CC" in
+ "xlc" ) CC="xlc_r" ;;
+ "xlC" ) CC="xlC_r" ;;
+ "cc" ) CC="cc_r" ;;
+ esac
+ fi
+ fi
+
+
+ if test "$with_xft_emacs" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xrender, fontconfig, and Xft" >&5
+$as_echo_n "checking for Xrender, fontconfig, and Xft... " >&6; }
+ xft_includes_found=no
+ xft_config_prog="pkg-config xft"
+ xft_config_ok=`$xft_config_prog --cflags 2>/dev/null`
+ if test "$?" = 0 ; then
+ xft_cflags=`$xft_config_prog --cflags`
+ xft_libs=`$xft_config_prog --libs`
+ c_switch_site="$c_switch_site $xft_cflags"
+ ld_switch_site="$ld_switch_site $xft_libs"
+ xft_includes_found=yes
+ else
+ for ac_header in freetype/config/ftheader.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "freetype/config/ftheader.h" "ac_cv_header_freetype_config_ftheader_h" "$ac_includes_default"
+if test "x$ac_cv_header_freetype_config_ftheader_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_FREETYPE_CONFIG_FTHEADER_H 1
+_ACEOF
+ xft_includes_found=yes
+else
+
+ for freetype_include_top in "/usr/local/include/freetype2" \
+ "/usr/X11R6/include/freetype2" \
+ "/usr/include/freetype2"
+ do
+ if test -d $freetype_include_top; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking in ${freetype_include_top}" >&5
+$as_echo_n "checking in ${freetype_include_top}... " >&6; }
+ unset "$as_ac_Header"
+ save_c_switch_site="$c_switch_site"
+ c_switch_site="$c_switch_site -I${freetype_include_top}"
+ for ac_header in freetype/config/ftheader.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "freetype/config/ftheader.h" "ac_cv_header_freetype_config_ftheader_h" "$ac_includes_default"
+if test "x$ac_cv_header_freetype_config_ftheader_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_FREETYPE_CONFIG_FTHEADER_H 1
+_ACEOF
+ xft_includes_found=yes
+else
+ c_switch_site=$save_c_switch_site
+fi
+
+done
+
+ fi
+ done
+fi
+
+done
+
+ fi
+ if test "$xft_includes_found" != "yes"; then
+ { echo "Error:" "Unable to find headers for --with-xft" >&2; exit 1; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRenderQueryExtension in -lXrender" >&5
+$as_echo_n "checking for XRenderQueryExtension in -lXrender... " >&6; }
+if ${ac_cv_lib_Xrender_XRenderQueryExtension+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXrender $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XRenderQueryExtension ();
+int
+main ()
+{
+return XRenderQueryExtension ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_Xrender_XRenderQueryExtension=yes
+else
+ ac_cv_lib_Xrender_XRenderQueryExtension=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrender_XRenderQueryExtension" >&5
+$as_echo "$ac_cv_lib_Xrender_XRenderQueryExtension" >&6; }
+if test "x$ac_cv_lib_Xrender_XRenderQueryExtension" = xyes; then :
+ libs_x="-lXrender $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXrender\" to \$libs_x"; fi
+else
+ { echo "Error:" "Unable to find libXrender for --with-xft" >&2; exit 1; }
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FcPatternCreate in -lfontconfig" >&5
+$as_echo_n "checking for FcPatternCreate in -lfontconfig... " >&6; }
+if ${ac_cv_lib_fontconfig_FcPatternCreate+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lfontconfig $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char FcPatternCreate ();
+int
+main ()
+{
+return FcPatternCreate ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_fontconfig_FcPatternCreate=yes
+else
+ ac_cv_lib_fontconfig_FcPatternCreate=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fontconfig_FcPatternCreate" >&5
+$as_echo "$ac_cv_lib_fontconfig_FcPatternCreate" >&6; }
+if test "x$ac_cv_lib_fontconfig_FcPatternCreate" = xyes; then :
+ libs_x="-lfontconfig $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lfontconfig\" to \$libs_x"; fi
+else
+ { echo "Error:" "Unable to find libfontconfig for --with-xft" >&2; exit 1; }
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XftFontOpen in -lXft" >&5
+$as_echo_n "checking for XftFontOpen in -lXft... " >&6; }
+if ${ac_cv_lib_Xft_XftFontOpen+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXft $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XftFontOpen ();
+int
+main ()
+{
+return XftFontOpen ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_Xft_XftFontOpen=yes
+else
+ ac_cv_lib_Xft_XftFontOpen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xft_XftFontOpen" >&5
+$as_echo "$ac_cv_lib_Xft_XftFontOpen" >&6; }
+if test "x$ac_cv_lib_Xft_XftFontOpen" = xyes; then :
+ libs_x="-lXft $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXft\" to \$libs_x"; fi
+else
+ { echo "Error:" "Unable to find libXft for --with-xft" >&2; exit 1; }
+fi
+
+
+ for ac_func in FcConfigGetRescanInterval
+do :
+ ac_fn_c_check_func "$LINENO" "FcConfigGetRescanInterval" "ac_cv_func_FcConfigGetRescanInterval"
+if test "x$ac_cv_func_FcConfigGetRescanInterval" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_FCCONFIGGETRESCANINTERVAL 1
+_ACEOF
+
+fi
+done
+
+ for ac_func in FcConfigSetRescanInterval
+do :
+ ac_fn_c_check_func "$LINENO" "FcConfigSetRescanInterval" "ac_cv_func_FcConfigSetRescanInterval"
+if test "x$ac_cv_func_FcConfigSetRescanInterval" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_FCCONFIGSETRESCANINTERVAL 1
+_ACEOF
+
+fi
+done
+
+ with_fontconfig=yes
+ $as_echo "@%:@define HAVE_FONTCONFIG 1" >>confdefs.h
+
+ $as_echo "@%:@define HAVE_XFT 1" >>confdefs.h
+
+ unset xft_includes_found
+ fi
+ fi
+
+fi
+if test "$with_msw" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MS-Windows" >&5
+$as_echo_n "checking for MS-Windows... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgdi32" >&5
+$as_echo_n "checking for main in -lgdi32... " >&6; }
+if ${ac_cv_lib_gdi32_main+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgdi32 $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+
+int
+main ()
+{
+return main ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_gdi32_main=yes
+else
+ ac_cv_lib_gdi32_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdi32_main" >&5
+$as_echo "$ac_cv_lib_gdi32_main" >&6; }
+if test "x$ac_cv_lib_gdi32_main" = xyes; then :
+ with_msw=yes
+fi
+
+ if test "$with_msw" = "yes"; then
+ $as_echo "@%:@define HAVE_MS_WINDOWS 1" >>confdefs.h
+
+
+ if test "$with_netinstall" = "yes"; then
+ MAKE_SUBDIR="$MAKE_SUBDIR netinstall" && if test "$verbose" = "yes"; then echo " Appending \"netinstall\" to \$MAKE_SUBDIR"; fi
+ SRC_SUBDIR_DEPS="$SRC_SUBDIR_DEPS netinstall" && if test "$verbose" = "yes"; then echo " Appending \"netinstall\" to \$SRC_SUBDIR_DEPS"; fi
+ INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR netinstall" && if test "$verbose" = "yes"; then echo " Appending \"netinstall\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
+ fi
+
+ install_pp="$srcdir/lib-src/installexe.sh"
+ libs_system="$libs_system -limm32 -lshell32 -lgdi32 -luser32 -lcomdlg32 -lcomctl32 -lole32 -luuid -lwinspool -lmpr" && if test "$verbose" = "yes"; then echo " Appending \"-limm32 -lshell32 -lgdi32 -luser32 -lcomdlg32 -lcomctl32 -lole32 -luuid -lwinspool -lmpr\" to \$libs_system"; fi
+ if test "$with_dragndrop" != no; then
+ dragndrop_proto="$dragndrop_proto msw" && if test "$verbose" = "yes"; then echo " Appending \"msw\" to \$dragndrop_proto"; fi
+ with_dragndrop=yes
+ fi
+ if test "$window_system" != x11; then
+ window_system=msw
+ test "$with_scrollbars" != "no" && with_scrollbars=msw
+ test "$with_menubars" != "no" && with_menubars=msw
+ test "$with_toolbars" != "no" && with_toolbars=msw
+ test "$with_dialogs" != "no" && with_dialogs=msw
+ test "$with_widgets" != "no" && with_widgets=msw
+ fi
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <fcntl.h>
+ int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ $as_echo "@%:@define HAVE_MSG_SELECT 1" >>confdefs.h
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ fi
+fi
+
+
+
+test -z "$with_dragndrop" && with_dragndrop="$with_dragndrop_default"
+test -z "$window_system" && window_system="none"
+
+if test "$window_system" = "none"; then
+ for feature in menubars scrollbars toolbars dialogs dragndrop xface
+ do
+ if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-$feature ignored: Not valid without window system support" >&5
+$as_echo "$as_me: WARNING: --with-$feature ignored: Not valid without window system support" >&2;}
+ fi
+ eval "with_${feature}=no"
+ done
+else
+ test -z "$with_toolbars" && with_toolbars=yes
+fi
+
+if test "$with_msw" != "yes"; then
+ for feature in MARTIN_IS_CLUELESS_ABOUT_MSW_FEATURES
+ do
+ if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-$feature ignored: Not valid without MS-Windows support" >&5
+$as_echo "$as_me: WARNING: --with-$feature ignored: Not valid without MS-Windows support" >&2;}
+ fi
+ eval "with_${feature}=no"
+ done
+else
+:
+fi
+
+if test "$with_x11" != "yes"; then
+ for feature in with_tooltalk with_cde with_wmcommand with_xim with_sound_nas
+ do
+ if eval "test -n \"\$${feature}\" -a \"\$${feature}\" != \"no\"" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --$feature ignored: Not valid without X support" >&5
+$as_echo "$as_me: WARNING: --$feature ignored: Not valid without X support" >&2;}
+ fi
+ eval "${feature}=no"
+ done
+fi
+
+if test "$with_x11" = "yes"; then
+ ac_fn_c_check_header_compile "$LINENO" "X11/extensions/shape.h" "ac_cv_header_X11_extensions_shape_h" "
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+"
+if test "x$ac_cv_header_X11_extensions_shape_h" = xyes; then :
+
+ $as_echo "@%:@define HAVE_BALLOON_HELP 1" >>confdefs.h
+
+
+fi
+
+
+fi
+
+bitmapdir=
+
+case "$window_system" in
+ x11 ) HAVE_X_WINDOWS=yes; echo " Using X11." ;;
+ msw ) HAVE_X_WINDOWS=no ; echo " Using MS-Windows." ;;
+ gtk )
+ HAVE_X_WINDOWS=no
+ test "$with_gnome" = "yes" && echo " Using GNOME."
+ test "$with_gnome" = "no" && echo " Using GTK."
+ ;;
+ none ) HAVE_X_WINDOWS=no ; echo " Using no window system." ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WM_COMMAND option" >&5
+$as_echo_n "checking for WM_COMMAND option... " >&6; }
+if test "$with_wmcommand" != "no"; then
+ $as_echo "@%:@define HAVE_WMCOMMAND 1" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
+test -z "$with_xauth" && { ac_fn_c_check_header_mongrel "$LINENO" "X11/Xauth.h" "ac_cv_header_X11_Xauth_h" "$ac_includes_default"
+if test "x$ac_cv_header_X11_Xauth_h" = xyes; then :
+
+else
+ with_xauth=no
+fi
+
+ }
+test -z "$with_xauth" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauGetAuthByAddr in -lXau" >&5
+$as_echo_n "checking for XauGetAuthByAddr in -lXau... " >&6; }
+if ${ac_cv_lib_Xau_XauGetAuthByAddr+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXau $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XauGetAuthByAddr ();
+int
+main ()
+{
+return XauGetAuthByAddr ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_Xau_XauGetAuthByAddr=yes
+else
+ ac_cv_lib_Xau_XauGetAuthByAddr=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xau_XauGetAuthByAddr" >&5
+$as_echo "$ac_cv_lib_Xau_XauGetAuthByAddr" >&6; }
+if test "x$ac_cv_lib_Xau_XauGetAuthByAddr" = xyes; then :
+ :
+else
+ with_xauth=no
+fi
+ }
+test -z "$with_xauth" && with_xauth=yes
+if test "$with_xauth" = "yes"; then
+ $as_echo "@%:@define HAVE_XAUTH 1" >>confdefs.h
+
+
+T=""
+for W in $GTK_LIBS $X_EXTRA_LIBS -lXau $libs_x $X_PRE_LIBS; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+libs_xauth="$T"
+
+fi
+
+
+
+
+
+if test "$XEMACS_CC_GPP" = "yes"; then
+ LIBSTDCPP=-lstdc++
+else
+ LIBSTDCPP=
+fi
+
+
+if test "$with_modules" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for module support" >&5
+$as_echo_n "checking for module support... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+
+ case "$opsys" in
+ mingw* | cygwin* ) have_dl=yes ;;
+ darwin ) have_dl=yes
+ $as_echo "@%:@define HAVE_DYLD 1" >>confdefs.h
+
+ ;;
+ * )
+ ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lc" >&5
+$as_echo_n "checking for dlopen in -lc... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <dlfcn.h>
+int
+main ()
+{
+dlopen ("", 0);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ have_dl=yes ; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_dl" >&5
+$as_echo "$have_dl" >&6; }
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+ ac_save_LIBS="$LIBS"
+ LIBS="$LIBS -ldl"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <dlfcn.h>
+int
+main ()
+{
+dlopen ("", 0);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ have_dl=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_dl" >&5
+$as_echo "$have_dl" >&6; }
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+ LIBS="$ac_save_LIBS -lsvld"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <dlfcn.h>
+int
+main ()
+{
+dlopen ("", 0);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ have_dl=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_dl" >&5
+$as_echo "$have_dl" >&6; }
+else
+ LIBS="$ac_save_LIBS" ; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+
+
+ if test "$have_dl" = "yes"; then
+ $as_echo "@%:@define HAVE_DLOPEN 1" >>confdefs.h
+
+ else
+ ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
+if test "x$ac_cv_header_dl_h" = xyes; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -lc" >&5
+$as_echo_n "checking for shl_load in -lc... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <dl.h>
+int
+main ()
+{
+shl_load ("", 0, 0);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ have_dl=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_dl" >&5
+$as_echo "$have_dl" >&6; }
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldl" >&5
+$as_echo_n "checking for shl_load in -ldl... " >&6; }
+ ac_save_LIBS="$LIBS"
+ LIBS="$LIBS -ldld"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <dl.h>
+int
+main ()
+{
+shl_load ("", 0, 0);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ have_dl=yes
+else
+ LIBS="$ac_save_LIBS"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+
+
+ if test "$have_dl" = "yes"; then
+ $as_echo "@%:@define HAVE_SHL_LOAD 1" >>confdefs.h
+
+ else
+ ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
+if test "x$ac_cv_header_ltdl_h" = xyes; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lt_dlinit in -lltdl" >&5
+$as_echo_n "checking for lt_dlinit in -lltdl... " >&6; }
+ ac_save_LIBS="$LIBS"
+ LIBS="$LIBS -lltdl"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ltdl.h>
+int
+main ()
+{
+lt_dlinit ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ have_dl=yes
+else
+ LIBS="$ac_save_LIBS"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_dl" >&5
+$as_echo "$have_dl" >&6; }
+ if test "$have_dl" = "yes"; then
+ $as_echo "@%:@define HAVE_LTDL 1" >>confdefs.h
+
+ fi
+ fi
+ fi
+ ac_save_LIBS=
+ esac
+
+ if test -n "$have_dl"; then
+
+dll_ld=
+dll_ldflags=
+dll_cflags=
+dll_post=
+dll_ldo="-o"
+ld_dynamic_link_flags=
+xehost=$ac_cv_build
+xealias=$ac_cv_build_alias
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to build dynamic libraries for ${xehost}" >&5
+$as_echo_n "checking how to build dynamic libraries for ${xehost}... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+# Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
+case "$xehost" in
+*-*-linux-gnu*) ;;
+*-*-linux*) xehost=`echo $xehost | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+esac
+
+xehost_cpu=`echo $xehost | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+xehost_vendor=`echo $xehost | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+xehost_os=`echo $xehost | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+# Now see if the compiler is really GCC.
+if test "$GCC" = "yes"; then
+ XEGCC=yes
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using GNU C" >&5
+$as_echo_n "checking whether we are using GNU C... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#ifdef __GNUC__
+ yes;
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "yes" >/dev/null 2>&1; then :
+ XEGCC=yes
+else
+ XEGCC=no
+fi
+rm -f conftest*
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${XEGCC}" >&5
+$as_echo "${XEGCC}" >&6; }
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to produce PIC code" >&5
+$as_echo_n "checking how to produce PIC code... " >&6; }
+wl=
+
+can_build_shared=yes
+if test "$XEGCC" = yes -o "$__ICC" = yes; then
+ wl='-Wl,'
+
+ case "$xehost_os" in
+ aix[4-9]* | irix[5-9]* | osf[3-9])
+ # PIC is the default for these OSes.
+ ;;
+
+ *darwin*) dll_cflags='-dynamic'
+ ;;
+
+ os2*)
+ # We can build DLLs from non-PIC.
+ ;;
+ amigaos*)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+ # adding the `-m68020' flag to GCC prevents building anything better,
+ # like `-m68040'.
+ dll_cflags='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ *cygwin* | *mingw* )
+ # PIC is the default
+ ;;
+ *)
+ dll_cflags='-fPIC'
+ ;;
+ esac
+else
+ # PORTME Check for PIC flags for the system compiler.
+ case "$xehost_os" in
+ hpux1[0-9]*)
+ # Is there a better link_static_flag that works with the bundled CC?
+ wl='-Wl,'
+ dll_cflags='+Z'
+ ;;
+
+ irix[5-9]*)
+ wl='-Wl,'
+ # PIC (with -KPIC) is the default.
+ ;;
+
+ os2*)
+ # We can build DLLs from non-PIC.
+ ;;
+
+ osf[3-9]*)
+ # All OSF/1 code is PIC.
+ wl='-Wl,'
+ ;;
+
+ aix[4-9]*)
+ # All AIX code is PIC.
+ wl='-Wl,'
+ ;;
+
+ sco3.2v5*)
+ dll_cflags='-belf -Kpic'
+ wl='-Wl,'
+ ;;
+
+ unixware*)
+ dll_cflags="-KPIC"
+ wl="-Wl,"
+ ;;
+
+ sysv4*)
+ dll_cflags="-KPIC"
+ wl="-Wl,"
+ ;;
+
+ sysv5*)
+ dll_cflags="-KPIC"
+ wl="-Wl,"
+ ;;
+
+ solaris2*)
+ dll_cflags='-KPIC'
+ wl='-Wl,'
+ ;;
+
+ uts4*)
+ dll_cflags='-pic'
+ ;;
+
+ *)
+ can_build_shared=no
+ ;;
+ esac
+fi
+
+if test -n "$dll_cflags"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${dll_cflags}" >&5
+$as_echo "${dll_cflags}" >&6; }
+
+ # Check to make sure the dll_cflags actually works.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PIC flag ${dll_cflags} really works" >&5
+$as_echo_n "checking if PIC flag ${dll_cflags} really works... " >&6; }
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $dll_cflags -DPIC"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int x=0;
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+ # On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also
+ # reports no error. So, we need to grep stderr for (Bundled).
+ if grep '(Bundled)' config.log >/dev/null; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ can_build_shared=no
+ dll_cflags=
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ fi
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ can_build_shared=no
+ dll_cflags=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$save_CFLAGS"
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+fi
+
+if test "$can_build_shared" = "yes"; then
+cc_produces_so=no
+xldf=
+xcldf=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if C compiler can produce shared libraries" >&5
+$as_echo_n "checking if C compiler can produce shared libraries... " >&6; }
+if test "$XEGCC" = yes -o "$__ICC" = yes; then
+ case "$xehost_os" in
+ *darwin*)
+ xcldf='-bundle'
+ xldf='-bundle -bundle_loader ../../src/xemacs'
+ ;;
+ *)
+ xcldf="-shared"
+ xldf="-shared"
+ ;;
+ esac
+else # Not using GCC
+ case "$xehost_os" in
+ aix[4-9]*)
+ xldf="-bE:ELLSONAME.exp -H512 -T512 -bhalt:4 -bM:SRE -bnoentry -lc"
+ xcldf="${wl}-bE:ELLSONAME.exp ${wl}-H512 ${wl}-T512 ${wl}-bhalt:4 ${wl}-bM:SRE ${wl}-bnoentry ${wl}-lc"
+ ;;
+
+ freebsd2* | netbsd* | openbsd*)
+ xldf="-Bshareable"
+ xcldf="${wl}-Bshareable"
+ ;;
+
+ freebsd3*)
+ xcldf="-shared"
+ ;;
+
+ hpux*)
+ xldf="-b +s"
+ xcldf="${wl}-b ${wl}+s"
+ ;;
+
+ irix[5-9]* | osf[3-9]*)
+ xcldf="${wl}-shared"
+ xldf="-shared"
+ ;;
+
+ sco3.2v5* | unixware* | sysv5* | sysv4* | solaris2* | solaris7* | uts4*)
+ xcldf="-G"
+ xldf="-G"
+ ;;
+ esac
+fi # End if if we are using gcc
+
+if test -n "$xcldf"; then
+ save_LDFLAGS=$LDFLAGS
+ save_LIBS=$LIBS
+ save_xe_libs=$xe_libs
+ LDFLAGS="$xcldf $LDFLAGS"
+ LIBS=
+ xe_libs=
+ ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int x=0;
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ cc_produces_so=yes
+else
+ cc_produces_so=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
+ xe_libs=$save_xe_libs
+ ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
+else
+ cc_produces_so=no
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${cc_produces_so}" >&5
+$as_echo "${cc_produces_so}" >&6; }
+
+LTLD=$LD
+if test -z "$LTLD"; then
+ ac_prog=ld
+ if test "$XEGCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
+$as_echo_n "checking for ld used by GCC... " >&6; }
+ ac_prog=`($CC -print-prog-name=ld) 2>&5`
+ case "$ac_prog" in
+ # Accept absolute paths.
+ /*)
+ if test -z "$LTLD"; then
+# case "$ac_prog" in
+# *gcc-lib*) LTLD="$CC"
+# ;;
+# *)
+ LTLD="$ac_prog"
+# ;;
+# esac
+ fi
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+ fi
+
+ if test -z "$LTLD"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog"; then
+ LTLD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some GNU ld's only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ if "$LTLD" -v 2>&1 < /dev/null | $EGREP '(GNU|with BFD)' > /dev/null; then
+ xe_gnu_ld=yes
+ else
+ xe_gnu_ld=no
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+ fi
+
+ if test -n "$LTLD"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${LTLD}" >&5
+$as_echo "${LTLD}" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+
+ if test -z "$LTLD" -a "$cc_produces_so" = no; then
+ as_fn_error $? "no acceptable linker found in \$PATH" "$LINENO" 5
+ exit 1
+ fi
+fi
+
+ld_dynamic_link_flags=
+
+# Check to see if it really is or isn't GNU ld.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker is GNU ld" >&5
+$as_echo_n "checking if the linker is GNU ld... " >&6; }
+# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LTLD -v 2>&1 </dev/null | $EGREP '(GNU|with BFD)' 1>&5; then
+ xe_gnu_ld=yes
+else
+ xe_gnu_ld=no
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${xe_gnu_ld}" >&5
+$as_echo "${xe_gnu_ld}" >&6; }
+
+case "$xehost_os" in
+ amigaos*)
+ # On this operating system, we should treat GNU ld like the system ld.
+ gnu_ld_acts_native=yes
+ ;;
+ *)
+ gnu_ld_acts_native=no
+ ;;
+esac
+
+if test "$cc_produces_so" = "yes"; then
+ dll_ld=$CC
+ case "$xehost_os" in
+ *darwin*)
+ dll_ldflags=$xldf
+ ;;
+ *)
+ dll_ldflags=$xcldf
+ ;;
+ esac
+ can_build_shared=yes
+ ld_shlibs=yes
+else
+ # OK - only NOW do we futz about with ld.
+ # See if the linker supports building shared libraries.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker supports shared libraries" >&5
+$as_echo_n "checking whether the linker supports shared libraries... " >&6; }
+ dll_ld=$CC
+ dll_ldflags=$LDFLAGS
+ ld_shlibs=yes
+ can_build_shared=yes
+ if test "$xe_gnu_ld" = yes && test "$gnu_ld_acts_native" != yes; then
+ # See if GNU ld supports shared libraries.
+ if $LTLD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null; then
+ dll_ld=$CC
+ dll_ldflags="-shared"
+ ld_shlibs=yes
+ else
+ ld_shlibs=no
+ fi
+ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+ case "$xehost_os" in
+ aix[4-9]*)
+ dll_ldflags=$xcldf
+ ;;
+
+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+ # support. Future versions do this automatically, but an explicit c++rt0.o
+ # doesn't break anything, and helps significantly (at the cost of a little
+ # extra space).
+ freebsd2.2*)
+ dll_ld=$LTLD
+ dll_ldflags=$xldf
+ dll_post="/usr/lib/c++rt0.o"
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 don't have this feature.
+ freebsd2*)
+ dll_ld=$LTLD
+ dll_ldflags="-Bshareable"
+ ;;
+
+ # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
+ freebsd3*)
+ dll_ldflags="-shared"
+ ;;
+
+ hpux*)
+ dll_ld=$LTLD
+ dll_ldflags=$xldf
+ ;;
+
+ irix[5-9]*)
+ dll_ld=$LTLD
+ dll_ldflags=$xldf
+ ;;
+
+ netbsd*)
+ # Tested with NetBSD 1.2 ld
+ dll_ld=$LTLD
+ dll_ldflags=$xldf
+ ;;
+
+ openbsd*)
+ dll_ld=$LTLD
+ dll_ldflags=$xldf
+ ;;
+
+ osf3* | osf4*)
+ dll_ld=$LTLD
+ dll_ldflags=$xldf
+ ;;
+
+ # For both SCO and Solaris we MAY want to have LDFLAGS include -z text
+ sco3.2v5* | unixware* | sysv5* | sysv4* | solaris2* | solaris7*)
+ dll_ld=$LTLD
+ case "$dll_ld" in
+ *gcc*) dll_ldflags="-shared"
+ dll_ld=$CC
+ ;;
+ *) dll_ldflags="-G"
+ ;;
+ esac
+ ;;
+
+ uts4*)
+ dll_ld=$LTLD
+ dll_ldflags="-G"
+ ;;
+
+ bsdi*)
+ dll_ldflags="-r"
+ dll_ld="shlicc2"
+ ;;
+
+ *)
+ ld_shlibs=no
+ can_build_shared=no
+ ;;
+ esac
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ld_shlibs}" >&5
+$as_echo "${ld_shlibs}" >&6; }
+ if test "$ld_shlibs" = "no"; then
+ can_build_shared=no
+ fi
+fi # End of if cc_produces_so = no
+
+
+if test "$xe_gnu_ld" = yes -a "$ld_shlibs" = yes; then
+ case "$xehost_os" in
+ *cygwin* | *mingw* )
+ # -export-all-symbols is the PE equivalent of ELF-specific -export-dynamic
+ ld_dynamic_link_flags="${wl}-export-all-symbols"
+ ;;
+
+ *)
+ ld_dynamic_link_flags="${wl}-export-dynamic"
+ ;;
+ esac
+fi
+
+if test -z "$ld_dynamic_link_flags"; then
+ case "$xehost_os" in
+ aix[3-9]*)
+ ld_dynamic_link_flags=
+ ;;
+
+ *darwin*)
+ ld_dynamic_link_flags=
+ ;;
+
+ freebsd2.2*)
+ ld_dynamic_link_flags=
+ ;;
+
+ freebsd2*)
+ ld_dynamic_link_flags=
+ ;;
+
+ freebsd3*)
+ ld_dynamic_link_flags=
+ ;;
+
+ hpux*)
+ ld_dynamic_link_flags="${wl}-E"
+ ;;
+
+ irix[5-9]*)
+ ld_dynamic_link_flags=
+ ;;
+
+ netbsd*)
+ ld_dynamic_link_flags=
+ ;;
+
+ openbsd*)
+ ld_dynamic_link_flags=
+ ;;
+
+ osf3* | osf4*)
+ ld_dynamic_link_flags=
+ ;;
+
+ solaris2* | solaris7*)
+ ld_dynamic_link_flags=
+ ;;
+
+ unixware* | sysv5* | sysv4*)
+ ld_dynamic_link_flags="${wl}-Bexport"
+ ;;
+
+ uts4*)
+ ld_dynamic_link_flags=
+ ;;
+
+ esac
+fi # End of if -z ld_dynamic_link_flags
+fi # End of if test "$can_build_shared" = "yes"
+
+
+
+
+
+
+
+
+ fi
+
+ if test "$can_build_shared" = "yes"; then
+ $as_echo "@%:@define HAVE_SHLIB 1" >>confdefs.h
+
+ MAKE_SUBDIR="$MAKE_SUBDIR src" && if test "$verbose" = "yes"; then echo " Appending \"src\" to \$MAKE_SUBDIR"; fi
+ INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR src" && if test "$verbose" = "yes"; then echo " Appending \"src\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
+ test -n "$libdl" && LIBS="-l${libdl} $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-l${libdl}\" to \$LIBS"; fi
+ for ac_func in dlerror _dlerror
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+ with_modules=yes
+ MOD_CC="../../lib-src/ellcc"
+ MODCFLAGS="\$(CFLAGS) --mode=compile --mod-output=\$@ -I../../src -I\$(srcdir)/../../src"
+ INSTALLPATH="\$(moduledir)"
+ MOD_INSTALL_PROGRAM=${INSTALL_PROGRAM}
+ OBJECT_TO_BUILD="\$(MODNAME).ell"
+ else
+ if test "$with_modules" = "yes"; then
+ { echo "Error:" "Required module support cannot be provided." >&2; exit 1; }
+ else
+ echo " No module support."
+ fi
+ with_modules=no
+ fi
+fi
+if test "$with_modules" != "yes"; then
+ MOD_CC="$XEMACS_CC"
+ MODCFLAGS="\$(XE_CFLAGS) -I../../src -I\$(srcdir)/../../src"
+ INSTALLPATH=""
+ MOD_INSTALL_PROGRAM="true"
+ OBJECT_TO_BUILD="\$(MODNAME).o"
+fi
+MODARCHDIR=
+MAKE_DOCFILE="../../lib-src/make-docfile"
+with_modules=$with_modules
+
+
+
+
+
+
+
+
+
+if test "$with_tooltalk" != "no" ; then
+ for dir in "" "Tt/" "desktop/" ; do
+ as_ac_Header=`$as_echo "ac_cv_header_${dir}tt_c.h" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "${dir}tt_c.h" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ tt_c_h_file="${dir}tt_c.h"; break
+fi
+
+
+ done
+ if test -z "$tt_c_h_file"; then
+ if test "$with_tooltalk" = "yes"; then
+ (echo "$progname: Usage error:"
+echo " " "Unable to find required tooltalk header files."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+ fi
+ with_tooltalk=no
+ fi
+fi
+if test "$with_tooltalk" != "no" ; then
+ for extra_libs in "" "-lI18N -lce" "-lcxx"; do
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tt_message_create in -ltt" >&5
+$as_echo_n "checking for tt_message_create in -ltt... " >&6; }
+if ${ac_cv_lib_tt_tt_message_create+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltt $extra_libs $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tt_message_create ();
+int
+main ()
+{
+return tt_message_create ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_tt_tt_message_create=yes
+else
+ ac_cv_lib_tt_tt_message_create=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tt_tt_message_create" >&5
+$as_echo "$ac_cv_lib_tt_tt_message_create" >&6; }
+if test "x$ac_cv_lib_tt_tt_message_create" = xyes; then :
+ tt_libs="-ltt $extra_libs"; break
+else
+ :
+fi
+
+ done
+ if test -z "$tt_libs"; then
+ if test "$with_tooltalk" = "yes"; then
+ (echo "$progname: Usage error:"
+echo " " "Unable to find required tooltalk libraries."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+ fi
+ with_tooltalk=no
+ fi
+fi
+test -z "$with_tooltalk" && with_tooltalk=yes
+if test "$with_tooltalk" = "yes"; then
+ $as_echo "@%:@define TOOLTALK 1" >>confdefs.h
+
+ cat >>confdefs.h <<_ACEOF
+@%:@define TT_C_H_FILE "$tt_c_h_file"
+_ACEOF
+
+ libs_x="$tt_libs $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"$tt_libs\" to \$libs_x"; fi
+fi
+
+test -z "$with_cde" && { ac_fn_c_check_header_mongrel "$LINENO" "Dt/Dt.h" "ac_cv_header_Dt_Dt_h" "$ac_includes_default"
+if test "x$ac_cv_header_Dt_Dt_h" = xyes; then :
+
+else
+ with_cde=no
+fi
+
+ }
+test -z "$with_cde" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DtDndDragStart in -lDtSvc" >&5
+$as_echo_n "checking for DtDndDragStart in -lDtSvc... " >&6; }
+if ${ac_cv_lib_DtSvc_DtDndDragStart+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lDtSvc $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char DtDndDragStart ();
+int
+main ()
+{
+return DtDndDragStart ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_DtSvc_DtDndDragStart=yes
+else
+ ac_cv_lib_DtSvc_DtDndDragStart=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_DtSvc_DtDndDragStart" >&5
+$as_echo "$ac_cv_lib_DtSvc_DtDndDragStart" >&6; }
+if test "x$ac_cv_lib_DtSvc_DtDndDragStart" = xyes; then :
+ :
+else
+ with_cde=no
+fi
+ }
+if test "$with_dragndrop" = "no" ; then
+ if test "$with_cde" = "yes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-cde forced to \`no'; no generic Drag'n'Drop support" >&5
+$as_echo "$as_me: WARNING: --with-cde forced to \`no'; no generic Drag'n'Drop support" >&2;}
+ fi
+ with_cde=no
+fi
+test -z "$with_cde" && with_cde=yes
+if test "$with_cde" = "yes" ; then
+ $as_echo "@%:@define HAVE_CDE 1" >>confdefs.h
+
+ libs_x="-lDtSvc $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lDtSvc\" to \$libs_x"; fi
+ dragndrop_proto="$dragndrop_proto CDE" && if test "$verbose" = "yes"; then echo " Appending \"CDE\" to \$dragndrop_proto"; fi
+ with_tooltalk=yes # CDE requires Tooltalk
+ need_motif=yes # CDE requires Motif
+fi
+
+if test "$with_gtk" = "yes"; then
+ dragndrop_proto="$dragndrop_proto GTK" && if test "$verbose" = "yes"; then echo " Appending \"GTK\" to \$dragndrop_proto"; fi
+fi
+
+if test "$with_dragndrop" != "no" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if drag and drop API is needed" >&5
+$as_echo_n "checking if drag and drop API is needed... " >&6; }
+ if test -n "$dragndrop_proto" ; then
+ with_dragndrop=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (${dragndrop_proto} )" >&5
+$as_echo "yes (${dragndrop_proto} )" >&6; }
+ $as_echo "@%:@define HAVE_DRAGNDROP 1" >>confdefs.h
+
+ extra_objs="$extra_objs dragdrop.o" && if test "$verbose" = "yes"; then echo " Appending \"dragdrop.o\" to \$extra_objs"; fi
+ else
+ with_dragndrop=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LDAP" >&5
+$as_echo_n "checking for LDAP... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+ldap_libs=
+test -z "$with_ldap" && { ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default"
+if test "x$ac_cv_header_ldap_h" = xyes; then :
+
+else
+ with_ldap=no
+fi
+
+ }
+test -z "$with_ldap" && { ac_fn_c_check_header_mongrel "$LINENO" "lber.h" "ac_cv_header_lber_h" "$ac_includes_default"
+if test "x$ac_cv_header_lber_h" = xyes; then :
+
+else
+ with_ldap=no
+fi
+
+ }
+if test "$with_ldap" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_search in -lldap" >&5
+$as_echo_n "checking for ldap_search in -lldap... " >&6; }
+if ${ac_cv_lib_ldap_ldap_search+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lldap $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ldap_search ();
+int
+main ()
+{
+return ldap_search ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ldap_ldap_search=yes
+else
+ ac_cv_lib_ldap_ldap_search=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_search" >&5
+$as_echo "$ac_cv_lib_ldap_ldap_search" >&6; }
+if test "x$ac_cv_lib_ldap_ldap_search" = xyes; then :
+ with_ldap=yes
+fi
+
+ test "$with_ldap" != "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_open in -lldap" >&5
+$as_echo_n "checking for ldap_open in -lldap... " >&6; }
+if ${ac_cv_lib_ldap_ldap_open+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lldap -llber $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ldap_open ();
+int
+main ()
+{
+return ldap_open ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ldap_ldap_open=yes
+else
+ ac_cv_lib_ldap_ldap_open=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_open" >&5
+$as_echo "$ac_cv_lib_ldap_ldap_open" >&6; }
+if test "x$ac_cv_lib_ldap_ldap_open" = xyes; then :
+ with_ldap=yes with_ldap_lber=yes
+fi
+ }
+ test "$with_ldap" != "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_open in -lldap" >&5
+$as_echo_n "checking for ldap_open in -lldap... " >&6; }
+if ${ac_cv_lib_ldap_ldap_open+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lldap -llber -lkrb $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ldap_open ();
+int
+main ()
+{
+return ldap_open ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ldap_ldap_open=yes
+else
+ ac_cv_lib_ldap_ldap_open=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_open" >&5
+$as_echo "$ac_cv_lib_ldap_ldap_open" >&6; }
+if test "x$ac_cv_lib_ldap_ldap_open" = xyes; then :
+ with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes
+fi
+ }
+ test "$with_ldap" != "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_open in -lldap" >&5
+$as_echo_n "checking for ldap_open in -lldap... " >&6; }
+if ${ac_cv_lib_ldap_ldap_open+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lldap -llber -lkrb -ldes $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ldap_open ();
+int
+main ()
+{
+return ldap_open ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ldap_ldap_open=yes
+else
+ ac_cv_lib_ldap_ldap_open=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_open" >&5
+$as_echo "$ac_cv_lib_ldap_ldap_open" >&6; }
+if test "x$ac_cv_lib_ldap_ldap_open" = xyes; then :
+ with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes with_ldap_des=yes
+fi
+ }
+ test "$with_ldap_lber" != "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ber_pvt_opt_on in -llber" >&5
+$as_echo_n "checking for ber_pvt_opt_on in -llber... " >&6; }
+if ${ac_cv_lib_lber_ber_pvt_opt_on+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-llber $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ber_pvt_opt_on ();
+int
+main ()
+{
+return ber_pvt_opt_on ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_lber_ber_pvt_opt_on=yes
+else
+ ac_cv_lib_lber_ber_pvt_opt_on=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lber_ber_pvt_opt_on" >&5
+$as_echo "$ac_cv_lib_lber_ber_pvt_opt_on" >&6; }
+if test "x$ac_cv_lib_lber_ber_pvt_opt_on" = xyes; then :
+ with_ldap_lber=yes
+fi
+ }
+fi
+if test "$with_ldap" = "yes"; then
+ $as_echo "@%:@define HAVE_LDAP 1" >>confdefs.h
+
+ if test "$with_ldap_des" = "yes" ; then
+ ldap_libs="-ldes $ldap_libs" && if test "$verbose" = "yes"; then echo " Prepending \"-ldes\" to \$ldap_libs"; fi
+ fi
+ if test "$with_ldap_krb" = "yes" ; then
+ ldap_libs="-lkrb $ldap_libs" && if test "$verbose" = "yes"; then echo " Prepending \"-lkrb\" to \$ldap_libs"; fi
+ fi
+ if test "$with_ldap_lber" = "yes" ; then
+ ldap_libs="-llber $ldap_libs" && if test "$verbose" = "yes"; then echo " Prepending \"-llber\" to \$ldap_libs"; fi
+ fi
+ ldap_libs="-lldap $ldap_libs" && if test "$verbose" = "yes"; then echo " Prepending \"-lldap\" to \$ldap_libs"; fi
+ save_LIBS="$LIBS" LIBS="$LIBS $ldap_libs"
+ for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+ LIBS="$save_LIBS"
+ MAKE_SUBDIR="$MAKE_SUBDIR modules/ldap" && if test "$verbose" = "yes"; then echo " Appending \"modules/ldap\" to \$MAKE_SUBDIR"; fi
+ need_modules_common=yes
+ if test "$with_modules" = "yes"; then
+ INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/ldap" && if test "$verbose" = "yes"; then echo " Appending \"modules/ldap\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
+ fi
+fi
+
+
+postgresql_libs=
+if test "$with_postgresql" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL" >&5
+$as_echo_n "checking for PostgreSQL... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+
+ for header_dir in "" "pgsql/" "postgresql/"; do
+ as_ac_Header=`$as_echo "ac_cv_header_${header_dir}libpq-fe.h" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "${header_dir}libpq-fe.h" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ libpq_fe_h_file=${header_dir}libpq-fe.h; break
+fi
+
+
+ done
+
+ pq_libs=
+ extra_libs=
+ if test -n "$libpq_fe_h_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQconnectdb in -lpq" >&5
+$as_echo_n "checking for PQconnectdb in -lpq... " >&6; }
+if ${ac_cv_lib_pq_PQconnectdb+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpq $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char PQconnectdb ();
+int
+main ()
+{
+return PQconnectdb ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_pq_PQconnectdb=yes
+else
+ ac_cv_lib_pq_PQconnectdb=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQconnectdb" >&5
+$as_echo "$ac_cv_lib_pq_PQconnectdb" >&6; }
+if test "x$ac_cv_lib_pq_PQconnectdb" = xyes; then :
+ pq_libs="-lpq"
+else
+
+ unset ac_cv_lib_pq_PQconnectdb;
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQconnectdb in -lpq" >&5
+$as_echo_n "checking for PQconnectdb in -lpq... " >&6; }
+if ${ac_cv_lib_pq_PQconnectdb+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpq -lcrypto -lssl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char PQconnectdb ();
+int
+main ()
+{
+return PQconnectdb ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_pq_PQconnectdb=yes
+else
+ ac_cv_lib_pq_PQconnectdb=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQconnectdb" >&5
+$as_echo "$ac_cv_lib_pq_PQconnectdb" >&6; }
+if test "x$ac_cv_lib_pq_PQconnectdb" = xyes; then :
+ pq_libs="-lpq -lcrypto -lssl"
+fi
+
+fi
+
+ if test -z "$pq_libs"; then
+ have_libpq="no"
+ else
+ have_libpq="yes"
+ fi
+ fi
+
+ if test -n "$libpq_fe_h_file" -a "$have_libpq" = "yes"; then
+ with_postgresql=yes
+ $as_echo "@%:@define HAVE_POSTGRESQL 1" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQconnectStart in -lpq" >&5
+$as_echo_n "checking for PQconnectStart in -lpq... " >&6; }
+if ${ac_cv_lib_pq_PQconnectStart+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpq $extra_libs $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char PQconnectStart ();
+int
+main ()
+{
+return PQconnectStart ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_pq_PQconnectStart=yes
+else
+ ac_cv_lib_pq_PQconnectStart=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQconnectStart" >&5
+$as_echo "$ac_cv_lib_pq_PQconnectStart" >&6; }
+if test "x$ac_cv_lib_pq_PQconnectStart" = xyes; then :
+
+ with_postgresqlv7=yes;
+ $as_echo "@%:@define HAVE_POSTGRESQLV7 1" >>confdefs.h
+
+else
+ :
+fi
+
+ cat >>confdefs.h <<_ACEOF
+@%:@define LIBPQ_FE_H_FILE "$libpq_fe_h_file"
+_ACEOF
+
+ postgresql_libs="$pq_libs $postgresql_libs" && if test "$verbose" = "yes"; then echo " Prepending \"$pq_libs\" to \$postgresql_libs"; fi
+ MAKE_SUBDIR="$MAKE_SUBDIR modules/postgresql" && if test "$verbose" = "yes"; then echo " Appending \"modules/postgresql\" to \$MAKE_SUBDIR"; fi
+ need_modules_common=yes
+ if test "$with_modules" = "yes"; then
+ INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/postgresql" && if test "$verbose" = "yes"; then echo " Appending \"modules/postgresql\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
+ fi
+ elif test "$with_postgresql" = "yes"; then
+ { echo "Error:" "Required PostgreSQL support cannot be provided. Check --with-site-prefixes." >&2; exit 1; }
+ fi
+fi
+
+
+
+if test "$window_system" != "none"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for graphics libraries" >&5
+$as_echo_n "checking for graphics libraries... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+
+ libpath_xpm=
+ incpath_xpm=
+ libname_xpm="-lXpm"
+ case "$opsys" in
+ cygwin*)
+ cygwin_top=`eval gcc -print-search-dirs | sed -ne s'/install: //p'`
+ cygwin_top=`eval "cd $cygwin_top/../../../..; pwd"`
+ case "$window_system" in
+ x11) ;;
+ msw) libpath_xpm="-L${cygwin_top}/lib/noX"
+ incpath_xpm="-I${cygwin_top}/include/noX"
+ libname_xpm="-lXpm-noX"
+ ;;
+ gtk) ;;
+ none) ;;
+ *) ;;
+ esac
+ ;;
+ *) ;;
+ esac
+ xpm_problem=""
+ if test -z "$with_xpm"; then
+ CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
+ XE_CFLAGS=""$incpath_xpm" $XE_CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$XE_CFLAGS"; fi
+ LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xpm - no older than 3.4f" >&5
+$as_echo_n "checking for Xpm - no older than 3.4f... " >&6; }
+ xe_check_libs="$libname_xpm"
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#define XPM_NUMBERS
+#include <X11/xpm.h>
+ int main(int c, char **v) {
+ return c == 1 ? 0 :
+ XpmIncludeVersion != XpmLibraryVersion() ? 1 :
+ XpmIncludeVersion < 30406 ? 2 : 0 ;}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ ./conftest dummy_arg; xpm_status=$?;
+ if test "$xpm_status" = "0"; then
+ with_xpm=yes;
+ else
+ with_xpm=no;
+ if test "$xpm_status" = "1"; then
+ xpm_problem="Xpm library version and header file version don't match!"
+ elif test "$xpm_status" = "2"; then
+ xpm_problem="Xpm library version is too old!"
+ else
+ xpm_problem="Internal xpm detection logic error!"
+ fi
+ echo "
+*** WARNING *** $xpm_problem
+ I'm not touching that with a 10-foot pole!
+ If you really want to use the installed version of Xpm, rerun
+ configure and add '--with-xpm=yes', but don't blame me if XEmacs crashes!"
+ fi
+else
+ with_xpm=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ xe_check_libs=
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_xpm" >&5
+$as_echo "$with_xpm" >&6; }
+ fi
+ if test "$with_xpm" = "yes"; then
+ $as_echo "@%:@define HAVE_XPM 1" >>confdefs.h
+
+ LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
+ libs_x=""$libname_xpm" $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \""$libname_xpm"\" to \$libs_x"; fi
+ CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
+ XE_CFLAGS=""$incpath_xpm" $XE_CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$XE_CFLAGS"; fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for \"FOR_MSW\" xpm" >&5
+$as_echo_n "checking for \"FOR_MSW\" xpm... " >&6; }
+ xe_check_libs="$libname_xpm"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+XpmCreatePixmapFromData();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ xpm_for_msw=no
+else
+ xpm_for_msw=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ xe_check_libs=
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xpm_for_msw" >&5
+$as_echo "$xpm_for_msw" >&6; }
+ if test "$xpm_for_msw" = "yes"; then
+ $as_echo "@%:@define FOR_MSW 1" >>confdefs.h
+
+ fi
+ fi
+
+ test -z "$with_xface" && { ac_fn_c_check_header_mongrel "$LINENO" "compface.h" "ac_cv_header_compface_h" "$ac_includes_default"
+if test "x$ac_cv_header_compface_h" = xyes; then :
+
+else
+ with_xface=no
+fi
+
+ }
+ test -z "$with_xface" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UnGenFace in -lcompface" >&5
+$as_echo_n "checking for UnGenFace in -lcompface... " >&6; }
+if ${ac_cv_lib_compface_UnGenFace+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcompface $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char UnGenFace ();
+int
+main ()
+{
+return UnGenFace ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_compface_UnGenFace=yes
+else
+ ac_cv_lib_compface_UnGenFace=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_compface_UnGenFace" >&5
+$as_echo "$ac_cv_lib_compface_UnGenFace" >&6; }
+if test "x$ac_cv_lib_compface_UnGenFace" = xyes; then :
+ :
+else
+ with_xface=no
+fi
+ }
+ test -z "$with_xface" && with_xface=yes
+ if test "$with_xface" = "yes"; then
+ $as_echo "@%:@define HAVE_XFACE 1" >>confdefs.h
+
+ libs_x="-lcompface $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lcompface\" to \$libs_x"; fi
+ fi
+
+ test -z "$with_gif" && { ac_fn_c_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
+if test "x$ac_cv_header_gif_lib_h" = xyes; then :
+
+else
+ with_gif=no
+fi
+
+ }
+ if test "$with_gif" != "no"; then
+ with_gif="yes"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lgif" >&5
+$as_echo_n "checking for EGifPutExtensionLast in -lgif... " >&6; }
+if ${ac_cv_lib_gif_EGifPutExtensionLast+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgif $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char EGifPutExtensionLast ();
+int
+main ()
+{
+return EGifPutExtensionLast ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_gif_EGifPutExtensionLast=yes
+else
+ ac_cv_lib_gif_EGifPutExtensionLast=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_EGifPutExtensionLast" >&5
+$as_echo "$ac_cv_lib_gif_EGifPutExtensionLast" >&6; }
+if test "x$ac_cv_lib_gif_EGifPutExtensionLast" = xyes; then :
+ libs_x="-lgif $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lgif\" to \$libs_x"; fi
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lungif" >&5
+$as_echo_n "checking for EGifPutExtensionLast in -lungif... " >&6; }
+if ${ac_cv_lib_ungif_EGifPutExtensionLast+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lungif $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char EGifPutExtensionLast ();
+int
+main ()
+{
+return EGifPutExtensionLast ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ungif_EGifPutExtensionLast=yes
+else
+ ac_cv_lib_ungif_EGifPutExtensionLast=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
+$as_echo "$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; }
+if test "x$ac_cv_lib_ungif_EGifPutExtensionLast" = xyes; then :
+ libs_x="-lungif $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lungif\" to \$libs_x"; fi
+else
+ with_gif=no
+fi
+
+fi
+
+ fi
+ if test "$with_gif" != "no"; then
+ $as_echo "@%:@define HAVE_GIF 1" >>confdefs.h
+
+ fi
+
+ if test "$with_png $with_tiff" != "no no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lc" >&5
+$as_echo_n "checking for inflate in -lc... " >&6; }
+if ${ac_cv_lib_c_inflate+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lc $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char inflate ();
+int
+main ()
+{
+return inflate ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_c_inflate=yes
+else
+ ac_cv_lib_c_inflate=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_inflate" >&5
+$as_echo "$ac_cv_lib_c_inflate" >&6; }
+if test "x$ac_cv_lib_c_inflate" = xyes; then :
+ :
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5
+$as_echo_n "checking for inflate in -lz... " >&6; }
+if ${ac_cv_lib_z_inflate+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char inflate ();
+int
+main ()
+{
+return inflate ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_z_inflate=yes
+else
+ ac_cv_lib_z_inflate=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5
+$as_echo "$ac_cv_lib_z_inflate" >&6; }
+if test "x$ac_cv_lib_z_inflate" = xyes; then :
+ libs_x="-lz $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lz\" to \$libs_x"; fi
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lgz" >&5
+$as_echo_n "checking for inflate in -lgz... " >&6; }
+if ${ac_cv_lib_gz_inflate+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgz $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char inflate ();
+int
+main ()
+{
+return inflate ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_gz_inflate=yes
+else
+ ac_cv_lib_gz_inflate=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gz_inflate" >&5
+$as_echo "$ac_cv_lib_gz_inflate" >&6; }
+if test "x$ac_cv_lib_gz_inflate" = xyes; then :
+ libs_x="-lgz $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lgz\" to \$libs_x"; fi
+fi
+
+fi
+
+fi
+
+ fi
+
+ test -z "$with_jpeg" && { ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
+if test "x$ac_cv_header_jpeglib_h" = xyes; then :
+
+else
+ with_jpeg=no
+fi
+
+ }
+ test -z "$with_jpeg" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_destroy_decompress in -ljpeg" >&5
+$as_echo_n "checking for jpeg_destroy_decompress in -ljpeg... " >&6; }
+if ${ac_cv_lib_jpeg_jpeg_destroy_decompress+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljpeg $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jpeg_destroy_decompress ();
+int
+main ()
+{
+return jpeg_destroy_decompress ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_jpeg_jpeg_destroy_decompress=yes
+else
+ ac_cv_lib_jpeg_jpeg_destroy_decompress=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5
+$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; }
+if test "x$ac_cv_lib_jpeg_jpeg_destroy_decompress" = xyes; then :
+ :
+else
+ with_jpeg=no
+fi
+ }
+ test -z "$with_jpeg" && with_jpeg=yes
+ if test "$with_jpeg" = "yes"; then
+ $as_echo "@%:@define HAVE_JPEG 1" >>confdefs.h
+
+ libs_x="-ljpeg $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-ljpeg\" to \$libs_x"; fi
+ fi
+
+ png_problem=""
+ test -z "$with_png" && { ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
+if test "x$ac_cv_func_pow" = xyes; then :
+
+else
+ with_png=no
+fi
+ }
+ test -z "$with_png" && { ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
+if test "x$ac_cv_header_png_h" = xyes; then :
+
+else
+ with_png=no
+fi
+
+ }
+ test -z "$with_png" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_image in -lpng" >&5
+$as_echo_n "checking for png_read_image in -lpng... " >&6; }
+if ${ac_cv_lib_png_png_read_image+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpng -lz $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char png_read_image ();
+int
+main ()
+{
+return png_read_image ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_png_png_read_image=yes
+else
+ ac_cv_lib_png_png_read_image=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_read_image" >&5
+$as_echo "$ac_cv_lib_png_png_read_image" >&6; }
+if test "x$ac_cv_lib_png_png_read_image" = xyes; then :
+ :
+else
+ with_png=no
+fi
+ }
+ if test -z "$with_png"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for workable png version information" >&5
+$as_echo_n "checking for workable png version information... " >&6; }
+ xe_check_libs="-lpng -lz"
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <png.h>
+ int main(int c, char **v) {
+ if (c == 1) return 0;
+ if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1;
+ return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ ./conftest dummy_arg; png_status=$?;
+ if test "$png_status" = "0"; then
+ with_png=yes;
+ else
+ with_png=no;
+ if test "$png_status" = "1"; then
+ png_problem="PNG library version and header file don't match!"
+ elif test "$png_status" = "2"; then
+ png_problem="PNG library version too old (pre 1.0.2)!"
+ fi
+ echo "
+*** WARNING *** $png_problem
+ I'm not touching that with a 10-foot pole!
+ If you really want to use the installed version of libPNG, rerun
+ configure and add '--with-png=yes', but don't blame me if XEmacs crashes!"
+ fi
+else
+ with_png=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ xe_check_libs=
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_png" >&5
+$as_echo "$with_png" >&6; }
+ fi
+ if test "$with_png" = "yes"; then
+ $as_echo "@%:@define HAVE_PNG 1" >>confdefs.h
+
+ libs_x="-lpng $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lpng\" to \$libs_x"; fi
+ fi
+
+ test -z "$with_tiff" && { ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
+if test "x$ac_cv_header_tiffio_h" = xyes; then :
+
+else
+ with_tiff=no
+fi
+
+ }
+ test -z "$with_tiff" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFClientOpen in -ltiff" >&5
+$as_echo_n "checking for TIFFClientOpen in -ltiff... " >&6; }
+if ${ac_cv_lib_tiff_TIFFClientOpen+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltiff -lz $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char TIFFClientOpen ();
+int
+main ()
+{
+return TIFFClientOpen ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_tiff_TIFFClientOpen=yes
+else
+ ac_cv_lib_tiff_TIFFClientOpen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFClientOpen" >&5
+$as_echo "$ac_cv_lib_tiff_TIFFClientOpen" >&6; }
+if test "x$ac_cv_lib_tiff_TIFFClientOpen" = xyes; then :
+ :
+else
+ with_tiff=no
+fi
+ }
+ test -z "$with_tiff" && with_tiff=yes
+ if test "$with_tiff" = "yes"; then
+ $as_echo "@%:@define HAVE_TIFF 1" >>confdefs.h
+
+ libs_x="-ltiff $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-ltiff\" to \$libs_x"; fi
+ fi
+fi
+
+
+if test "$with_gtk" = "yes"; then
+ test -z "$with_xface" && { ac_fn_c_check_header_mongrel "$LINENO" "compface.h" "ac_cv_header_compface_h" "$ac_includes_default"
+if test "x$ac_cv_header_compface_h" = xyes; then :
+
+else
+ with_xface=no
+fi
+
+ }
+ test -z "$with_xface" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UnGenFace in -lcompface" >&5
+$as_echo_n "checking for UnGenFace in -lcompface... " >&6; }
+if ${ac_cv_lib_compface_UnGenFace+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcompface $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char UnGenFace ();
+int
+main ()
+{
+return UnGenFace ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_compface_UnGenFace=yes
+else
+ ac_cv_lib_compface_UnGenFace=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_compface_UnGenFace" >&5
+$as_echo "$ac_cv_lib_compface_UnGenFace" >&6; }
+if test "x$ac_cv_lib_compface_UnGenFace" = xyes; then :
+ :
+else
+ with_xface=no
+fi
+ }
+ test -z "$with_xface" && with_xface=yes
+ if test "$with_xface" = "yes"; then
+ $as_echo "@%:@define HAVE_XFACE 1" >>confdefs.h
+
+ libs_gtk="-lcompface $libs_gtk" && if test "$verbose" = "yes"; then echo " Prepending \"-lcompface\" to \$libs_gtk"; fi
+ fi
+fi
+
+
+if test "$with_x11" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11 graphics libraries" >&5
+$as_echo_n "checking for X11 graphics libraries... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+fi
+
+case "$with_widgets" in
+ "" | "yes" | "athena") detect_athena=yes ;;
+ *) detect_athena=no ;;
+esac
+
+case "$with_dialogs" in
+ "" | "yes" | "athena") detect_athena=yes ;;
+esac
+
+if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Athena widgets" >&5
+$as_echo_n "checking for the Athena widgets... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+
+ case "$with_athena" in
+ "xaw" | "") athena_variant=Xaw athena_3d=no ;;
+ "3d") athena_variant=Xaw3d athena_3d=yes ;;
+ "next") athena_variant=neXtaw athena_3d=yes ;;
+ "95") athena_variant=Xaw95 athena_3d=yes ;;
+ "xpm") athena_variant=XawXpm athena_3d=yes ;;
+ *) { echo "Error:" "Unknown Athena widget set \`$with_athena'. This should not happen." >&2; exit 1; } ;;
+ esac
+
+ if test "$athena_3d" = "no"; then
+ as_ac_Lib=`$as_echo "ac_cv_lib_$athena_variant''_XawScrollbarSetThumb" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+$as_echo_n "checking for XawScrollbarSetThumb in -l$athena_variant... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$athena_variant $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XawScrollbarSetThumb ();
+int
+main ()
+{
+return XawScrollbarSetThumb ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$as_ac_Lib=yes"
+else
+ eval "$as_ac_Lib=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+eval ac_res=\$$as_ac_Lib
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+
+ as_ac_Lib=`$as_echo "ac_cv_lib_$athena_variant''_XawSme3dComputeTopShadowRGB" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawSme3dComputeTopShadowRGB in -l$athena_variant" >&5
+$as_echo_n "checking for XawSme3dComputeTopShadowRGB in -l$athena_variant... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$athena_variant $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XawSme3dComputeTopShadowRGB ();
+int
+main ()
+{
+return XawSme3dComputeTopShadowRGB ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$as_ac_Lib=yes"
+else
+ eval "$as_ac_Lib=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+eval ac_res=\$$as_ac_Lib
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a non-3d Athena widget library." >&5
+$as_echo "$as_me: WARNING: Could not find a non-3d Athena widget library." >&2;}
+else
+ athena_lib=$athena_variant
+fi
+
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find an Athena widget library." >&5
+$as_echo "$as_me: WARNING: Could not find an Athena widget library." >&2;}
+fi
+
+ else
+ as_ac_Lib=`$as_echo "ac_cv_lib_$athena_variant''_XawSme3dComputeTopShadowRGB" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawSme3dComputeTopShadowRGB in -l$athena_variant" >&5
+$as_echo_n "checking for XawSme3dComputeTopShadowRGB in -l$athena_variant... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$athena_variant $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XawSme3dComputeTopShadowRGB ();
+int
+main ()
+{
+return XawSme3dComputeTopShadowRGB ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$as_ac_Lib=yes"
+else
+ eval "$as_ac_Lib=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+eval ac_res=\$$as_ac_Lib
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ athena_lib=$athena_variant
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawSme3dComputeTopShadowRGB in -lXaw" >&5
+$as_echo_n "checking for XawSme3dComputeTopShadowRGB in -lXaw... " >&6; }
+if ${ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXaw $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XawSme3dComputeTopShadowRGB ();
+int
+main ()
+{
+return XawSme3dComputeTopShadowRGB ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB=yes
+else
+ ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB" >&5
+$as_echo "$ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB" >&6; }
+if test "x$ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB" = xyes; then :
+
+ athena_lib=Xaw;
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming that libXaw is actually $athena_variant." >&5
+$as_echo "$as_me: WARNING: Assuming that libXaw is actually $athena_variant." >&2;};
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a 3d Athena widget library that looked like $athena_variant." >&5
+$as_echo "$as_me: WARNING: Could not find a 3d Athena widget library that looked like $athena_variant." >&2;}
+fi
+
+fi
+
+ fi
+
+ if test "$athena_3d" = "no"; then
+ ac_fn_c_check_header_mongrel "$LINENO" "X11/Xaw/ThreeD.h" "ac_cv_header_X11_Xaw_ThreeD_h" "$ac_includes_default"
+if test "x$ac_cv_header_X11_Xaw_ThreeD_h" = xyes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a non-3d Athena header set." >&5
+$as_echo "$as_me: WARNING: Could not find a non-3d Athena header set." >&2;}
+else
+ ac_fn_c_check_header_compile "$LINENO" "X11/Xaw/XawInit.h" "ac_cv_header_X11_Xaw_XawInit_h" "
+#include <X11/Intrinsic.h>
+
+"
+if test "x$ac_cv_header_X11_Xaw_XawInit_h" = xyes; then :
+ athena_h_path=X11/Xaw
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a non-3d Athena header set." >&5
+$as_echo "$as_me: WARNING: Could not find a non-3d Athena header set." >&2;}
+fi
+
+
+fi
+
+
+ else
+ as_ac_Header=`$as_echo "ac_cv_header_X11/$athena_variant/XawInit.h" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "X11/$athena_variant/XawInit.h" "$as_ac_Header" "
+#if HAVE_X11_XFUNCPROTO_H
+#include <X11/Xfuncproto.h>
+#endif
+#include <X11/Intrinsic.h>
+
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ as_ac_Header=`$as_echo "ac_cv_header_X11/$athena_variant/ThreeD.h" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "X11/$athena_variant/ThreeD.h" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ athena_h_path=X11/$athena_variant
+fi
+
+
+fi
+
+
+
+ if test -z "$athena_h_path"; then
+ as_ac_Header=`$as_echo "ac_cv_header_$athena_variant/XawInit.h" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$athena_variant/XawInit.h" "$as_ac_Header" "
+#if HAVE_X11_XFUNCPROTO_H
+#include <X11/Xfuncproto.h>
+#endif
+#include <X11/Intrinsic.h>
+
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ as_ac_Header=`$as_echo "ac_cv_header_$athena_variant/ThreeD.h" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$athena_variant/ThreeD.h" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ athena_h_path=$athena_variant
+fi
+
+
+fi
+
+
+ fi
+
+ if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
+ ac_fn_c_check_header_compile "$LINENO" "X11/Xaw3d/XawInit.h" "ac_cv_header_X11_Xaw3d_XawInit_h" "
+#if HAVE_X11_XFUNCPROTO_H
+#include <X11/Xfuncproto.h>
+#endif
+#include <X11/Intrinsic.h>
+
+"
+if test "x$ac_cv_header_X11_Xaw3d_XawInit_h" = xyes; then :
+ ac_fn_c_check_header_mongrel "$LINENO" "X11/Xaw3d/ThreeD.h" "ac_cv_header_X11_Xaw3d_ThreeD_h" "$ac_includes_default"
+if test "x$ac_cv_header_X11_Xaw3d_ThreeD_h" = xyes; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming that X11/Xaw3d headers are suitable for $athena_variant." >&5
+$as_echo "$as_me: WARNING: Assuming that X11/Xaw3d headers are suitable for $athena_variant." >&2;}
+ athena_h_path=X11/Xaw3d
+
+fi
+
+
+fi
+
+
+ fi
+
+ if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
+ ac_fn_c_check_header_compile "$LINENO" "Xaw3d/XawInit.h" "ac_cv_header_Xaw3d_XawInit_h" "
+#if HAVE_X11_XFUNCPROTO_H
+#include <X11/Xfuncproto.h>
+#endif
+#include <X11/Intrinsic.h>
+
+"
+if test "x$ac_cv_header_Xaw3d_XawInit_h" = xyes; then :
+ ac_fn_c_check_header_mongrel "$LINENO" "Xaw3d/ThreeD.h" "ac_cv_header_Xaw3d_ThreeD_h" "$ac_includes_default"
+if test "x$ac_cv_header_Xaw3d_ThreeD_h" = xyes; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming that Xaw3d headers are suitable for $athena_variant." >&5
+$as_echo "$as_me: WARNING: Assuming that Xaw3d headers are suitable for $athena_variant." >&2;}
+ athena_h_path=Xaw3d
+
+fi
+
+
+fi
+
+
+ fi
+
+ if test -z "$athena_h_path"; then
+ ac_fn_c_check_header_mongrel "$LINENO" "X11/Xaw/ThreeD.h" "ac_cv_header_X11_Xaw_ThreeD_h" "$ac_includes_default"
+if test "x$ac_cv_header_X11_Xaw_ThreeD_h" = xyes; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming that X11/Xaw headers are suitable for $athena_variant." >&5
+$as_echo "$as_me: WARNING: Assuming that X11/Xaw headers are suitable for $athena_variant." >&2;}
+ athena_h_path=X11/Xaw
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a suitable 3d Athena header set." >&5
+$as_echo "$as_me: WARNING: Could not find a suitable 3d Athena header set." >&2;}
+fi
+
+
+ fi
+ fi
+
+ if test -n "$athena_lib" -a -n "$athena_h_path"; then
+ have_xaw=yes
+ else
+ have_xaw=no
+ fi
+
+else
+ have_xaw=no
+fi
+if test "$with_x11" = "yes"; then
+ ac_fn_c_check_header_mongrel "$LINENO" "Xm/Xm.h" "ac_cv_header_Xm_Xm_h" "$ac_includes_default"
+if test "x$ac_cv_header_Xm_Xm_h" = xyes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmStringCreate in -lXm" >&5
+$as_echo_n "checking for XmStringCreate in -lXm... " >&6; }
+if ${ac_cv_lib_Xm_XmStringCreate+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXm $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XmStringCreate ();
+int
+main ()
+{
+return XmStringCreate ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_Xm_XmStringCreate=yes
+else
+ ac_cv_lib_Xm_XmStringCreate=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xm_XmStringCreate" >&5
+$as_echo "$ac_cv_lib_Xm_XmStringCreate" >&6; }
+if test "x$ac_cv_lib_Xm_XmStringCreate" = xyes; then :
+ have_motif=yes
+else
+ have_motif=no
+fi
+
+else
+ have_motif=no
+fi
+
+
+
+ if test "$have_motif" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Lesstif" >&5
+$as_echo_n "checking for Lesstif... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <Xm/Xm.h>
+#ifdef LESSTIF_VERSION
+yes
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "yes" >/dev/null 2>&1; then :
+ have_lesstif=yes
+else
+ have_lesstif=no
+fi
+rm -f conftest*
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_lesstif" >&5
+$as_echo "$have_lesstif" >&6; }
+ fi
+
+fi
+
+case "$opsys" in
+ *linux* | *darwin* | *bsd* | *cygwin* ) lucid_prefers_motif="no" ;;
+ * ) lucid_prefers_motif="yes" ;;
+esac
+
+case "$with_menubars" in "" | "yes" | "athena" )
+ with_menubars="lucid" ;;
+esac
+if test "$with_xft_menubars" != "no" ; then
+ if test "$with_xft_emacs" = "yes" -a "$with_menubars" != "no" ; then
+ with_xft_menubars="yes"
+ else
+ with_xft_menubars="no"
+ fi
+fi
+case "$with_dialogs" in "" | "yes" | "lucid" )
+ if test "$lucid_prefers_motif" = "yes"; then
+ if test "$have_motif" = "yes"; then with_dialogs="motif"
+ elif test "$have_xaw" = "yes"; then with_dialogs="athena"
+ elif test "$with_msw" = "yes"; then with_dialogs="msw"
+ else with_dialogs=no
+ fi
+ else
+ if test "$have_xaw" = "yes"; then with_dialogs="athena"
+ elif test "$have_motif" = "yes"; then with_dialogs="motif"
+ elif test "$with_msw" = "yes"; then with_dialogs="msw"
+ else with_dialogs=no
+ fi
+ fi ;;
+esac
+case "$with_scrollbars" in "" | "yes" )
+ with_scrollbars="lucid" ;;
+esac
+case "$with_widgets" in "" | "yes" | "lucid")
+ if test "$lucid_prefers_motif" = "yes"; then
+ if test "$have_motif" = "yes"; then with_widgets="motif"
+ elif test "$have_xaw" = "yes"; then with_widgets="athena"
+ elif test "$with_msw" = "yes"; then with_widgets="msw"
+ else with_widgets=no
+ fi
+ else
+ if test "$have_xaw" = "yes"; then with_widgets="athena"
+ elif test "$have_motif" = "yes"; then with_widgets="motif"
+ elif test "$with_msw" = "yes"; then with_widgets="msw"
+ else with_widgets=no
+ fi
+ fi ;;
+esac
+if test "$with_xft_tabs" != "no" ; then
+ if test "$with_xft_emacs" = "yes" -a "$with_widgets" != "no" ; then
+ with_xft_tabs="yes"
+ else
+ with_xft_tabs="no"
+ fi
+fi
+if test "$with_xft_gauges" != "no" ; then
+ if test "$with_xft_emacs" = "yes" -a "$with_widgets" != "no" ; then
+ with_xft_gauges="yes"
+ else
+ with_xft_gauges="no"
+ fi
+fi
+
+all_widgets="$with_menubars $with_scrollbars $with_dialogs $with_toolbars $with_widgets"
+
+case "$all_widgets" in
+ *athena* )
+ if test "$have_xaw" != "yes"; then
+ { echo "Error:" "Could not find a suitable Athena library to build with." >&2; exit 1; }
+ fi
+
+ lwlib_objs="$lwlib_objs lwlib-Xaw.o" && if test "$verbose" = "yes"; then echo " Appending \"lwlib-Xaw.o\" to \$lwlib_objs"; fi
+
+ libs_x="-l$athena_lib $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-l$athena_lib\" to \$libs_x"; fi
+
+ cat >>confdefs.h <<_ACEOF
+@%:@define ATHENA_Scrollbar_h_ "$athena_h_path/Scrollbar.h"
+_ACEOF
+
+ cat >>confdefs.h <<_ACEOF
+@%:@define ATHENA_Dialog_h_ "$athena_h_path/Dialog.h"
+_ACEOF
+
+ cat >>confdefs.h <<_ACEOF
+@%:@define ATHENA_Form_h_ "$athena_h_path/Form.h"
+_ACEOF
+
+ cat >>confdefs.h <<_ACEOF
+@%:@define ATHENA_Command_h_ "$athena_h_path/Command.h"
+_ACEOF
+
+ cat >>confdefs.h <<_ACEOF
+@%:@define ATHENA_Label_h_ "$athena_h_path/Label.h"
+_ACEOF
+
+ cat >>confdefs.h <<_ACEOF
+@%:@define ATHENA_LabelP_h_ "$athena_h_path/LabelP.h"
+_ACEOF
+
+ cat >>confdefs.h <<_ACEOF
+@%:@define ATHENA_Toggle_h_ "$athena_h_path/Toggle.h"
+_ACEOF
+
+ cat >>confdefs.h <<_ACEOF
+@%:@define ATHENA_ToggleP_h_ "$athena_h_path/ToggleP.h"
+_ACEOF
+
+ cat >>confdefs.h <<_ACEOF
+@%:@define ATHENA_AsciiText_h_ "$athena_h_path/AsciiText.h"
+_ACEOF
+
+ cat >>confdefs.h <<_ACEOF
+@%:@define ATHENA_XawInit_h_ "$athena_h_path/XawInit.h"
+_ACEOF
+
+
+ $as_echo "@%:@define LWLIB_USES_ATHENA 1" >>confdefs.h
+
+ $as_echo "@%:@define NEED_ATHENA 1" >>confdefs.h
+
+ need_athena="yes"
+
+ if test "$athena_3d" = "yes"; then
+ $as_echo "@%:@define HAVE_ATHENA_3D 1" >>confdefs.h
+
+ fi
+ ;;
+esac
+
+case "$all_widgets" in *motif* )
+ $as_echo "@%:@define LWLIB_USES_MOTIF 1" >>confdefs.h
+
+ $as_echo "@%:@define NEED_MOTIF 1" >>confdefs.h
+
+ lwlib_objs="$lwlib_objs lwlib-Xm.o" && if test "$verbose" = "yes"; then echo " Appending \"lwlib-Xm.o\" to \$lwlib_objs"; fi
+ need_motif=yes ;;
+esac
+
+test "$with_menubars" = "lucid" && lwlib_objs="$lwlib_objs xlwmenu.o" && if test "$verbose" = "yes"; then echo " Appending \"xlwmenu.o\" to \$lwlib_objs"; fi
+test "$with_menubars" = "motif" && lwlib_objs="$lwlib_objs xlwmenu.o" && if test "$verbose" = "yes"; then echo " Appending \"xlwmenu.o\" to \$lwlib_objs"; fi
+test "$with_scrollbars" = "lucid" && lwlib_objs="$lwlib_objs xlwscrollbar.o" && if test "$verbose" = "yes"; then echo " Appending \"xlwscrollbar.o\" to \$lwlib_objs"; fi
+test "$with_widgets" != "no" && test "$with_widgets" != "msw" && \
+ lwlib_objs="$lwlib_objs xlwtabs.o xlwgcs.o" && if test "$verbose" = "yes"; then echo " Appending \"xlwtabs.o xlwgcs.o\" to \$lwlib_objs"; fi
+case "$with_widgets" in athena* )
+ lwlib_objs="$lwlib_objs xlwradio.o xlwcheckbox.o xlwgauge.o" && if test "$verbose" = "yes"; then echo " Appending \"xlwradio.o xlwcheckbox.o xlwgauge.o\" to \$lwlib_objs"; fi;;
+esac
+case "$all_widgets" in *lucid* )
+ $as_echo "@%:@define NEED_LUCID 1" >>confdefs.h
+
+ lwlib_objs="$lwlib_objs lwlib-Xlw.o" && if test "$verbose" = "yes"; then echo " Appending \"lwlib-Xlw.o\" to \$lwlib_objs"; fi ;;
+esac
+
+
+
+test "$with_scrollbars" = "athena" && $as_echo "@%:@define LWLIB_SCROLLBARS_ATHENA 1" >>confdefs.h
+
+test "$with_dialogs" = "athena" && $as_echo "@%:@define LWLIB_DIALOGS_ATHENA 1" >>confdefs.h
+
+
+if test "$athena_3d" = "yes"; then
+ test "$with_scrollbars" = "athena" && $as_echo "@%:@define LWLIB_SCROLLBARS_ATHENA3D 1" >>confdefs.h
+
+ test "$with_dialogs" = "athena" && $as_echo "@%:@define LWLIB_DIALOGS_ATHENA3D 1" >>confdefs.h
+
+fi
+
+case "$with_widgets" in athena* ) $as_echo "@%:@define LWLIB_WIDGETS_ATHENA 1" >>confdefs.h
+;; esac
+test "$with_widgets" != "no" && test "$with_widgets" != "msw" && \
+ $as_echo "@%:@define LWLIB_TABS_LUCID 1" >>confdefs.h
+
+
+test "$with_menubars" != "no" && $as_echo "@%:@define HAVE_MENUBARS 1" >>confdefs.h
+
+test "$with_scrollbars" != "no" && $as_echo "@%:@define HAVE_SCROLLBARS 1" >>confdefs.h
+
+test "$with_dialogs" != "no" && $as_echo "@%:@define HAVE_DIALOGS 1" >>confdefs.h
+
+test "$with_toolbars" != "no" && $as_echo "@%:@define HAVE_TOOLBARS 1" >>confdefs.h
+
+test "$with_widgets" != "no" && $as_echo "@%:@define HAVE_WIDGETS 1" >>confdefs.h
+
+
+test "$with_menubars" = "lucid" && $as_echo "@%:@define LWLIB_MENUBARS_LUCID 1" >>confdefs.h
+
+test "$with_scrollbars" = "lucid" && $as_echo "@%:@define LWLIB_SCROLLBARS_LUCID 1" >>confdefs.h
+
+
+test "$with_menubars" = "motif" && $as_echo "@%:@define LWLIB_MENUBARS_MOTIF 1" >>confdefs.h
+
+test "$with_scrollbars" = "motif" && $as_echo "@%:@define LWLIB_SCROLLBARS_MOTIF 1" >>confdefs.h
+
+test "$with_dialogs" = "motif" && $as_echo "@%:@define LWLIB_DIALOGS_MOTIF 1" >>confdefs.h
+
+test "$with_widgets" = "motif" && $as_echo "@%:@define LWLIB_WIDGETS_MOTIF 1" >>confdefs.h
+
+
+test "$with_xft_menubars" = "yes" && $as_echo "@%:@define HAVE_XFT_MENUBARS 1" >>confdefs.h
+
+test "$with_xft_tabs" = "yes" && $as_echo "@%:@define HAVE_XFT_TABS 1" >>confdefs.h
+
+test "$with_xft_gauges" = "yes" && $as_echo "@%:@define HAVE_XFT_GAUGES 1" >>confdefs.h
+
+
+
+test -z "$with_mule" && with_mule=no
+
+
+if test "$with_default_eol_detection" = "yes"; then
+ $as_echo "@%:@define HAVE_DEFAULT_EOL_DETECTION 1" >>confdefs.h
+
+fi
+
+canna_libs=
+wnn_libs=
+
+if test "$with_mule" = "yes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mule-related features" >&5
+$as_echo_n "checking for Mule-related features... " >&6; }
+ $as_echo "@%:@define MULE 1" >>confdefs.h
+
+
+ for ac_header in libintl.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
+if test "x$ac_cv_header_libintl_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_LIBINTL_H 1
+_ACEOF
+
+fi
+
+done
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strerror in -lintl" >&5
+$as_echo_n "checking for strerror in -lintl... " >&6; }
+if ${ac_cv_lib_intl_strerror+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lintl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char strerror ();
+int
+main ()
+{
+return strerror ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_strerror=yes
+else
+ ac_cv_lib_intl_strerror=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strerror" >&5
+$as_echo "$ac_cv_lib_intl_strerror" >&6; }
+if test "x$ac_cv_lib_intl_strerror" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_LIBINTL 1
+_ACEOF
+
+ LIBS="-lintl $LIBS"
+
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mule input methods" >&5
+$as_echo_n "checking for Mule input methods... " >&6; }
+ case "$with_xim" in "" | "yes" )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XIM" >&5
+$as_echo_n "checking for XIM... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenIM in -lX11" >&5
+$as_echo_n "checking for XOpenIM in -lX11... " >&6; }
+if ${ac_cv_lib_X11_XOpenIM+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lX11 $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XOpenIM ();
+int
+main ()
+{
+return XOpenIM ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_X11_XOpenIM=yes
+else
+ ac_cv_lib_X11_XOpenIM=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenIM" >&5
+$as_echo "$ac_cv_lib_X11_XOpenIM" >&6; }
+if test "x$ac_cv_lib_X11_XOpenIM" = xyes; then :
+ with_xim=xlib
+else
+ with_xim=no
+fi
+
+ if test "$need_motif $have_lesstif" = "yes no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmImMbLookupString in -lXm" >&5
+$as_echo_n "checking for XmImMbLookupString in -lXm... " >&6; }
+if ${ac_cv_lib_Xm_XmImMbLookupString+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXm $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XmImMbLookupString ();
+int
+main ()
+{
+return XmImMbLookupString ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_Xm_XmImMbLookupString=yes
+else
+ ac_cv_lib_Xm_XmImMbLookupString=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xm_XmImMbLookupString" >&5
+$as_echo "$ac_cv_lib_Xm_XmImMbLookupString" >&6; }
+if test "x$ac_cv_lib_Xm_XmImMbLookupString" = xyes; then :
+ with_xim=motif
+fi
+
+ elif test "$have_motif $have_lesstif $with_xim" = "yes no no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmImMbLookupString in -lXm" >&5
+$as_echo_n "checking for XmImMbLookupString in -lXm... " >&6; }
+if ${ac_cv_lib_Xm_XmImMbLookupString+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXm $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XmImMbLookupString ();
+int
+main ()
+{
+return XmImMbLookupString ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_Xm_XmImMbLookupString=yes
+else
+ ac_cv_lib_Xm_XmImMbLookupString=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xm_XmImMbLookupString" >&5
+$as_echo "$ac_cv_lib_Xm_XmImMbLookupString" >&6; }
+if test "x$ac_cv_lib_Xm_XmImMbLookupString" = xyes; then :
+ with_xim=motif
+fi
+
+ fi ;;
+ esac
+ if test "$with_xim" != "no"; then
+ $as_echo "@%:@define HAVE_XIM 1" >>confdefs.h
+
+ if test "$with_xim" = "xlib"; then
+ $as_echo "@%:@define XIM_XLIB 1" >>confdefs.h
+
+ extra_objs="$extra_objs input-method-xlib.o" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"input-method-xlib.o\""
+ fi
+ fi
+ if test "$with_xim" = "motif"; then
+ $as_echo "@%:@define XIM_MOTIF 1" >>confdefs.h
+
+ need_motif=yes
+ extra_objs="$extra_objs input-method-motif.o" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"input-method-motif.o\""
+ fi
+ fi
+ if test "$with_xim" = "motif"; then
+ with_xfs=no
+ fi
+ fi
+
+ if test "$with_xfs" = "yes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XFontSet" >&5
+$as_echo_n "checking for XFontSet... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmbDrawString in -lX11" >&5
+$as_echo_n "checking for XmbDrawString in -lX11... " >&6; }
+if ${ac_cv_lib_X11_XmbDrawString+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lX11 $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XmbDrawString ();
+int
+main ()
+{
+return XmbDrawString ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_X11_XmbDrawString=yes
+else
+ ac_cv_lib_X11_XmbDrawString=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XmbDrawString" >&5
+$as_echo "$ac_cv_lib_X11_XmbDrawString" >&6; }
+if test "x$ac_cv_lib_X11_XmbDrawString" = xyes; then :
+ :
+else
+ with_xfs=no
+fi
+
+ if test "$with_xfs" = "yes" && test "$with_menubars" = "lucid"; then
+ $as_echo "@%:@define USE_XFONTSET 1" >>confdefs.h
+
+ if test "$with_xim" = "no" ; then
+ extra_objs="$extra_objs input-method-xlib.o" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"input-method-xlib.o\""
+ fi
+ fi
+ fi
+ fi
+ test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
+ test -z "$with_wnn" && { ac_fn_c_check_header_mongrel "$LINENO" "wnn/jllib.h" "ac_cv_header_wnn_jllib_h" "$ac_includes_default"
+if test "x$ac_cv_header_wnn_jllib_h" = xyes; then :
+
+else
+ with_wnn=no
+fi
+
+ }
+ test -z "$with_wnn" && { ac_fn_c_check_header_mongrel "$LINENO" "wnn/commonhd.h" "ac_cv_header_wnn_commonhd_h" "$ac_includes_default"
+if test "x$ac_cv_header_wnn_commonhd_h" = xyes; then :
+
+else
+ with_wnn=no
+fi
+
+ }
+ if test "$with_wnn" != "no"; then
+ for ac_func in crypt
+do :
+ ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt"
+if test "x$ac_cv_func_crypt" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_CRYPT 1
+_ACEOF
+
+fi
+done
+
+ test "$ac_cv_func_crypt" != "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
+$as_echo_n "checking for crypt in -lcrypt... " >&6; }
+if ${ac_cv_lib_crypt_crypt+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypt $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char crypt ();
+int
+main ()
+{
+return crypt ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_crypt_crypt=yes
+else
+ ac_cv_lib_crypt_crypt=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
+$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
+if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_LIBCRYPT 1
+_ACEOF
+
+ LIBS="-lcrypt $LIBS"
+
+fi
+ }
+ fi
+ if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jl_dic_list_e in -lwnn" >&5
+$as_echo_n "checking for jl_dic_list_e in -lwnn... " >&6; }
+if ${ac_cv_lib_wnn_jl_dic_list_e+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lwnn $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jl_dic_list_e ();
+int
+main ()
+{
+return jl_dic_list_e ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_wnn_jl_dic_list_e=yes
+else
+ ac_cv_lib_wnn_jl_dic_list_e=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wnn_jl_dic_list_e" >&5
+$as_echo "$ac_cv_lib_wnn_jl_dic_list_e" >&6; }
+if test "x$ac_cv_lib_wnn_jl_dic_list_e" = xyes; then :
+ libwnn=wnn
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jl_dic_list_e in -lwnn4" >&5
+$as_echo_n "checking for jl_dic_list_e in -lwnn4... " >&6; }
+if ${ac_cv_lib_wnn4_jl_dic_list_e+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lwnn4 $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jl_dic_list_e ();
+int
+main ()
+{
+return jl_dic_list_e ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_wnn4_jl_dic_list_e=yes
+else
+ ac_cv_lib_wnn4_jl_dic_list_e=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wnn4_jl_dic_list_e" >&5
+$as_echo "$ac_cv_lib_wnn4_jl_dic_list_e" >&6; }
+if test "x$ac_cv_lib_wnn4_jl_dic_list_e" = xyes; then :
+ libwnn=wnn4
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jl_dic_list_e in -lwnn6" >&5
+$as_echo_n "checking for jl_dic_list_e in -lwnn6... " >&6; }
+if ${ac_cv_lib_wnn6_jl_dic_list_e+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lwnn6 $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jl_dic_list_e ();
+int
+main ()
+{
+return jl_dic_list_e ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_wnn6_jl_dic_list_e=yes
+else
+ ac_cv_lib_wnn6_jl_dic_list_e=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wnn6_jl_dic_list_e" >&5
+$as_echo "$ac_cv_lib_wnn6_jl_dic_list_e" >&6; }
+if test "x$ac_cv_lib_wnn6_jl_dic_list_e" = xyes; then :
+ libwnn=wnn6
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dic_list_e in -lwnn6_fromsrc" >&5
+$as_echo_n "checking for dic_list_e in -lwnn6_fromsrc... " >&6; }
+if ${ac_cv_lib_wnn6_fromsrc_dic_list_e+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lwnn6_fromsrc $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dic_list_e ();
+int
+main ()
+{
+return dic_list_e ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_wnn6_fromsrc_dic_list_e=yes
+else
+ ac_cv_lib_wnn6_fromsrc_dic_list_e=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wnn6_fromsrc_dic_list_e" >&5
+$as_echo "$ac_cv_lib_wnn6_fromsrc_dic_list_e" >&6; }
+if test "x$ac_cv_lib_wnn6_fromsrc_dic_list_e" = xyes; then :
+ libwnn=wnn6_fromsrc
+else
+ with_wnn=no
+fi
+
+fi
+
+fi
+
+fi
+
+ fi
+ test -z "$with_wnn" && with_wnn=yes
+ if test "$with_wnn" = "yes"; then
+ $as_echo "@%:@define HAVE_WNN 1" >>confdefs.h
+
+ libs_x="-l$libwnn $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-l$libwnn\" to \$libs_x"; fi
+ if test "$with_wnn6" != "no"; then
+ as_ac_Lib=`$as_echo "ac_cv_lib_$libwnn''_jl_fi_dic_list" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jl_fi_dic_list in -l$libwnn" >&5
+$as_echo_n "checking for jl_fi_dic_list in -l$libwnn... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$libwnn $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jl_fi_dic_list ();
+int
+main ()
+{
+return jl_fi_dic_list ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$as_ac_Lib=yes"
+else
+ eval "$as_ac_Lib=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+eval ac_res=\$$as_ac_Lib
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ with_wnn6=yes
+fi
+
+ test "$with_wnn6" = "yes" && $as_echo "@%:@define WNN6 1" >>confdefs.h
+
+ fi
+ fi
+
+ have_canna=no
+ if test "$with_canna" != "no"; then
+ save_c_switch_site="$c_switch_site"
+ for canna_include_path in "" " -I/usr/local/canna/include"; do
+ for canna_wchar_aware in "" " -DCANNA_NEW_WCHAR_AWARE=1"; do
+ c_switch_site="$save_c_switch_site$canna_include_path$canna_wchar_aware"
+ # defeat autoconf's cache mechanism
+ $as_unset ac_cv_header_canna_jrkanji_h
+ $as_unset ac_cv_header_canna_RK_h
+ # using $ac_header_compiler is a hack, but autoconf doesn't let us
+ # get at this information otherwise :-(
+ ac_fn_c_check_header_mongrel "$LINENO" "canna/jrkanji.h" "ac_cv_header_canna_jrkanji_h" "$ac_includes_default"
+if test "x$ac_cv_header_canna_jrkanji_h" = xyes; then :
+ ac_fn_c_check_header_mongrel "$LINENO" "canna/RK.h" "ac_cv_header_canna_RK_h" "$ac_includes_default"
+if test "x$ac_cv_header_canna_RK_h" = xyes; then :
+ have_canna=$ac_header_compiler
+fi
+
+
+fi
+
+
+ test "$have_canna" = "yes" && break
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You may ignore any *Present but not compiled* message
+ from autoconf. We detect that condition and recheck, but there
+ is no way to suppress autoconf's message." >&5
+$as_echo "$as_me: WARNING: You may ignore any *Present but not compiled* message
+ from autoconf. We detect that condition and recheck, but there
+ is no way to suppress autoconf's message." >&2;}
+ done
+ test "$have_canna" = "yes" && break
+ done
+ if test "$have_canna" = "yes"; then
+ c_switch_site="$save_c_switch_site$canna_include_path"
+ else
+ c_switch_site="$save_c_switch_site"
+ fi
+ fi
+
+ test "$have_canna" = "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RkBgnBun in -lRKC" >&5
+$as_echo_n "checking for RkBgnBun in -lRKC... " >&6; }
+if ${ac_cv_lib_RKC_RkBgnBun+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lRKC $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char RkBgnBun ();
+int
+main ()
+{
+return RkBgnBun ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_RKC_RkBgnBun=yes
+else
+ ac_cv_lib_RKC_RkBgnBun=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_RKC_RkBgnBun" >&5
+$as_echo "$ac_cv_lib_RKC_RkBgnBun" >&6; }
+if test "x$ac_cv_lib_RKC_RkBgnBun" = xyes; then :
+ :
+else
+ have_canna=no
+fi
+ }
+ test "$have_canna" = "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jrKanjiControl in -lcanna" >&5
+$as_echo_n "checking for jrKanjiControl in -lcanna... " >&6; }
+if ${ac_cv_lib_canna_jrKanjiControl+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcanna $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jrKanjiControl ();
+int
+main ()
+{
+return jrKanjiControl ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_canna_jrKanjiControl=yes
+else
+ ac_cv_lib_canna_jrKanjiControl=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_canna_jrKanjiControl" >&5
+$as_echo "$ac_cv_lib_canna_jrKanjiControl" >&6; }
+if test "x$ac_cv_lib_canna_jrKanjiControl" = xyes; then :
+ :
+else
+ have_canna=no
+fi
+ }
+ if test "$have_canna" = "yes"; then
+ $as_echo "@%:@define HAVE_CANNA 1" >>confdefs.h
+
+ test -n "$canna_wchar_aware" && $as_echo "@%:@define CANNA_NEW_WCHAR_AWARE 1" >>confdefs.h
+
+ MAKE_SUBDIR="$MAKE_SUBDIR modules/canna" && if test "$verbose" = "yes"; then echo " Appending \"modules/canna\" to \$MAKE_SUBDIR"; fi
+ need_modules_common=yes
+ if test "$with_modules" = "yes"; then
+ INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/canna" && if test "$verbose" = "yes"; then echo " Appending \"modules/canna\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
+ fi
+ canna_libs="-lcanna -lRKC $canna_libs" && if test "$verbose" = "yes"; then echo " Prepending \"-lcanna -lRKC\" to \$canna_libs"; fi
+ elif test "$with_canna" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Canna configuration failed. If you expected success,
+maybe you need --with-site-prefixes=/usr/local/canna?" >&5
+$as_echo "$as_me: WARNING: Canna configuration failed. If you expected success,
+maybe you need --with-site-prefixes=/usr/local/canna?" >&2;}
+ fi
+
+
+else for feature in xim canna wnn; do
+ if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-${feature} ignored: Not valid without Mule support" >&5
+$as_echo "$as_me: WARNING: --with-${feature} ignored: Not valid without Mule support" >&2;}
+ fi
+ eval "with_${feature}=no"
+ done
+fi
+
+if test "$need_motif" = "yes" ; then
+ libs_x="-lXm $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXm\" to \$libs_x"; fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for layout_object_getvalue in -li18n" >&5
+$as_echo_n "checking for layout_object_getvalue in -li18n... " >&6; }
+if ${ac_cv_lib_i18n_layout_object_getvalue+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-li18n $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char layout_object_getvalue ();
+int
+main ()
+{
+return layout_object_getvalue ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_i18n_layout_object_getvalue=yes
+else
+ ac_cv_lib_i18n_layout_object_getvalue=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_i18n_layout_object_getvalue" >&5
+$as_echo "$ac_cv_lib_i18n_layout_object_getvalue" >&6; }
+if test "x$ac_cv_lib_i18n_layout_object_getvalue" = xyes; then :
+ libs_x="-li18n $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-li18n\" to \$libs_x"; fi
+fi
+
+
+if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then
+ ld_switch_site=`echo '' $ld_switch_site | sed -e 's:^ ::' -e "s/$dash_r[^ ]*//g"`
+ ld_switch_x_site=`echo '' $ld_switch_x_site | sed -e 's:^ ::' -e "s/$dash_r[^ ]*//g"`
+
+ runpath="" runpath_dirs=""
+ if test -n "$LD_RUN_PATH"; then
+ runpath="$LD_RUN_PATH"
+ elif test "$GCC" = "yes"; then
+ ld_switch_run_save="$ld_switch_run"; ld_switch_run=""
+ echo "int main(int argc, char **argv) {return 0;}" > conftest.c
+ xe_runpath_link='${CC-cc} -o conftest -v $CFLAGS '"$xe_ldflags"' conftest.$ac_ext 2>&1 1>/dev/null'
+ for arg in `eval "$xe_runpath_link" | grep ' -L'`; do
+ case "$arg" in P,* | -L* | -R* )
+ for dir in `echo '' "$arg" | sed -e 's:^ ::' -e 's/^..//' -e 'y/:/ /'`; do
+ {
+xe_runpath_dir="$dir"
+ test "$xe_runpath_dir" != "/lib" -a \
+ "$xe_runpath_dir" != "/usr/lib" -a \
+ -n "`ls ${xe_runpath_dir}/*.s[ol] 2>/dev/null`" && \
+ eval "$xe_add_unique_runpath_dir"
+}
+ done ;;
+ esac
+ done
+ ld_switch_run="$ld_switch_run_save"
+ rm -f conftest*
+ else
+ for arg in $ld_switch_site $ld_switch_x_site; do
+ case "$arg" in -L*) {
+xe_runpath_dir=`echo '' "$arg" | sed -e 's:^ ::' -e 's/^-L//'`
+ test "$xe_runpath_dir" != "/lib" -a \
+ "$xe_runpath_dir" != "/usr/lib" -a \
+ -n "`ls ${xe_runpath_dir}/*.s[ol] 2>/dev/null`" && \
+ eval "$xe_add_unique_runpath_dir"
+};; esac
+ done
+ if test "$opsys $need_motif" = "sol2 yes"; then
+ xe_runpath_dir="/opt/SUNWdt/lib";
+ eval "$xe_add_unique_runpath_dir";
+ fi
+ fi
+ if test -n "$runpath"; then
+ ld_switch_run="${dash_r}${runpath}"
+
+if test "$GCC" = "yes"; then
+ set x $ld_switch_run; shift; ld_switch_run=""
+ while test -n "$1"; do
+ case $1 in
+ -L | -l | -u ) ld_switch_run="$ld_switch_run $1 $2"; shift ;;
+ -L* | -l* | -u* | -Wl* | -pg ) ld_switch_run="$ld_switch_run $1" ;;
+ -Xlinker* ) ;;
+ * ) ld_switch_run="$ld_switch_run -Xlinker $1" ;;
+ esac
+ shift
+ done
+fi
+ test "$verbose" = "yes" && echo "Setting runpath to $runpath"
+ fi
+fi
+
+fi
+
+case "$opsys" in
+ *cygwin* ) for ac_func in cygwin_conv_path
+do :
+ ac_fn_c_check_func "$LINENO" "cygwin_conv_path" "ac_cv_func_cygwin_conv_path"
+if test "x$ac_cv_func_cygwin_conv_path" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_CYGWIN_CONV_PATH 1
+_ACEOF
+
+fi
+done
+
+ ;;
+esac
+
+
+for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+if test "$ac_cv_func_getaddrinfo" != "no" ; then
+ case "$opsys" in
+ hpux11 )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Use of getaddrinfo is disabled for HP-UX 11.XX." >&5
+$as_echo "$as_me: WARNING: Use of getaddrinfo is disabled for HP-UX 11.XX." >&2;}
+ ac_cv_func_getaddrinfo=no
+ ;;
+ esac
+fi
+
+if test "$check_vdb_posix" = "yes" ; then
+ ac_fn_c_check_func "$LINENO" "mprotect" "ac_cv_func_mprotect"
+if test "x$ac_cv_func_mprotect" = xyes; then :
+ $as_echo "@%:@define HAVE_MPROTECT 1" >>confdefs.h
+ have_vdb_mprotect=yes
+fi
+
+
+ ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction"
+if test "x$ac_cv_func_sigaction" = xyes; then :
+ $as_echo "@%:@define HAVE_SIGACTION 1" >>confdefs.h
+ have_vdb_sigaction=yes
+else
+ have_vdb_sigaction=no
+fi
+
+ ac_fn_c_check_member "$LINENO" "struct siginfo" "si_addr" "ac_cv_member_struct_siginfo_si_addr" "#include <signal.h>
+"
+if test "x$ac_cv_member_struct_siginfo_si_addr" = xyes; then :
+ $as_echo "@%:@define HAVE_STRUCT_SIGINFO_SI_ADDR 1" >>confdefs.h
+ have_si_addr=yes
+fi
+
+ ac_fn_c_check_member "$LINENO" "siginfo_t" "si_addr" "ac_cv_member_siginfo_t_si_addr" "#include <signal.h>
+"
+if test "x$ac_cv_member_siginfo_t_si_addr" = xyes; then :
+ $as_echo "@%:@define HAVE_SIGINFO_T_SI_ADDR 1" >>confdefs.h
+ have_si_addr=yes
+fi
+
+ if test "$have_si_addr" != "yes" ; then
+ have_vdb_sigaction=no
+ fi
+
+ ac_fn_c_check_func "$LINENO" "signal" "ac_cv_func_signal"
+if test "x$ac_cv_func_signal" = xyes; then :
+ $as_echo "@%:@define HAVE_SIGNAL 1" >>confdefs.h
+ have_vdb_signal=yes
+fi
+
+ ac_fn_c_check_member "$LINENO" "struct sigcontext" "cr2" "ac_cv_member_struct_sigcontext_cr2" "#include <signal.h>
+"
+if test "x$ac_cv_member_struct_sigcontext_cr2" = xyes; then :
+ $as_echo "@%:@define HAVE_STRUCT_SIGCONTEXT_CR2 1" >>confdefs.h
+ have_cr2=yes
+fi
+
+
+ if test "$have_cr2" != "yes" ; then
+ have_vdb_signal=no
+ fi
+
+ if test "$have_vdb_mprotect" != "yes" ; then
+ have_vdb_sigaction=no
+ have_vdb_signal=no
+ fi
+
+ if test "$have_vdb_sigaction" != "yes" -a "$have_vdb_signal" != "yes" ; then
+ have_vdb_posix=no
+ have_vdb_fake=yes
+ { echo "Error:" "No working write-barrier implementation found for this system.
+ Please report this and provide information about your system." >&2; exit 1; }
+ else
+ have_vdb_posix=yes
+ have_vdb_fake=no
+ fi
+fi
+
+
+for ac_func in getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+ac_fn_c_check_func "$LINENO" "openpty" "ac_cv_func_openpty"
+if test "x$ac_cv_func_openpty" = xyes; then :
+ have_openpty=yes
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5
+$as_echo_n "checking for openpty in -lutil... " >&6; }
+if ${ac_cv_lib_util_openpty+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lutil $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char openpty ();
+int
+main ()
+{
+return openpty ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_util_openpty=yes
+else
+ ac_cv_lib_util_openpty=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_openpty" >&5
+$as_echo "$ac_cv_lib_util_openpty" >&6; }
+if test "x$ac_cv_lib_util_openpty" = xyes; then :
+ have_openpty=yes need_libutil=yes
+fi
+
+fi
+
+if test "$have_openpty" = "yes"; then
+ $as_echo "@%:@define HAVE_OPENPTY 1" >>confdefs.h
+
+ for ac_header in libutil.h util.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ break
+fi
+
+done
+
+ test "$need_libutil" = "yes" && libs_system="$libs_system -lutil" && if test "$verbose" = "yes"; then echo " Appending \"-lutil\" to \$libs_system"; fi
+fi
+
+case "$opsys" in
+ hpux*) for ac_header in sys/ptyio.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "sys/ptyio.h" "ac_cv_header_sys_ptyio_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_ptyio_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_SYS_PTYIO_H 1
+_ACEOF
+
+fi
+
+done
+ ;;
+ *) for ac_header in pty.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "pty.h" "ac_cv_header_pty_h" "$ac_includes_default"
+if test "x$ac_cv_header_pty_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_PTY_H 1
+_ACEOF
+
+fi
+
+done
+
+ test "$ac_cv_header_pty_h" = "no" && for ac_header in sys/pty.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "sys/pty.h" "ac_cv_header_sys_pty_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_pty_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_SYS_PTY_H 1
+_ACEOF
+
+fi
+
+done
+
+ ;;
+esac
+
+for ac_header in stropts.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "stropts.h" "ac_cv_header_stropts_h" "$ac_includes_default"
+if test "x$ac_cv_header_stropts_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_STROPTS_H 1
+_ACEOF
+
+fi
+
+done
+
+if test "$ac_cv_header_stropts_h" = "yes"; then
+ for ac_func in isastream
+do :
+ ac_fn_c_check_func "$LINENO" "isastream" "ac_cv_func_isastream"
+if test "x$ac_cv_func_isastream" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_ISASTREAM 1
+_ACEOF
+
+fi
+done
+
+ for ac_header in strtio.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "strtio.h" "ac_cv_header_strtio_h" "$ac_includes_default"
+if test "x$ac_cv_header_strtio_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_STRTIO_H 1
+_ACEOF
+
+fi
+
+done
+ fi
+
+for ac_func in getloadavg
+do :
+ ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg"
+if test "x$ac_cv_func_getloadavg" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_GETLOADAVG 1
+_ACEOF
+
+fi
+done
+
+
+if test "$ac_cv_func_getloadavg" = "yes"; then
+ for ac_header in sys/loadavg.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "sys/loadavg.h" "ac_cv_header_sys_loadavg_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_loadavg_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_SYS_LOADAVG_H 1
+_ACEOF
+
+fi
+
+done
+
+else
+ extra_objs="$extra_objs getloadavg.o" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"getloadavg.o\""
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kstat_open in -lkstat" >&5
+$as_echo_n "checking for kstat_open in -lkstat... " >&6; }
+if ${ac_cv_lib_kstat_kstat_open+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lkstat $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char kstat_open ();
+int
+main ()
+{
+return kstat_open ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_kstat_kstat_open=yes
+else
+ ac_cv_lib_kstat_kstat_open=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kstat_kstat_open" >&5
+$as_echo "$ac_cv_lib_kstat_kstat_open" >&6; }
+if test "x$ac_cv_lib_kstat_kstat_open" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_LIBKSTAT 1
+_ACEOF
+
+ LIBS="-lkstat $LIBS"
+
+fi
+
+ for ac_header in kstat.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "kstat.h" "ac_cv_header_kstat_h" "$ac_includes_default"
+if test "x$ac_cv_header_kstat_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_KSTAT_H 1
+_ACEOF
+
+fi
+
+done
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kvm_read in -lkvm" >&5
+$as_echo_n "checking for kvm_read in -lkvm... " >&6; }
+if ${ac_cv_lib_kvm_kvm_read+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lkvm $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char kvm_read ();
+int
+main ()
+{
+return kvm_read ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_kvm_kvm_read=yes
+else
+ ac_cv_lib_kvm_kvm_read=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kvm_kvm_read" >&5
+$as_echo "$ac_cv_lib_kvm_kvm_read" >&6; }
+if test "x$ac_cv_lib_kvm_kvm_read" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_LIBKVM 1
+_ACEOF
+
+ LIBS="-lkvm $LIBS"
+
+fi
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether netdb declares h_errno" >&5
+$as_echo_n "checking whether netdb declares h_errno... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <netdb.h>
+int
+main ()
+{
+return h_errno;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ $as_echo "@%:@define HAVE_H_ERRNO 1" >>confdefs.h
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigsetjmp" >&5
+$as_echo_n "checking for sigsetjmp... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <setjmp.h>
+int
+main ()
+{
+sigjmp_buf bar; sigsetjmp (bar, 0);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ $as_echo "@%:@define HAVE_SIGSETJMP 1" >>confdefs.h
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether localtime caches TZ" >&5
+$as_echo_n "checking whether localtime caches TZ... " >&6; }
+if ${emacs_cv_localtime_cache+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "$ac_cv_func_tzset" = "yes"; then
+if test "$cross_compiling" = yes; then :
+ # If we have tzset, assume the worst when cross-compiling.
+emacs_cv_localtime_cache=yes
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <time.h>
+#if STDC_HEADERS
+# include <stdlib.h>
+#endif
+extern char **environ;
+unset_TZ ()
+{
+ char **from, **to;
+ for (to = from = environ; (*to = *from); from++)
+ if (! (to[0][0] == 'T' && to[0][1] == 'Z' && to[0][2] == '='))
+ to++;
+}
+char TZ_GMT0[] = "TZ=GMT0";
+char TZ_PST8[] = "TZ=PST8";
+main()
+{
+ time_t now = time ((time_t *) 0);
+ int hour_GMT0, hour_unset;
+ if (putenv (TZ_GMT0) != 0)
+ exit (1);
+ hour_GMT0 = localtime (&now)->tm_hour;
+ unset_TZ ();
+ hour_unset = localtime (&now)->tm_hour;
+ if (putenv (TZ_PST8) != 0)
+ exit (1);
+ if (localtime (&now)->tm_hour == hour_GMT0)
+ exit (1);
+ unset_TZ ();
+ if (localtime (&now)->tm_hour != hour_unset)
+ exit (1);
+ exit (0);
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ emacs_cv_localtime_cache=no
+else
+ emacs_cv_localtime_cache=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+else
+ # If we lack tzset, report that localtime does not cache TZ,
+ # since we can't invalidate the cache if we don't have tzset.
+ emacs_cv_localtime_cache=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_localtime_cache" >&5
+$as_echo "$emacs_cv_localtime_cache" >&6; }
+if test $emacs_cv_localtime_cache = yes; then
+ $as_echo "@%:@define LOCALTIME_CACHE 1" >>confdefs.h
+
+fi
+
+if test "$HAVE_TIMEVAL" = "yes"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday accepts one or two arguments" >&5
+$as_echo_n "checking whether gettimeofday accepts one or two arguments... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#ifdef TIME_WITH_SYS_TIME
+#include <sys/time.h>
+#include <time.h>
+#else
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif
+#endif
+
+int
+main ()
+{
+
+ struct timeval time;
+ gettimeofday (&time, 0);
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: two" >&5
+$as_echo "two" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: one" >&5
+$as_echo "one" >&6; }
+ $as_echo "@%:@define GETTIMEOFDAY_ONE_ARGUMENT 1" >>confdefs.h
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if ${ac_cv_c_inline+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_c_inline=no
+for ac_kw in inline __inline__ __inline; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifndef __cplusplus
+typedef int foo_t;
+static $ac_kw foo_t static_foo () {return 0; }
+$ac_kw foo_t foo () {return 0; }
+#endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_c_inline=$ac_kw
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ test "$ac_cv_c_inline" != no && break
+done
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
+
+case $ac_cv_c_inline in
+ inline | yes) ;;
+ *)
+ case $ac_cv_c_inline in
+ no) ac_val=;;
+ *) ac_val=$ac_cv_c_inline;;
+ esac
+ cat >>confdefs.h <<_ACEOF
+#ifndef __cplusplus
+#define inline $ac_val
+#endif
+_ACEOF
+ ;;
+esac
+
+test "$ac_cv_c_inline" != "no" -a "$GCC" = "yes" && extra_objs="$extra_objs inline.o" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"inline.o\""
+ fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for typeof" >&5
+$as_echo_n "checking for typeof... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int i; __typeof__(i) j;
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ typeofname="__typeof__"
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int i; typeof(i) j;
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ typeofname="typeof"
+else
+ typeofname=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $typeofname" >&5
+$as_echo "$typeofname" >&6; }
+if test "$typeofname" != "no"; then
+ cat >>confdefs.h <<_ACEOF
+@%:@define TYPEOF $typeofname
+_ACEOF
+
+fi
+
+
+if test "$__DECC" != "yes"; then
+ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+# for constant arguments. Useless!
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if ${ac_cv_working_alloca_h+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+@%:@include <alloca.h>
+int
+main ()
+{
+char *p = (char *) alloca (2 * sizeof (int));
+ if (p) return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_working_alloca_h=yes
+else
+ ac_cv_working_alloca_h=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
+if test $ac_cv_working_alloca_h = yes; then
+
+$as_echo "@%:@define HAVE_ALLOCA_H 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if ${ac_cv_func_alloca_works+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+#else
+# ifdef _MSC_VER
+# include <malloc.h>
+# define alloca _alloca
+# else
+# ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+# else
+# ifdef _AIX
+ #pragma alloca
+# else
+# ifndef alloca /* predefined by HP cc +Olibcalls */
+void *alloca (size_t);
+# endif
+# endif
+# endif
+# endif
+#endif
+
+int
+main ()
+{
+char *p = (char *) alloca (1);
+ if (p) return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_func_alloca_works=yes
+else
+ ac_cv_func_alloca_works=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
+
+if test $ac_cv_func_alloca_works = yes; then
+
+$as_echo "@%:@define HAVE_ALLOCA 1" >>confdefs.h
+
+else
+ # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+# that cause trouble. Some versions do not even contain alloca or
+# contain a buggy version. If you still want to use their alloca,
+# use ar to extract alloca.o from them instead of compiling alloca.c.
+
+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
+
+$as_echo "@%:@define C_ALLOCA 1" >>confdefs.h
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if ${ac_cv_os_cray+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#if defined CRAY && ! defined CRAY2
+webecray
+#else
+wenotbecray
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "webecray" >/dev/null 2>&1; then :
+ ac_cv_os_cray=yes
+else
+ ac_cv_os_cray=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
+if test $ac_cv_os_cray = yes; then
+ for ac_func in _getb67 GETB67 getb67; do
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+
+cat >>confdefs.h <<_ACEOF
+@%:@define CRAY_STACKSEG_END $ac_func
+_ACEOF
+
+ break
+fi
+
+ done
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if ${ac_cv_c_stack_direction+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then :
+ ac_cv_c_stack_direction=0
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$ac_includes_default
+int
+find_stack_direction ()
+{
+ static char *addr = 0;
+ auto char dummy;
+ if (addr == 0)
+ {
+ addr = &dummy;
+ return find_stack_direction ();
+ }
+ else
+ return (&dummy > addr) ? 1 : -1;
+}
+
+int
+main ()
+{
+ return find_stack_direction () < 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ ac_cv_c_stack_direction=1
+else
+ ac_cv_c_stack_direction=-1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
+cat >>confdefs.h <<_ACEOF
+@%:@define STACK_DIRECTION $ac_cv_c_stack_direction
+_ACEOF
+
+
+fi
+
+ test -n "$ALLOCA" && extra_objs="$extra_objs $ALLOCA" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"$ALLOCA\""
+ fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca in function calls" >&5
+$as_echo_n "checking for working alloca in function calls... " >&6; }
+if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#if defined (__CYGWIN__)
+#include <alloca.h>
+#elif defined (__GNUC__)
+#define alloca __builtin_alloca
+#elif defined (__DECC)
+#include <alloca.h>
+#pragma intrinsic(alloca)
+#elif defined (HAVE_ALLOCA_H)
+#include <alloca.h>
+#elif defined (_AIX)
+#pragma alloca
+#elif ! defined (alloca)
+#ifdef C_ALLOCA
+#define alloca xemacs_c_alloca
+#else
+void *alloca ();
+#endif /* C_ALLOCA */
+#endif /* !defined (alloca) */
+
+void
+f1 (double a, void *ptr, int b)
+{
+ unsigned char *ptr2 = (unsigned char *) ptr;
+ if (ptr2[0] != 0xBF || ptr2[1] != 0xBF || ptr2[3000] != 0xBF)
+ exit (1);
+ if (a != 3.1415 || b != -5490)
+ exit (1);
+}
+
+int
+f2 (short c, void *ptr, long e)
+{
+ unsigned char *ptr2 = (unsigned char *) ptr;
+ if (ptr2[0] != 0xFB || ptr2[1] != 0xFB || ptr2[1000] != 0xFB)
+ exit (1);
+ if (c != 665 || e != 776776776)
+ exit (1);
+ f1 (3.1415, memset (alloca (3001), 0xBF, 3001), -5490);
+ return 42;
+}
+
+int
+main (int argc, char **argv)
+{
+ if (f2 (665, memset (alloca (1001), 0xFB, 1001), 776776776) != 42)
+ return 1;
+ return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ working_alloca_in_function_calls=yes
+else
+ working_alloca_in_function_calls=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $working_alloca_in_function_calls" >&5
+$as_echo "$working_alloca_in_function_calls" >&6; }
+test "$working_alloca_in_function_calls" != "yes" && \
+ $as_echo "@%:@define BROKEN_ALLOCA_IN_FUNCTION_CALLS 1" >>confdefs.h
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working scanf" >&5
+$as_echo_n "checking for working scanf... " >&6; }
+if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main (int argc, char **argv)
+{
+ int ret, cp1, cp2, endcount;
+ char *p = "0x7d 0x000E ";
+ ret = sscanf (p, "%i %i%n", &cp1, &cp2, &endcount);
+ /* endcount should be 13 but it's 11 in Cygwin newlib after 6/04;
+ this breaks unicode.c */
+ return endcount != 13;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ working_scanf=yes
+else
+ working_scanf=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $working_scanf" >&5
+$as_echo "$working_scanf" >&6; }
+test "$working_scanf" != "yes" && \
+ $as_echo "@%:@define CYGWIN_SCANF_BUG 1" >>confdefs.h
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strcoll" >&5
+$as_echo_n "checking for working strcoll... " >&6; }
+if ${ac_cv_func_strcoll_works+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then :
+ ac_cv_func_strcoll_works=no
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+return (strcoll ("abc", "def") >= 0 ||
+ strcoll ("ABC", "DEF") >= 0 ||
+ strcoll ("123", "456") >= 0)
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ ac_cv_func_strcoll_works=yes
+else
+ ac_cv_func_strcoll_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strcoll_works" >&5
+$as_echo "$ac_cv_func_strcoll_works" >&6; }
+if test $ac_cv_func_strcoll_works = yes; then
+
+$as_echo "@%:@define HAVE_STRCOLL 1" >>confdefs.h
+
+fi
+
+
+for ac_func in getpgrp
+do :
+ ac_fn_c_check_func "$LINENO" "getpgrp" "ac_cv_func_getpgrp"
+if test "x$ac_cv_func_getpgrp" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_GETPGRP 1
+_ACEOF
+
+fi
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpgrp requires zero arguments" >&5
+$as_echo_n "checking whether getpgrp requires zero arguments... " >&6; }
+if ${ac_cv_func_getpgrp_void+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ # Use it with a single arg.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+getpgrp (0);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_func_getpgrp_void=no
+else
+ ac_cv_func_getpgrp_void=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getpgrp_void" >&5
+$as_echo "$ac_cv_func_getpgrp_void" >&6; }
+if test $ac_cv_func_getpgrp_void = yes; then
+
+$as_echo "@%:@define GETPGRP_VOID 1" >>confdefs.h
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
+$as_echo_n "checking for working mmap... " >&6; }
+if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+
+#ifndef MAP_VARIABLE
+#define MAP_VARIABLE 0
+#endif
+
+#ifndef MAP_FAILED
+#define MAP_FAILED -1
+#endif
+
+int main (int argc, char **argv)
+{
+ int fd = -1;
+ caddr_t p;
+#ifndef MAP_ANONYMOUS
+ fd = open ("/dev/zero", O_RDWR);
+ if (fd < 0)
+ return 1;
+#define MAP_ANONYMOUS 0
+#endif
+ if (mmap(0, 1024, PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_VARIABLE | MAP_ANONYMOUS,
+ fd, 0) != (void *) MAP_FAILED)
+ return 0;
+ perror ("conftest: mmap failed");
+ return 1;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ have_mmap=yes
+else
+ have_mmap=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_mmap" >&5
+$as_echo "$have_mmap" >&6; }
+test "$have_mmap" = "yes" && $as_echo "@%:@define HAVE_MMAP 1" >>confdefs.h
+
+
+case "$opsys" in cygwin*)
+ test "$with_rel_alloc" = "default" && with_rel_alloc=no ;;
+esac
+test "$GNU_MALLOC" != "yes" -a "$have_mmap" != "yes" && with_rel_alloc=no
+if test "$with_rel_alloc $have_mmap" = "default yes"; then
+ if test "$doug_lea_malloc" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for M_MMAP_THRESHOLD" >&5
+$as_echo_n "checking for M_MMAP_THRESHOLD... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <malloc.h>
+int
+main ()
+{
+
+#ifndef M_MMAP_THRESHOLD
+#error No M_MMAP_THRESHOLD :-(
+!@+$%^&*_)(_ - unlikely to compile...
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ with_rel_alloc=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; };
+else
+ with_rel_alloc=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; };
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+ with_rel_alloc=yes
+ fi
+fi
+test "$with_rel_alloc" = "yes" && $as_echo "@%:@define REL_ALLOC 1" >>confdefs.h
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "termios.h" "ac_cv_header_termios_h" "$ac_includes_default"
+if test "x$ac_cv_header_termios_h" = xyes; then :
+ $as_echo "@%:@define HAVE_TERMIOS 1" >>confdefs.h
+
+ $as_echo "@%:@define SIGNALS_VIA_CHARACTERS 1" >>confdefs.h
+
+ $as_echo "@%:@define NO_TERMIO 1" >>confdefs.h
+
+else
+ ac_fn_c_check_header_mongrel "$LINENO" "termio.h" "ac_cv_header_termio_h" "$ac_includes_default"
+if test "x$ac_cv_header_termio_h" = xyes; then :
+ $as_echo "@%:@define HAVE_TERMIO 1" >>confdefs.h
+
+fi
+
+
+fi
+
+
+
+
+ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
+if test "x$ac_cv_func_socket" = xyes; then :
+ ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default"
+if test "x$ac_cv_header_netinet_in_h" = xyes; then :
+ ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default"
+if test "x$ac_cv_header_arpa_inet_h" = xyes; then :
+
+ $as_echo "@%:@define HAVE_SOCKETS 1" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sun_len member in struct sockaddr_un" >&5
+$as_echo_n "checking for sun_len member in struct sockaddr_un... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
+int
+main ()
+{
+static struct sockaddr_un x; x.sun_len = 1;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }; $as_echo "@%:@define HAVE_SOCKADDR_SUN_LEN 1" >>confdefs.h
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ip_mreq struct in netinet/in.h" >&5
+$as_echo_n "checking for ip_mreq struct in netinet/in.h... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <sys/types.h>
+#include <netinet/in.h>
+
+int
+main ()
+{
+static struct ip_mreq x;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }; $as_echo "@%:@define HAVE_MULTICAST 1" >>confdefs.h
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+
+
+fi
+
+
+fi
+
+
+ac_fn_c_check_func "$LINENO" "msgget" "ac_cv_func_msgget"
+if test "x$ac_cv_func_msgget" = xyes; then :
+ ac_fn_c_check_header_mongrel "$LINENO" "sys/ipc.h" "ac_cv_header_sys_ipc_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_ipc_h" = xyes; then :
+ ac_fn_c_check_header_mongrel "$LINENO" "sys/msg.h" "ac_cv_header_sys_msg_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_msg_h" = xyes; then :
+ $as_echo "@%:@define HAVE_SYSVIPC 1" >>confdefs.h
+
+fi
+
+
+fi
+
+
+fi
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "dirent.h" "ac_cv_header_dirent_h" "$ac_includes_default"
+if test "x$ac_cv_header_dirent_h" = xyes; then :
+ $as_echo "@%:@define SYSV_SYSTEM_DIR 1" >>confdefs.h
+
+else
+ ac_fn_c_check_header_mongrel "$LINENO" "sys/dir.h" "ac_cv_header_sys_dir_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_dir_h" = xyes; then :
+
+else
+ $as_echo "@%:@define NONSYSTEM_DIR_LIBRARY 1" >>confdefs.h
+
+fi
+
+
+fi
+
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "nlist.h" "ac_cv_header_nlist_h" "$ac_includes_default"
+if test "x$ac_cv_header_nlist_h" = xyes; then :
+ $as_echo "@%:@define NLIST_STRUCT 1" >>confdefs.h
+
+fi
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sound support" >&5
+$as_echo_n "checking for sound support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+
+test -n "$with_native_sound_lib" && with_sound_native=yes
+
+if test "$with_sound_native" != "no"; then
+ if test -n "$with_native_sound_lib"; then
+ ac_fn_c_check_header_mongrel "$LINENO" "multimedia/audio_device.h" "ac_cv_header_multimedia_audio_device_h" "$ac_includes_default"
+if test "x$ac_cv_header_multimedia_audio_device_h" = xyes; then :
+ sound_found=yes sound_cflags=""
+ extra_objs="$extra_objs sunplay.o" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"sunplay.o\""
+ fi
+fi
+
+
+ fi
+
+ if test -z "$sound_found" -a -d "/usr/demo/SOUND"; then
+ if test -d "/usr/demo/SOUND/include/multimedia"; then
+ sun_sound_cflags="-I/usr/demo/SOUND/include"
+ elif test -d "/usr/demo/SOUND/multimedia"; then
+ sun_sound_cflags="-I/usr/demo/SOUND"
+ fi
+
+ if test -n "$with_native_sound_lib"; then
+ sun_sound_lib="$with_native_sound_lib"
+ elif test -r "/usr/demo/SOUND/lib/libaudio.a"; then
+ sun_sound_lib="/usr/demo/SOUND/lib/libaudio.a"
+ elif test -r "/usr/demo/SOUND/libaudio.a"; then
+ sun_sound_lib="/usr/demo/SOUND/libaudio.a"
+ fi
+
+ if test -n "$sun_sound_cflags" -a -n "$sun_sound_lib"; then
+ with_native_sound_lib="$sun_sound_lib"
+ sound_cflags="$sun_sound_cflags"
+ sound_found=yes
+ extra_objs="$extra_objs sunplay.o" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"sunplay.o\""
+ fi
+ fi
+ fi
+
+ if test -z "$sound_found"; then
+ case "$ac_cv_build" in
+ *-sgi-* )
+ if test -z "$with_native_sound_lib"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALopenport in -laudio" >&5
+$as_echo_n "checking for ALopenport in -laudio... " >&6; }
+if ${ac_cv_lib_audio_ALopenport+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-laudio $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ALopenport ();
+int
+main ()
+{
+return ALopenport ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_audio_ALopenport=yes
+else
+ ac_cv_lib_audio_ALopenport=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audio_ALopenport" >&5
+$as_echo "$ac_cv_lib_audio_ALopenport" >&6; }
+if test "x$ac_cv_lib_audio_ALopenport" = xyes; then :
+ with_native_sound_lib="-laudio"
+fi
+
+ fi
+ if test -n "$with_native_sound_lib"; then
+ sound_found=yes sound_cflags=""
+ extra_objs="$extra_objs sgiplay.o" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"sgiplay.o\""
+ fi
+ fi ;;
+ hppa*-hp-hpux* )
+ if test -z "$with_native_sound_lib"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AOpenAudio in -lAlib" >&5
+$as_echo_n "checking for AOpenAudio in -lAlib... " >&6; }
+if ${ac_cv_lib_Alib_AOpenAudio+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lAlib $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char AOpenAudio ();
+int
+main ()
+{
+return AOpenAudio ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_Alib_AOpenAudio=yes
+else
+ ac_cv_lib_Alib_AOpenAudio=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Alib_AOpenAudio" >&5
+$as_echo "$ac_cv_lib_Alib_AOpenAudio" >&6; }
+if test "x$ac_cv_lib_Alib_AOpenAudio" = xyes; then :
+ with_native_sound_lib="-lAlib"
+fi
+
+ fi
+ if test -n "$with_native_sound_lib"; then
+ sound_found=yes
+ extra_objs="$extra_objs hpplay.o" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"hpplay.o\""
+ fi
+ if test "$GCC" = "yes" # Kludge city
+ then sound_cflags="-Dconst= -Dvolatile= -I/usr/audio/examples"
+ else sound_cflags="+e -I/usr/audio/examples"
+ fi
+ fi ;;
+ esac
+ fi
+
+ if test -z "$sound_found"; then
+ case "$opsys" in cygwin* | mingw* )
+ sound_found=yes
+ with_native_sound_lib=
+ extra_objs="$extra_objs ntplay.o" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"ntplay.o\""
+ fi
+ ;;
+ esac
+ fi
+
+ if test -z "$sound_found"; then
+ for dir in "machine" "sys" "linux"; do
+ as_ac_Header=`$as_echo "ac_cv_header_${dir}/soundcard.h" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "${dir}/soundcard.h" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+
+ sound_found=yes
+ case "${ac_cv_build}" in
+ *netbsd* )
+ # #### this is probably not the right way to do this
+ # we should port to native NetBSD stuff
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _oss_ioctl in -lossaudio" >&5
+$as_echo_n "checking for _oss_ioctl in -lossaudio... " >&6; }
+if ${ac_cv_lib_ossaudio__oss_ioctl+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lossaudio $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char _oss_ioctl ();
+int
+main ()
+{
+return _oss_ioctl ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ossaudio__oss_ioctl=yes
+else
+ ac_cv_lib_ossaudio__oss_ioctl=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
+$as_echo "$ac_cv_lib_ossaudio__oss_ioctl" >&6; }
+if test "x$ac_cv_lib_ossaudio__oss_ioctl" = xyes; then :
+ with_native_sound_lib=-lossaudio
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Using NetBSD-deprecated -lossaudio" >&5
+$as_echo "$as_me: WARNING: Using NetBSD-deprecated -lossaudio" >&2;}
+else
+ sound_found=no
+fi
+
+ ;;
+ esac
+ break
+fi
+
+
+ done
+
+ if test "$sound_found" = "yes"; then
+ need_miscplay=yes
+ extra_objs="$extra_objs linuxplay.o" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"linuxplay.o\""
+ fi
+ cat >>confdefs.h <<_ACEOF
+@%:@define SOUNDCARD_H_FILE "${dir}/soundcard.h"
+_ACEOF
+
+ fi
+ fi
+
+ if test "$sound_found" = "yes"; then
+ with_sound_native=yes
+ else
+ if test "$with_sound_native" = "yes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No native libraries found. Disabling native sound support." >&5
+$as_echo "$as_me: WARNING: No native libraries found. Disabling native sound support." >&2;}
+ fi
+ with_sound_native=no
+ fi
+fi
+
+if test "$with_sound_native" = "yes"; then
+ $as_echo "@%:@define HAVE_NATIVE_SOUND 1" >>confdefs.h
+
+ test -n "$with_native_sound_lib" && LIBS="$with_native_sound_lib $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"$with_native_sound_lib\" to \$LIBS"; fi
+fi
+
+if test "$with_sound_alsa" != "no"; then
+ ac_fn_c_check_header_mongrel "$LINENO" "alsa/input.h" "ac_cv_header_alsa_input_h" "$ac_includes_default"
+if test "x$ac_cv_header_alsa_input_h" = xyes; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_open in -lasound" >&5
+$as_echo_n "checking for snd_pcm_open in -lasound... " >&6; }
+if ${ac_cv_lib_asound_snd_pcm_open+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lasound $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char snd_pcm_open ();
+int
+main ()
+{
+return snd_pcm_open ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_asound_snd_pcm_open=yes
+else
+ ac_cv_lib_asound_snd_pcm_open=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_open" >&5
+$as_echo "$ac_cv_lib_asound_snd_pcm_open" >&6; }
+if test "x$ac_cv_lib_asound_snd_pcm_open" = xyes; then :
+ have_alsa_sound=yes
+fi
+
+fi
+
+
+ if test "$have_alsa_sound" = "yes"; then
+ with_sound_alsa=yes
+ $as_echo "@%:@define HAVE_ALSA_SOUND 1" >>confdefs.h
+
+ extra_objs="$extra_objs alsaplay.o" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"alsaplay.o\""
+ fi
+ LIBS="-lasound $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-lasound\" to \$LIBS"; fi
+ else
+ test "$with_sound_alsa" = "yes" && \
+ { echo "Error:" "Required ALSA sound support cannot be provided." >&2; exit 1; }
+ with_sound_alsa=no
+ fi
+fi
+
+if test "$with_sound_nas" != "no"; then
+ ac_fn_c_check_header_mongrel "$LINENO" "audio/audiolib.h" "ac_cv_header_audio_audiolib_h" "$ac_includes_default"
+if test "x$ac_cv_header_audio_audiolib_h" = xyes; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AuOpenServer in -laudio" >&5
+$as_echo_n "checking for AuOpenServer in -laudio... " >&6; }
+if ${ac_cv_lib_audio_AuOpenServer+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-laudio $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char AuOpenServer ();
+int
+main ()
+{
+return AuOpenServer ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_audio_AuOpenServer=yes
+else
+ ac_cv_lib_audio_AuOpenServer=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audio_AuOpenServer" >&5
+$as_echo "$ac_cv_lib_audio_AuOpenServer" >&6; }
+if test "x$ac_cv_lib_audio_AuOpenServer" = xyes; then :
+ have_nas_sound=yes
+fi
+
+fi
+
+
+ if test "$have_nas_sound" = "yes"; then
+ with_sound_nas=yes
+ $as_echo "@%:@define HAVE_NAS_SOUND 1" >>confdefs.h
+
+ extra_objs="$extra_objs nas.o" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"nas.o\""
+ fi
+ libs_x="-laudio $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-laudio\" to \$libs_x"; fi
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <audio/Xtutil.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "AuXtErrorJump" >/dev/null 2>&1; then :
+
+else
+ old_nas=yes; $as_echo "@%:@define NAS_NO_ERROR_JUMP 1" >>confdefs.h
+
+fi
+rm -f conftest*
+
+ else
+ test "$with_sound_nas" = "yes" && \
+ { echo "Error:" "Required NAS sound support cannot be provided." >&2; exit 1; }
+ with_sound_nas=no
+ fi
+fi
+
+if test "$with_sound_esd" != "no"; then
+ # Extract the first word of "esd-config", so it can be a program name with args.
+set dummy esd-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_have_esd_config+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$have_esd_config"; then
+ ac_cv_prog_have_esd_config="$have_esd_config" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_have_esd_config="yes"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_prog_have_esd_config" && ac_cv_prog_have_esd_config="no"
+fi
+fi
+have_esd_config=$ac_cv_prog_have_esd_config
+if test -n "$have_esd_config"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_esd_config" >&5
+$as_echo "$have_esd_config" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ if test "$have_esd_config" = "yes"; then
+ save_c_switch_site="$c_switch_site" save_LIBS="$LIBS"
+ c_switch_site="$c_switch_site `esd-config --cflags`" && if test "$verbose" = "yes"; then echo " Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi
+ LIBS="`esd-config --libs` $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"`esd-config --libs`\" to \$LIBS"; fi
+ ac_fn_c_check_func "$LINENO" "esd_play_stream" "ac_cv_func_esd_play_stream"
+if test "x$ac_cv_func_esd_play_stream" = xyes; then :
+ have_esd_sound=yes
+else
+ c_switch_site="$save_c_switch_site" LIBS="$save_LIBS"
+fi
+
+ fi
+
+ if test "$have_esd_sound" = "yes"; then
+ with_sound_esd=yes
+ need_miscplay=yes
+ extra_objs="$extra_objs esd.o" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"esd.o\""
+ fi
+ $as_echo "@%:@define HAVE_ESD_SOUND 1" >>confdefs.h
+
+ else
+ test "$with_sound_esd" = "yes" && \
+ { echo "Error:" "Required ESD sound support cannot be provided." >&2; exit 1; }
+ with_sound_esd=no
+ fi
+fi
+
+test "$need_miscplay" = "yes" && extra_objs="$extra_objs miscplay.o" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"miscplay.o\""
+ fi
+
+
+test -z "$with_tty" && with_tty=yes
+
+if test "$with_tty" = "yes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TTY-related features" >&5
+$as_echo_n "checking for TTY-related features... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+ $as_echo "@%:@define HAVE_TTY 1" >>confdefs.h
+
+
+ if test -z "$with_ncurses"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
+$as_echo_n "checking for tgetent in -lncurses... " >&6; }
+if ${ac_cv_lib_ncurses_tgetent+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lncurses $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tgetent ();
+int
+main ()
+{
+return tgetent ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ncurses_tgetent=yes
+else
+ ac_cv_lib_ncurses_tgetent=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
+$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
+if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then :
+ with_ncurses=yes
+else
+ with_ncurses=no
+fi
+
+ fi
+ if test "$with_ncurses" = "yes"; then
+ $as_echo "@%:@define HAVE_NCURSES 1" >>confdefs.h
+
+ ac_fn_c_check_header_mongrel "$LINENO" "ncurses/curses.h" "ac_cv_header_ncurses_curses_h" "$ac_includes_default"
+if test "x$ac_cv_header_ncurses_curses_h" = xyes; then :
+ curses_h_file=ncurses/curses.h
+fi
+
+
+ ac_fn_c_check_header_mongrel "$LINENO" "ncurses/term.h" "ac_cv_header_ncurses_term_h" "$ac_includes_default"
+if test "x$ac_cv_header_ncurses_term_h" = xyes; then :
+ term_h_file=ncurses/term.h
+fi
+
+
+ extra_objs="$extra_objs terminfo.o" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"terminfo.o\""
+ fi
+ LIBS="-lncurses $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-lncurses\" to \$LIBS"; fi
+
+ if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then
+ save_c_switch_site="$c_switch_site"
+ c_switch_site="$c_switch_site -I/usr/include/ncurses"
+ ac_fn_c_check_header_mongrel "$LINENO" "ncurses/curses.h" "ac_cv_header_ncurses_curses_h" "$ac_includes_default"
+if test "x$ac_cv_header_ncurses_curses_h" = xyes; then :
+ curses_h_file=ncurses/curses.h
+fi
+
+
+ if test "$ac_cv_header_ncurses_curses_h" = "yes"
+ then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your system has the bogus ncurses include bug." >&5
+$as_echo "$as_me: WARNING: Your system has the bogus ncurses include bug." >&2;}
+ else c_switch_site="$save_c_switch_site"
+ fi
+ fi
+ else if test "$have_terminfo" = "yes"; then
+ extra_objs="$extra_objs terminfo.o" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"terminfo.o\""
+ fi
+ if test -n "$libs_termcap"; then
+ LIBS="$libs_termcap $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"$libs_termcap\" to \$LIBS"; fi
+ else
+ for lib in curses termlib termcap; do
+ as_ac_Lib=`$as_echo "ac_cv_lib_$lib''_tgetent" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l$lib" >&5
+$as_echo_n "checking for tgetent in -l$lib... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$lib $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tgetent ();
+int
+main ()
+{
+return tgetent ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$as_ac_Lib=yes"
+else
+ eval "$as_ac_Lib=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+eval ac_res=\$$as_ac_Lib
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ LIBS="-l${lib} $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-l${lib}\" to \$LIBS"; fi; break
+fi
+
+ done
+ fi
+ else extra_objs="$extra_objs tparam.o" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"tparam.o\""
+ fi
+ case "$opsys" in *-hp-hpux* ) libs_termcap="-ltermcap" ;; esac
+ if test -n "$libs_termcap"; then
+ LIBS="$libs_termcap $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"$libs_termcap\" to \$LIBS"; fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5
+$as_echo_n "checking for tgetent in -lcurses... " >&6; }
+if ${ac_cv_lib_curses_tgetent+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcurses $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tgetent ();
+int
+main ()
+{
+return tgetent ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_curses_tgetent=yes
+else
+ ac_cv_lib_curses_tgetent=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_tgetent" >&5
+$as_echo "$ac_cv_lib_curses_tgetent" >&6; }
+if test "x$ac_cv_lib_curses_tgetent" = xyes; then :
+ LIBS="-lcurses $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-lcurses\" to \$LIBS"; fi
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
+$as_echo_n "checking for tgetent in -ltermcap... " >&6; }
+if ${ac_cv_lib_termcap_tgetent+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltermcap $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tgetent ();
+int
+main ()
+{
+return tgetent ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_termcap_tgetent=yes
+else
+ ac_cv_lib_termcap_tgetent=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
+$as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
+if test "x$ac_cv_lib_termcap_tgetent" = xyes; then :
+ LIBS="-ltermcap $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-ltermcap\" to \$LIBS"; fi
+else
+ extra_objs="$extra_objs termcap.o" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"termcap.o\""
+ fi
+fi
+
+fi
+
+ fi
+ fi
+ fi
+ cat >>confdefs.h <<_ACEOF
+@%:@define CURSES_H_FILE "${curses_h_file-curses.h}"
+_ACEOF
+
+ cat >>confdefs.h <<_ACEOF
+@%:@define TERM_H_FILE "${term_h_file-term.h}"
+_ACEOF
+
+
+ if test "$with_gpm" != "no"; then
+ ac_fn_c_check_header_mongrel "$LINENO" "gpm.h" "ac_cv_header_gpm_h" "$ac_includes_default"
+if test "x$ac_cv_header_gpm_h" = xyes; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Gpm_Open in -lgpm" >&5
+$as_echo_n "checking for Gpm_Open in -lgpm... " >&6; }
+if ${ac_cv_lib_gpm_Gpm_Open+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgpm $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char Gpm_Open ();
+int
+main ()
+{
+return Gpm_Open ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_gpm_Gpm_Open=yes
+else
+ ac_cv_lib_gpm_Gpm_Open=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+$as_echo "$ac_cv_lib_gpm_Gpm_Open" >&6; }
+if test "x$ac_cv_lib_gpm_Gpm_Open" = xyes; then :
+ have_gpm=yes
+fi
+
+fi
+
+
+ if test "$have_gpm" = "yes"; then
+ with_gpm=yes
+ $as_echo "@%:@define HAVE_GPM 1" >>confdefs.h
+
+ LIBS="-lgpm $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-lgpm\" to \$LIBS"; fi
+ elif test "$with_gpm" = "yes"; then
+ { echo "Error:" "GPM requested, but gpm.h or libgpm seems to be missing." >&2; exit 1; }
+ else
+ with_gpm=no
+ fi
+ fi
+
+else for feature in ncurses gpm; do
+ if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-${feature} ignored: Not valid without TTY support" >&5
+$as_echo "$as_me: WARNING: --with-${feature} ignored: Not valid without TTY support" >&2;}
+ fi
+ eval "with_${feature}=no"
+ done
+fi
+
+test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
+ != "no no no" && { $as_echo "$as_me:${as_lineno-$LINENO}: checking for database support" >&5
+$as_echo_n "checking for database support... " >&6; } && \
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+
+if test "$with_database_gdbm $with_database_dbm" != "no no"; then
+ ndbm_h_file=""
+ for ac_header in ndbm.h gdbm/ndbm.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ ndbm_h_file=$ac_header; break;
+fi
+
+done
+
+ if test "x$ndbm_h_file" = "x"; then
+ test "$with_database_gdbm" = "yes" -o \
+ "$with_database_dbm" = "yes" && \
+ { echo "Error:" "Required DBM support cannot be provided." >&2; exit 1; }
+ with_database_gdbm=no with_database_dbm=no]
+ fi
+fi
+
+if test "$with_database_gdbm" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -lgdbm" >&5
+$as_echo_n "checking for dbm_open in -lgdbm... " >&6; }
+if ${ac_cv_lib_gdbm_dbm_open+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgdbm $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dbm_open ();
+int
+main ()
+{
+return dbm_open ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_gdbm_dbm_open=yes
+else
+ ac_cv_lib_gdbm_dbm_open=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_dbm_open" >&5
+$as_echo "$ac_cv_lib_gdbm_dbm_open" >&6; }
+if test "x$ac_cv_lib_gdbm_dbm_open" = xyes; then :
+
+ with_database_gdbm=yes with_database_dbm=no libdbm=-lgdbm
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -lgdbm_compat" >&5
+$as_echo_n "checking for dbm_open in -lgdbm_compat... " >&6; }
+if ${ac_cv_lib_gdbm_compat_dbm_open+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgdbm_compat -lgdbm $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dbm_open ();
+int
+main ()
+{
+return dbm_open ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_gdbm_compat_dbm_open=yes
+else
+ ac_cv_lib_gdbm_compat_dbm_open=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_compat_dbm_open" >&5
+$as_echo "$ac_cv_lib_gdbm_compat_dbm_open" >&6; }
+if test "x$ac_cv_lib_gdbm_compat_dbm_open" = xyes; then :
+
+ with_database_gdbm=yes with_database_dbm=no libdbm="-lgdbm_compat -lgdbm"
+else
+
+ if test "$with_database_gdbm" = "yes"; then
+ { echo "Error:" "Required GNU DBM support cannot be provided." >&2; exit 1; }
+ fi
+ with_database_gdbm=no
+fi
+
+
+fi
+
+fi
+
+if test "$with_database_dbm" != "no"; then
+ ac_fn_c_check_func "$LINENO" "dbm_open" "ac_cv_func_dbm_open"
+if test "x$ac_cv_func_dbm_open" = xyes; then :
+ with_database_dbm=yes libdbm=
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -ldbm" >&5
+$as_echo_n "checking for dbm_open in -ldbm... " >&6; }
+if ${ac_cv_lib_dbm_dbm_open+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldbm $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dbm_open ();
+int
+main ()
+{
+return dbm_open ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dbm_dbm_open=yes
+else
+ ac_cv_lib_dbm_dbm_open=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dbm_dbm_open" >&5
+$as_echo "$ac_cv_lib_dbm_dbm_open" >&6; }
+if test "x$ac_cv_lib_dbm_dbm_open" = xyes; then :
+ with_database_dbm=yes libdbm=-ldbm
+else
+
+ test "$with_database_dbm" = "yes" && \
+ { echo "Error:" "Required DBM support cannot be provided." >&2; exit 1; }
+ with_database_dbm=no
+fi
+
+fi
+
+fi
+
+test -n "$libdbm" && LIBS=""$libdbm" $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \""$libdbm"\" to \$LIBS"; fi
+if test "$with_database_gdbm" = "yes" -o \
+ "$with_database_dbm" = "yes"; then
+ cat >>confdefs.h <<_ACEOF
+@%:@define NDBM_H_FILE "$ndbm_h_file"
+_ACEOF
+
+ $as_echo "@%:@define HAVE_DBM 1" >>confdefs.h
+
+ if test "$XEMACS_CC_GPP" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+ ac_ext=c
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='$XEMACS_CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
+ac_link='$XEMACS_CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ ac_ext=c
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='$XEMACS_CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
+ac_link='$XEMACS_CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -z "$CXX"; then
+ if test -n "$CCC"; then
+ CXX=$CCC
+ else
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CXX"; then
+ ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$CXX" && break
+ done
+fi
+if test -z "$CXX"; then
+ ac_ct_CXX=$CXX
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CXX"; then
+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CXX="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_CXX" && break
+done
+
+ if test "x$ac_ct_CXX" = x; then
+ CXX="g++"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CXX=$ac_ct_CXX
+ fi
+fi
+
+ fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+#ifndef __GNUC__
+ choke me
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_compiler_gnu=yes
+else
+ ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GXX=yes
+else
+ GXX=
+fi
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if ${ac_cv_prog_cxx_g+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ ac_cxx_werror_flag=yes
+ ac_cv_prog_cxx_g=no
+ CXXFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_cv_prog_cxx_g=yes
+else
+ CXXFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ CXXFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_cv_prog_cxx_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+ CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+ if test "$GXX" = yes; then
+ CXXFLAGS="-g -O2"
+ else
+ CXXFLAGS="-g"
+ fi
+else
+ if test "$GXX" = yes; then
+ CXXFLAGS="-O2"
+ else
+ CXXFLAGS=
+ fi
+fi
+ac_ext=c
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='$XEMACS_CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
+ac_link='$XEMACS_CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include "$ndbm_h_file"
+int
+main ()
+{
+dbm_close((DBM *) 0);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ndbm.h is compatible with g++" >&5
+$as_echo_n "checking whether ndbm.h is compatible with g++... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ $as_echo "@%:@define TRUST_NDBM_H_PROTOTYPES 1" >>confdefs.h
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ndbm.h is compatible with g++" >&5
+$as_echo_n "checking whether ndbm.h is compatible with g++... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ else
+ $as_echo "@%:@define TRUST_NDBM_H_PROTOTYPES 1" >>confdefs.h
+
+ fi
+ $as_unset ndbm_h_file
+fi
+
+ac_fn_c_check_type "$LINENO" "u_int8_t" "ac_cv_type_u_int8_t" "$ac_includes_default"
+if test "x$ac_cv_type_u_int8_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_U_INT8_T 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_type "$LINENO" "u_int16_t" "ac_cv_type_u_int16_t" "$ac_includes_default"
+if test "x$ac_cv_type_u_int16_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_U_INT16_T 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "$ac_includes_default"
+if test "x$ac_cv_type_u_int32_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_U_INT32_T 1
+_ACEOF
+
+
+fi
+
+
+if test "$with_database_berkdb" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley db.h" >&5
+$as_echo_n "checking for Berkeley db.h... " >&6; }
+ for header in "db/db.h" "db.h"; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <stdlib.h>
+#if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1)
+#ifdef HAVE_INTTYPES_H
+#define __BIT_TYPES_DEFINED__
+#include <inttypes.h>
+#if !HAVE_U_INT8_T
+typedef uint8_t u_int8_t;
+#endif
+#if !HAVE_U_INT16_T
+typedef uint16_t u_int16_t;
+#endif
+#if !HAVE_U_INT32_T
+typedef uint32_t u_int32_t;
+#endif
+#ifdef WE_DONT_NEED_QUADS
+#if !HAVE_U_INT64_T
+typedef uint64_t u_int64_t;
+#endif
+#endif
+#endif
+#endif
+#include <$header>
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ db_h_file="$header"; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ if test -z "$db_h_file"
+ then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; with_database_berkdb=no
+ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $db_h_file" >&5
+$as_echo "$db_h_file" >&6; }
+ fi
+
+ if test "$with_database_berkdb" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB version" >&5
+$as_echo_n "checking for Berkeley DB version... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <$db_h_file>
+#if DB_VERSION_MAJOR > 1
+yes
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "yes" >/dev/null 2>&1; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <$db_h_file>
+#if DB_VERSION_MAJOR > 2
+yes
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "yes" >/dev/null 2>&1; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <$db_h_file>
+#if DB_VERSION_MAJOR > 3
+yes
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "yes" >/dev/null 2>&1; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 4" >&5
+$as_echo "4" >&6; }; dbfunc=db_create; dbver=4
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 3" >&5
+$as_echo "3" >&6; }; dbfunc=db_create; dbver=3
+fi
+rm -f conftest*
+
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2" >&5
+$as_echo "2" >&6; }; dbfunc=db_open; dbver=2
+fi
+rm -f conftest*
+
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 1" >&5
+$as_echo "1" >&6; }; dbfunc=dbopen; dbver=1
+fi
+rm -f conftest*
+
+ as_ac_var=`$as_echo "ac_cv_func_$dbfunc" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$dbfunc" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ with_database_berkdb=yes need_libdb=no
+else
+
+ as_ac_Lib=`$as_echo "ac_cv_lib_db_$dbfunc" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dbfunc in -ldb" >&5
+$as_echo_n "checking for $dbfunc in -ldb... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldb $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $dbfunc ();
+int
+main ()
+{
+return $dbfunc ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$as_ac_Lib=yes"
+else
+ eval "$as_ac_Lib=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+eval ac_res=\$$as_ac_Lib
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ with_database_berkdb=yes need_libdb=yes
+fi
+
+fi
+
+ fi
+
+ if test "$with_database_berkdb" = "yes" -a "$dbver" = "4"; then
+ rm -f $tempcname
+ echo "#include <$db_h_file>" > $tempcname
+ echo "configure___ dbfunc=db_create" >> $tempcname
+ eval `$CPP -Isrc $tempcname \
+ | sed -n -e "s/[ TAB]*=[ TAB\"]*/='/" -e "s/[ TAB\"]*\$/'/" -e "s/^configure___//p"`
+ rm -f $tempcname
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"db_create is really $dbfunc\"" >&5
+$as_echo "$as_me: WARNING: \"db_create is really $dbfunc\"" >&2;}
+ as_ac_Lib=`$as_echo "ac_cv_lib_db_$dbfunc" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dbfunc in -ldb" >&5
+$as_echo_n "checking for $dbfunc in -ldb... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldb $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $dbfunc ();
+int
+main ()
+{
+return $dbfunc ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$as_ac_Lib=yes"
+else
+ eval "$as_ac_Lib=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+eval ac_res=\$$as_ac_Lib
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ with_database_berkdb=yes need_libdb=yes
+fi
+
+ fi
+
+ if test "$with_database_berkdb" = "yes"; then
+ cat >>confdefs.h <<_ACEOF
+@%:@define DB_H_FILE "$db_h_file"
+_ACEOF
+
+ $as_echo "@%:@define HAVE_BERKELEY_DB 1" >>confdefs.h
+
+ test "$need_libdb" = "yes" && LIBS="-ldb $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-ldb\" to \$LIBS"; fi
+ else with_database_berkdb=no
+ fi
+fi
+
+if test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
+ != "no no no"; then
+ $as_echo "@%:@define HAVE_DATABASE 1" >>confdefs.h
+
+fi
+
+if test "$with_socks" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOCKSinit in -lsocks" >&5
+$as_echo_n "checking for SOCKSinit in -lsocks... " >&6; }
+if ${ac_cv_lib_socks_SOCKSinit+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsocks $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char SOCKSinit ();
+int
+main ()
+{
+return SOCKSinit ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_socks_SOCKSinit=yes
+else
+ ac_cv_lib_socks_SOCKSinit=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socks_SOCKSinit" >&5
+$as_echo "$ac_cv_lib_socks_SOCKSinit" >&6; }
+if test "x$ac_cv_lib_socks_SOCKSinit" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_LIBSOCKS 1
+_ACEOF
+
+ LIBS="-lsocks $LIBS"
+
+fi
+
+ test -n "$ac_cv_lib_socks_SOCKSinit" && $as_echo "@%:@define HAVE_SOCKS 1" >>confdefs.h
+
+fi
+
+if test "$usage_tracking" = "yes"; then
+ $as_echo "@%:@define USAGE_TRACKING 1" >>confdefs.h
+
+ LIBS="-Bstatic -lut -Bdynamic $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-Bstatic -lut -Bdynamic\" to \$LIBS"; fi
+fi
+
+if test "$with_bignum" = "gmp"; then
+ ac_fn_c_check_header_mongrel "$LINENO" "gmp.h" "ac_cv_header_gmp_h" "$ac_includes_default"
+if test "x$ac_cv_header_gmp_h" = xyes; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gmpz_init in -lgmp" >&5
+$as_echo_n "checking for __gmpz_init in -lgmp... " >&6; }
+if ${ac_cv_lib_gmp___gmpz_init+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgmp $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __gmpz_init ();
+int
+main ()
+{
+return __gmpz_init ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_gmp___gmpz_init=yes
+else
+ ac_cv_lib_gmp___gmpz_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpz_init" >&5
+$as_echo "$ac_cv_lib_gmp___gmpz_init" >&6; }
+if test "x$ac_cv_lib_gmp___gmpz_init" = xyes; then :
+ have_mpz_init=yes
+fi
+
+fi
+
+
+ if test "$have_mpz_init" = "yes"; then
+ $as_echo "@%:@define WITH_NUMBER_TYPES 1" >>confdefs.h
+
+ $as_echo "@%:@define WITH_GMP 1" >>confdefs.h
+
+ LIBS="-lgmp $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-lgmp\" to \$LIBS"; fi
+ else
+ { echo "Error:" "Required GMP numeric support cannot be provided." >&2; exit 1; }
+ fi
+elif test "$with_bignum" = "mp"; then
+ for library in "" "-lcrypto"; do
+ ac_fn_c_check_header_mongrel "$LINENO" "mp.h" "ac_cv_header_mp_h" "$ac_includes_default"
+if test "x$ac_cv_header_mp_h" = xyes; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mp_mfree in -lmp" >&5
+$as_echo_n "checking for mp_mfree in -lmp... " >&6; }
+if ${ac_cv_lib_mp_mp_mfree+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmp $library $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char mp_mfree ();
+int
+main ()
+{
+return mp_mfree ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_mp_mp_mfree=yes
+else
+ ac_cv_lib_mp_mp_mfree=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mp_mp_mfree" >&5
+$as_echo "$ac_cv_lib_mp_mp_mfree" >&6; }
+if test "x$ac_cv_lib_mp_mp_mfree" = xyes; then :
+ have_mp_mfree=yes; break
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mfree in -lmp" >&5
+$as_echo_n "checking for mfree in -lmp... " >&6; }
+if ${ac_cv_lib_mp_mfree+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmp $library $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char mfree ();
+int
+main ()
+{
+return mfree ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_mp_mfree=yes
+else
+ ac_cv_lib_mp_mfree=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mp_mfree" >&5
+$as_echo "$ac_cv_lib_mp_mfree" >&6; }
+if test "x$ac_cv_lib_mp_mfree" = xyes; then :
+ have_mfree=yes; break
+fi
+
+fi
+
+fi
+
+
+ done
+ if test "$have_mp_mfree" = "yes"; then
+ $as_echo "@%:@define MP_PREFIX 1" >>confdefs.h
+
+ LIBS="$LIBS -lmp" && if test "$verbose" = "yes"; then echo " Appending \"-lmp\" to \$LIBS"; fi
+ if test "$library" != ""; then
+ LIBS="$LIBS $library" && if test "$verbose" = "yes"; then echo " Appending \"$library\" to \$LIBS"; fi
+ fi
+ ac_fn_c_check_func "$LINENO" "mp_move" "ac_cv_func_mp_move"
+if test "x$ac_cv_func_mp_move" = xyes; then :
+ $as_echo "@%:@define HAVE_MP_MOVE 1" >>confdefs.h
+
+fi
+
+ elif test "$have_mfree" = "yes"; then
+ LIBS="$LIBS -lmp" && if test "$verbose" = "yes"; then echo " Appending \"-lmp\" to \$LIBS"; fi
+ if test "$library" != ""; then
+ LIBS="$LIBS $library" && if test "$verbose" = "yes"; then echo " Appending \"$library\" to \$LIBS"; fi
+ fi
+ ac_fn_c_check_func "$LINENO" "move" "ac_cv_func_move"
+if test "x$ac_cv_func_move" = xyes; then :
+ $as_echo "@%:@define HAVE_MP_MOVE 1" >>confdefs.h
+
+fi
+
+ else
+ { echo "Error:" "Required MP numeric support cannot be provided." >&2; exit 1; }
+ fi
+ $as_echo "@%:@define WITH_NUMBER_TYPES 1" >>confdefs.h
+
+ $as_echo "@%:@define WITH_MP 1" >>confdefs.h
+
+fi
+
+if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int main(int c,char **v){return 0;}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ :
+else
+
+ echo ""
+ echo "*** PANIC *** The C compiler can no longer build working executables."
+ echo "*** PANIC *** Please examine the tail of config.log for runtime errors."
+ echo "*** PANIC *** The most likely reason for this problem is that configure"
+ echo "*** PANIC *** links with shared libraries, but those libraries cannot be"
+ echo "*** PANIC *** found at run time."
+ echo "*** PANIC ***"
+ echo "*** PANIC *** On a Linux system, edit /etc/ld.so.conf and re-run ldconfig."
+ echo "*** PANIC *** On other systems, try telling configure where to find the"
+ echo "*** PANIC *** shared libraries using the --with-site-runtime-libraries option"
+ echo "*** PANIC ***"
+ echo "*** PANIC *** Another way to shoot yourself in the foot is to specify"
+ echo "*** PANIC *** --with-FEATURE when FEATURE is not actually installed"
+ echo "*** PANIC *** on your system. Don't do that."
+ exit 1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+if test "$win32_processes" != "yes"; then
+ $as_echo "@%:@define HAVE_UNIX_PROCESSES 1" >>confdefs.h
+
+fi
+
+
+if test "$with_modules" = "yes"; then
+ ld_libs_module=
+else
+
+T=""
+for W in $ldap_libs $postgresql_libs $canna_libs; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+ld_libs_module="$T"
+
+fi
+
+
+T=""
+for W in $CFLAGS; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+CFLAGS="$T"
+
+
+T=""
+for W in $extra_objs; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+extra_objs="$T"
+
+
+T=""
+for W in -DHAVE_CONFIG_H $c_switch_site $c_switch_machine $c_switch_system; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+c_switch_general="$T"
+
+
+T=""
+for W in $c_switch_x_site $c_switch_gtk $X_CFLAGS; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+c_switch_window_system="$T"
+
+
+T=""
+for W in $c_switch_general $c_switch_window_system; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+c_switch_all="$T"
+
+
+T=""
+for W in $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_run; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+ld_switch_general="$T"
+
+
+T=""
+for W in $ld_switch_x_site; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+ld_switch_window_system="$T"
+
+
+T=""
+for W in $ld_switch_general $ld_switch_window_system; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+ld_switch_all="$T"
+
+
+T=""
+for W in $LIBS $libs_machine $libs_system $libs_standard; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+ld_libs_general="$T"
+
+
+T=""
+for W in $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+ld_libs_window_system="$T"
+
+
+T=""
+for W in $ld_libs_window_system $ld_libs_general $ld_libs_module; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+ld_libs_all="$T"
+
+
+if test "$with_modules" = "no"; then
+ MAKE_SUBDIR="$MAKE_SUBDIR src" && if test "$verbose" = "yes"; then echo " Appending \"src\" to \$MAKE_SUBDIR"; fi
+fi
+
+
+internal_makefile_list="Makefile.in src/.gdbinit.in"
+SUBDIR_MAKEFILES=''
+test -d lock || mkdir lock
+for dir in $MAKE_SUBDIR; do
+ case "$dir" in */* ) ( for d in `echo $dir | sed 's:/: :g'` ; do
+ test -d "$d" || mkdir "$d"; cd "$d"
+ done ) ;;
+ * ) test -d "$dir" || mkdir "$dir" ;;
+ esac
+
+T=""
+for W in $SUBDIR_MAKEFILES $dir/Makefile $dir/GNUmakefile; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+SUBDIR_MAKEFILES="$T"
+
+
+T=""
+for W in $internal_makefile_list $dir/Makefile.in; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+internal_makefile_list="$T"
+
+done
+
+
+
+
+for dir in src/s src/m; do
+ if test ! -d "$dir" ; then
+ echo Making symbolic link to "$srcdir/$dir"
+ ${LN_S} "$srcdir/$dir" "$dir"
+ fi
+done
+
+if test "$need_modules_common" = "yes"; then
+ for dir in modules/common; do
+ if test ! -d "$dir" ; then
+ echo Making symbolic link to "$srcdir/$dir"
+ ${LN_S} "$srcdir/$dir" "$dir"
+ fi
+ done
+fi
+
+if test "$verbose" = "yes"; then
+ echo ""
+ for var in extra_objs c_switch_general c_switch_window_system c_switch_all ld_switch_general ld_switch_window_system ld_switch_all ld_libs_general ld_libs_window_system ld_libs_all; do eval "echo \"$var = '\$$var'\""; done
+ echo ""
+fi
+
+
+
+if test -f "$srcdir/etc/dbxrc.in"; then
+ test "$verbose" = "yes" && echo "creating src/.dbxrc.in"
+ echo ". $srcdir/etc/dbxrc.in" > "src/.dbxrc.in"
+fi
+
+if test -f "$srcdir/TAGS" -a ! -f "TAGS"; then
+ test "$verbose" = "yes" && echo "creating TAGS"
+ echo "
+$srcdir/TAGS,include" > "TAGS"
+fi
+
+if test "$__SUNPRO_C" = "yes"; then
+ test "$verbose" = "yes" && echo "creating .sbinit"
+ ( echo "# For use with Sun WorkShop's Source browser."
+ echo "# See sbquery(1) and sbinit(4) for more information"
+ for dir in $MAKE_SUBDIR; do echo "import $dir"; done
+ ) > .sbinit
+fi
+
+rm -f core
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+PREFIX=$prefix
+while true; do
+ case "$PREFIX" in
+ *\$* ) eval "PREFIX=$PREFIX" ;;
+ *) break ;;
+ esac
+done
+
+
+
+
+EXEC_PREFIX=$exec_prefix
+while true; do
+ case "$EXEC_PREFIX" in
+ *\$* ) eval "EXEC_PREFIX=$EXEC_PREFIX" ;;
+ *) break ;;
+ esac
+done
+
+
+
+
+INFODIR=$infodir
+while true; do
+ case "$INFODIR" in
+ *\$* ) eval "INFODIR=$INFODIR" ;;
+ *) break ;;
+ esac
+done
+
+
+infopath=$with_infopath
+
+
+INFOPATH=$with_info_path
+while true; do
+ case "$INFOPATH" in
+ *\$* ) eval "INFOPATH=$INFOPATH" ;;
+ *) break ;;
+ esac
+done
+
+
+test -n "$with_user_packages" && with_early_packages=$with_user_packages
+early_packages=$with_early_packages
+
+
+EARLY_PACKAGE_DIRECTORIES=$with_early_packages
+while true; do
+ case "$EARLY_PACKAGE_DIRECTORIES" in
+ *\$* ) eval "EARLY_PACKAGE_DIRECTORIES=$EARLY_PACKAGE_DIRECTORIES" ;;
+ *) break ;;
+ esac
+done
+
+
+test -n "$with_system_packages" && with_late_packages=$with_system_packages
+late_packages=$with_late_packages
+
+
+LATE_PACKAGE_DIRECTORIES=$with_late_packages
+while true; do
+ case "$LATE_PACKAGE_DIRECTORIES" in
+ *\$* ) eval "LATE_PACKAGE_DIRECTORIES=$LATE_PACKAGE_DIRECTORIES" ;;
+ *) break ;;
+ esac
+done
+
+
+test -n "$with_legacy_packages" && with_last_packages=$with_legacy_packages
+last_packages=$with_last_packages
+
+
+LAST_PACKAGE_DIRECTORIES=$with_last_packages
+while true; do
+ case "$LAST_PACKAGE_DIRECTORIES" in
+ *\$* ) eval "LAST_PACKAGE_DIRECTORIES=$LAST_PACKAGE_DIRECTORIES" ;;
+ *) break ;;
+ esac
+done
+
+
+package_path=$with_package_path
+
+
+PACKAGE_PATH=$with_package_path
+while true; do
+ case "$PACKAGE_PATH" in
+ *\$* ) eval "PACKAGE_PATH=$PACKAGE_PATH" ;;
+ *) break ;;
+ esac
+done
+
+
+lispdir=$with_lispdir
+
+
+LISPDIR=$with_lispdir
+while true; do
+ case "$LISPDIR" in
+ *\$* ) eval "LISPDIR=$LISPDIR" ;;
+ *) break ;;
+ esac
+done
+
+
+moduledir=$with_moduledir
+
+
+MODULEDIR=$with_moduledir
+while true; do
+ case "$MODULEDIR" in
+ *\$* ) eval "MODULEDIR=$MODULEDIR" ;;
+ *) break ;;
+ esac
+done
+
+
+sitelispdir=$with_sitelispdir
+
+
+SITELISPDIR=$sitelispdir
+while true; do
+ case "$SITELISPDIR" in
+ *\$* ) eval "SITELISPDIR=$SITELISPDIR" ;;
+ *) break ;;
+ esac
+done
+
+
+
+
+SITEMODULEDIR=$sitemoduledir
+while true; do
+ case "$SITEMODULEDIR" in
+ *\$* ) eval "SITEMODULEDIR=$SITEMODULEDIR" ;;
+ *) break ;;
+ esac
+done
+
+
+etcdir=$with_etcdir
+
+
+ETCDIR=$with_etcdir
+while true; do
+ case "$ETCDIR" in
+ *\$* ) eval "ETCDIR=$ETCDIR" ;;
+ *) break ;;
+ esac
+done
+
+
+archlibdir=$with_archlibdir
+
+
+ARCHLIBDIR=$with_archlibdir
+ARCHLIBDIR=$with_archlibdir
+while true; do
+ case "$ARCHLIBDIR" in
+ *\$* ) eval "ARCHLIBDIR=$ARCHLIBDIR" ;;
+ *) break ;;
+ esac
+done
+
+
+docdir=$with_docdir
+
+
+DOCDIR=$with_docdir
+while true; do
+ case "$DOCDIR" in
+ *\$* ) eval "DOCDIR=$DOCDIR" ;;
+ *) break ;;
+ esac
+done
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+RECURSIVE_MAKE_ARGS="\$(MFLAGS) CC='\$(CC)' CFLAGS='\$(CFLAGS)' LDFLAGS='\$(LDFLAGS)' CPPFLAGS='\$(CPPFLAGS)'"
+
+
+native_sound_lib=$with_native_sound_lib
+
+
+
+
+
+
+
+if test "$with_prefix" = "yes"; then
+ $as_echo "@%:@define PREFIX_USER_DEFINED 1" >>confdefs.h
+
+fi
+
+if test "$with_site_lisp" = "no"; then
+ $as_echo "@%:@define INHIBIT_SITE_LISP 1" >>confdefs.h
+
+fi
+if test "$with_site_modules" = "no"; then
+ $as_echo "@%:@define INHIBIT_SITE_MODULES 1" >>confdefs.h
+
+fi
+
+
+T=""
+for W in $ac_configure_args; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+ac_configure_args="$T"
+
+ac_configure_args=" $ac_configure_args"
+cat >>confdefs.h <<_ACEOF
+@%:@define EMACS_CONFIGURATION "$ac_cv_build"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+@%:@define EMACS_CONFIG_OPTIONS "$ac_configure_args"
+_ACEOF
+
+
+
+null_string=""
+cat >>confdefs.h <<_ACEOF
+@%:@define LD_SWITCH_X_SITE $null_string
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+@%:@define LD_SWITCH_X_SITE_AUX $null_string
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+@%:@define C_SWITCH_X_SITE $null_string
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+@%:@define LD_SWITCH_SITE $null_string
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+@%:@define C_SWITCH_SITE $null_string
+_ACEOF
+
+
+
+if test "$with_system_malloc" = "yes"; then $as_echo "@%:@define USE_SYSTEM_MALLOC 1" >>confdefs.h
+
+elif test "$with_debug_malloc" = "yes"; then $as_echo "@%:@define USE_DEBUG_MALLOC 1" >>confdefs.h
+
+ $as_echo "@%:@define USE_SYSTEM_MALLOC 1" >>confdefs.h
+
+fi
+test "$GCC" = "yes" && $as_echo "@%:@define USE_GCC 1" >>confdefs.h
+
+test "$XEMACS_CC_GPP" = "yes" && $as_echo "@%:@define USE_GPLUSPLUS 1" >>confdefs.h
+
+test "$with_external_widget" = "yes" && $as_echo "@%:@define EXTERNAL_WIDGET 1" >>confdefs.h
+
+test "$with_kkcc" = "yes" && $as_echo "@%:@define USE_KKCC 1" >>confdefs.h
+
+test "$with_newgc" = "yes" && $as_echo "@%:@define NEW_GC 1" >>confdefs.h
+
+test "$have_vdb_posix" = "yes" && $as_echo "@%:@define VDB_POSIX 1" >>confdefs.h
+
+test "$have_vdb_fake" = "yes" && $as_echo "@%:@define VDB_FAKE 1" >>confdefs.h
+
+test "$with_quick_build" = "yes" && $as_echo "@%:@define QUICK_BUILD 1" >>confdefs.h
+
+test "$with_purify" = "yes" && $as_echo "@%:@define PURIFY 1" >>confdefs.h
+
+test "$with_quantify" = "yes" && $as_echo "@%:@define QUANTIFY 1" >>confdefs.h
+
+test "$with_valgrind" = "yes" && $as_echo "@%:@define USE_VALGRIND 1" >>confdefs.h
+
+test "$with_pop" = "yes" && $as_echo "@%:@define MAIL_USE_POP 1" >>confdefs.h
+
+test "$with_kerberos" = "yes" && $as_echo "@%:@define KERBEROS 1" >>confdefs.h
+
+test "$with_hesiod" = "yes" && $as_echo "@%:@define HESIOD 1" >>confdefs.h
+
+test "$with_union_type" = "yes" && $as_echo "@%:@define USE_UNION_TYPE 1" >>confdefs.h
+
+test "$with_pdump" = "yes" && $as_echo "@%:@define PDUMP 1" >>confdefs.h
+
+test "$with_dump_in_exec" = "yes" && $as_echo "@%:@define DUMP_IN_EXEC 1" >>confdefs.h
+
+test "$with_ipv6_cname" = "yes" && $as_echo "@%:@define IPV6_CANONICALIZE 1" >>confdefs.h
+
+
+
+
+
+
+(
+if test -f /etc/osversion; then echo "osversion: `cat /etc/osversion`"
+else
+ echo "uname -a: `uname -a`"
+fi
+echo ""
+echo "$progname $ac_configure_args"
+) > Installation
+
+if test ! -z ${emacs_beta_version} ; then
+ if test -z "${emacs_is_beta}" ; then
+ xemacs_betaname=".${emacs_beta_version}"
+ else
+ xemacs_betaname="-b${emacs_beta_version}"
+ fi
+else
+ xemacs_betaname=""
+fi
+
+(
+echo "
+
+XEmacs ${emacs_major_version}.${emacs_minor_version}${xemacs_betaname} \"$xemacs_codename\" $xemacs_extra_name configured for \`$ac_cv_build'."
+
+echo "
+Compilation Environment and Installation Defaults:"
+echo " Source code location: $srcdir"
+echo " Installation prefix: $prefix"
+if test -n "$with_site_includes"; then
+ echo " Additional header files: $with_site_includes"
+fi
+if test -n "$with_site_libraries"; then
+ echo " Additional libraries: $with_site_libraries"
+fi
+if test -n "$with_site_prefixes"; then
+ echo " Additional prefixes: $with_site_prefixes"
+fi
+if test -n "$runpath"; then
+ echo " Runtime library search path: $runpath"
+fi
+
+if test -n "$opsysfile"
+then echo " Operating system description file: \`$opsysfile'"
+else echo " Not using any operating system description file"
+fi
+if test -n "$machfile"
+then echo " Machine description file: \`$machfile'"
+else echo " Not using any machine description file"
+fi
+
+echo " Compiler version: $compiler_version"
+if test -n "$gcc_compiler_specs"; then
+ echo " - GCC specs file: $gcc_compiler_specs"
+fi
+echo " - Compiler command: $XEMACS_CC $XE_CFLAGS"
+if test "$CC" != "$XEMACS_CC"; then
+ echo " Compiler version for lib-src: (detection code unimplemented)"
+ echo " - Compiler command for lib-src: $CC $CFLAGS"
+ if test "$xemacs_cc_cc_mismatch" = "yes"; then
+ echo " WARNING: CC and XEMACS_CC mismatched; check CFLAGS carefully."
+ fi
+fi
+echo " libc version: $libc_version"
+echo " Relocating allocator for buffers: $with_rel_alloc"
+echo " GNU version of malloc: ${GNU_MALLOC}${GNU_MALLOC_reason}"
+case "$ld_switch_site" in
+ *nocombreloc*) echo " Linking with \`-z nocombreloc'.
+ - Consider configuring with --with-pdump." ;;
+esac
+
+echo "
+Window System:"
+if test "$with_msw" = "yes"; then
+ echo " Compiling in support for the Microsoft window system."
+fi
+if test "$with_x11" = "yes"; then
+ echo " Compiling in support for the X window system:"
+ echo " - X Windows headers location: $x_includes"
+ echo " - X Windows libraries location: $x_libraries"
+ if test "$with_xauth" != yes; then
+ echo " - Xau (X authority) not available."
+ fi
+ if test "$with_wmcommand" != no; then
+ echo " - Handling WM_COMMAND properly."
+ fi
+ if test "$with_fontconfig" = "yes"; then
+ echo " - Using fontconfig to manage fonts."
+ fi
+ if test "$with_xft_emacs" = "yes"; then
+ echo " - Compiling in support for Xft antialiased fonts (EXPERIMENTAL)."
+ fi
+fi
+if test "$need_motif" = "yes" ; then
+ echo " Compiling in support for Motif."
+ if test "$have_lesstif" = "yes"; then
+ echo " - Using LessTif implementation."
+ fi
+ echo " *WARNING* Many versions of Motif are buggy, requiring workarounds."
+ echo " You are likely to experience slow redisplay."
+ echo " You may need to install vendor patches to Motif."
+ echo " See PROBLEMS for more information."
+fi
+if test "$need_athena" = "yes"; then
+ echo " Compiling in support for the Athena widget set:"
+ echo " - Athena headers location: $athena_h_path"
+ echo " - Athena library to link: $athena_lib"
+fi
+case "$with_menubars" in
+ gtk ) echo " Using GTK menubars." ;;
+ lucid ) echo " Using Lucid menubars." ;;
+ motif ) echo " Using Motif menubars."
+ echo " *WARNING* The Motif menubar implementation is currently buggy."
+ echo " We recommend using the Lucid menubar instead."
+ echo " Re-run configure with --with-menubars='lucid'." ;;
+ msw ) echo " Using MS-Windows menubars." ;;
+esac
+if test "$with_xft_menubars" = "yes"; then
+ echo " - Using Xft to render antialiased fonts in menubars."
+ echo " WARNING: This Xft feature will be replaced with a face."
+fi
+case "$with_scrollbars" in
+ gtk ) echo " Using GTK scrollbars." ;;
+ lucid ) echo " Using Lucid scrollbars." ;;
+ motif ) echo " Using Motif scrollbars." ;;
+ athena ) echo " Using Athena scrollbars." ;;
+ msw ) echo " Using MS-Windows scrollbars." ;;
+esac
+case "$with_dialogs" in
+ gtk ) echo " Using GTK dialog boxes." ;;
+ motif ) echo " Using Motif dialog boxes."
+ if test "$unexec" = "unexaix.o"; then if test "`uname -v`" = 4 -a "`uname -r`" -ge 3; then
+ echo " *WARNING* The Motif dialog boxes cause problems on AIX 4.3 and higher."
+ echo " We recommend using the Athena dialog boxes instead."
+ echo " Install libXaw and re-run configure with --with-dialogs='athena'."
+ echo " Read the PROBLEMS file for more information."
+ fi; fi ;;
+ athena ) echo " Using Athena dialog boxes." ;;
+ msw ) echo " Using MS-Windows dialog boxes." ;;
+esac
+case "$with_widgets" in
+ gtk ) echo " Using GTK native widgets." ;;
+ motif ) echo " Using Motif native widgets." ;;
+ athena ) echo " Using Athena native widgets." ;;
+ msw ) echo " Using MS-Windows native widgets." ;;
+esac
+if test "$with_xft_tabs" = "yes"; then
+ echo " - Using Xft to render antialiased fonts in tab controls."
+ echo " WARNING: This Xft feature will be replaced with a face."
+fi
+if test "$with_xft_gauges" = "yes"; then
+ echo " - Using Xft to render antialiased fonts in progress bars."
+ echo " WARNING: This Xft feature will be replaced with a face."
+ echo " WARNING: This Xft feature not yet implemented; setting ignored."
+fi
+if test "$with_dragndrop" = yes; then
+ echo " Compiling in support for Drag'n'Drop (EXPERIMENTAL)."
+ echo " - Drag'n'Drop prototype: $dragndrop_proto."
+fi
+
+echo "
+TTY:"
+test "$with_ncurses" = yes && echo " Compiling in support for ncurses."
+test "$with_gpm" = yes && echo " Compiling in support for GPM (General Purpose Mouse)."
+
+echo "
+Images:"
+test "$with_gif" = yes && echo " Compiling in support for GIF images."
+if test "$with_xpm" = yes; then
+ echo " Compiling in support for XPM images."
+elif test "$with_x11" = yes; then
+ echo " WARNING: -----------------------------------------------------------"
+ echo " WARNING: Compiling without XPM image support."
+ if test "$xpm_problem" != ""; then
+ echo " Reason: $xpm_problem"
+ fi
+ echo " WARNING: You should strongly consider installing XPM."
+ echo " WARNING: Otherwise toolbars and other graphics will look suboptimal."
+ echo " WARNING: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux)"
+ echo " WARNING: -----------------------------------------------------------"
+fi
+if test "$with_png" = yes; then
+ echo " Compiling in support for PNG images."
+elif test "$window_system" != "none"; then
+ echo " WARNING: -----------------------------------------------------------"
+ echo " WARNING: Compiling without PNG image support."
+ if test "$png_problem" != ""; then
+ echo " Reason: $png_problem"
+ fi
+ echo " WARNING: You should strongly consider installing the PNG libraries."
+ echo " WARNING: Otherwise certain images and glyphs may not display."
+ echo " WARNING: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux)"
+ echo " WARNING: -----------------------------------------------------------"
+fi
+test "$with_jpeg" = yes && echo " Compiling in support for JPEG images."
+test "$with_tiff" = yes && echo " Compiling in support for TIFF images."
+test "$with_xface" = yes && echo " Compiling in support for X-Face message headers."
+
+echo "
+Sound:"
+test "$with_sound_native" = yes && echo " Compiling in support for sound (native)."
+test "$with_sound_alsa" = yes && echo " Compiling in support for ALSA (Advanced Linux Sound Architecture)."
+test "$with_sound_nas" = yes && echo " Compiling in support for NAS (network audio system)."
+test "$old_nas" = yes && echo " - NAS library lacks error trapping; will play synchronously."
+test "$with_sound_esd" = yes && echo " Compiling in support for ESD (Enlightened Sound Daemon)."
+
+echo "
+Databases:"
+test "$with_database_berkdb" = yes && echo " Compiling in support for Berkeley database."
+test "$with_database_dbm" = yes && echo " Compiling in support for DBM."
+test "$with_database_gdbm" = yes && echo " Compiling in support for GNU DBM."
+test "$with_ldap" = yes && echo " Compiling in support for LDAP."
+if test "$with_postgresql" = yes; then
+ echo " Compiling in support for PostgreSQL."
+ echo " - Using PostgreSQL header file: $libpq_fe_h_file"
+ test "$with_postgresqlv7" = yes && echo " - Using PostgreSQL V7 bindings."
+fi
+
+echo "
+Internationalization:"
+test "$with_mule" = yes && echo " Compiling in support for Mule (multi-lingual Emacs)."
+test "$with_xim" != no && echo " Compiling in support for XIM (X11R5+ I18N input method)."
+test "$with_xim" = motif && echo " - Using Motif to provide XIM support."
+test "$with_xim" = xlib && echo " - Using raw Xlib to provide XIM support."
+test "$with_xfs" = yes && echo " - Using XFontSet to provide bilingual menubar."
+test "$have_canna" = yes && echo " Compiling in support for Canna on Mule."
+if test "$with_wnn" = yes; then
+ echo " Compiling in support for the WNN input method on Mule."
+ test "$with_wnn6" = yes && echo " - Using WNN version 6."
+fi
+
+echo "
+Mail:"
+test "$with_pop" = yes && echo " Compiling in support for POP mail retrieval."
+test "$with_kerberos" = yes && echo " Compiling in support for Kerberos POP authentication."
+test "$with_hesiod" = yes && echo " Compiling in support for Hesiod POP server access."
+test -n "$with_mail_locking" && echo " Compiling in support for \"$with_mail_locking\" mail spool file locking method."
+
+echo "
+Other Features:"
+test "$with_ipv6_cname" = no && echo " Inhibiting IPv6 canonicalization at startup."
+test "$with_tooltalk" = yes && echo " Compiling in support for ToolTalk."
+test "$with_workshop" = yes && echo " Compiling in support for Sun WorkShop."
+test "$with_socks" = yes && echo " Compiling in support for SOCKS."
+test "$with_dnet" = yes && echo " Compiling in support for DNET."
+test "$with_modules" = "yes" && echo " Compiling in support for dynamic shared object modules."
+test "$with_bignum" = "gmp" && echo " Compiling in support for more number types using the GNU MP library."
+test "$with_bignum" = "mp" && echo " Compiling in support for more number types using the BSD MP library."
+if test "$with_union_type" = yes ; then
+ echo " Using the union type for Lisp_Objects."
+ echo " WARNING: ---------------------------------------------------------"
+ echo " WARNING: This tends to trigger compiler bugs, especially when"
+ echo " WARNING: combined with MULE and ERROR_CHECKING. Crashes have"
+ echo " WARNING: been seen with various versions of GCC (up to about 2.95),"
+ echo " WARNING: and recently with Visual C++ as well (mid-2003)."
+ echo " WARNING: More recent versions may be safer, or not."
+ echo " WARNING: ---------------------------------------------------------"
+fi
+if test "$with_kkcc" = yes ; then
+ echo " Using the new GC mark algorithms (KKCC)."
+ echo " WARNING: ---------------------------------------------------------"
+ echo " WARNING: The new algorithms are experimental. They are enabled by"
+ echo " WARNING: default for this release. Use \`--disable-kkcc' to"
+ echo " WARNING: turn it off."
+ echo " WARNING: ---------------------------------------------------------"
+fi
+test "$with_newgc" = yes && echo " Using the new incremental garbage collector and the new allocator."
+if test "$have_vdb_posix" = yes ; then
+ if test "$have_vdb_sigaction" = yes ; then
+ echo " Using POSIX sigaction() to install fault handler."
+ else
+ echo " Using POSIX signal() to install vdb fault handler."
+ fi
+fi
+if test "$have_vdb_win32" = yes ; then
+ echo " Using special WIN32 vdb fault handler."
+fi
+if test "$have_vdb_mach" = yes ; then
+ echo " Using mach exception mechanism as vdb fault handler."
+fi
+if test "$have_vdb_fake" = yes && test "$with_vdb" == fake; then
+ echo " Virtual dirty bit write barrier manually disabled."
+fi
+test "$with_pdump" = yes && echo " Using the new portable dumper."
+test "$with_dump_in_exec" = yes && echo " Dumping into executable."
+test "$with_debug" = yes && echo " Compiling in support for extra debugging code."
+test "$usage_tracking" = yes && echo " Compiling in support for active usage tracking (Sun internal)."
+if test "$with_error_checking_extents $with_error_checking_types $with_error_checking_text $with_error_checking_gc $with_error_checking_malloc $with_error_checking_glyphs $with_error_checking_byte_code $with_error_checking_display $with_error_checking_structures" \
+ != "no no no no no no no no no"; then
+ echo " Compiling in support for runtime error checking."
+ echo " WARNING: ---------------------------------------------------------"
+ echo " WARNING: XEmacs will run noticeably more slowly as a result."
+ echo " WARNING: Error checking is on by default for XEmacs beta releases."
+ echo " WARNING: ---------------------------------------------------------"
+fi
+test "$with_valgrind" = yes && echo " Compiling in support for memory debugging with Valgrind."
+echo ""
+) | tee -a Installation
+echo ""
+
+ac_config_headers="$ac_config_headers src/config.h lwlib/config.h"
+
+
+
+# Remove any trailing slashes in these variables.
+test -n "$prefix" &&
+ prefix=`echo '' "$prefix" | sed -e 's:^ ::' -e 's,\([^/]\)/*$,\1,'`
+test -n "$exec_prefix" &&
+ exec_prefix=`echo '' "$exec_prefix" | sed -e 's:^ ::' -e 's,\([^/]\)/*$,\1,'`
+
+
+if test -r $srcdir/src/depend; then :;
+else
+ echo "creating $srcdir/src/depend"
+ perl $srcdir/src/make-src-depend > $srcdir/src/depend
+fi
+
+for file in $internal_makefile_list; do
+ case $file in
+ src/Makefile.in ) file="src/Makefile.in:src/Makefile.in.in:src/depend" ;;
+ modules/* ) file="${file}:${file}.in:modules/common/Makefile.common" ;;
+ esac
+ ac_config_files="$ac_config_files $file"
+
+done
+ac_config_files="$ac_config_files src/paths.h src/xemacs.def.in lib-src/config.values"
+
+test "$with_modules" = "yes" && ac_config_files="$ac_config_files lib-src/ellcc.h"
+
+
+
+
+
+
+
+
+ac_config_commands="$ac_config_commands default"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems. If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+ eval ac_val=\$$ac_var
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) { eval $ac_var=; unset $ac_var;} ;;
+ esac ;;
+ esac
+ done
+
+ (set) 2>&1 |
+ case $as_nl`(ac_space=' '; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
+ # `set' does not quote correctly, so add quotes: double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
+ sed -n \
+ "s/'/'\\\\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+ ;; #(
+ *)
+ # `set' quotes correctly as required by POSIX, so do not add quotes.
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+ ;;
+ esac |
+ sort
+) |
+ sed '
+ /^ac_cv_env_/b end
+ t clear
+ :clear
+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+ t end
+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+ :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+ if test -w "$cache_file"; then
+ if test "x$cache_file" != "x/dev/null"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+ if test ! -f "$cache_file" || test -h "$cache_file"; then
+ cat confcache >"$cache_file"
+ else
+ case $cache_file in #(
+ */* | ?:*)
+ mv -f confcache "$cache_file"$$ &&
+ mv -f "$cache_file"$$ "$cache_file" ;; #(
+ *)
+ mv -f confcache "$cache_file" ;;
+ esac
+ fi
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+U=
+for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
+ # 1. Remove the extension, and $U if already installed.
+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
+ # will be set to the directory where LIBOBJS objects are built.
+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIB@&t@OBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+
+
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in @%:@(
+ *posix*) :
+ set -o posix ;; @%:@(
+ *) :
+ ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
+ else
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in @%:@(
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
+ fi
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" "" $as_nl"
+
+# Find who we are. Look in the path if we contain no directory separator.
+as_myself=
+case $0 in @%:@((
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+ as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+@%:@ as_fn_error STATUS ERROR [LINENO LOG_FD]
+@%:@ ----------------------------------------
+@%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+@%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+@%:@ script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} @%:@ as_fn_error
+
+
+@%:@ as_fn_set_status STATUS
+@%:@ -----------------------
+@%:@ Set @S|@? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} @%:@ as_fn_set_status
+
+@%:@ as_fn_exit STATUS
+@%:@ -----------------
+@%:@ Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} @%:@ as_fn_exit
+
+@%:@ as_fn_unset VAR
+@%:@ ---------------
+@%:@ Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+@%:@ as_fn_append VAR VALUE
+@%:@ ----------------------
+@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take
+@%:@ advantage of any shell optimizations that allow amortized linear growth over
+@%:@ repeated appends, instead of the typical quadratic growth present in naive
+@%:@ implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+@%:@ as_fn_arith ARG...
+@%:@ ------------------
+@%:@ Perform arithmetic evaluation on the ARGs, and store the result in the
+@%:@ global @S|@as_val. Take advantage of shells that can avoid forks. The arguments
+@%:@ must be portable across @S|@(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+else
+ as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
+else
+ as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in @%:@(((((
+-n*)
+ case `echo 'xy\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
+ esac;;
+*)
+ ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
+else
+ rm -f conf$$.dir
+ mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+ as_ln_s='cp -p'
+ fi
+else
+ as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+@%:@ as_fn_mkdir_p
+@%:@ -------------
+@%:@ Create "@S|@as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} @%:@ as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+ as_mkdir_p='mkdir -p "$as_dir"'
+else
+ test -d ./-p && rmdir ./-p
+ as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
+else
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in @%:@(
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in @%:@((
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by XEmacs $as_me 21.5, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+ CONFIG_LINKS = $CONFIG_LINKS
+ CONFIG_COMMANDS = $CONFIG_COMMANDS
+ $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration. Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+ -h, --help print this help, then exit
+ -V, --version print version number and configuration settings, then exit
+ --config print configuration, then exit
+ -q, --quiet, --silent
+ do not print progress messages
+ -d, --debug don't remove temporary files
+ --recheck update $as_me by reconfiguring in the same conditions
+ --file=FILE[:TEMPLATE]
+ instantiate the configuration file FILE
+ --header=FILE[:TEMPLATE]
+ instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to <xemacs-beta@xemacs.org>."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_version="\\
+XEmacs config.status 21.5
+configured by $0, generated by GNU Autoconf 2.68,
+ with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2010 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+ case $1 in
+ --*=?*)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+ ac_shift=:
+ ;;
+ --*=)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=
+ ac_shift=:
+ ;;
+ *)
+ ac_option=$1
+ ac_optarg=$2
+ ac_shift=shift
+ ;;
+ esac
+
+ case $ac_option in
+ # Handling of the options.
+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+ ac_cs_recheck=: ;;
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+ $as_echo "$ac_cs_version"; exit ;;
+ --config | --confi | --conf | --con | --co | --c )
+ $as_echo "$ac_cs_config"; exit ;;
+ --debug | --debu | --deb | --de | --d | -d )
+ debug=: ;;
+ --file | --fil | --fi | --f )
+ $ac_shift
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ '') as_fn_error $? "missing file argument" ;;
+ esac
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
+ ac_need_defaults=false;;
+ --header | --heade | --head | --hea )
+ $ac_shift
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+ ac_need_defaults=false;;
+ --he | --h)
+ # Conflict between --help and --header
+ as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+ --help | --hel | -h )
+ $as_echo "$ac_cs_usage"; exit ;;
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil | --si | --s)
+ ac_cs_silent=: ;;
+
+ # This is an error.
+ -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+ *) as_fn_append ac_config_targets " $1"
+ ac_need_defaults=false ;;
+
+ esac
+ shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+ exec 6>/dev/null
+ ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ shift
+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+ CONFIG_SHELL='$SHELL'
+ export CONFIG_SHELL
+ exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+ echo
+ sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
+@%:@@%:@ Running $as_me. @%:@@%:@
+_ASBOX
+ $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+CPP="$CPP"
+ MAKE_SUBDIR="$MAKE_SUBDIR"
+
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+ case $ac_config_target in
+ "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
+ "lwlib/config.h") CONFIG_HEADERS="$CONFIG_HEADERS lwlib/config.h" ;;
+ "$file") CONFIG_FILES="$CONFIG_FILES $file" ;;
+ "src/paths.h") CONFIG_FILES="$CONFIG_FILES src/paths.h" ;;
+ "src/xemacs.def.in") CONFIG_FILES="$CONFIG_FILES src/xemacs.def.in" ;;
+ "lib-src/config.values") CONFIG_FILES="$CONFIG_FILES lib-src/config.values" ;;
+ "lib-src/ellcc.h") CONFIG_FILES="$CONFIG_FILES lib-src/ellcc.h" ;;
+ "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used. Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience. Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+ tmp= ac_tmp=
+ trap 'exit_status=$?
+ : "${ac_tmp:=$tmp}"
+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+ trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+ test -d "$tmp"
+} ||
+{
+ tmp=./conf$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+ eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+ ac_cs_awk_cr='\\r'
+else
+ ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+ echo "cat >conf$$subs.awk <<_ACEOF" &&
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+ echo "_ACEOF"
+} >conf$$subs.sh ||
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ . ./conf$$subs.sh ||
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+ if test $ac_delim_n = $ac_delim_num; then
+ break
+ elif $ac_last_try; then
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+ N
+ s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+ for (key in S) S_is_set[key] = 1
+ FS = ""
+
+}
+{
+ line = $ 0
+ nfields = split(line, field, "@")
+ substed = 0
+ len = length(field[1])
+ for (i = 2; i < nfields; i++) {
+ key = field[i]
+ keylen = length(key)
+ if (S_is_set[key]) {
+ value = S[key]
+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+ len += length(value) + length(field[++i])
+ substed = 1
+ } else
+ len += 1 + keylen
+ }
+
+ print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+ cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
+h
+s///
+s/^/:/
+s/[ ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[ ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[ ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_tt"; then
+ break
+ elif $ac_last_try; then
+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any. Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[ ]*#[ ]*define[ ][ ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ for (key in D) D_is_set[key] = 1
+ FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+ line = \$ 0
+ split(line, arg, " ")
+ if (arg[1] == "#") {
+ defundef = arg[2]
+ mac1 = arg[3]
+ } else {
+ defundef = substr(arg[1], 2)
+ mac1 = arg[2]
+ }
+ split(mac1, mac2, "(") #)
+ macro = mac2[1]
+ prefix = substr(line, 1, index(line, defundef) - 1)
+ if (D_is_set[macro]) {
+ # Preserve the white space surrounding the "#".
+ print prefix "define", macro P[macro] D[macro]
+ next
+ } else {
+ # Replace #undef with comments. This is necessary, for example,
+ # in the case of _POSIX_SOURCE, which is predefined and required
+ # on some systems where configure will not decide to define it.
+ if (defundef == "undef") {
+ print "/*", prefix defundef, macro, "*/"
+ next
+ }
+ }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+ case $ac_tag in
+ :[FHLC]) ac_mode=$ac_tag; continue;;
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+ esac
+ ac_save_IFS=$IFS
+ IFS=:
+ set x $ac_tag
+ IFS=$ac_save_IFS
+ shift
+ ac_file=$1
+ shift
+
+ case $ac_mode in
+ :L) ac_source=$1;;
+ :[FH])
+ ac_file_inputs=
+ for ac_f
+ do
+ case $ac_f in
+ -) ac_f="$ac_tmp/stdin";;
+ *) # Look for the file first in the build tree, then in the source tree
+ # (if the path is not absolute). The absolute path cannot be DOS-style,
+ # because $ac_f cannot contain `:'.
+ test -f "$ac_f" ||
+ case $ac_f in
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ esac
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ as_fn_append ac_file_inputs " '$ac_f'"
+ done
+
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # use $as_me), people would be surprised to read:
+ # /* config.h. Generated by config.status. */
+ configure_input='Generated from '`
+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+ `' by configure.'
+ if test x"$ac_file" != x-; then
+ configure_input="$ac_file. $configure_input"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+ fi
+ # Neutralize special characters interpreted by sed in replacement strings.
+ case $configure_input in #(
+ *\&* | *\|* | *\\* )
+ ac_sed_conf_input=`$as_echo "$configure_input" |
+ sed 's/[\\\\&|]/\\\\&/g'`;; #(
+ *) ac_sed_conf_input=$configure_input;;
+ esac
+
+ case $ac_tag in
+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ esac
+ ;;
+ esac
+
+ ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ as_dir="$ac_dir"; as_fn_mkdir_p
+ ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+ .) # We are building in place.
+ ac_srcdir=.
+ ac_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+ case $ac_mode in
+ :F)
+ #
+ # CONFIG_FILE
+ #
+
+ case $INSTALL in
+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+ esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+ p
+ q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_datarootdir_hack='
+ s&@datadir@&$datadir&g
+ s&@docdir@&$docdir&g
+ s&@infodir@&$infodir&g
+ s&@localedir@&$localedir&g
+ s&@mandir@&$mandir&g
+ s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined" >&2;}
+
+ rm -f "$ac_tmp/stdin"
+ case $ac_file in
+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+ esac \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+ :H)
+ #
+ # CONFIG_HEADER
+ #
+ if test x"$ac_file" != x-; then
+ {
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+ } >"$ac_tmp/config.h" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ rm -f "$ac_file"
+ mv "$ac_tmp/config.h" "$ac_file" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ fi
+ else
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+ || as_fn_error $? "could not create -" "$LINENO" 5
+ fi
+ ;;
+
+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+ esac
+
+
+ case $ac_file$ac_mode in
+ "default":C) for dir in . $MAKE_SUBDIR; do
+ (
+ cd $dir
+
+ rm -f junk.c
+ < Makefile.in \
+ sed -e '/^# Generated/d' \
+ -e 's%/\*\*/#.*%%' \
+ -e 's/^ *# */#/' \
+ -e '/^##/d' \
+ -e '/^#/ {
+p
+d
+}' \
+ -e '/./ {
+s/\([\"]\)/\\\1/g
+s/^/"/
+s/$/"/
+}' > junk.c;
+
+ echo creating $dir/Makefile
+$CPP -I. -I${srcdir}/src junk.c \
+ | sed -e 's/^\#.*//' \
+ -e 's/^[ TAB][ TAB]*$//'\
+ -e 's/^ / /' \
+ -e '/^[ ]*$/d' \
+ -e '/^\"/ {
+ s/\\\([\"]\)/\1/g
+ s/^[ TAB]*\"//
+ s/\"[ TAB]*$//
+}' \
+ -e 's/^XCOMM /\# /' > Makefile.new
+ chmod 444 Makefile.new
+ mv -f Makefile.new Makefile
+
+ echo creating $dir/GNUmakefile
+$CPP -I. -I${srcdir}/src -DUSE_GNU_MAKE junk.c \
+ | sed -e 's/^\#.*//' \
+ -e 's/^[ TAB][ TAB]*$//'\
+ -e 's/^ / /' \
+ -e '/^[ ]*$/d' \
+ -e '/^\"/ {
+ s/\\\([\"]\)/\1/g
+ s/^[ TAB]*\"//
+ s/\"[ TAB]*$//
+}' \
+ -e 's/^XCOMM /\# /' > Makefile.new
+ chmod 444 Makefile.new
+ mv -f Makefile.new GNUmakefile
+
+ if test -r ".gdbinit.in"; then
+ rm -f junk.c
+ < .gdbinit.in \
+ sed -e '/^# Generated/d' \
+ -e 's%/\*\*/#.*%%' \
+ -e 's/^ *# */#/' \
+ -e '/^##/d' \
+ -e '/^#/ {
+p
+d
+}' \
+ -e '/./ {
+s/\([\"]\)/\\\1/g
+s/^/"/
+s/$/"/
+}' > junk.c;
+
+ echo creating $dir/.gdbinit
+$CPP -I. -I${srcdir}/src junk.c \
+ | sed -e 's/^\#.*//' \
+ -e 's/^[ TAB][ TAB]*$//'\
+ -e 's/^ / /' \
+ -e '/^[ ]*$/d' \
+ -e '/^\"/ {
+ s/\\\([\"]\)/\1/g
+ s/^[ TAB]*\"//
+ s/\"[ TAB]*$//
+}' \
+ -e 's/^XCOMM /\# /' > Makefile.new
+ chmod 444 Makefile.new
+ mv -f Makefile.new .gdbinit
+
+ fi
+ if test -r ".dbxrc.in"; then
+ rm -f junk.c
+ < .dbxrc.in \
+ sed -e '/^# Generated/d' \
+ -e 's%/\*\*/#.*%%' \
+ -e 's/^ *# */#/' \
+ -e '/^##/d' \
+ -e '/^#/ {
+p
+d
+}' \
+ -e '/./ {
+s/\([\"]\)/\\\1/g
+s/^/"/
+s/$/"/
+}' > junk.c;
+
+ echo creating $dir/.dbxrc
+$CPP -I. -I${srcdir}/src junk.c \
+ | sed -e 's/^\#.*//' \
+ -e 's/^[ TAB][ TAB]*$//'\
+ -e 's/^ / /' \
+ -e '/^[ ]*$/d' \
+ -e '/^\"/ {
+ s/\\\([\"]\)/\1/g
+ s/^[ TAB]*\"//
+ s/\"[ TAB]*$//
+}' \
+ -e 's/^XCOMM /\# /' > Makefile.new
+ chmod 444 Makefile.new
+ mv -f Makefile.new .dbxrc
+
+ fi
+ if test -r "xemacs.def.in"; then
+ rm -f junk.c
+ cp xemacs.def.in junk.c
+ echo creating $dir/xemacs.def
+$CPP -I. -I${srcdir}/src junk.c \
+ | sed -e 's/^\#.*//' \
+ -e 's/^[ TAB][ TAB]*$//'\
+ -e 's/^ / /' \
+ -e '/^[ ]*$/d' \
+ -e '/^\"/ {
+ s/\\\([\"]\)/\1/g
+ s/^[ TAB]*\"//
+ s/\"[ TAB]*$//
+}' \
+ -e 's/^XCOMM /\# /' > Makefile.new
+ chmod 444 Makefile.new
+ mv -f Makefile.new xemacs.def
+
+ fi
+ rm -f junk.c
+ )
+done
+
+sed < config.status >> lib-src/config.values \
+ -e '/{ac_dA}.*{ac_dB}.*{ac_dC}.*{ac_dD}$/!d' \
+ -e 's/\${ac_dA}\(.*\)\${ac_dB}.*\${ac_dC}\(.*\)\${ac_dD}/\1 \2/' \
+ -e 's/^\([^ ]*\) $/\1 ""/' \
+ -e 's/ 1$/ t/'
+
+ ;;
+
+ esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded. So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status. When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+ ac_cs_success=:
+ ac_config_status_args=
+ test "$silent" = yes &&
+ ac_config_status_args="$ac_config_status_args --quiet"
+ exec 5>/dev/null
+ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+ exec 5>>config.log
+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+ # would make configure fail if this is the last instruction.
+ $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
diff --text -u /dev/null 'xemacs-21.5.31/autom4te.cache/requests'
Index: ./autom4te.cache/requests
--- ./autom4te.cache/requests Thu Jan 1 09:00:00 1970
+++ ./autom4te.cache/requests Fri Apr 29 22:31:38 2011
@@ -0,0 +1,76 @@
+# This file was generated.
+# It contains the lists of macros which have been traced.
+# It can be safely removed.
+
+@request = (
+ bless( [
+ '0',
+ 1,
+ [
+ '/opt/local/share/autoconf'
+ ],
+ [
+ '/opt/local/share/autoconf/autoconf/autoconf.m4f',
+ 'aclocal.m4',
+ 'configure.ac'
+ ],
+ {
+ '_LT_AC_TAGCONFIG' => 1,
+ 'AM_PROG_F77_C_O' => 1,
+ 'AC_INIT' => 1,
+ 'm4_pattern_forbid' => 1,
+ '_AM_COND_IF' => 1,
+ 'AC_CANONICAL_TARGET' => 1,
+ 'AC_SUBST' => 1,
+ 'AC_CONFIG_LIBOBJ_DIR' => 1,
+ 'AC_FC_SRCEXT' => 1,
+ 'AC_CANONICAL_HOST' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ 'AM_PATH_GUILE' => 1,
+ 'AC_CONFIG_SUBDIRS' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'LT_CONFIG_LTDL_DIR' => 1,
+ 'AC_REQUIRE_AUX_FILE' => 1,
+ 'AC_CONFIG_LINKS' => 1,
+ 'm4_sinclude' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
+ 'AM_MAINTAINER_MODE' => 1,
+ 'AM_NLS' => 1,
+ 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+ 'AM_MAKEFILE_INCLUDE' => 1,
+ '_m4_warn' => 1,
+ 'AM_PROG_CXX_C_O' => 1,
+ '_AM_COND_ENDIF' => 1,
+ '_AM_MAKEFILE_INCLUDE' => 1,
+ 'AM_ENABLE_MULTILIB' => 1,
+ 'AM_SILENT_RULES' => 1,
+ 'AM_PROG_MOC' => 1,
+ 'AC_CONFIG_FILES' => 1,
+ 'include' => 1,
+ 'LT_INIT' => 1,
+ 'AM_PROG_AR' => 1,
+ 'AM_GNU_GETTEXT' => 1,
+ 'AC_LIBSOURCE' => 1,
+ 'AM_PROG_FC_C_O' => 1,
+ 'AC_CANONICAL_BUILD' => 1,
+ 'AC_FC_FREEFORM' => 1,
+ 'AH_OUTPUT' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'AC_CONFIG_AUX_DIR' => 1,
+ 'sinclude' => 1,
+ 'AM_PROG_CC_C_O' => 1,
+ 'm4_pattern_allow' => 1,
+ 'AM_XGETTEXT_OPTION' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
+ 'AM_CONDITIONAL' => 1,
+ 'AC_CONFIG_HEADERS' => 1,
+ 'AC_DEFINE_TRACE_LITERAL' => 1,
+ 'AM_POT_TOOLS' => 1,
+ 'm4_include' => 1,
+ '_AM_COND_ELSE' => 1,
+ 'AC_SUBST_TRACE' => 1
+ }
+ ], 'Autom4te::Request' )
+ );
+
diff --text -u /dev/null 'xemacs-21.5.31/autom4te.cache/traces.0'
Index: ./autom4te.cache/traces.0
--- ./autom4te.cache/traces.0 Thu Jan 1 09:00:00 1970
+++ ./autom4te.cache/traces.0 Fri Apr 29 22:31:37 2011
@@ -0,0 +1,1823 @@
+m4trace:configure.ac:38: -1- AC_INIT([XEmacs], [21.5], [xemacs-beta@xemacs.org])
+m4trace:configure.ac:38: -1- m4_pattern_forbid([^_?A[CHUM]_])
+m4trace:configure.ac:38: -1- m4_pattern_forbid([_AC_])
+m4trace:configure.ac:38: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^AS_FLAGS$])
+m4trace:configure.ac:38: -1- m4_pattern_forbid([^_?m4_])
+m4trace:configure.ac:38: -1- m4_pattern_forbid([^dnl$])
+m4trace:configure.ac:38: -1- m4_pattern_forbid([^_?AS_])
+m4trace:configure.ac:38: -1- AC_SUBST([SHELL])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([SHELL])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^SHELL$])
+m4trace:configure.ac:38: -1- AC_SUBST([PATH_SEPARATOR])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([PATH_SEPARATOR])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^PATH_SEPARATOR$])
+m4trace:configure.ac:38: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME], ['AC_PACKAGE_NAME'])])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([PACKAGE_NAME])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^PACKAGE_NAME$])
+m4trace:configure.ac:38: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME], ['AC_PACKAGE_TARNAME'])])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([PACKAGE_TARNAME])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
+m4trace:configure.ac:38: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION], ['AC_PACKAGE_VERSION'])])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([PACKAGE_VERSION])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^PACKAGE_VERSION$])
+m4trace:configure.ac:38: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING], ['AC_PACKAGE_STRING'])])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([PACKAGE_STRING])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^PACKAGE_STRING$])
+m4trace:configure.ac:38: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([PACKAGE_BUGREPORT])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
+m4trace:configure.ac:38: -1- AC_SUBST([PACKAGE_URL], [m4_ifdef([AC_PACKAGE_URL], ['AC_PACKAGE_URL'])])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([PACKAGE_URL])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^PACKAGE_URL$])
+m4trace:configure.ac:38: -1- AC_SUBST([exec_prefix], [NONE])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([exec_prefix])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^exec_prefix$])
+m4trace:configure.ac:38: -1- AC_SUBST([prefix], [NONE])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([prefix])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^prefix$])
+m4trace:configure.ac:38: -1- AC_SUBST([program_transform_name], [s,x,x,])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([program_transform_name])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^program_transform_name$])
+m4trace:configure.ac:38: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([bindir])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^bindir$])
+m4trace:configure.ac:38: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([sbindir])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^sbindir$])
+m4trace:configure.ac:38: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([libexecdir])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^libexecdir$])
+m4trace:configure.ac:38: -1- AC_SUBST([datarootdir], ['${prefix}/share'])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([datarootdir])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^datarootdir$])
+m4trace:configure.ac:38: -1- AC_SUBST([datadir], ['${datarootdir}'])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([datadir])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^datadir$])
+m4trace:configure.ac:38: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([sysconfdir])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^sysconfdir$])
+m4trace:configure.ac:38: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([sharedstatedir])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^sharedstatedir$])
+m4trace:configure.ac:38: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([localstatedir])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^localstatedir$])
+m4trace:configure.ac:38: -1- AC_SUBST([includedir], ['${prefix}/include'])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([includedir])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^includedir$])
+m4trace:configure.ac:38: -1- AC_SUBST([oldincludedir], ['/usr/include'])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([oldincludedir])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^oldincludedir$])
+m4trace:configure.ac:38: -1- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
+ ['${datarootdir}/doc/${PACKAGE_TARNAME}'],
+ ['${datarootdir}/doc/${PACKAGE}'])])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([docdir])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^docdir$])
+m4trace:configure.ac:38: -1- AC_SUBST([infodir], ['${datarootdir}/info'])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([infodir])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^infodir$])
+m4trace:configure.ac:38: -1- AC_SUBST([htmldir], ['${docdir}'])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([htmldir])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^htmldir$])
+m4trace:configure.ac:38: -1- AC_SUBST([dvidir], ['${docdir}'])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([dvidir])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^dvidir$])
+m4trace:configure.ac:38: -1- AC_SUBST([pdfdir], ['${docdir}'])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([pdfdir])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^pdfdir$])
+m4trace:configure.ac:38: -1- AC_SUBST([psdir], ['${docdir}'])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([psdir])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^psdir$])
+m4trace:configure.ac:38: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([libdir])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^libdir$])
+m4trace:configure.ac:38: -1- AC_SUBST([localedir], ['${datarootdir}/locale'])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([localedir])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^localedir$])
+m4trace:configure.ac:38: -1- AC_SUBST([mandir], ['${datarootdir}/man'])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([mandir])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^mandir$])
+m4trace:configure.ac:38: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^PACKAGE_NAME$])
+m4trace:configure.ac:38: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */
+@%:@undef PACKAGE_NAME])
+m4trace:configure.ac:38: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
+m4trace:configure.ac:38: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */
+@%:@undef PACKAGE_TARNAME])
+m4trace:configure.ac:38: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^PACKAGE_VERSION$])
+m4trace:configure.ac:38: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */
+@%:@undef PACKAGE_VERSION])
+m4trace:configure.ac:38: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^PACKAGE_STRING$])
+m4trace:configure.ac:38: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */
+@%:@undef PACKAGE_STRING])
+m4trace:configure.ac:38: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
+m4trace:configure.ac:38: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */
+@%:@undef PACKAGE_BUGREPORT])
+m4trace:configure.ac:38: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_URL])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^PACKAGE_URL$])
+m4trace:configure.ac:38: -1- AH_OUTPUT([PACKAGE_URL], [/* Define to the home page for this package. */
+@%:@undef PACKAGE_URL])
+m4trace:configure.ac:38: -1- AC_SUBST([DEFS])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([DEFS])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^DEFS$])
+m4trace:configure.ac:38: -1- AC_SUBST([ECHO_C])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([ECHO_C])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^ECHO_C$])
+m4trace:configure.ac:38: -1- AC_SUBST([ECHO_N])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([ECHO_N])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^ECHO_N$])
+m4trace:configure.ac:38: -1- AC_SUBST([ECHO_T])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([ECHO_T])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^ECHO_T$])
+m4trace:configure.ac:38: -1- AC_SUBST([LIBS])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([LIBS])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:38: -1- AC_SUBST([build_alias])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([build_alias])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^build_alias$])
+m4trace:configure.ac:38: -1- AC_SUBST([host_alias])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([host_alias])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^host_alias$])
+m4trace:configure.ac:38: -1- AC_SUBST([target_alias])
+m4trace:configure.ac:38: -1- AC_SUBST_TRACE([target_alias])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^target_alias$])
+m4trace:configure.ac:645: -1- AC_DEFINE_TRACE_LITERAL([LISPDIR_USER_DEFINED])
+m4trace:configure.ac:645: -1- m4_pattern_allow([^LISPDIR_USER_DEFINED$])
+m4trace:configure.ac:648: -1- AC_DEFINE_TRACE_LITERAL([ARCHLIBDIR_USER_DEFINED])
+m4trace:configure.ac:648: -1- m4_pattern_allow([^ARCHLIBDIR_USER_DEFINED$])
+m4trace:configure.ac:651: -1- AC_DEFINE_TRACE_LITERAL([MODULEDIR_USER_DEFINED])
+m4trace:configure.ac:651: -1- m4_pattern_allow([^MODULEDIR_USER_DEFINED$])
+m4trace:configure.ac:654: -1- AC_DEFINE_TRACE_LITERAL([ETCDIR_USER_DEFINED])
+m4trace:configure.ac:654: -1- m4_pattern_allow([^ETCDIR_USER_DEFINED$])
+m4trace:configure.ac:657: -1- AC_DEFINE_TRACE_LITERAL([DOCDIR_USER_DEFINED])
+m4trace:configure.ac:657: -1- m4_pattern_allow([^DOCDIR_USER_DEFINED$])
+m4trace:configure.ac:668: -1- AC_DEFINE_TRACE_LITERAL([EARLY_PACKAGE_DIRECTORIES_USER_DEFINED])
+m4trace:configure.ac:668: -1- m4_pattern_allow([^EARLY_PACKAGE_DIRECTORIES_USER_DEFINED$])
+m4trace:configure.ac:671: -1- AC_DEFINE_TRACE_LITERAL([EARLY_PACKAGE_DIRECTORIES_USER_DEFINED])
+m4trace:configure.ac:671: -1- m4_pattern_allow([^EARLY_PACKAGE_DIRECTORIES_USER_DEFINED$])
+m4trace:configure.ac:674: -1- AC_DEFINE_TRACE_LITERAL([LATE_PACKAGE_DIRECTORIES_USER_DEFINED])
+m4trace:configure.ac:674: -1- m4_pattern_allow([^LATE_PACKAGE_DIRECTORIES_USER_DEFINED$])
+m4trace:configure.ac:677: -1- AC_DEFINE_TRACE_LITERAL([LATE_PACKAGE_DIRECTORIES_USER_DEFINED])
+m4trace:configure.ac:677: -1- m4_pattern_allow([^LATE_PACKAGE_DIRECTORIES_USER_DEFINED$])
+m4trace:configure.ac:680: -1- AC_DEFINE_TRACE_LITERAL([LAST_PACKAGE_DIRECTORIES_USER_DEFINED])
+m4trace:configure.ac:680: -1- m4_pattern_allow([^LAST_PACKAGE_DIRECTORIES_USER_DEFINED$])
+m4trace:configure.ac:683: -1- AC_DEFINE_TRACE_LITERAL([LAST_PACKAGE_DIRECTORIES_USER_DEFINED])
+m4trace:configure.ac:683: -1- m4_pattern_allow([^LAST_PACKAGE_DIRECTORIES_USER_DEFINED$])
+m4trace:configure.ac:686: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_PATH_USER_DEFINED])
+m4trace:configure.ac:686: -1- m4_pattern_allow([^PACKAGE_PATH_USER_DEFINED$])
+m4trace:configure.ac:689: -1- AC_DEFINE_TRACE_LITERAL([INFOPATH_USER_DEFINED])
+m4trace:configure.ac:689: -1- m4_pattern_allow([^INFOPATH_USER_DEFINED$])
+m4trace:configure.ac:1083: -1- AC_DEFINE_TRACE_LITERAL([EXEC_PREFIX_USER_DEFINED])
+m4trace:configure.ac:1083: -1- m4_pattern_allow([^EXEC_PREFIX_USER_DEFINED$])
+m4trace:configure.ac:1103: -1- AC_DEFINE_TRACE_LITERAL([INFODIR_USER_DEFINED])
+m4trace:configure.ac:1103: -1- m4_pattern_allow([^INFODIR_USER_DEFINED$])
+m4trace:configure.ac:1104: -1- AC_DEFINE_TRACE_LITERAL([LISPDIR_USER_DEFINED])
+m4trace:configure.ac:1104: -1- m4_pattern_allow([^LISPDIR_USER_DEFINED$])
+m4trace:configure.ac:1105: -1- AC_DEFINE_TRACE_LITERAL([ETCDIR_USER_DEFINED])
+m4trace:configure.ac:1105: -1- m4_pattern_allow([^ETCDIR_USER_DEFINED$])
+m4trace:configure.ac:1106: -1- AC_DEFINE_TRACE_LITERAL([LATE_PACKAGE_DIRECTORIES_USER_DEFINED])
+m4trace:configure.ac:1106: -1- m4_pattern_allow([^LATE_PACKAGE_DIRECTORIES_USER_DEFINED$])
+m4trace:configure.ac:1111: -1- AC_DEFINE_TRACE_LITERAL([MODULEDIR_USER_DEFINED])
+m4trace:configure.ac:1111: -1- m4_pattern_allow([^MODULEDIR_USER_DEFINED$])
+m4trace:configure.ac:1112: -1- AC_DEFINE_TRACE_LITERAL([ARCHLIBDIR_USER_DEFINED])
+m4trace:configure.ac:1112: -1- m4_pattern_allow([^ARCHLIBDIR_USER_DEFINED$])
+m4trace:configure.ac:1113: -1- AC_DEFINE_TRACE_LITERAL([DOCDIR_USER_DEFINED])
+m4trace:configure.ac:1113: -1- m4_pattern_allow([^DOCDIR_USER_DEFINED$])
+m4trace:configure.ac:1118: -1- AC_DEFINE_TRACE_LITERAL([INFODIR_USER_DEFINED])
+m4trace:configure.ac:1118: -1- m4_pattern_allow([^INFODIR_USER_DEFINED$])
+m4trace:configure.ac:1129: -1- AC_SUBST([inststaticdir])
+m4trace:configure.ac:1129: -1- AC_SUBST_TRACE([inststaticdir])
+m4trace:configure.ac:1129: -1- m4_pattern_allow([^inststaticdir$])
+m4trace:configure.ac:1130: -1- AC_SUBST([statedir], [$with_statedir])
+m4trace:configure.ac:1130: -1- AC_SUBST_TRACE([statedir])
+m4trace:configure.ac:1130: -1- m4_pattern_allow([^statedir$])
+m4trace:configure.ac:1134: -1- AC_SUBST([LN_S], [$as_ln_s])
+m4trace:configure.ac:1134: -1- AC_SUBST_TRACE([LN_S])
+m4trace:configure.ac:1134: -1- m4_pattern_allow([^LN_S$])
+m4trace:configure.ac:1156: -1- AC_SUBST([blddir])
+m4trace:configure.ac:1156: -1- AC_SUBST_TRACE([blddir])
+m4trace:configure.ac:1156: -1- m4_pattern_allow([^blddir$])
+m4trace:configure.ac:1187: -1- AC_CANONICAL_BUILD
+m4trace:configure.ac:1187: -1- AC_REQUIRE_AUX_FILE([config.sub])
+m4trace:configure.ac:1187: -1- AC_REQUIRE_AUX_FILE([config.guess])
+m4trace:configure.ac:1187: -1- AC_SUBST([build], [$ac_cv_build])
+m4trace:configure.ac:1187: -1- AC_SUBST_TRACE([build])
+m4trace:configure.ac:1187: -1- m4_pattern_allow([^build$])
+m4trace:configure.ac:1187: -1- AC_SUBST([build_cpu], [$[1]])
+m4trace:configure.ac:1187: -1- AC_SUBST_TRACE([build_cpu])
+m4trace:configure.ac:1187: -1- m4_pattern_allow([^build_cpu$])
+m4trace:configure.ac:1187: -1- AC_SUBST([build_vendor], [$[2]])
+m4trace:configure.ac:1187: -1- AC_SUBST_TRACE([build_vendor])
+m4trace:configure.ac:1187: -1- m4_pattern_allow([^build_vendor$])
+m4trace:configure.ac:1187: -1- AC_SUBST([build_os])
+m4trace:configure.ac:1187: -1- AC_SUBST_TRACE([build_os])
+m4trace:configure.ac:1187: -1- m4_pattern_allow([^build_os$])
+m4trace:configure.ac:1203: -1- AC_DEFINE_TRACE_LITERAL([EMACS_MAJOR_VERSION])
+m4trace:configure.ac:1203: -1- m4_pattern_allow([^EMACS_MAJOR_VERSION$])
+m4trace:configure.ac:1204: -1- AC_DEFINE_TRACE_LITERAL([EMACS_MINOR_VERSION])
+m4trace:configure.ac:1204: -1- m4_pattern_allow([^EMACS_MINOR_VERSION$])
+m4trace:configure.ac:1208: -1- AC_DEFINE_TRACE_LITERAL([EMACS_BETA_VERSION])
+m4trace:configure.ac:1208: -1- m4_pattern_allow([^EMACS_BETA_VERSION$])
+m4trace:configure.ac:1211: -1- AC_DEFINE_TRACE_LITERAL([EMACS_PATCH_LEVEL])
+m4trace:configure.ac:1211: -1- m4_pattern_allow([^EMACS_PATCH_LEVEL$])
+m4trace:configure.ac:1214: -1- AC_DEFINE_TRACE_LITERAL([XEMACS_CODENAME])
+m4trace:configure.ac:1214: -1- m4_pattern_allow([^XEMACS_CODENAME$])
+m4trace:configure.ac:1218: -1- AC_DEFINE_TRACE_LITERAL([XEMACS_EXTRA_NAME])
+m4trace:configure.ac:1218: -1- m4_pattern_allow([^XEMACS_EXTRA_NAME$])
+m4trace:configure.ac:1222: -1- AC_DEFINE_TRACE_LITERAL([XEMACS_RELEASE_DATE])
+m4trace:configure.ac:1222: -1- m4_pattern_allow([^XEMACS_RELEASE_DATE$])
+m4trace:configure.ac:1224: -1- AC_DEFINE_TRACE_LITERAL([EMACS_VERSION])
+m4trace:configure.ac:1224: -1- m4_pattern_allow([^EMACS_VERSION$])
+m4trace:configure.ac:1229: -1- AC_SUBST([SHEBANG_PROGNAME])
+m4trace:configure.ac:1229: -1- AC_SUBST_TRACE([SHEBANG_PROGNAME])
+m4trace:configure.ac:1229: -1- m4_pattern_allow([^SHEBANG_PROGNAME$])
+m4trace:configure.ac:1231: -1- AC_DEFINE_TRACE_LITERAL([EMACS_PROGNAME])
+m4trace:configure.ac:1231: -1- m4_pattern_allow([^EMACS_PROGNAME$])
+m4trace:configure.ac:1233: -1- AC_DEFINE_TRACE_LITERAL([SHEBANG_PROGNAME])
+m4trace:configure.ac:1233: -1- m4_pattern_allow([^SHEBANG_PROGNAME$])
+m4trace:configure.ac:1241: -1- AC_DEFINE_TRACE_LITERAL([ERROR_CHECK_EXTENTS])
+m4trace:configure.ac:1241: -1- m4_pattern_allow([^ERROR_CHECK_EXTENTS$])
+m4trace:configure.ac:1242: -1- AC_DEFINE_TRACE_LITERAL([ERROR_CHECK_TYPES])
+m4trace:configure.ac:1242: -1- m4_pattern_allow([^ERROR_CHECK_TYPES$])
+m4trace:configure.ac:1243: -1- AC_DEFINE_TRACE_LITERAL([ERROR_CHECK_TEXT])
+m4trace:configure.ac:1243: -1- m4_pattern_allow([^ERROR_CHECK_TEXT$])
+m4trace:configure.ac:1244: -1- AC_DEFINE_TRACE_LITERAL([ERROR_CHECK_GC])
+m4trace:configure.ac:1244: -1- m4_pattern_allow([^ERROR_CHECK_GC$])
+m4trace:configure.ac:1245: -1- AC_DEFINE_TRACE_LITERAL([ERROR_CHECK_MALLOC])
+m4trace:configure.ac:1245: -1- m4_pattern_allow([^ERROR_CHECK_MALLOC$])
+m4trace:configure.ac:1246: -1- AC_DEFINE_TRACE_LITERAL([ERROR_CHECK_BYTE_CODE])
+m4trace:configure.ac:1246: -1- m4_pattern_allow([^ERROR_CHECK_BYTE_CODE$])
+m4trace:configure.ac:1247: -1- AC_DEFINE_TRACE_LITERAL([ERROR_CHECK_GLYPHS])
+m4trace:configure.ac:1247: -1- m4_pattern_allow([^ERROR_CHECK_GLYPHS$])
+m4trace:configure.ac:1248: -1- AC_DEFINE_TRACE_LITERAL([ERROR_CHECK_DISPLAY])
+m4trace:configure.ac:1248: -1- m4_pattern_allow([^ERROR_CHECK_DISPLAY$])
+m4trace:configure.ac:1249: -1- AC_DEFINE_TRACE_LITERAL([ERROR_CHECK_STRUCTURES])
+m4trace:configure.ac:1249: -1- m4_pattern_allow([^ERROR_CHECK_STRUCTURES$])
+m4trace:configure.ac:1256: -1- AC_DEFINE_TRACE_LITERAL([DEBUG_XEMACS])
+m4trace:configure.ac:1256: -1- m4_pattern_allow([^DEBUG_XEMACS$])
+m4trace:configure.ac:1258: -1- AC_DEFINE_TRACE_LITERAL([USE_ASSERTIONS])
+m4trace:configure.ac:1258: -1- m4_pattern_allow([^USE_ASSERTIONS$])
+m4trace:configure.ac:1259: -1- AC_DEFINE_TRACE_LITERAL([MEMORY_USAGE_STATS])
+m4trace:configure.ac:1259: -1- m4_pattern_allow([^MEMORY_USAGE_STATS$])
+m4trace:configure.ac:1270: -1- AC_SUBST([configuration], [$ac_cv_build])
+m4trace:configure.ac:1270: -1- AC_SUBST_TRACE([configuration])
+m4trace:configure.ac:1270: -1- m4_pattern_allow([^configuration$])
+m4trace:configure.ac:1353: -1- AC_DEFINE_TRACE_LITERAL([USE_PARAM_H])
+m4trace:configure.ac:1353: -1- m4_pattern_allow([^USE_PARAM_H$])
+m4trace:configure.ac:1400: -1- AC_DEFINE_TRACE_LITERAL([OS_RELEASE])
+m4trace:configure.ac:1400: -1- m4_pattern_allow([^OS_RELEASE$])
+m4trace:configure.ac:1435: -1- AC_DEFINE_TRACE_LITERAL([config_machfile])
+m4trace:configure.ac:1435: -1- m4_pattern_allow([^config_machfile$])
+m4trace:configure.ac:1443: -1- AC_DEFINE_TRACE_LITERAL([config_opsysfile])
+m4trace:configure.ac:1443: -1- m4_pattern_allow([^config_opsysfile$])
+m4trace:configure.ac:1468: -1- AC_DEFINE_TRACE_LITERAL([VDB_MACH])
+m4trace:configure.ac:1468: -1- m4_pattern_allow([^VDB_MACH$])
+m4trace:configure.ac:1470: -1- AC_DEFINE_TRACE_LITERAL([VDB_WIN32])
+m4trace:configure.ac:1470: -1- m4_pattern_allow([^VDB_WIN32$])
+m4trace:configure.ac:1478: -1- AC_DEFINE_TRACE_LITERAL([VDB_MACH])
+m4trace:configure.ac:1478: -1- m4_pattern_allow([^VDB_MACH$])
+m4trace:configure.ac:1479: -1- AC_DEFINE_TRACE_LITERAL([VDB_WIN32])
+m4trace:configure.ac:1479: -1- m4_pattern_allow([^VDB_WIN32$])
+m4trace:configure.ac:1496: -1- AC_DEFINE_TRACE_LITERAL([DLSYM_NEEDS_UNDERSCORE])
+m4trace:configure.ac:1496: -1- m4_pattern_allow([^DLSYM_NEEDS_UNDERSCORE$])
+m4trace:configure.ac:1515: -1- AC_DEFINE_TRACE_LITERAL([STACK_TRACE_EYE_CATCHER])
+m4trace:configure.ac:1515: -1- m4_pattern_allow([^STACK_TRACE_EYE_CATCHER$])
+m4trace:configure.ac:1525: -1- AC_DEFINE_TRACE_LITERAL([SUNPRO])
+m4trace:configure.ac:1525: -1- m4_pattern_allow([^SUNPRO$])
+m4trace:configure.ac:1529: -1- AC_DEFINE_TRACE_LITERAL([CLASH_DETECTION])
+m4trace:configure.ac:1529: -1- m4_pattern_allow([^CLASH_DETECTION$])
+m4trace:configure.ac:1566: -1- _m4_warn([obsolete], [The macro `AC_AIX' is obsolete.
+You should run autoupdate.], [../../lib/autoconf/specific.m4:432: AC_AIX is expanded from...
+configure.ac:1566: the top level])
+m4trace:configure.ac:1566: -1- AC_SUBST([CC])
+m4trace:configure.ac:1566: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:1566: -1- AC_SUBST([CFLAGS])
+m4trace:configure.ac:1566: -1- AC_SUBST_TRACE([CFLAGS])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.ac:1566: -1- AC_SUBST([LDFLAGS])
+m4trace:configure.ac:1566: -1- AC_SUBST_TRACE([LDFLAGS])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:1566: -1- AC_SUBST([LIBS])
+m4trace:configure.ac:1566: -1- AC_SUBST_TRACE([LIBS])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:1566: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:1566: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:1566: -1- AC_SUBST([CC])
+m4trace:configure.ac:1566: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:1566: -1- AC_SUBST([CC])
+m4trace:configure.ac:1566: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:1566: -1- AC_SUBST([CC])
+m4trace:configure.ac:1566: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:1566: -1- AC_SUBST([CC])
+m4trace:configure.ac:1566: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:1566: -1- AC_SUBST([ac_ct_CC])
+m4trace:configure.ac:1566: -1- AC_SUBST_TRACE([ac_ct_CC])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^ac_ct_CC$])
+m4trace:configure.ac:1566: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
+m4trace:configure.ac:1566: -1- AC_SUBST_TRACE([EXEEXT])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^EXEEXT$])
+m4trace:configure.ac:1566: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
+m4trace:configure.ac:1566: -1- AC_SUBST_TRACE([OBJEXT])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^OBJEXT$])
+m4trace:configure.ac:1566: -1- AC_SUBST([CPP])
+m4trace:configure.ac:1566: -1- AC_SUBST_TRACE([CPP])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:1566: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:1566: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:1566: -1- AC_SUBST([CPP])
+m4trace:configure.ac:1566: -1- AC_SUBST_TRACE([CPP])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:1566: -1- AC_SUBST([GREP])
+m4trace:configure.ac:1566: -1- AC_SUBST_TRACE([GREP])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:1566: -1- AC_SUBST([EGREP])
+m4trace:configure.ac:1566: -1- AC_SUBST_TRACE([EGREP])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^EGREP$])
+m4trace:configure.ac:1566: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:1566: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
+@%:@undef STDC_HEADERS])
+m4trace:configure.ac:1566: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
+@%:@undef HAVE_SYS_TYPES_H])
+m4trace:configure.ac:1566: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
+@%:@undef HAVE_SYS_STAT_H])
+m4trace:configure.ac:1566: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
+@%:@undef HAVE_STDLIB_H])
+m4trace:configure.ac:1566: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
+@%:@undef HAVE_STRING_H])
+m4trace:configure.ac:1566: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
+@%:@undef HAVE_MEMORY_H])
+m4trace:configure.ac:1566: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
+@%:@undef HAVE_STRINGS_H])
+m4trace:configure.ac:1566: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
+@%:@undef HAVE_INTTYPES_H])
+m4trace:configure.ac:1566: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
+@%:@undef HAVE_STDINT_H])
+m4trace:configure.ac:1566: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
+@%:@undef HAVE_UNISTD_H])
+m4trace:configure.ac:1566: -1- AC_DEFINE_TRACE_LITERAL([_POSIX_SOURCE])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^_POSIX_SOURCE$])
+m4trace:configure.ac:1566: -1- AH_OUTPUT([_POSIX_SOURCE], [/* Define to 1 if you need to in order for `stat\' and other things to work. */
+@%:@undef _POSIX_SOURCE])
+m4trace:configure.ac:1566: -1- AC_DEFINE_TRACE_LITERAL([_POSIX_1_SOURCE])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^_POSIX_1_SOURCE$])
+m4trace:configure.ac:1566: -1- AH_OUTPUT([_POSIX_1_SOURCE], [/* Define to 2 if the system does not provide POSIX.1 features except with
+ this defined. */
+@%:@undef _POSIX_1_SOURCE])
+m4trace:configure.ac:1566: -1- AC_DEFINE_TRACE_LITERAL([_MINIX])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^_MINIX$])
+m4trace:configure.ac:1566: -1- AH_OUTPUT([_MINIX], [/* Define to 1 if on MINIX. */
+@%:@undef _MINIX])
+m4trace:configure.ac:1566: -1- AH_OUTPUT([USE_SYSTEM_EXTENSIONS], [/* Enable extensions on AIX 3, Interix. */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+])
+m4trace:configure.ac:1566: -1- AC_DEFINE_TRACE_LITERAL([__EXTENSIONS__])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^__EXTENSIONS__$])
+m4trace:configure.ac:1566: -1- AC_DEFINE_TRACE_LITERAL([_ALL_SOURCE])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^_ALL_SOURCE$])
+m4trace:configure.ac:1566: -1- AC_DEFINE_TRACE_LITERAL([_GNU_SOURCE])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^_GNU_SOURCE$])
+m4trace:configure.ac:1566: -1- AC_DEFINE_TRACE_LITERAL([_POSIX_PTHREAD_SEMANTICS])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^_POSIX_PTHREAD_SEMANTICS$])
+m4trace:configure.ac:1566: -1- AC_DEFINE_TRACE_LITERAL([_TANDEM_SOURCE])
+m4trace:configure.ac:1566: -1- m4_pattern_allow([^_TANDEM_SOURCE$])
+m4trace:configure.ac:1568: -1- AC_SUBST([CC])
+m4trace:configure.ac:1568: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:1568: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:1568: -1- AC_SUBST([CFLAGS])
+m4trace:configure.ac:1568: -1- AC_SUBST_TRACE([CFLAGS])
+m4trace:configure.ac:1568: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.ac:1568: -1- AC_SUBST([LDFLAGS])
+m4trace:configure.ac:1568: -1- AC_SUBST_TRACE([LDFLAGS])
+m4trace:configure.ac:1568: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:1568: -1- AC_SUBST([LIBS])
+m4trace:configure.ac:1568: -1- AC_SUBST_TRACE([LIBS])
+m4trace:configure.ac:1568: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:1568: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:1568: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:1568: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:1568: -1- AC_SUBST([CC])
+m4trace:configure.ac:1568: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:1568: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:1568: -1- AC_SUBST([CC])
+m4trace:configure.ac:1568: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:1568: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:1568: -1- AC_SUBST([CC])
+m4trace:configure.ac:1568: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:1568: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:1568: -1- AC_SUBST([CC])
+m4trace:configure.ac:1568: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:1568: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:1568: -1- AC_SUBST([ac_ct_CC])
+m4trace:configure.ac:1568: -1- AC_SUBST_TRACE([ac_ct_CC])
+m4trace:configure.ac:1568: -1- m4_pattern_allow([^ac_ct_CC$])
+m4trace:configure.ac:1573: -1- AC_SUBST([CC])
+m4trace:configure.ac:1573: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:1573: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:1573: -1- AC_SUBST([CFLAGS])
+m4trace:configure.ac:1573: -1- AC_SUBST_TRACE([CFLAGS])
+m4trace:configure.ac:1573: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.ac:1573: -1- AC_SUBST([LDFLAGS])
+m4trace:configure.ac:1573: -1- AC_SUBST_TRACE([LDFLAGS])
+m4trace:configure.ac:1573: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:1573: -1- AC_SUBST([LIBS])
+m4trace:configure.ac:1573: -1- AC_SUBST_TRACE([LIBS])
+m4trace:configure.ac:1573: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:1573: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:1573: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:1573: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:1573: -1- AC_SUBST([CC])
+m4trace:configure.ac:1573: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:1573: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:1573: -1- AC_SUBST([CC])
+m4trace:configure.ac:1573: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:1573: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:1573: -1- AC_SUBST([CC])
+m4trace:configure.ac:1573: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:1573: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:1573: -1- AC_SUBST([CC])
+m4trace:configure.ac:1573: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:1573: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:1573: -1- AC_SUBST([ac_ct_CC])
+m4trace:configure.ac:1573: -1- AC_SUBST_TRACE([ac_ct_CC])
+m4trace:configure.ac:1573: -1- m4_pattern_allow([^ac_ct_CC$])
+m4trace:configure.ac:1576: -1- AC_SUBST([CC])
+m4trace:configure.ac:1576: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:1576: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:1576: -1- AC_SUBST([CFLAGS])
+m4trace:configure.ac:1576: -1- AC_SUBST_TRACE([CFLAGS])
+m4trace:configure.ac:1576: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.ac:1576: -1- AC_SUBST([LDFLAGS])
+m4trace:configure.ac:1576: -1- AC_SUBST_TRACE([LDFLAGS])
+m4trace:configure.ac:1576: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:1576: -1- AC_SUBST([LIBS])
+m4trace:configure.ac:1576: -1- AC_SUBST_TRACE([LIBS])
+m4trace:configure.ac:1576: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:1576: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:1576: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:1576: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:1576: -1- AC_SUBST([CC])
+m4trace:configure.ac:1576: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:1576: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:1576: -1- AC_SUBST([CC])
+m4trace:configure.ac:1576: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:1576: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:1576: -1- AC_SUBST([CC])
+m4trace:configure.ac:1576: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:1576: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:1576: -1- AC_SUBST([CC])
+m4trace:configure.ac:1576: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:1576: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:1576: -1- AC_SUBST([ac_ct_CC])
+m4trace:configure.ac:1576: -1- AC_SUBST_TRACE([ac_ct_CC])
+m4trace:configure.ac:1576: -1- m4_pattern_allow([^ac_ct_CC$])
+m4trace:configure.ac:1582: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [../../lib/autoconf/general.m4:2749: AC_RUN_IFELSE is expanded from...
+configure.ac:1582: the top level])
+m4trace:configure.ac:1585: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [../../lib/autoconf/general.m4:2749: AC_RUN_IFELSE is expanded from...
+configure.ac:1585: the top level])
+m4trace:configure.ac:1641: -1- AC_SUBST([CPP])
+m4trace:configure.ac:1641: -1- AC_SUBST_TRACE([CPP])
+m4trace:configure.ac:1641: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:1641: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:1641: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:1641: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:1641: -1- AC_SUBST([CPP])
+m4trace:configure.ac:1641: -1- AC_SUBST_TRACE([CPP])
+m4trace:configure.ac:1641: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:1660: -1- AC_DEFINE_TRACE_LITERAL([_GNU_SOURCE])
+m4trace:configure.ac:1660: -1- m4_pattern_allow([^_GNU_SOURCE$])
+m4trace:configure.ac:1667: -1- AC_DEFINE_TRACE_LITERAL([__EXTENSIONS__])
+m4trace:configure.ac:1667: -1- m4_pattern_allow([^__EXTENSIONS__$])
+m4trace:configure.ac:1670: -1- AC_DEFINE_TRACE_LITERAL([_XOPEN_SOURCE])
+m4trace:configure.ac:1670: -1- m4_pattern_allow([^_XOPEN_SOURCE$])
+m4trace:configure.ac:1671: -1- AC_DEFINE_TRACE_LITERAL([_XOPEN_SOURCE_EXTENDED])
+m4trace:configure.ac:1671: -1- m4_pattern_allow([^_XOPEN_SOURCE_EXTENDED$])
+m4trace:configure.ac:1674: -1- AC_DEFINE_TRACE_LITERAL([_POSIX_C_SOURCE])
+m4trace:configure.ac:1674: -1- m4_pattern_allow([^_POSIX_C_SOURCE$])
+m4trace:configure.ac:1676: -1- AC_DEFINE_TRACE_LITERAL([_XOPEN_SOURCE])
+m4trace:configure.ac:1676: -1- m4_pattern_allow([^_XOPEN_SOURCE$])
+m4trace:configure.ac:1677: -1- AC_DEFINE_TRACE_LITERAL([_XOPEN_SOURCE_EXTENDED])
+m4trace:configure.ac:1677: -1- m4_pattern_allow([^_XOPEN_SOURCE_EXTENDED$])
+m4trace:configure.ac:1680: -1- AC_DEFINE_TRACE_LITERAL([_POSIX_C_SOURCE])
+m4trace:configure.ac:1680: -1- m4_pattern_allow([^_POSIX_C_SOURCE$])
+m4trace:configure.ac:1682: -1- AC_DEFINE_TRACE_LITERAL([_XOPEN_SOURCE])
+m4trace:configure.ac:1682: -1- m4_pattern_allow([^_XOPEN_SOURCE$])
+m4trace:configure.ac:1690: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [../../lib/autoconf/general.m4:2749: AC_RUN_IFELSE is expanded from...
+configure.ac:1690: the top level])
+m4trace:configure.ac:1830: -1- AC_DEFINE_TRACE_LITERAL([SYSTEM_TYPE])
+m4trace:configure.ac:1830: -1- m4_pattern_allow([^SYSTEM_TYPE$])
+m4trace:configure.ac:2233: -1- AC_SUBST([start_flags])
+m4trace:configure.ac:2233: -1- AC_SUBST_TRACE([start_flags])
+m4trace:configure.ac:2233: -1- m4_pattern_allow([^start_flags$])
+m4trace:configure.ac:2235: -1- AC_SUBST([ld_switch_shared])
+m4trace:configure.ac:2235: -1- AC_SUBST_TRACE([ld_switch_shared])
+m4trace:configure.ac:2235: -1- m4_pattern_allow([^ld_switch_shared$])
+m4trace:configure.ac:2236: -1- AC_SUBST([start_files])
+m4trace:configure.ac:2236: -1- AC_SUBST_TRACE([start_files])
+m4trace:configure.ac:2236: -1- m4_pattern_allow([^start_files$])
+m4trace:configure.ac:2242: -1- AC_SUBST([ld])
+m4trace:configure.ac:2242: -1- AC_SUBST_TRACE([ld])
+m4trace:configure.ac:2242: -1- m4_pattern_allow([^ld$])
+m4trace:configure.ac:2243: -1- AC_SUBST([lib_gcc])
+m4trace:configure.ac:2243: -1- AC_SUBST_TRACE([lib_gcc])
+m4trace:configure.ac:2243: -1- m4_pattern_allow([^lib_gcc$])
+m4trace:configure.ac:2552: -1- AC_DEFINE_TRACE_LITERAL([DOUG_LEA_MALLOC])
+m4trace:configure.ac:2552: -1- m4_pattern_allow([^DOUG_LEA_MALLOC$])
+m4trace:configure.ac:2556: -1- AC_DEFINE_TRACE_LITERAL([_NO_MALLOC_WARNING_])
+m4trace:configure.ac:2556: -1- m4_pattern_allow([^_NO_MALLOC_WARNING_$])
+m4trace:configure.ac:2583: -1- AC_SUBST([AR])
+m4trace:configure.ac:2583: -1- AC_SUBST_TRACE([AR])
+m4trace:configure.ac:2583: -1- m4_pattern_allow([^AR$])
+m4trace:configure.ac:2588: -1- AC_SUBST([RANLIB])
+m4trace:configure.ac:2588: -1- AC_SUBST_TRACE([RANLIB])
+m4trace:configure.ac:2588: -1- m4_pattern_allow([^RANLIB$])
+m4trace:configure.ac:2589: -1- AC_REQUIRE_AUX_FILE([install-sh])
+m4trace:configure.ac:2589: -1- AC_SUBST([INSTALL_PROGRAM])
+m4trace:configure.ac:2589: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
+m4trace:configure.ac:2589: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
+m4trace:configure.ac:2589: -1- AC_SUBST([INSTALL_SCRIPT])
+m4trace:configure.ac:2589: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
+m4trace:configure.ac:2589: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
+m4trace:configure.ac:2589: -1- AC_SUBST([INSTALL_DATA])
+m4trace:configure.ac:2589: -1- AC_SUBST_TRACE([INSTALL_DATA])
+m4trace:configure.ac:2589: -1- m4_pattern_allow([^INSTALL_DATA$])
+m4trace:configure.ac:2590: -1- AC_SUBST([YACC])
+m4trace:configure.ac:2590: -1- AC_SUBST_TRACE([YACC])
+m4trace:configure.ac:2590: -1- m4_pattern_allow([^YACC$])
+m4trace:configure.ac:2590: -1- AC_SUBST([YACC])
+m4trace:configure.ac:2590: -1- AC_SUBST_TRACE([YACC])
+m4trace:configure.ac:2590: -1- m4_pattern_allow([^YACC$])
+m4trace:configure.ac:2590: -1- AC_SUBST([YFLAGS])
+m4trace:configure.ac:2590: -1- AC_SUBST_TRACE([YFLAGS])
+m4trace:configure.ac:2590: -1- m4_pattern_allow([^YFLAGS$])
+m4trace:configure.ac:2593: -1- AH_OUTPUT([HAVE_A_OUT_H], [/* Define to 1 if you have the <a.out.h> header file. */
+@%:@undef HAVE_A_OUT_H])
+m4trace:configure.ac:2593: -1- AH_OUTPUT([HAVE_ELF_H], [/* Define to 1 if you have the <elf.h> header file. */
+@%:@undef HAVE_ELF_H])
+m4trace:configure.ac:2593: -1- AH_OUTPUT([HAVE_CYGWIN_VERSION_H], [/* Define to 1 if you have the <cygwin/version.h> header file. */
+@%:@undef HAVE_CYGWIN_VERSION_H])
+m4trace:configure.ac:2593: -1- AH_OUTPUT([HAVE_FCNTL_H], [/* Define to 1 if you have the <fcntl.h> header file. */
+@%:@undef HAVE_FCNTL_H])
+m4trace:configure.ac:2593: -1- AH_OUTPUT([HAVE_LIBGEN_H], [/* Define to 1 if you have the <libgen.h> header file. */
+@%:@undef HAVE_LIBGEN_H])
+m4trace:configure.ac:2593: -1- AH_OUTPUT([HAVE_LOCALE_H], [/* Define to 1 if you have the <locale.h> header file. */
+@%:@undef HAVE_LOCALE_H])
+m4trace:configure.ac:2593: -1- AH_OUTPUT([HAVE_WCHAR_H], [/* Define to 1 if you have the <wchar.h> header file. */
+@%:@undef HAVE_WCHAR_H])
+m4trace:configure.ac:2593: -1- AH_OUTPUT([HAVE_MACH_MACH_H], [/* Define to 1 if you have the <mach/mach.h> header file. */
+@%:@undef HAVE_MACH_MACH_H])
+m4trace:configure.ac:2593: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */
+@%:@undef HAVE_SYS_PARAM_H])
+m4trace:configure.ac:2593: -1- AH_OUTPUT([HAVE_SYS_PSTAT_H], [/* Define to 1 if you have the <sys/pstat.h> header file. */
+@%:@undef HAVE_SYS_PSTAT_H])
+m4trace:configure.ac:2593: -1- AH_OUTPUT([HAVE_SYS_RESOURCE_H], [/* Define to 1 if you have the <sys/resource.h> header file. */
+@%:@undef HAVE_SYS_RESOURCE_H])
+m4trace:configure.ac:2593: -1- AH_OUTPUT([HAVE_SYS_TIME_H], [/* Define to 1 if you have the <sys/time.h> header file. */
+@%:@undef HAVE_SYS_TIME_H])
+m4trace:configure.ac:2593: -1- AH_OUTPUT([HAVE_SYS_TIMEB_H], [/* Define to 1 if you have the <sys/timeb.h> header file. */
+@%:@undef HAVE_SYS_TIMEB_H])
+m4trace:configure.ac:2593: -1- AH_OUTPUT([HAVE_SYS_TIMES_H], [/* Define to 1 if you have the <sys/times.h> header file. */
+@%:@undef HAVE_SYS_TIMES_H])
+m4trace:configure.ac:2593: -1- AH_OUTPUT([HAVE_SYS_UN_H], [/* Define to 1 if you have the <sys/un.h> header file. */
+@%:@undef HAVE_SYS_UN_H])
+m4trace:configure.ac:2593: -1- AH_OUTPUT([HAVE_SYS_VLIMIT_H], [/* Define to 1 if you have the <sys/vlimit.h> header file. */
+@%:@undef HAVE_SYS_VLIMIT_H])
+m4trace:configure.ac:2593: -1- AH_OUTPUT([HAVE_ULIMIT_H], [/* Define to 1 if you have the <ulimit.h> header file. */
+@%:@undef HAVE_ULIMIT_H])
+m4trace:configure.ac:2612: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_WAIT_H])
+m4trace:configure.ac:2612: -1- m4_pattern_allow([^HAVE_SYS_WAIT_H$])
+m4trace:configure.ac:2612: -1- AH_OUTPUT([HAVE_SYS_WAIT_H], [/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+@%:@undef HAVE_SYS_WAIT_H])
+m4trace:configure.ac:2613: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
+m4trace:configure.ac:2613: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:2613: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
+@%:@undef STDC_HEADERS])
+m4trace:configure.ac:2614: -1- AC_DEFINE_TRACE_LITERAL([TIME_WITH_SYS_TIME])
+m4trace:configure.ac:2614: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
+m4trace:configure.ac:2614: -1- AH_OUTPUT([TIME_WITH_SYS_TIME], [/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+@%:@undef TIME_WITH_SYS_TIME])
+m4trace:configure.ac:2615: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_SYS_SIGLIST])
+m4trace:configure.ac:2615: -1- m4_pattern_allow([^HAVE_DECL_SYS_SIGLIST$])
+m4trace:configure.ac:2615: -1- AH_OUTPUT([HAVE_DECL_SYS_SIGLIST], [/* Define to 1 if you have the declaration of `sys_siglist\', and to 0 if you
+ don\'t. */
+@%:@undef HAVE_DECL_SYS_SIGLIST])
+m4trace:configure.ac:2631: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UTIME])
+m4trace:configure.ac:2631: -1- m4_pattern_allow([^HAVE_UTIME$])
+m4trace:configure.ac:2631: -1- AH_OUTPUT([HAVE_UTIMES], [/* Define to 1 if you have the `utimes\' function. */
+@%:@undef HAVE_UTIMES])
+m4trace:configure.ac:2631: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UTIMES])
+m4trace:configure.ac:2631: -1- m4_pattern_allow([^HAVE_UTIMES$])
+m4trace:configure.ac:2642: -1- _m4_warn([obsolete], [The macro `AC_TYPE_SIGNAL' is obsolete.
+You should run autoupdate.], [../../lib/autoconf/types.m4:738: AC_TYPE_SIGNAL is expanded from...
+configure.ac:2642: the top level])
+m4trace:configure.ac:2642: -1- AC_DEFINE_TRACE_LITERAL([RETSIGTYPE])
+m4trace:configure.ac:2642: -1- m4_pattern_allow([^RETSIGTYPE$])
+m4trace:configure.ac:2642: -1- AH_OUTPUT([RETSIGTYPE], [/* Define as the return type of signal handlers (`int\' or `void\'). */
+@%:@undef RETSIGTYPE])
+m4trace:configure.ac:2643: -1- AC_DEFINE_TRACE_LITERAL([size_t])
+m4trace:configure.ac:2643: -1- m4_pattern_allow([^size_t$])
+m4trace:configure.ac:2643: -1- AH_OUTPUT([size_t], [/* Define to `unsigned int\' if <sys/types.h> does not define. */
+@%:@undef size_t])
+m4trace:configure.ac:2644: -1- AC_DEFINE_TRACE_LITERAL([pid_t])
+m4trace:configure.ac:2644: -1- m4_pattern_allow([^pid_t$])
+m4trace:configure.ac:2644: -1- AH_OUTPUT([pid_t], [/* Define to `int\' if <sys/types.h> does not define. */
+@%:@undef pid_t])
+m4trace:configure.ac:2645: -1- AC_DEFINE_TRACE_LITERAL([uid_t])
+m4trace:configure.ac:2645: -1- m4_pattern_allow([^uid_t$])
+m4trace:configure.ac:2645: -1- AH_OUTPUT([uid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
+@%:@undef uid_t])
+m4trace:configure.ac:2645: -1- AC_DEFINE_TRACE_LITERAL([gid_t])
+m4trace:configure.ac:2645: -1- m4_pattern_allow([^gid_t$])
+m4trace:configure.ac:2645: -1- AH_OUTPUT([gid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
+@%:@undef gid_t])
+m4trace:configure.ac:2646: -1- AC_DEFINE_TRACE_LITERAL([mode_t])
+m4trace:configure.ac:2646: -1- m4_pattern_allow([^mode_t$])
+m4trace:configure.ac:2646: -1- AH_OUTPUT([mode_t], [/* Define to `int\' if <sys/types.h> does not define. */
+@%:@undef mode_t])
+m4trace:configure.ac:2647: -1- AC_DEFINE_TRACE_LITERAL([off_t])
+m4trace:configure.ac:2647: -1- m4_pattern_allow([^off_t$])
+m4trace:configure.ac:2647: -1- AH_OUTPUT([off_t], [/* Define to `long int\' if <sys/types.h> does not define. */
+@%:@undef off_t])
+m4trace:configure.ac:2651: -1- AC_DEFINE_TRACE_LITERAL([ssize_t])
+m4trace:configure.ac:2651: -1- m4_pattern_allow([^ssize_t$])
+m4trace:configure.ac:2651: -1- AH_OUTPUT([ssize_t], [/* Define to `int\' if <sys/types.h> does not define. */
+@%:@undef ssize_t])
+m4trace:configure.ac:2659: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTPTR_T_IN_SYS_TYPES_H])
+m4trace:configure.ac:2659: -1- m4_pattern_allow([^HAVE_INTPTR_T_IN_SYS_TYPES_H$])
+m4trace:configure.ac:2668: -1- AC_DEFINE_TRACE_LITERAL([socklen_t])
+m4trace:configure.ac:2668: -1- m4_pattern_allow([^socklen_t$])
+m4trace:configure.ac:2668: -1- AC_DEFINE_TRACE_LITERAL([socklen_t])
+m4trace:configure.ac:2668: -1- m4_pattern_allow([^socklen_t$])
+m4trace:configure.ac:2682: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TIMEVAL])
+m4trace:configure.ac:2682: -1- m4_pattern_allow([^HAVE_TIMEVAL$])
+m4trace:configure.ac:2699: -1- AC_DEFINE_TRACE_LITERAL([TM_IN_SYS_TIME])
+m4trace:configure.ac:2699: -1- m4_pattern_allow([^TM_IN_SYS_TIME$])
+m4trace:configure.ac:2699: -1- AH_OUTPUT([TM_IN_SYS_TIME], [/* Define to 1 if your <sys/time.h> declares `struct tm\'. */
+@%:@undef TM_IN_SYS_TIME])
+m4trace:configure.ac:2700: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_TM_TM_ZONE])
+m4trace:configure.ac:2700: -1- m4_pattern_allow([^HAVE_STRUCT_TM_TM_ZONE$])
+m4trace:configure.ac:2700: -1- AH_OUTPUT([HAVE_STRUCT_TM_TM_ZONE], [/* Define to 1 if `tm_zone\' is a member of `struct tm\'. */
+@%:@undef HAVE_STRUCT_TM_TM_ZONE])
+m4trace:configure.ac:2700: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TM_ZONE])
+m4trace:configure.ac:2700: -1- m4_pattern_allow([^HAVE_TM_ZONE$])
+m4trace:configure.ac:2700: -1- AH_OUTPUT([HAVE_TM_ZONE], [/* Define to 1 if your `struct tm\' has `tm_zone\'. Deprecated, use
+ `HAVE_STRUCT_TM_TM_ZONE\' instead. */
+@%:@undef HAVE_TM_ZONE])
+m4trace:configure.ac:2700: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_TZNAME])
+m4trace:configure.ac:2700: -1- m4_pattern_allow([^HAVE_DECL_TZNAME$])
+m4trace:configure.ac:2700: -1- AH_OUTPUT([HAVE_DECL_TZNAME], [/* Define to 1 if you have the declaration of `tzname\', and to 0 if you don\'t.
+ */
+@%:@undef HAVE_DECL_TZNAME])
+m4trace:configure.ac:2700: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TZNAME])
+m4trace:configure.ac:2700: -1- m4_pattern_allow([^HAVE_TZNAME$])
+m4trace:configure.ac:2700: -1- AH_OUTPUT([HAVE_TZNAME], [/* Define to 1 if you don\'t have `tm_zone\' but do have the external array
+ `tzname\'. */
+@%:@undef HAVE_TZNAME])
+m4trace:configure.ac:2703: -1- AC_DEFINE_TRACE_LITERAL([const])
+m4trace:configure.ac:2703: -1- m4_pattern_allow([^const$])
+m4trace:configure.ac:2703: -1- AH_OUTPUT([const], [/* Define to empty if `const\' does not conform to ANSI C. */
+@%:@undef const])
+m4trace:configure.ac:2706: -1- AC_SUBST([SET_MAKE])
+m4trace:configure.ac:2706: -1- AC_SUBST_TRACE([SET_MAKE])
+m4trace:configure.ac:2706: -1- m4_pattern_allow([^SET_MAKE$])
+m4trace:configure.ac:2709: -1- AH_OUTPUT([WORDS_BIGENDIAN], [/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+ significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+# define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+# undef WORDS_BIGENDIAN
+# endif
+#endif])
+m4trace:configure.ac:2709: -1- AC_DEFINE_TRACE_LITERAL([WORDS_BIGENDIAN])
+m4trace:configure.ac:2709: -1- m4_pattern_allow([^WORDS_BIGENDIAN$])
+m4trace:configure.ac:2709: -1- AC_DEFINE_TRACE_LITERAL([AC_APPLE_UNIVERSAL_BUILD])
+m4trace:configure.ac:2709: -1- m4_pattern_allow([^AC_APPLE_UNIVERSAL_BUILD$])
+m4trace:configure.ac:2709: -1- AH_OUTPUT([AC_APPLE_UNIVERSAL_BUILD], [/* Define if building universal (internal helper macro) */
+@%:@undef AC_APPLE_UNIVERSAL_BUILD])
+m4trace:configure.ac:2712: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_SHORT])
+m4trace:configure.ac:2712: -1- m4_pattern_allow([^SIZEOF_SHORT$])
+m4trace:configure.ac:2712: -1- AH_OUTPUT([SIZEOF_SHORT], [/* The size of `short\', as computed by sizeof. */
+@%:@undef SIZEOF_SHORT])
+m4trace:configure.ac:2719: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_INT])
+m4trace:configure.ac:2719: -1- m4_pattern_allow([^SIZEOF_INT$])
+m4trace:configure.ac:2719: -1- AH_OUTPUT([SIZEOF_INT], [/* The size of `int\', as computed by sizeof. */
+@%:@undef SIZEOF_INT])
+m4trace:configure.ac:2720: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_LONG])
+m4trace:configure.ac:2720: -1- m4_pattern_allow([^SIZEOF_LONG$])
+m4trace:configure.ac:2720: -1- AH_OUTPUT([SIZEOF_LONG], [/* The size of `long\', as computed by sizeof. */
+@%:@undef SIZEOF_LONG])
+m4trace:configure.ac:2721: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_LONG_LONG])
+m4trace:configure.ac:2721: -1- m4_pattern_allow([^SIZEOF_LONG_LONG$])
+m4trace:configure.ac:2721: -1- AH_OUTPUT([SIZEOF_LONG_LONG], [/* The size of `long long\', as computed by sizeof. */
+@%:@undef SIZEOF_LONG_LONG])
+m4trace:configure.ac:2722: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_VOID_P])
+m4trace:configure.ac:2722: -1- m4_pattern_allow([^SIZEOF_VOID_P$])
+m4trace:configure.ac:2722: -1- AH_OUTPUT([SIZEOF_VOID_P], [/* The size of `void *\', as computed by sizeof. */
+@%:@undef SIZEOF_VOID_P])
+m4trace:configure.ac:2723: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_DOUBLE])
+m4trace:configure.ac:2723: -1- m4_pattern_allow([^SIZEOF_DOUBLE$])
+m4trace:configure.ac:2723: -1- AH_OUTPUT([SIZEOF_DOUBLE], [/* The size of `double\', as computed by sizeof. */
+@%:@undef SIZEOF_DOUBLE])
+m4trace:configure.ac:2726: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LONG_FILE_NAMES])
+m4trace:configure.ac:2726: -1- m4_pattern_allow([^HAVE_LONG_FILE_NAMES$])
+m4trace:configure.ac:2726: -1- AH_OUTPUT([HAVE_LONG_FILE_NAMES], [/* Define to 1 if you support file names longer than 14 characters. */
+@%:@undef HAVE_LONG_FILE_NAMES])
+m4trace:configure.ac:2729: -2- AH_OUTPUT([HAVE_LIBM], [/* Define to 1 if you have the `m\' library (-lm). */
+@%:@undef HAVE_LIBM])
+m4trace:configure.ac:2729: -2- AC_DEFINE_TRACE_LITERAL([HAVE_LIBM])
+m4trace:configure.ac:2729: -2- m4_pattern_allow([^HAVE_LIBM$])
+m4trace:configure.ac:2733: -2- AC_DEFINE_TRACE_LITERAL([HAVE_INVERSE_HYPERBOLIC])
+m4trace:configure.ac:2733: -2- m4_pattern_allow([^HAVE_INVERSE_HYPERBOLIC$])
+m4trace:configure.ac:2736: -1- AH_OUTPUT([HAVE_MKSTEMP], [/* Define to 1 if you have the `mkstemp\' function. */
+@%:@undef HAVE_MKSTEMP])
+m4trace:configure.ac:2736: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MKSTEMP])
+m4trace:configure.ac:2736: -1- m4_pattern_allow([^HAVE_MKSTEMP$])
+m4trace:configure.ac:2741: -1- AH_OUTPUT([HAVE_LOCKF], [/* Define to 1 if you have the `lockf\' function. */
+@%:@undef HAVE_LOCKF])
+m4trace:configure.ac:2741: -1- AH_OUTPUT([HAVE_FLOCK], [/* Define to 1 if you have the `flock\' function. */
+@%:@undef HAVE_FLOCK])
+m4trace:configure.ac:2752: -1- AC_DEFINE_TRACE_LITERAL([MAIL_LOCK_LOCKF])
+m4trace:configure.ac:2752: -1- m4_pattern_allow([^MAIL_LOCK_LOCKF$])
+m4trace:configure.ac:2753: -1- AC_DEFINE_TRACE_LITERAL([MAIL_LOCK_FLOCK])
+m4trace:configure.ac:2753: -1- m4_pattern_allow([^MAIL_LOCK_FLOCK$])
+m4trace:configure.ac:2754: -1- AC_DEFINE_TRACE_LITERAL([MAIL_LOCK_LOCKING])
+m4trace:configure.ac:2754: -1- m4_pattern_allow([^MAIL_LOCK_LOCKING$])
+m4trace:configure.ac:2758: -1- AC_DEFINE_TRACE_LITERAL([MAIL_LOCK_MMDF])
+m4trace:configure.ac:2758: -1- m4_pattern_allow([^MAIL_LOCK_MMDF$])
+m4trace:configure.ac:2759: -1- AC_DEFINE_TRACE_LITERAL([MAIL_LOCK_DOT])
+m4trace:configure.ac:2759: -1- m4_pattern_allow([^MAIL_LOCK_DOT$])
+m4trace:configure.ac:2827: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GNOME])
+m4trace:configure.ac:2827: -1- m4_pattern_allow([^HAVE_GNOME$])
+m4trace:configure.ac:2873: -1- AH_OUTPUT([HAVE_GDK_IMLIB_INIT], [/* Define to 1 if you have the `gdk_imlib_init\' function. */
+@%:@undef HAVE_GDK_IMLIB_INIT])
+m4trace:configure.ac:2873: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GDK_IMLIB_INIT])
+m4trace:configure.ac:2873: -1- m4_pattern_allow([^HAVE_GDK_IMLIB_INIT$])
+m4trace:configure.ac:2875: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XPM])
+m4trace:configure.ac:2875: -1- m4_pattern_allow([^HAVE_XPM$])
+m4trace:configure.ac:2876: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GTK])
+m4trace:configure.ac:2876: -1- m4_pattern_allow([^HAVE_GTK$])
+m4trace:configure.ac:2877: -1- AC_SUBST([GTK_CONFIG])
+m4trace:configure.ac:2877: -1- AC_SUBST_TRACE([GTK_CONFIG])
+m4trace:configure.ac:2877: -1- m4_pattern_allow([^GTK_CONFIG$])
+m4trace:configure.ac:2914: -1- AH_OUTPUT([HAVE_GLADE_GLADE_H], [/* Define to 1 if you have the <glade/glade.h> header file. */
+@%:@undef HAVE_GLADE_GLADE_H])
+m4trace:configure.ac:2914: -1- AH_OUTPUT([HAVE_GLADE_H], [/* Define to 1 if you have the <glade.h> header file. */
+@%:@undef HAVE_GLADE_H])
+m4trace:configure.ac:2918: -1- AC_DEFINE_TRACE_LITERAL([LIBGLADE_XML_TXTDOMAIN])
+m4trace:configure.ac:2918: -1- m4_pattern_allow([^LIBGLADE_XML_TXTDOMAIN$])
+m4trace:configure.ac:2966: -1- AC_SUBST([XMKMF])
+m4trace:configure.ac:2966: -1- AC_SUBST_TRACE([XMKMF])
+m4trace:configure.ac:2966: -1- m4_pattern_allow([^XMKMF$])
+m4trace:configure.ac:2966: -1- AC_DEFINE_TRACE_LITERAL([X_DISPLAY_MISSING])
+m4trace:configure.ac:2966: -1- m4_pattern_allow([^X_DISPLAY_MISSING$])
+m4trace:configure.ac:2966: -1- AH_OUTPUT([X_DISPLAY_MISSING], [/* Define to 1 if the X Window System is missing or not being used. */
+@%:@undef X_DISPLAY_MISSING])
+m4trace:configure.ac:2966: -1- AC_SUBST([X_CFLAGS])
+m4trace:configure.ac:2966: -1- AC_SUBST_TRACE([X_CFLAGS])
+m4trace:configure.ac:2966: -1- m4_pattern_allow([^X_CFLAGS$])
+m4trace:configure.ac:2966: -1- AC_SUBST([X_PRE_LIBS])
+m4trace:configure.ac:2966: -1- AC_SUBST_TRACE([X_PRE_LIBS])
+m4trace:configure.ac:2966: -1- m4_pattern_allow([^X_PRE_LIBS$])
+m4trace:configure.ac:2966: -1- AC_SUBST([X_LIBS])
+m4trace:configure.ac:2966: -1- AC_SUBST_TRACE([X_LIBS])
+m4trace:configure.ac:2966: -1- m4_pattern_allow([^X_LIBS$])
+m4trace:configure.ac:2966: -1- AC_SUBST([X_EXTRA_LIBS])
+m4trace:configure.ac:2966: -1- AC_SUBST_TRACE([X_EXTRA_LIBS])
+m4trace:configure.ac:2966: -1- m4_pattern_allow([^X_EXTRA_LIBS$])
+m4trace:configure.ac:2980: -1- AC_DEFINE_TRACE_LITERAL([HAVE_X_WINDOWS])
+m4trace:configure.ac:2980: -1- m4_pattern_allow([^HAVE_X_WINDOWS$])
+m4trace:configure.ac:3050: -1- AC_DEFINE_TRACE_LITERAL([BITMAPDIR])
+m4trace:configure.ac:3050: -1- m4_pattern_allow([^BITMAPDIR$])
+m4trace:configure.ac:3125: -1- AH_OUTPUT([HAVE_XCONVERTCASE], [/* Define to 1 if you have the `XConvertCase\' function. */
+@%:@undef HAVE_XCONVERTCASE])
+m4trace:configure.ac:3125: -1- AH_OUTPUT([HAVE_XTREGISTERDRAWABLE], [/* Define to 1 if you have the `XtRegisterDrawable\' function. */
+@%:@undef HAVE_XTREGISTERDRAWABLE])
+m4trace:configure.ac:3127: -1- AH_OUTPUT([HAVE_X11_XLOCALE_H], [/* Define to 1 if you have the <X11/Xlocale.h> header file. */
+@%:@undef HAVE_X11_XLOCALE_H])
+m4trace:configure.ac:3127: -1- AH_OUTPUT([HAVE_X11_XFUNCPROTO_H], [/* Define to 1 if you have the <X11/Xfuncproto.h> header file. */
+@%:@undef HAVE_X11_XFUNCPROTO_H])
+m4trace:configure.ac:3130: -1- AH_OUTPUT([HAVE_XREGISTERIMINSTANTIATECALLBACK], [/* Define to 1 if you have the `XRegisterIMInstantiateCallback\' function. */
+@%:@undef HAVE_XREGISTERIMINSTANTIATECALLBACK])
+m4trace:configure.ac:3130: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XREGISTERIMINSTANTIATECALLBACK])
+m4trace:configure.ac:3130: -1- m4_pattern_allow([^HAVE_XREGISTERIMINSTANTIATECALLBACK$])
+m4trace:configure.ac:3132: -1- AC_DEFINE_TRACE_LITERAL([XREGISTERIMINSTANTIATECALLBACK_NONSTANDARD_PROTOTYPE])
+m4trace:configure.ac:3132: -1- m4_pattern_allow([^XREGISTERIMINSTANTIATECALLBACK_NONSTANDARD_PROTOTYPE$])
+m4trace:configure.ac:3187: -1- AH_OUTPUT([HAVE_FREETYPE_CONFIG_FTHEADER_H], [/* Define to 1 if you have the <freetype/config/ftheader.h> header file. */
+@%:@undef HAVE_FREETYPE_CONFIG_FTHEADER_H])
+m4trace:configure.ac:3187: -1- AC_DEFINE_TRACE_LITERAL([HAVE_FREETYPE_CONFIG_FTHEADER_H])
+m4trace:configure.ac:3187: -1- m4_pattern_allow([^HAVE_FREETYPE_CONFIG_FTHEADER_H$])
+m4trace:configure.ac:3187: -1- AH_OUTPUT([HAVE_FREETYPE_CONFIG_FTHEADER_H], [/* Define to 1 if you have the <freetype/config/ftheader.h> header file. */
+@%:@undef HAVE_FREETYPE_CONFIG_FTHEADER_H])
+m4trace:configure.ac:3187: -1- AC_DEFINE_TRACE_LITERAL([HAVE_FREETYPE_CONFIG_FTHEADER_H])
+m4trace:configure.ac:3187: -1- m4_pattern_allow([^HAVE_FREETYPE_CONFIG_FTHEADER_H$])
+m4trace:configure.ac:3220: -1- AH_OUTPUT([HAVE_FCCONFIGGETRESCANINTERVAL], [/* Define to 1 if you have the `FcConfigGetRescanInterval\' function. */
+@%:@undef HAVE_FCCONFIGGETRESCANINTERVAL])
+m4trace:configure.ac:3220: -1- AC_DEFINE_TRACE_LITERAL([HAVE_FCCONFIGGETRESCANINTERVAL])
+m4trace:configure.ac:3220: -1- m4_pattern_allow([^HAVE_FCCONFIGGETRESCANINTERVAL$])
+m4trace:configure.ac:3221: -1- AH_OUTPUT([HAVE_FCCONFIGSETRESCANINTERVAL], [/* Define to 1 if you have the `FcConfigSetRescanInterval\' function. */
+@%:@undef HAVE_FCCONFIGSETRESCANINTERVAL])
+m4trace:configure.ac:3221: -1- AC_DEFINE_TRACE_LITERAL([HAVE_FCCONFIGSETRESCANINTERVAL])
+m4trace:configure.ac:3221: -1- m4_pattern_allow([^HAVE_FCCONFIGSETRESCANINTERVAL$])
+m4trace:configure.ac:3224: -1- AC_DEFINE_TRACE_LITERAL([HAVE_FONTCONFIG])
+m4trace:configure.ac:3224: -1- m4_pattern_allow([^HAVE_FONTCONFIG$])
+m4trace:configure.ac:3225: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XFT])
+m4trace:configure.ac:3225: -1- m4_pattern_allow([^HAVE_XFT$])
+m4trace:configure.ac:3239: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MS_WINDOWS])
+m4trace:configure.ac:3239: -1- m4_pattern_allow([^HAVE_MS_WINDOWS$])
+m4trace:configure.ac:3263: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [../../lib/autoconf/general.m4:2749: AC_RUN_IFELSE is expanded from...
+configure.ac:3263: the top level])
+m4trace:configure.ac:3263: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MSG_SELECT])
+m4trace:configure.ac:3263: -1- m4_pattern_allow([^HAVE_MSG_SELECT$])
+m4trace:configure.ac:3269: -1- AC_SUBST([install_pp])
+m4trace:configure.ac:3269: -1- AC_SUBST_TRACE([install_pp])
+m4trace:configure.ac:3269: -1- m4_pattern_allow([^install_pp$])
+m4trace:configure.ac:3320: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BALLOON_HELP])
+m4trace:configure.ac:3320: -1- m4_pattern_allow([^HAVE_BALLOON_HELP$])
+m4trace:configure.ac:3347: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WMCOMMAND])
+m4trace:configure.ac:3347: -1- m4_pattern_allow([^HAVE_WMCOMMAND$])
+m4trace:configure.ac:3360: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XAUTH])
+m4trace:configure.ac:3360: -1- m4_pattern_allow([^HAVE_XAUTH$])
+m4trace:configure.ac:3363: -1- AC_SUBST([libs_xauth])
+m4trace:configure.ac:3363: -1- AC_SUBST_TRACE([libs_xauth])
+m4trace:configure.ac:3363: -1- m4_pattern_allow([^libs_xauth$])
+m4trace:configure.ac:3367: -1- AC_SUBST([dnd_objs])
+m4trace:configure.ac:3367: -1- AC_SUBST_TRACE([dnd_objs])
+m4trace:configure.ac:3367: -1- m4_pattern_allow([^dnd_objs$])
+m4trace:configure.ac:3379: -1- AC_SUBST([LIBSTDCPP])
+m4trace:configure.ac:3379: -1- AC_SUBST_TRACE([LIBSTDCPP])
+m4trace:configure.ac:3379: -1- m4_pattern_allow([^LIBSTDCPP$])
+m4trace:configure.ac:3389: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DYLD])
+m4trace:configure.ac:3389: -1- m4_pattern_allow([^HAVE_DYLD$])
+m4trace:configure.ac:3410: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DLOPEN])
+m4trace:configure.ac:3410: -1- m4_pattern_allow([^HAVE_DLOPEN$])
+m4trace:configure.ac:3425: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SHL_LOAD])
+m4trace:configure.ac:3425: -1- m4_pattern_allow([^HAVE_SHL_LOAD$])
+m4trace:configure.ac:3436: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LTDL])
+m4trace:configure.ac:3436: -1- m4_pattern_allow([^HAVE_LTDL$])
+m4trace:configure.ac:3448: -1- AC_SUBST([dll_ld])
+m4trace:configure.ac:3448: -1- AC_SUBST_TRACE([dll_ld])
+m4trace:configure.ac:3448: -1- m4_pattern_allow([^dll_ld$])
+m4trace:configure.ac:3448: -1- AC_SUBST([dll_cflags])
+m4trace:configure.ac:3448: -1- AC_SUBST_TRACE([dll_cflags])
+m4trace:configure.ac:3448: -1- m4_pattern_allow([^dll_cflags$])
+m4trace:configure.ac:3448: -1- AC_SUBST([dll_ldflags])
+m4trace:configure.ac:3448: -1- AC_SUBST_TRACE([dll_ldflags])
+m4trace:configure.ac:3448: -1- m4_pattern_allow([^dll_ldflags$])
+m4trace:configure.ac:3448: -1- AC_SUBST([dll_post])
+m4trace:configure.ac:3448: -1- AC_SUBST_TRACE([dll_post])
+m4trace:configure.ac:3448: -1- m4_pattern_allow([^dll_post$])
+m4trace:configure.ac:3448: -1- AC_SUBST([dll_ldo])
+m4trace:configure.ac:3448: -1- AC_SUBST_TRACE([dll_ldo])
+m4trace:configure.ac:3448: -1- m4_pattern_allow([^dll_ldo$])
+m4trace:configure.ac:3448: -1- AC_SUBST([ld_dynamic_link_flags])
+m4trace:configure.ac:3448: -1- AC_SUBST_TRACE([ld_dynamic_link_flags])
+m4trace:configure.ac:3448: -1- m4_pattern_allow([^ld_dynamic_link_flags$])
+m4trace:configure.ac:3452: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SHLIB])
+m4trace:configure.ac:3452: -1- m4_pattern_allow([^HAVE_SHLIB$])
+m4trace:configure.ac:3459: -1- AH_OUTPUT([HAVE_DLERROR], [/* Define to 1 if you have the `dlerror\' function. */
+@%:@undef HAVE_DLERROR])
+m4trace:configure.ac:3459: -1- AH_OUTPUT([HAVE__DLERROR], [/* Define to 1 if you have the `_dlerror\' function. */
+@%:@undef HAVE__DLERROR])
+m4trace:configure.ac:3484: -1- AC_SUBST([with_modules], [$with_modules])
+m4trace:configure.ac:3484: -1- AC_SUBST_TRACE([with_modules])
+m4trace:configure.ac:3484: -1- m4_pattern_allow([^with_modules$])
+m4trace:configure.ac:3485: -1- AC_SUBST([MOD_CC])
+m4trace:configure.ac:3485: -1- AC_SUBST_TRACE([MOD_CC])
+m4trace:configure.ac:3485: -1- m4_pattern_allow([^MOD_CC$])
+m4trace:configure.ac:3486: -1- AC_SUBST([MODARCHDIR])
+m4trace:configure.ac:3486: -1- AC_SUBST_TRACE([MODARCHDIR])
+m4trace:configure.ac:3486: -1- m4_pattern_allow([^MODARCHDIR$])
+m4trace:configure.ac:3487: -1- AC_SUBST([MAKE_DOCFILE])
+m4trace:configure.ac:3487: -1- AC_SUBST_TRACE([MAKE_DOCFILE])
+m4trace:configure.ac:3487: -1- m4_pattern_allow([^MAKE_DOCFILE$])
+m4trace:configure.ac:3488: -1- AC_SUBST([MODCFLAGS])
+m4trace:configure.ac:3488: -1- AC_SUBST_TRACE([MODCFLAGS])
+m4trace:configure.ac:3488: -1- m4_pattern_allow([^MODCFLAGS$])
+m4trace:configure.ac:3489: -1- AC_SUBST([INSTALLPATH])
+m4trace:configure.ac:3489: -1- AC_SUBST_TRACE([INSTALLPATH])
+m4trace:configure.ac:3489: -1- m4_pattern_allow([^INSTALLPATH$])
+m4trace:configure.ac:3490: -1- AC_SUBST([MOD_INSTALL_PROGRAM])
+m4trace:configure.ac:3490: -1- AC_SUBST_TRACE([MOD_INSTALL_PROGRAM])
+m4trace:configure.ac:3490: -1- m4_pattern_allow([^MOD_INSTALL_PROGRAM$])
+m4trace:configure.ac:3491: -1- AC_SUBST([OBJECT_TO_BUILD])
+m4trace:configure.ac:3491: -1- AC_SUBST_TRACE([OBJECT_TO_BUILD])
+m4trace:configure.ac:3491: -1- m4_pattern_allow([^OBJECT_TO_BUILD$])
+m4trace:configure.ac:3521: -1- AC_DEFINE_TRACE_LITERAL([TOOLTALK])
+m4trace:configure.ac:3521: -1- m4_pattern_allow([^TOOLTALK$])
+m4trace:configure.ac:3522: -1- AC_DEFINE_TRACE_LITERAL([TT_C_H_FILE])
+m4trace:configure.ac:3522: -1- m4_pattern_allow([^TT_C_H_FILE$])
+m4trace:configure.ac:3537: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CDE])
+m4trace:configure.ac:3537: -1- m4_pattern_allow([^HAVE_CDE$])
+m4trace:configure.ac:3555: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DRAGNDROP])
+m4trace:configure.ac:3555: -1- m4_pattern_allow([^HAVE_DRAGNDROP$])
+m4trace:configure.ac:3584: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LDAP])
+m4trace:configure.ac:3584: -1- m4_pattern_allow([^HAVE_LDAP$])
+m4trace:configure.ac:3596: -1- AH_OUTPUT([HAVE_LDAP_SET_OPTION], [/* Define to 1 if you have the `ldap_set_option\' function. */
+@%:@undef HAVE_LDAP_SET_OPTION])
+m4trace:configure.ac:3596: -1- AH_OUTPUT([HAVE_LDAP_GET_LDERRNO], [/* Define to 1 if you have the `ldap_get_lderrno\' function. */
+@%:@undef HAVE_LDAP_GET_LDERRNO])
+m4trace:configure.ac:3596: -1- AH_OUTPUT([HAVE_LDAP_RESULT2ERROR], [/* Define to 1 if you have the `ldap_result2error\' function. */
+@%:@undef HAVE_LDAP_RESULT2ERROR])
+m4trace:configure.ac:3596: -1- AH_OUTPUT([HAVE_LDAP_PARSE_RESULT], [/* Define to 1 if you have the `ldap_parse_result\' function. */
+@%:@undef HAVE_LDAP_PARSE_RESULT])
+m4trace:configure.ac:3604: -1- AC_SUBST([ldap_libs])
+m4trace:configure.ac:3604: -1- AC_SUBST_TRACE([ldap_libs])
+m4trace:configure.ac:3604: -1- m4_pattern_allow([^ldap_libs$])
+m4trace:configure.ac:3643: -1- AC_DEFINE_TRACE_LITERAL([HAVE_POSTGRESQL])
+m4trace:configure.ac:3643: -1- m4_pattern_allow([^HAVE_POSTGRESQL$])
+m4trace:configure.ac:3644: -1- AC_DEFINE_TRACE_LITERAL([HAVE_POSTGRESQLV7])
+m4trace:configure.ac:3644: -1- m4_pattern_allow([^HAVE_POSTGRESQLV7$])
+m4trace:configure.ac:3647: -1- AC_DEFINE_TRACE_LITERAL([LIBPQ_FE_H_FILE])
+m4trace:configure.ac:3647: -1- m4_pattern_allow([^LIBPQ_FE_H_FILE$])
+m4trace:configure.ac:3658: -1- AC_SUBST([postgresql_libs])
+m4trace:configure.ac:3658: -1- AC_SUBST_TRACE([postgresql_libs])
+m4trace:configure.ac:3658: -1- m4_pattern_allow([^postgresql_libs$])
+m4trace:configure.ac:3704: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [../../lib/autoconf/general.m4:2749: AC_RUN_IFELSE is expanded from...
+configure.ac:3704: the top level])
+m4trace:configure.ac:3736: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XPM])
+m4trace:configure.ac:3736: -1- m4_pattern_allow([^HAVE_XPM$])
+m4trace:configure.ac:3749: -1- AC_DEFINE_TRACE_LITERAL([FOR_MSW])
+m4trace:configure.ac:3749: -1- m4_pattern_allow([^FOR_MSW$])
+m4trace:configure.ac:3758: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XFACE])
+m4trace:configure.ac:3758: -1- m4_pattern_allow([^HAVE_XFACE$])
+m4trace:configure.ac:3775: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GIF])
+m4trace:configure.ac:3775: -1- m4_pattern_allow([^HAVE_GIF$])
+m4trace:configure.ac:3791: -1- AC_DEFINE_TRACE_LITERAL([HAVE_JPEG])
+m4trace:configure.ac:3791: -1- m4_pattern_allow([^HAVE_JPEG$])
+m4trace:configure.ac:3803: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [../../lib/autoconf/general.m4:2749: AC_RUN_IFELSE is expanded from...
+configure.ac:3803: the top level])
+m4trace:configure.ac:3829: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PNG])
+m4trace:configure.ac:3829: -1- m4_pattern_allow([^HAVE_PNG$])
+m4trace:configure.ac:3838: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TIFF])
+m4trace:configure.ac:3838: -1- m4_pattern_allow([^HAVE_TIFF$])
+m4trace:configure.ac:3853: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XFACE])
+m4trace:configure.ac:3853: -1- m4_pattern_allow([^HAVE_XFACE$])
+m4trace:configure.ac:4115: -1- AC_DEFINE_TRACE_LITERAL([ATHENA_Scrollbar_h_])
+m4trace:configure.ac:4115: -1- m4_pattern_allow([^ATHENA_Scrollbar_h_$])
+m4trace:configure.ac:4116: -1- AC_DEFINE_TRACE_LITERAL([ATHENA_Dialog_h_])
+m4trace:configure.ac:4116: -1- m4_pattern_allow([^ATHENA_Dialog_h_$])
+m4trace:configure.ac:4117: -1- AC_DEFINE_TRACE_LITERAL([ATHENA_Form_h_])
+m4trace:configure.ac:4117: -1- m4_pattern_allow([^ATHENA_Form_h_$])
+m4trace:configure.ac:4118: -1- AC_DEFINE_TRACE_LITERAL([ATHENA_Command_h_])
+m4trace:configure.ac:4118: -1- m4_pattern_allow([^ATHENA_Command_h_$])
+m4trace:configure.ac:4119: -1- AC_DEFINE_TRACE_LITERAL([ATHENA_Label_h_])
+m4trace:configure.ac:4119: -1- m4_pattern_allow([^ATHENA_Label_h_$])
+m4trace:configure.ac:4120: -1- AC_DEFINE_TRACE_LITERAL([ATHENA_LabelP_h_])
+m4trace:configure.ac:4120: -1- m4_pattern_allow([^ATHENA_LabelP_h_$])
+m4trace:configure.ac:4121: -1- AC_DEFINE_TRACE_LITERAL([ATHENA_Toggle_h_])
+m4trace:configure.ac:4121: -1- m4_pattern_allow([^ATHENA_Toggle_h_$])
+m4trace:configure.ac:4122: -1- AC_DEFINE_TRACE_LITERAL([ATHENA_ToggleP_h_])
+m4trace:configure.ac:4122: -1- m4_pattern_allow([^ATHENA_ToggleP_h_$])
+m4trace:configure.ac:4123: -1- AC_DEFINE_TRACE_LITERAL([ATHENA_AsciiText_h_])
+m4trace:configure.ac:4123: -1- m4_pattern_allow([^ATHENA_AsciiText_h_$])
+m4trace:configure.ac:4124: -1- AC_DEFINE_TRACE_LITERAL([ATHENA_XawInit_h_])
+m4trace:configure.ac:4124: -1- m4_pattern_allow([^ATHENA_XawInit_h_$])
+m4trace:configure.ac:4126: -1- AC_DEFINE_TRACE_LITERAL([LWLIB_USES_ATHENA])
+m4trace:configure.ac:4126: -1- m4_pattern_allow([^LWLIB_USES_ATHENA$])
+m4trace:configure.ac:4127: -1- AC_DEFINE_TRACE_LITERAL([NEED_ATHENA])
+m4trace:configure.ac:4127: -1- m4_pattern_allow([^NEED_ATHENA$])
+m4trace:configure.ac:4131: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ATHENA_3D])
+m4trace:configure.ac:4131: -1- m4_pattern_allow([^HAVE_ATHENA_3D$])
+m4trace:configure.ac:4137: -1- AC_DEFINE_TRACE_LITERAL([LWLIB_USES_MOTIF])
+m4trace:configure.ac:4137: -1- m4_pattern_allow([^LWLIB_USES_MOTIF$])
+m4trace:configure.ac:4138: -1- AC_DEFINE_TRACE_LITERAL([NEED_MOTIF])
+m4trace:configure.ac:4138: -1- m4_pattern_allow([^NEED_MOTIF$])
+m4trace:configure.ac:4152: -1- AC_DEFINE_TRACE_LITERAL([NEED_LUCID])
+m4trace:configure.ac:4152: -1- m4_pattern_allow([^NEED_LUCID$])
+m4trace:configure.ac:4156: -1- AC_SUBST([lwlib_objs])
+m4trace:configure.ac:4156: -1- AC_SUBST_TRACE([lwlib_objs])
+m4trace:configure.ac:4156: -1- m4_pattern_allow([^lwlib_objs$])
+m4trace:configure.ac:4158: -1- AC_DEFINE_TRACE_LITERAL([LWLIB_SCROLLBARS_ATHENA])
+m4trace:configure.ac:4158: -1- m4_pattern_allow([^LWLIB_SCROLLBARS_ATHENA$])
+m4trace:configure.ac:4159: -1- AC_DEFINE_TRACE_LITERAL([LWLIB_DIALOGS_ATHENA])
+m4trace:configure.ac:4159: -1- m4_pattern_allow([^LWLIB_DIALOGS_ATHENA$])
+m4trace:configure.ac:4162: -1- AC_DEFINE_TRACE_LITERAL([LWLIB_SCROLLBARS_ATHENA3D])
+m4trace:configure.ac:4162: -1- m4_pattern_allow([^LWLIB_SCROLLBARS_ATHENA3D$])
+m4trace:configure.ac:4163: -1- AC_DEFINE_TRACE_LITERAL([LWLIB_DIALOGS_ATHENA3D])
+m4trace:configure.ac:4163: -1- m4_pattern_allow([^LWLIB_DIALOGS_ATHENA3D$])
+m4trace:configure.ac:4166: -1- AC_DEFINE_TRACE_LITERAL([LWLIB_WIDGETS_ATHENA])
+m4trace:configure.ac:4166: -1- m4_pattern_allow([^LWLIB_WIDGETS_ATHENA$])
+m4trace:configure.ac:4168: -1- AC_DEFINE_TRACE_LITERAL([LWLIB_TABS_LUCID])
+m4trace:configure.ac:4168: -1- m4_pattern_allow([^LWLIB_TABS_LUCID$])
+m4trace:configure.ac:4170: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MENUBARS])
+m4trace:configure.ac:4170: -1- m4_pattern_allow([^HAVE_MENUBARS$])
+m4trace:configure.ac:4171: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SCROLLBARS])
+m4trace:configure.ac:4171: -1- m4_pattern_allow([^HAVE_SCROLLBARS$])
+m4trace:configure.ac:4172: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DIALOGS])
+m4trace:configure.ac:4172: -1- m4_pattern_allow([^HAVE_DIALOGS$])
+m4trace:configure.ac:4173: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TOOLBARS])
+m4trace:configure.ac:4173: -1- m4_pattern_allow([^HAVE_TOOLBARS$])
+m4trace:configure.ac:4174: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WIDGETS])
+m4trace:configure.ac:4174: -1- m4_pattern_allow([^HAVE_WIDGETS$])
+m4trace:configure.ac:4176: -1- AC_DEFINE_TRACE_LITERAL([LWLIB_MENUBARS_LUCID])
+m4trace:configure.ac:4176: -1- m4_pattern_allow([^LWLIB_MENUBARS_LUCID$])
+m4trace:configure.ac:4177: -1- AC_DEFINE_TRACE_LITERAL([LWLIB_SCROLLBARS_LUCID])
+m4trace:configure.ac:4177: -1- m4_pattern_allow([^LWLIB_SCROLLBARS_LUCID$])
+m4trace:configure.ac:4179: -1- AC_DEFINE_TRACE_LITERAL([LWLIB_MENUBARS_MOTIF])
+m4trace:configure.ac:4179: -1- m4_pattern_allow([^LWLIB_MENUBARS_MOTIF$])
+m4trace:configure.ac:4180: -1- AC_DEFINE_TRACE_LITERAL([LWLIB_SCROLLBARS_MOTIF])
+m4trace:configure.ac:4180: -1- m4_pattern_allow([^LWLIB_SCROLLBARS_MOTIF$])
+m4trace:configure.ac:4181: -1- AC_DEFINE_TRACE_LITERAL([LWLIB_DIALOGS_MOTIF])
+m4trace:configure.ac:4181: -1- m4_pattern_allow([^LWLIB_DIALOGS_MOTIF$])
+m4trace:configure.ac:4182: -1- AC_DEFINE_TRACE_LITERAL([LWLIB_WIDGETS_MOTIF])
+m4trace:configure.ac:4182: -1- m4_pattern_allow([^LWLIB_WIDGETS_MOTIF$])
+m4trace:configure.ac:4184: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XFT_MENUBARS])
+m4trace:configure.ac:4184: -1- m4_pattern_allow([^HAVE_XFT_MENUBARS$])
+m4trace:configure.ac:4185: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XFT_TABS])
+m4trace:configure.ac:4185: -1- m4_pattern_allow([^HAVE_XFT_TABS$])
+m4trace:configure.ac:4186: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XFT_GAUGES])
+m4trace:configure.ac:4186: -1- m4_pattern_allow([^HAVE_XFT_GAUGES$])
+m4trace:configure.ac:4202: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DEFAULT_EOL_DETECTION])
+m4trace:configure.ac:4202: -1- m4_pattern_allow([^HAVE_DEFAULT_EOL_DETECTION$])
+m4trace:configure.ac:4211: -1- AC_DEFINE_TRACE_LITERAL([MULE])
+m4trace:configure.ac:4211: -1- m4_pattern_allow([^MULE$])
+m4trace:configure.ac:4214: -1- AH_OUTPUT([HAVE_LIBINTL_H], [/* Define to 1 if you have the <libintl.h> header file. */
+@%:@undef HAVE_LIBINTL_H])
+m4trace:configure.ac:4214: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBINTL_H])
+m4trace:configure.ac:4214: -1- m4_pattern_allow([^HAVE_LIBINTL_H$])
+m4trace:configure.ac:4215: -1- AH_OUTPUT([HAVE_LIBINTL], [/* Define to 1 if you have the `intl\' library (-lintl). */
+@%:@undef HAVE_LIBINTL])
+m4trace:configure.ac:4215: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBINTL])
+m4trace:configure.ac:4215: -1- m4_pattern_allow([^HAVE_LIBINTL$])
+m4trace:configure.ac:4233: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XIM])
+m4trace:configure.ac:4233: -1- m4_pattern_allow([^HAVE_XIM$])
+m4trace:configure.ac:4235: -1- AC_DEFINE_TRACE_LITERAL([XIM_XLIB])
+m4trace:configure.ac:4235: -1- m4_pattern_allow([^XIM_XLIB$])
+m4trace:configure.ac:4239: -1- AC_DEFINE_TRACE_LITERAL([XIM_MOTIF])
+m4trace:configure.ac:4239: -1- m4_pattern_allow([^XIM_MOTIF$])
+m4trace:configure.ac:4253: -1- AC_DEFINE_TRACE_LITERAL([USE_XFONTSET])
+m4trace:configure.ac:4253: -1- m4_pattern_allow([^USE_XFONTSET$])
+m4trace:configure.ac:4267: -1- AH_OUTPUT([HAVE_CRYPT], [/* Define to 1 if you have the `crypt\' function. */
+@%:@undef HAVE_CRYPT])
+m4trace:configure.ac:4267: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CRYPT])
+m4trace:configure.ac:4267: -1- m4_pattern_allow([^HAVE_CRYPT$])
+m4trace:configure.ac:4268: -1- AH_OUTPUT([HAVE_LIBCRYPT], [/* Define to 1 if you have the `crypt\' library (-lcrypt). */
+@%:@undef HAVE_LIBCRYPT])
+m4trace:configure.ac:4268: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCRYPT])
+m4trace:configure.ac:4268: -1- m4_pattern_allow([^HAVE_LIBCRYPT$])
+m4trace:configure.ac:4279: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WNN])
+m4trace:configure.ac:4279: -1- m4_pattern_allow([^HAVE_WNN$])
+m4trace:configure.ac:4283: -1- AC_DEFINE_TRACE_LITERAL([WNN6])
+m4trace:configure.ac:4283: -1- m4_pattern_allow([^WNN6$])
+m4trace:configure.ac:4321: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CANNA])
+m4trace:configure.ac:4321: -1- m4_pattern_allow([^HAVE_CANNA$])
+m4trace:configure.ac:4322: -1- AC_DEFINE_TRACE_LITERAL([CANNA_NEW_WCHAR_AWARE])
+m4trace:configure.ac:4322: -1- m4_pattern_allow([^CANNA_NEW_WCHAR_AWARE$])
+m4trace:configure.ac:4333: -1- AC_SUBST([canna_libs])
+m4trace:configure.ac:4333: -1- AC_SUBST_TRACE([canna_libs])
+m4trace:configure.ac:4333: -1- m4_pattern_allow([^canna_libs$])
+m4trace:configure.ac:4355: -1- AH_OUTPUT([HAVE_CYGWIN_CONV_PATH], [/* Define to 1 if you have the `cygwin_conv_path\' function. */
+@%:@undef HAVE_CYGWIN_CONV_PATH])
+m4trace:configure.ac:4355: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CYGWIN_CONV_PATH])
+m4trace:configure.ac:4355: -1- m4_pattern_allow([^HAVE_CYGWIN_CONV_PATH$])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_CBRT], [/* Define to 1 if you have the `cbrt\' function. */
+@%:@undef HAVE_CBRT])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_CLOSEDIR], [/* Define to 1 if you have the `closedir\' function. */
+@%:@undef HAVE_CLOSEDIR])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_DUP2], [/* Define to 1 if you have the `dup2\' function. */
+@%:@undef HAVE_DUP2])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_EACCESS], [/* Define to 1 if you have the `eaccess\' function. */
+@%:@undef HAVE_EACCESS])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_FMOD], [/* Define to 1 if you have the `fmod\' function. */
+@%:@undef HAVE_FMOD])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_FPATHCONF], [/* Define to 1 if you have the `fpathconf\' function. */
+@%:@undef HAVE_FPATHCONF])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_FREXP], [/* Define to 1 if you have the `frexp\' function. */
+@%:@undef HAVE_FREXP])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_FSYNC], [/* Define to 1 if you have the `fsync\' function. */
+@%:@undef HAVE_FSYNC])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_FTIME], [/* Define to 1 if you have the `ftime\' function. */
+@%:@undef HAVE_FTIME])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_FTRUNCATE], [/* Define to 1 if you have the `ftruncate\' function. */
+@%:@undef HAVE_FTRUNCATE])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_GETADDRINFO], [/* Define to 1 if you have the `getaddrinfo\' function. */
+@%:@undef HAVE_GETADDRINFO])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_GETHOSTNAME], [/* Define to 1 if you have the `gethostname\' function. */
+@%:@undef HAVE_GETHOSTNAME])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_GETNAMEINFO], [/* Define to 1 if you have the `getnameinfo\' function. */
+@%:@undef HAVE_GETNAMEINFO])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_GETPAGESIZE], [/* Define to 1 if you have the `getpagesize\' function. */
+@%:@undef HAVE_GETPAGESIZE])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_GETRLIMIT], [/* Define to 1 if you have the `getrlimit\' function. */
+@%:@undef HAVE_GETRLIMIT])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_GETTIMEOFDAY], [/* Define to 1 if you have the `gettimeofday\' function. */
+@%:@undef HAVE_GETTIMEOFDAY])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_GETCWD], [/* Define to 1 if you have the `getcwd\' function. */
+@%:@undef HAVE_GETCWD])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_LINK], [/* Define to 1 if you have the `link\' function. */
+@%:@undef HAVE_LINK])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_LOGB], [/* Define to 1 if you have the `logb\' function. */
+@%:@undef HAVE_LOGB])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_LRAND48], [/* Define to 1 if you have the `lrand48\' function. */
+@%:@undef HAVE_LRAND48])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_MATHERR], [/* Define to 1 if you have the `matherr\' function. */
+@%:@undef HAVE_MATHERR])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_MKDIR], [/* Define to 1 if you have the `mkdir\' function. */
+@%:@undef HAVE_MKDIR])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_MKTIME], [/* Define to 1 if you have the `mktime\' function. */
+@%:@undef HAVE_MKTIME])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_PERROR], [/* Define to 1 if you have the `perror\' function. */
+@%:@undef HAVE_PERROR])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_POLL], [/* Define to 1 if you have the `poll\' function. */
+@%:@undef HAVE_POLL])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_RANDOM], [/* Define to 1 if you have the `random\' function. */
+@%:@undef HAVE_RANDOM])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_READLINK], [/* Define to 1 if you have the `readlink\' function. */
+@%:@undef HAVE_READLINK])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_RENAME], [/* Define to 1 if you have the `rename\' function. */
+@%:@undef HAVE_RENAME])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_RES_INIT], [/* Define to 1 if you have the `res_init\' function. */
+@%:@undef HAVE_RES_INIT])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_RINT], [/* Define to 1 if you have the `rint\' function. */
+@%:@undef HAVE_RINT])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_RMDIR], [/* Define to 1 if you have the `rmdir\' function. */
+@%:@undef HAVE_RMDIR])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_SELECT], [/* Define to 1 if you have the `select\' function. */
+@%:@undef HAVE_SELECT])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_SETITIMER], [/* Define to 1 if you have the `setitimer\' function. */
+@%:@undef HAVE_SETITIMER])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_SETPGID], [/* Define to 1 if you have the `setpgid\' function. */
+@%:@undef HAVE_SETPGID])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_SETSID], [/* Define to 1 if you have the `setsid\' function. */
+@%:@undef HAVE_SETSID])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_SIGBLOCK], [/* Define to 1 if you have the `sigblock\' function. */
+@%:@undef HAVE_SIGBLOCK])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_SIGHOLD], [/* Define to 1 if you have the `sighold\' function. */
+@%:@undef HAVE_SIGHOLD])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_SIGPROCMASK], [/* Define to 1 if you have the `sigprocmask\' function. */
+@%:@undef HAVE_SIGPROCMASK])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_SNPRINTF], [/* Define to 1 if you have the `snprintf\' function. */
+@%:@undef HAVE_SNPRINTF])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_STRERROR], [/* Define to 1 if you have the `strerror\' function. */
+@%:@undef HAVE_STRERROR])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_STRLWR], [/* Define to 1 if you have the `strlwr\' function. */
+@%:@undef HAVE_STRLWR])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_STRUPR], [/* Define to 1 if you have the `strupr\' function. */
+@%:@undef HAVE_STRUPR])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_SYMLINK], [/* Define to 1 if you have the `symlink\' function. */
+@%:@undef HAVE_SYMLINK])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_TZSET], [/* Define to 1 if you have the `tzset\' function. */
+@%:@undef HAVE_TZSET])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_ULIMIT], [/* Define to 1 if you have the `ulimit\' function. */
+@%:@undef HAVE_ULIMIT])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_UMASK], [/* Define to 1 if you have the `umask\' function. */
+@%:@undef HAVE_UMASK])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_USLEEP], [/* Define to 1 if you have the `usleep\' function. */
+@%:@undef HAVE_USLEEP])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_VLIMIT], [/* Define to 1 if you have the `vlimit\' function. */
+@%:@undef HAVE_VLIMIT])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_VSNPRINTF], [/* Define to 1 if you have the `vsnprintf\' function. */
+@%:@undef HAVE_VSNPRINTF])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_WAITPID], [/* Define to 1 if you have the `waitpid\' function. */
+@%:@undef HAVE_WAITPID])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_WCSCMP], [/* Define to 1 if you have the `wcscmp\' function. */
+@%:@undef HAVE_WCSCMP])
+m4trace:configure.ac:4363: -1- AH_OUTPUT([HAVE_WCSLEN], [/* Define to 1 if you have the `wcslen\' function. */
+@%:@undef HAVE_WCSLEN])
+m4trace:configure.ac:4378: -2- AC_DEFINE_TRACE_LITERAL([HAVE_MPROTECT])
+m4trace:configure.ac:4378: -2- m4_pattern_allow([^HAVE_MPROTECT$])
+m4trace:configure.ac:4381: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SIGACTION])
+m4trace:configure.ac:4381: -2- m4_pattern_allow([^HAVE_SIGACTION$])
+m4trace:configure.ac:4384: -2- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_SIGINFO_SI_ADDR])
+m4trace:configure.ac:4384: -2- m4_pattern_allow([^HAVE_STRUCT_SIGINFO_SI_ADDR$])
+m4trace:configure.ac:4387: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SIGINFO_T_SI_ADDR])
+m4trace:configure.ac:4387: -2- m4_pattern_allow([^HAVE_SIGINFO_T_SI_ADDR$])
+m4trace:configure.ac:4394: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SIGNAL])
+m4trace:configure.ac:4394: -2- m4_pattern_allow([^HAVE_SIGNAL$])
+m4trace:configure.ac:4396: -2- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_SIGCONTEXT_CR2])
+m4trace:configure.ac:4396: -2- m4_pattern_allow([^HAVE_STRUCT_SIGCONTEXT_CR2$])
+m4trace:configure.ac:4427: -1- AH_OUTPUT([HAVE_GETPT], [/* Define to 1 if you have the `getpt\' function. */
+@%:@undef HAVE_GETPT])
+m4trace:configure.ac:4427: -1- AH_OUTPUT([HAVE__GETPTY], [/* Define to 1 if you have the `_getpty\' function. */
+@%:@undef HAVE__GETPTY])
+m4trace:configure.ac:4427: -1- AH_OUTPUT([HAVE_GRANTPT], [/* Define to 1 if you have the `grantpt\' function. */
+@%:@undef HAVE_GRANTPT])
+m4trace:configure.ac:4427: -1- AH_OUTPUT([HAVE_UNLOCKPT], [/* Define to 1 if you have the `unlockpt\' function. */
+@%:@undef HAVE_UNLOCKPT])
+m4trace:configure.ac:4427: -1- AH_OUTPUT([HAVE_PTSNAME], [/* Define to 1 if you have the `ptsname\' function. */
+@%:@undef HAVE_PTSNAME])
+m4trace:configure.ac:4427: -1- AH_OUTPUT([HAVE_KILLPG], [/* Define to 1 if you have the `killpg\' function. */
+@%:@undef HAVE_KILLPG])
+m4trace:configure.ac:4427: -1- AH_OUTPUT([HAVE_TCGETPGRP], [/* Define to 1 if you have the `tcgetpgrp\' function. */
+@%:@undef HAVE_TCGETPGRP])
+m4trace:configure.ac:4437: -1- AC_DEFINE_TRACE_LITERAL([HAVE_OPENPTY])
+m4trace:configure.ac:4437: -1- m4_pattern_allow([^HAVE_OPENPTY$])
+m4trace:configure.ac:4438: -1- AH_OUTPUT([HAVE_LIBUTIL_H], [/* Define to 1 if you have the <libutil.h> header file. */
+@%:@undef HAVE_LIBUTIL_H])
+m4trace:configure.ac:4438: -1- AH_OUTPUT([HAVE_UTIL_H], [/* Define to 1 if you have the <util.h> header file. */
+@%:@undef HAVE_UTIL_H])
+m4trace:configure.ac:4446: -1- AH_OUTPUT([HAVE_SYS_PTYIO_H], [/* Define to 1 if you have the <sys/ptyio.h> header file. */
+@%:@undef HAVE_SYS_PTYIO_H])
+m4trace:configure.ac:4446: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_PTYIO_H])
+m4trace:configure.ac:4446: -1- m4_pattern_allow([^HAVE_SYS_PTYIO_H$])
+m4trace:configure.ac:4447: -1- AH_OUTPUT([HAVE_PTY_H], [/* Define to 1 if you have the <pty.h> header file. */
+@%:@undef HAVE_PTY_H])
+m4trace:configure.ac:4447: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PTY_H])
+m4trace:configure.ac:4447: -1- m4_pattern_allow([^HAVE_PTY_H$])
+m4trace:configure.ac:4448: -1- AH_OUTPUT([HAVE_SYS_PTY_H], [/* Define to 1 if you have the <sys/pty.h> header file. */
+@%:@undef HAVE_SYS_PTY_H])
+m4trace:configure.ac:4448: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_PTY_H])
+m4trace:configure.ac:4448: -1- m4_pattern_allow([^HAVE_SYS_PTY_H$])
+m4trace:configure.ac:4454: -1- AH_OUTPUT([HAVE_STROPTS_H], [/* Define to 1 if you have the <stropts.h> header file. */
+@%:@undef HAVE_STROPTS_H])
+m4trace:configure.ac:4454: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STROPTS_H])
+m4trace:configure.ac:4454: -1- m4_pattern_allow([^HAVE_STROPTS_H$])
+m4trace:configure.ac:4456: -1- AH_OUTPUT([HAVE_ISASTREAM], [/* Define to 1 if you have the `isastream\' function. */
+@%:@undef HAVE_ISASTREAM])
+m4trace:configure.ac:4456: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ISASTREAM])
+m4trace:configure.ac:4456: -1- m4_pattern_allow([^HAVE_ISASTREAM$])
+m4trace:configure.ac:4457: -1- AH_OUTPUT([HAVE_STRTIO_H], [/* Define to 1 if you have the <strtio.h> header file. */
+@%:@undef HAVE_STRTIO_H])
+m4trace:configure.ac:4457: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRTIO_H])
+m4trace:configure.ac:4457: -1- m4_pattern_allow([^HAVE_STRTIO_H$])
+m4trace:configure.ac:4461: -1- AH_OUTPUT([HAVE_GETLOADAVG], [/* Define to 1 if you have the `getloadavg\' function. */
+@%:@undef HAVE_GETLOADAVG])
+m4trace:configure.ac:4461: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETLOADAVG])
+m4trace:configure.ac:4461: -1- m4_pattern_allow([^HAVE_GETLOADAVG$])
+m4trace:configure.ac:4467: -1- AH_OUTPUT([HAVE_SYS_LOADAVG_H], [/* Define to 1 if you have the <sys/loadavg.h> header file. */
+@%:@undef HAVE_SYS_LOADAVG_H])
+m4trace:configure.ac:4467: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_LOADAVG_H])
+m4trace:configure.ac:4467: -1- m4_pattern_allow([^HAVE_SYS_LOADAVG_H$])
+m4trace:configure.ac:4473: -1- AH_OUTPUT([HAVE_LIBKSTAT], [/* Define to 1 if you have the `kstat\' library (-lkstat). */
+@%:@undef HAVE_LIBKSTAT])
+m4trace:configure.ac:4473: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBKSTAT])
+m4trace:configure.ac:4473: -1- m4_pattern_allow([^HAVE_LIBKSTAT$])
+m4trace:configure.ac:4474: -1- AH_OUTPUT([HAVE_KSTAT_H], [/* Define to 1 if you have the <kstat.h> header file. */
+@%:@undef HAVE_KSTAT_H])
+m4trace:configure.ac:4474: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KSTAT_H])
+m4trace:configure.ac:4474: -1- m4_pattern_allow([^HAVE_KSTAT_H$])
+m4trace:configure.ac:4477: -1- AH_OUTPUT([HAVE_LIBKVM], [/* Define to 1 if you have the `kvm\' library (-lkvm). */
+@%:@undef HAVE_LIBKVM])
+m4trace:configure.ac:4477: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBKVM])
+m4trace:configure.ac:4477: -1- m4_pattern_allow([^HAVE_LIBKVM$])
+m4trace:configure.ac:4482: -1- AC_DEFINE_TRACE_LITERAL([HAVE_H_ERRNO])
+m4trace:configure.ac:4482: -1- m4_pattern_allow([^HAVE_H_ERRNO$])
+m4trace:configure.ac:4489: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SIGSETJMP])
+m4trace:configure.ac:4489: -1- m4_pattern_allow([^HAVE_SIGSETJMP$])
+m4trace:configure.ac:4539: -1- AC_DEFINE_TRACE_LITERAL([LOCALTIME_CACHE])
+m4trace:configure.ac:4539: -1- m4_pattern_allow([^LOCALTIME_CACHE$])
+m4trace:configure.ac:4544: -1- AC_DEFINE_TRACE_LITERAL([GETTIMEOFDAY_ONE_ARGUMENT])
+m4trace:configure.ac:4544: -1- m4_pattern_allow([^GETTIMEOFDAY_ONE_ARGUMENT$])
+m4trace:configure.ac:4566: -1- AH_OUTPUT([inline], [/* Define to `__inline__\' or `__inline\' if that\'s what the C compiler
+ calls it, or to nothing if \'inline\' is not supported under any name. */
+#ifndef __cplusplus
+#undef inline
+#endif])
+m4trace:configure.ac:4578: -1- AC_DEFINE_TRACE_LITERAL([TYPEOF])
+m4trace:configure.ac:4578: -1- m4_pattern_allow([^TYPEOF$])
+m4trace:configure.ac:4588: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ALLOCA_H])
+m4trace:configure.ac:4588: -1- m4_pattern_allow([^HAVE_ALLOCA_H$])
+m4trace:configure.ac:4588: -1- AH_OUTPUT([HAVE_ALLOCA_H], [/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+ */
+@%:@undef HAVE_ALLOCA_H])
+m4trace:configure.ac:4588: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ALLOCA])
+m4trace:configure.ac:4588: -1- m4_pattern_allow([^HAVE_ALLOCA$])
+m4trace:configure.ac:4588: -1- AH_OUTPUT([HAVE_ALLOCA], [/* Define to 1 if you have `alloca\', as a function or macro. */
+@%:@undef HAVE_ALLOCA])
+m4trace:configure.ac:4588: -1- AC_LIBSOURCE([alloca.c])
+m4trace:configure.ac:4588: -1- AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.$ac_objext])
+m4trace:configure.ac:4588: -1- AC_SUBST_TRACE([ALLOCA])
+m4trace:configure.ac:4588: -1- m4_pattern_allow([^ALLOCA$])
+m4trace:configure.ac:4588: -1- AC_DEFINE_TRACE_LITERAL([C_ALLOCA])
+m4trace:configure.ac:4588: -1- m4_pattern_allow([^C_ALLOCA$])
+m4trace:configure.ac:4588: -1- AH_OUTPUT([C_ALLOCA], [/* Define to 1 if using `alloca.c\'. */
+@%:@undef C_ALLOCA])
+m4trace:configure.ac:4588: -1- AC_DEFINE_TRACE_LITERAL([CRAY_STACKSEG_END])
+m4trace:configure.ac:4588: -1- m4_pattern_allow([^CRAY_STACKSEG_END$])
+m4trace:configure.ac:4588: -1- AH_OUTPUT([CRAY_STACKSEG_END], [/* Define to one of `_getb67\', `GETB67\', `getb67\' for Cray-2 and Cray-YMP
+ systems. This function is required for `alloca.c\' support on those systems.
+ */
+@%:@undef CRAY_STACKSEG_END])
+m4trace:configure.ac:4588: -1- AH_OUTPUT([STACK_DIRECTION], [/* If using the C implementation of alloca, define if you know the
+ direction of stack growth for your system; otherwise it will be
+ automatically deduced at runtime.
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown */
+@%:@undef STACK_DIRECTION])
+m4trace:configure.ac:4588: -1- AC_DEFINE_TRACE_LITERAL([STACK_DIRECTION])
+m4trace:configure.ac:4588: -1- m4_pattern_allow([^STACK_DIRECTION$])
+m4trace:configure.ac:4593: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [../../lib/autoconf/general.m4:2749: AC_RUN_IFELSE is expanded from...
+configure.ac:4593: the top level])
+m4trace:configure.ac:4645: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_ALLOCA_IN_FUNCTION_CALLS])
+m4trace:configure.ac:4645: -1- m4_pattern_allow([^BROKEN_ALLOCA_IN_FUNCTION_CALLS$])
+m4trace:configure.ac:4648: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [../../lib/autoconf/general.m4:2749: AC_RUN_IFELSE is expanded from...
+configure.ac:4648: the top level])
+m4trace:configure.ac:4662: -1- AC_DEFINE_TRACE_LITERAL([CYGWIN_SCANF_BUG])
+m4trace:configure.ac:4662: -1- m4_pattern_allow([^CYGWIN_SCANF_BUG$])
+m4trace:configure.ac:4666: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRCOLL])
+m4trace:configure.ac:4666: -1- m4_pattern_allow([^HAVE_STRCOLL$])
+m4trace:configure.ac:4666: -1- AH_OUTPUT([HAVE_STRCOLL], [/* Define to 1 if you have the `strcoll\' function and it is properly defined.
+ */
+@%:@undef HAVE_STRCOLL])
+m4trace:configure.ac:4671: -1- AH_OUTPUT([HAVE_GETPGRP], [/* Define to 1 if you have the `getpgrp\' function. */
+@%:@undef HAVE_GETPGRP])
+m4trace:configure.ac:4671: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETPGRP])
+m4trace:configure.ac:4671: -1- m4_pattern_allow([^HAVE_GETPGRP$])
+m4trace:configure.ac:4672: -1- AC_DEFINE_TRACE_LITERAL([GETPGRP_VOID])
+m4trace:configure.ac:4672: -1- m4_pattern_allow([^GETPGRP_VOID$])
+m4trace:configure.ac:4672: -1- AH_OUTPUT([GETPGRP_VOID], [/* Define to 1 if the `getpgrp\' function requires zero arguments. */
+@%:@undef GETPGRP_VOID])
+m4trace:configure.ac:4677: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [../../lib/autoconf/general.m4:2749: AC_RUN_IFELSE is expanded from...
+configure.ac:4677: the top level])
+m4trace:configure.ac:4708: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MMAP])
+m4trace:configure.ac:4708: -1- m4_pattern_allow([^HAVE_MMAP$])
+m4trace:configure.ac:4732: -1- AC_DEFINE_TRACE_LITERAL([REL_ALLOC])
+m4trace:configure.ac:4732: -1- m4_pattern_allow([^REL_ALLOC$])
+m4trace:configure.ac:4737: -2- AC_DEFINE_TRACE_LITERAL([HAVE_TERMIOS])
+m4trace:configure.ac:4737: -2- m4_pattern_allow([^HAVE_TERMIOS$])
+m4trace:configure.ac:4738: -2- AC_DEFINE_TRACE_LITERAL([SIGNALS_VIA_CHARACTERS])
+m4trace:configure.ac:4738: -2- m4_pattern_allow([^SIGNALS_VIA_CHARACTERS$])
+m4trace:configure.ac:4739: -2- AC_DEFINE_TRACE_LITERAL([NO_TERMIO])
+m4trace:configure.ac:4739: -2- m4_pattern_allow([^NO_TERMIO$])
+m4trace:configure.ac:4736: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TERMIO])
+m4trace:configure.ac:4736: -1- m4_pattern_allow([^HAVE_TERMIO$])
+m4trace:configure.ac:4744: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SOCKETS])
+m4trace:configure.ac:4744: -1- m4_pattern_allow([^HAVE_SOCKETS$])
+m4trace:configure.ac:4744: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SOCKADDR_SUN_LEN])
+m4trace:configure.ac:4744: -1- m4_pattern_allow([^HAVE_SOCKADDR_SUN_LEN$])
+m4trace:configure.ac:4744: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MULTICAST])
+m4trace:configure.ac:4744: -1- m4_pattern_allow([^HAVE_MULTICAST$])
+m4trace:configure.ac:4767: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYSVIPC])
+m4trace:configure.ac:4767: -1- m4_pattern_allow([^HAVE_SYSVIPC$])
+m4trace:configure.ac:4773: -1- AC_DEFINE_TRACE_LITERAL([SYSV_SYSTEM_DIR])
+m4trace:configure.ac:4773: -1- m4_pattern_allow([^SYSV_SYSTEM_DIR$])
+m4trace:configure.ac:4773: -1- AC_DEFINE_TRACE_LITERAL([NONSYSTEM_DIR_LIBRARY])
+m4trace:configure.ac:4773: -1- m4_pattern_allow([^NONSYSTEM_DIR_LIBRARY$])
+m4trace:configure.ac:4777: -2- AC_DEFINE_TRACE_LITERAL([NLIST_STRUCT])
+m4trace:configure.ac:4777: -2- m4_pattern_allow([^NLIST_STRUCT$])
+m4trace:configure.ac:4883: -1- AC_DEFINE_TRACE_LITERAL([SOUNDCARD_H_FILE])
+m4trace:configure.ac:4883: -1- m4_pattern_allow([^SOUNDCARD_H_FILE$])
+m4trace:configure.ac:4898: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NATIVE_SOUND])
+m4trace:configure.ac:4898: -1- m4_pattern_allow([^HAVE_NATIVE_SOUND$])
+m4trace:configure.ac:4908: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ALSA_SOUND])
+m4trace:configure.ac:4908: -1- m4_pattern_allow([^HAVE_ALSA_SOUND$])
+m4trace:configure.ac:4924: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NAS_SOUND])
+m4trace:configure.ac:4924: -1- m4_pattern_allow([^HAVE_NAS_SOUND$])
+m4trace:configure.ac:4929: -1- AC_DEFINE_TRACE_LITERAL([NAS_NO_ERROR_JUMP])
+m4trace:configure.ac:4929: -1- m4_pattern_allow([^NAS_NO_ERROR_JUMP$])
+m4trace:configure.ac:4939: -1- AC_SUBST([have_esd_config])
+m4trace:configure.ac:4939: -1- AC_SUBST_TRACE([have_esd_config])
+m4trace:configure.ac:4939: -1- m4_pattern_allow([^have_esd_config$])
+m4trace:configure.ac:4953: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ESD_SOUND])
+m4trace:configure.ac:4953: -1- m4_pattern_allow([^HAVE_ESD_SOUND$])
+m4trace:configure.ac:4972: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TTY])
+m4trace:configure.ac:4972: -1- m4_pattern_allow([^HAVE_TTY$])
+m4trace:configure.ac:4979: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NCURSES])
+m4trace:configure.ac:4979: -1- m4_pattern_allow([^HAVE_NCURSES$])
+m4trace:configure.ac:5023: -1- AC_DEFINE_TRACE_LITERAL([CURSES_H_FILE])
+m4trace:configure.ac:5023: -1- m4_pattern_allow([^CURSES_H_FILE$])
+m4trace:configure.ac:5024: -1- AC_DEFINE_TRACE_LITERAL([TERM_H_FILE])
+m4trace:configure.ac:5024: -1- m4_pattern_allow([^TERM_H_FILE$])
+m4trace:configure.ac:5032: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GPM])
+m4trace:configure.ac:5032: -1- m4_pattern_allow([^HAVE_GPM$])
+m4trace:configure.ac:5063: -1- AH_OUTPUT([HAVE_NDBM_H], [/* Define to 1 if you have the <ndbm.h> header file. */
+@%:@undef HAVE_NDBM_H])
+m4trace:configure.ac:5063: -1- AH_OUTPUT([HAVE_GDBM_NDBM_H], [/* Define to 1 if you have the <gdbm/ndbm.h> header file. */
+@%:@undef HAVE_GDBM_NDBM_H])
+m4trace:configure.ac:5098: -1- AC_DEFINE_TRACE_LITERAL([NDBM_H_FILE])
+m4trace:configure.ac:5098: -1- m4_pattern_allow([^NDBM_H_FILE$])
+m4trace:configure.ac:5099: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DBM])
+m4trace:configure.ac:5099: -1- m4_pattern_allow([^HAVE_DBM$])
+m4trace:configure.ac:5106: -1- AC_SUBST([CXX])
+m4trace:configure.ac:5106: -1- AC_SUBST_TRACE([CXX])
+m4trace:configure.ac:5106: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:5106: -1- AC_SUBST([CXXFLAGS])
+m4trace:configure.ac:5106: -1- AC_SUBST_TRACE([CXXFLAGS])
+m4trace:configure.ac:5106: -1- m4_pattern_allow([^CXXFLAGS$])
+m4trace:configure.ac:5106: -1- AC_SUBST([LDFLAGS])
+m4trace:configure.ac:5106: -1- AC_SUBST_TRACE([LDFLAGS])
+m4trace:configure.ac:5106: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:5106: -1- AC_SUBST([LIBS])
+m4trace:configure.ac:5106: -1- AC_SUBST_TRACE([LIBS])
+m4trace:configure.ac:5106: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:5106: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:5106: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:5106: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:5106: -1- AC_SUBST([CXX])
+m4trace:configure.ac:5106: -1- AC_SUBST_TRACE([CXX])
+m4trace:configure.ac:5106: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:5106: -1- AC_SUBST([ac_ct_CXX])
+m4trace:configure.ac:5106: -1- AC_SUBST_TRACE([ac_ct_CXX])
+m4trace:configure.ac:5106: -1- m4_pattern_allow([^ac_ct_CXX$])
+m4trace:configure.ac:5106: -1- AC_DEFINE_TRACE_LITERAL([TRUST_NDBM_H_PROTOTYPES])
+m4trace:configure.ac:5106: -1- m4_pattern_allow([^TRUST_NDBM_H_PROTOTYPES$])
+m4trace:configure.ac:5115: -1- AC_DEFINE_TRACE_LITERAL([TRUST_NDBM_H_PROTOTYPES])
+m4trace:configure.ac:5115: -1- m4_pattern_allow([^TRUST_NDBM_H_PROTOTYPES$])
+m4trace:configure.ac:5121: -1- AC_DEFINE_TRACE_LITERAL([HAVE_U_INT8_T])
+m4trace:configure.ac:5121: -1- m4_pattern_allow([^HAVE_U_INT8_T$])
+m4trace:configure.ac:5121: -1- AH_OUTPUT([HAVE_U_INT8_T], [/* Define to 1 if the system has the type `u_int8_t\'. */
+@%:@undef HAVE_U_INT8_T])
+m4trace:configure.ac:5121: -1- AC_DEFINE_TRACE_LITERAL([HAVE_U_INT16_T])
+m4trace:configure.ac:5121: -1- m4_pattern_allow([^HAVE_U_INT16_T$])
+m4trace:configure.ac:5121: -1- AH_OUTPUT([HAVE_U_INT16_T], [/* Define to 1 if the system has the type `u_int16_t\'. */
+@%:@undef HAVE_U_INT16_T])
+m4trace:configure.ac:5121: -1- AC_DEFINE_TRACE_LITERAL([HAVE_U_INT32_T])
+m4trace:configure.ac:5121: -1- m4_pattern_allow([^HAVE_U_INT32_T$])
+m4trace:configure.ac:5121: -1- AH_OUTPUT([HAVE_U_INT32_T], [/* Define to 1 if the system has the type `u_int32_t\'. */
+@%:@undef HAVE_U_INT32_T])
+m4trace:configure.ac:5196: -1- AC_DEFINE_TRACE_LITERAL([DB_H_FILE])
+m4trace:configure.ac:5196: -1- m4_pattern_allow([^DB_H_FILE$])
+m4trace:configure.ac:5197: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BERKELEY_DB])
+m4trace:configure.ac:5197: -1- m4_pattern_allow([^HAVE_BERKELEY_DB$])
+m4trace:configure.ac:5205: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DATABASE])
+m4trace:configure.ac:5205: -1- m4_pattern_allow([^HAVE_DATABASE$])
+m4trace:configure.ac:5210: -1- AH_OUTPUT([HAVE_LIBSOCKS], [/* Define to 1 if you have the `socks\' library (-lsocks). */
+@%:@undef HAVE_LIBSOCKS])
+m4trace:configure.ac:5210: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSOCKS])
+m4trace:configure.ac:5210: -1- m4_pattern_allow([^HAVE_LIBSOCKS$])
+m4trace:configure.ac:5211: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SOCKS])
+m4trace:configure.ac:5211: -1- m4_pattern_allow([^HAVE_SOCKS$])
+m4trace:configure.ac:5216: -1- AC_DEFINE_TRACE_LITERAL([USAGE_TRACKING])
+m4trace:configure.ac:5216: -1- m4_pattern_allow([^USAGE_TRACKING$])
+m4trace:configure.ac:5225: -1- AC_DEFINE_TRACE_LITERAL([WITH_NUMBER_TYPES])
+m4trace:configure.ac:5225: -1- m4_pattern_allow([^WITH_NUMBER_TYPES$])
+m4trace:configure.ac:5226: -1- AC_DEFINE_TRACE_LITERAL([WITH_GMP])
+m4trace:configure.ac:5226: -1- m4_pattern_allow([^WITH_GMP$])
+m4trace:configure.ac:5239: -1- AC_DEFINE_TRACE_LITERAL([MP_PREFIX])
+m4trace:configure.ac:5239: -1- m4_pattern_allow([^MP_PREFIX$])
+m4trace:configure.ac:5244: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MP_MOVE])
+m4trace:configure.ac:5244: -1- m4_pattern_allow([^HAVE_MP_MOVE$])
+m4trace:configure.ac:5250: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MP_MOVE])
+m4trace:configure.ac:5250: -1- m4_pattern_allow([^HAVE_MP_MOVE$])
+m4trace:configure.ac:5254: -1- AC_DEFINE_TRACE_LITERAL([WITH_NUMBER_TYPES])
+m4trace:configure.ac:5254: -1- m4_pattern_allow([^WITH_NUMBER_TYPES$])
+m4trace:configure.ac:5255: -1- AC_DEFINE_TRACE_LITERAL([WITH_MP])
+m4trace:configure.ac:5255: -1- m4_pattern_allow([^WITH_MP$])
+m4trace:configure.ac:5262: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [../../lib/autoconf/general.m4:2749: AC_RUN_IFELSE is expanded from...
+configure.ac:5262: the top level])
+m4trace:configure.ac:5281: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNIX_PROCESSES])
+m4trace:configure.ac:5281: -1- m4_pattern_allow([^HAVE_UNIX_PROCESSES$])
+m4trace:configure.ac:5314: -1- AC_SUBST([SRC_SUBDIR_DEPS])
+m4trace:configure.ac:5314: -1- AC_SUBST_TRACE([SRC_SUBDIR_DEPS])
+m4trace:configure.ac:5314: -1- m4_pattern_allow([^SRC_SUBDIR_DEPS$])
+m4trace:configure.ac:5328: -1- AC_SUBST([INSTALL_ARCH_DEP_SUBDIR])
+m4trace:configure.ac:5328: -1- AC_SUBST_TRACE([INSTALL_ARCH_DEP_SUBDIR])
+m4trace:configure.ac:5328: -1- m4_pattern_allow([^INSTALL_ARCH_DEP_SUBDIR$])
+m4trace:configure.ac:5329: -1- AC_SUBST([MAKE_SUBDIR])
+m4trace:configure.ac:5329: -1- AC_SUBST_TRACE([MAKE_SUBDIR])
+m4trace:configure.ac:5329: -1- m4_pattern_allow([^MAKE_SUBDIR$])
+m4trace:configure.ac:5330: -1- AC_SUBST([SUBDIR_MAKEFILES])
+m4trace:configure.ac:5330: -1- AC_SUBST_TRACE([SUBDIR_MAKEFILES])
+m4trace:configure.ac:5330: -1- m4_pattern_allow([^SUBDIR_MAKEFILES$])
+m4trace:configure.ac:5400: -1- AC_SUBST([PROGNAME])
+m4trace:configure.ac:5400: -1- AC_SUBST_TRACE([PROGNAME])
+m4trace:configure.ac:5400: -1- m4_pattern_allow([^PROGNAME$])
+m4trace:configure.ac:5401: -1- AC_SUBST([version])
+m4trace:configure.ac:5401: -1- AC_SUBST_TRACE([version])
+m4trace:configure.ac:5401: -1- m4_pattern_allow([^version$])
+m4trace:configure.ac:5402: -1- AC_SUBST([verbose_version])
+m4trace:configure.ac:5402: -1- AC_SUBST_TRACE([verbose_version])
+m4trace:configure.ac:5402: -1- m4_pattern_allow([^verbose_version$])
+m4trace:configure.ac:5403: -1- AC_SUBST([inststaticdir])
+m4trace:configure.ac:5403: -1- AC_SUBST_TRACE([inststaticdir])
+m4trace:configure.ac:5403: -1- m4_pattern_allow([^inststaticdir$])
+m4trace:configure.ac:5404: -1- AC_SUBST([instvardir])
+m4trace:configure.ac:5404: -1- AC_SUBST_TRACE([instvardir])
+m4trace:configure.ac:5404: -1- m4_pattern_allow([^instvardir$])
+m4trace:configure.ac:5405: -1- AC_SUBST([srcdir])
+m4trace:configure.ac:5405: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.ac:5405: -1- m4_pattern_allow([^srcdir$])
+m4trace:configure.ac:5406: -1- AC_SUBST([bindir])
+m4trace:configure.ac:5406: -1- AC_SUBST_TRACE([bindir])
+m4trace:configure.ac:5406: -1- m4_pattern_allow([^bindir$])
+m4trace:configure.ac:5407: -1- AC_SUBST([datarootdir])
+m4trace:configure.ac:5407: -1- AC_SUBST_TRACE([datarootdir])
+m4trace:configure.ac:5407: -1- m4_pattern_allow([^datarootdir$])
+m4trace:configure.ac:5408: -1- AC_SUBST([datadir])
+m4trace:configure.ac:5408: -1- AC_SUBST_TRACE([datadir])
+m4trace:configure.ac:5408: -1- m4_pattern_allow([^datadir$])
+m4trace:configure.ac:5409: -1- AC_SUBST([statedir])
+m4trace:configure.ac:5409: -1- AC_SUBST_TRACE([statedir])
+m4trace:configure.ac:5409: -1- m4_pattern_allow([^statedir$])
+m4trace:configure.ac:5410: -1- AC_SUBST([libdir])
+m4trace:configure.ac:5410: -1- AC_SUBST_TRACE([libdir])
+m4trace:configure.ac:5410: -1- m4_pattern_allow([^libdir$])
+m4trace:configure.ac:5411: -1- AC_SUBST([mandir])
+m4trace:configure.ac:5411: -1- AC_SUBST_TRACE([mandir])
+m4trace:configure.ac:5411: -1- m4_pattern_allow([^mandir$])
+m4trace:configure.ac:5412: -1- AC_SUBST([extra_includes])
+m4trace:configure.ac:5412: -1- AC_SUBST_TRACE([extra_includes])
+m4trace:configure.ac:5412: -1- m4_pattern_allow([^extra_includes$])
+m4trace:configure.ac:5414: -1- AC_SUBST([prefix])
+m4trace:configure.ac:5414: -1- AC_SUBST_TRACE([prefix])
+m4trace:configure.ac:5414: -1- m4_pattern_allow([^prefix$])
+m4trace:configure.ac:5415: -1- AC_SUBST([PREFIX_USER_DEFINED])
+m4trace:configure.ac:5415: -1- AC_SUBST_TRACE([PREFIX_USER_DEFINED])
+m4trace:configure.ac:5415: -1- m4_pattern_allow([^PREFIX_USER_DEFINED$])
+m4trace:configure.ac:5417: -1- AC_SUBST([PREFIX])
+m4trace:configure.ac:5417: -1- AC_SUBST_TRACE([PREFIX])
+m4trace:configure.ac:5417: -1- m4_pattern_allow([^PREFIX$])
+m4trace:configure.ac:5419: -1- AC_SUBST([exec_prefix])
+m4trace:configure.ac:5419: -1- AC_SUBST_TRACE([exec_prefix])
+m4trace:configure.ac:5419: -1- m4_pattern_allow([^exec_prefix$])
+m4trace:configure.ac:5420: -1- AC_SUBST([EXEC_PREFIX_USER_DEFINED])
+m4trace:configure.ac:5420: -1- AC_SUBST_TRACE([EXEC_PREFIX_USER_DEFINED])
+m4trace:configure.ac:5420: -1- m4_pattern_allow([^EXEC_PREFIX_USER_DEFINED$])
+m4trace:configure.ac:5422: -1- AC_SUBST([EXEC_PREFIX])
+m4trace:configure.ac:5422: -1- AC_SUBST_TRACE([EXEC_PREFIX])
+m4trace:configure.ac:5422: -1- m4_pattern_allow([^EXEC_PREFIX$])
+m4trace:configure.ac:5424: -1- AC_SUBST([infodir])
+m4trace:configure.ac:5424: -1- AC_SUBST_TRACE([infodir])
+m4trace:configure.ac:5424: -1- m4_pattern_allow([^infodir$])
+m4trace:configure.ac:5425: -1- AC_SUBST([INFODIR_USER_DEFINED])
+m4trace:configure.ac:5425: -1- AC_SUBST_TRACE([INFODIR_USER_DEFINED])
+m4trace:configure.ac:5425: -1- m4_pattern_allow([^INFODIR_USER_DEFINED$])
+m4trace:configure.ac:5427: -1- AC_SUBST([INFODIR])
+m4trace:configure.ac:5427: -1- AC_SUBST_TRACE([INFODIR])
+m4trace:configure.ac:5427: -1- m4_pattern_allow([^INFODIR$])
+m4trace:configure.ac:5429: -1- AC_SUBST([infopath], [$with_infopath])
+m4trace:configure.ac:5429: -1- AC_SUBST_TRACE([infopath])
+m4trace:configure.ac:5429: -1- m4_pattern_allow([^infopath$])
+m4trace:configure.ac:5430: -1- AC_SUBST([INFOPATH_USER_DEFINED])
+m4trace:configure.ac:5430: -1- AC_SUBST_TRACE([INFOPATH_USER_DEFINED])
+m4trace:configure.ac:5430: -1- m4_pattern_allow([^INFOPATH_USER_DEFINED$])
+m4trace:configure.ac:5432: -1- AC_SUBST([INFOPATH])
+m4trace:configure.ac:5432: -1- AC_SUBST_TRACE([INFOPATH])
+m4trace:configure.ac:5432: -1- m4_pattern_allow([^INFOPATH$])
+m4trace:configure.ac:5435: -1- AC_SUBST([early_packages], [$with_early_packages])
+m4trace:configure.ac:5435: -1- AC_SUBST_TRACE([early_packages])
+m4trace:configure.ac:5435: -1- m4_pattern_allow([^early_packages$])
+m4trace:configure.ac:5436: -1- AC_SUBST([EARLY_PACKAGE_DIRECTORIES_USER_DEFINED])
+m4trace:configure.ac:5436: -1- AC_SUBST_TRACE([EARLY_PACKAGE_DIRECTORIES_USER_DEFINED])
+m4trace:configure.ac:5436: -1- m4_pattern_allow([^EARLY_PACKAGE_DIRECTORIES_USER_DEFINED$])
+m4trace:configure.ac:5438: -1- AC_SUBST([EARLY_PACKAGE_DIRECTORIES])
+m4trace:configure.ac:5438: -1- AC_SUBST_TRACE([EARLY_PACKAGE_DIRECTORIES])
+m4trace:configure.ac:5438: -1- m4_pattern_allow([^EARLY_PACKAGE_DIRECTORIES$])
+m4trace:configure.ac:5441: -1- AC_SUBST([late_packages], [$with_late_packages])
+m4trace:configure.ac:5441: -1- AC_SUBST_TRACE([late_packages])
+m4trace:configure.ac:5441: -1- m4_pattern_allow([^late_packages$])
+m4trace:configure.ac:5442: -1- AC_SUBST([LATE_PACKAGE_DIRECTORIES_USER_DEFINED])
+m4trace:configure.ac:5442: -1- AC_SUBST_TRACE([LATE_PACKAGE_DIRECTORIES_USER_DEFINED])
+m4trace:configure.ac:5442: -1- m4_pattern_allow([^LATE_PACKAGE_DIRECTORIES_USER_DEFINED$])
+m4trace:configure.ac:5444: -1- AC_SUBST([LATE_PACKAGE_DIRECTORIES])
+m4trace:configure.ac:5444: -1- AC_SUBST_TRACE([LATE_PACKAGE_DIRECTORIES])
+m4trace:configure.ac:5444: -1- m4_pattern_allow([^LATE_PACKAGE_DIRECTORIES$])
+m4trace:configure.ac:5447: -1- AC_SUBST([last_packages], [$with_last_packages])
+m4trace:configure.ac:5447: -1- AC_SUBST_TRACE([last_packages])
+m4trace:configure.ac:5447: -1- m4_pattern_allow([^last_packages$])
+m4trace:configure.ac:5448: -1- AC_SUBST([LAST_PACKAGE_DIRECTORIES_USER_DEFINED])
+m4trace:configure.ac:5448: -1- AC_SUBST_TRACE([LAST_PACKAGE_DIRECTORIES_USER_DEFINED])
+m4trace:configure.ac:5448: -1- m4_pattern_allow([^LAST_PACKAGE_DIRECTORIES_USER_DEFINED$])
+m4trace:configure.ac:5450: -1- AC_SUBST([LAST_PACKAGE_DIRECTORIES])
+m4trace:configure.ac:5450: -1- AC_SUBST_TRACE([LAST_PACKAGE_DIRECTORIES])
+m4trace:configure.ac:5450: -1- m4_pattern_allow([^LAST_PACKAGE_DIRECTORIES$])
+m4trace:configure.ac:5452: -1- AC_SUBST([package_path], [$with_package_path])
+m4trace:configure.ac:5452: -1- AC_SUBST_TRACE([package_path])
+m4trace:configure.ac:5452: -1- m4_pattern_allow([^package_path$])
+m4trace:configure.ac:5453: -1- AC_SUBST([PACKAGE_PATH_USER_DEFINED])
+m4trace:configure.ac:5453: -1- AC_SUBST_TRACE([PACKAGE_PATH_USER_DEFINED])
+m4trace:configure.ac:5453: -1- m4_pattern_allow([^PACKAGE_PATH_USER_DEFINED$])
+m4trace:configure.ac:5455: -1- AC_SUBST([PACKAGE_PATH])
+m4trace:configure.ac:5455: -1- AC_SUBST_TRACE([PACKAGE_PATH])
+m4trace:configure.ac:5455: -1- m4_pattern_allow([^PACKAGE_PATH$])
+m4trace:configure.ac:5457: -1- AC_SUBST([lispdir], [$with_lispdir])
+m4trace:configure.ac:5457: -1- AC_SUBST_TRACE([lispdir])
+m4trace:configure.ac:5457: -1- m4_pattern_allow([^lispdir$])
+m4trace:configure.ac:5458: -1- AC_SUBST([LISPDIR_USER_DEFINED])
+m4trace:configure.ac:5458: -1- AC_SUBST_TRACE([LISPDIR_USER_DEFINED])
+m4trace:configure.ac:5458: -1- m4_pattern_allow([^LISPDIR_USER_DEFINED$])
+m4trace:configure.ac:5460: -1- AC_SUBST([LISPDIR])
+m4trace:configure.ac:5460: -1- AC_SUBST_TRACE([LISPDIR])
+m4trace:configure.ac:5460: -1- m4_pattern_allow([^LISPDIR$])
+m4trace:configure.ac:5462: -1- AC_SUBST([moduledir], [$with_moduledir])
+m4trace:configure.ac:5462: -1- AC_SUBST_TRACE([moduledir])
+m4trace:configure.ac:5462: -1- m4_pattern_allow([^moduledir$])
+m4trace:configure.ac:5463: -1- AC_SUBST([MODULEDIR_USER_DEFINED])
+m4trace:configure.ac:5463: -1- AC_SUBST_TRACE([MODULEDIR_USER_DEFINED])
+m4trace:configure.ac:5463: -1- m4_pattern_allow([^MODULEDIR_USER_DEFINED$])
+m4trace:configure.ac:5465: -1- AC_SUBST([MODULEDIR])
+m4trace:configure.ac:5465: -1- AC_SUBST_TRACE([MODULEDIR])
+m4trace:configure.ac:5465: -1- m4_pattern_allow([^MODULEDIR$])
+m4trace:configure.ac:5467: -1- AC_SUBST([sitelispdir], [$with_sitelispdir])
+m4trace:configure.ac:5467: -1- AC_SUBST_TRACE([sitelispdir])
+m4trace:configure.ac:5467: -1- m4_pattern_allow([^sitelispdir$])
+m4trace:configure.ac:5468: -1- AC_SUBST([SITELISPDIR_USER_DEFINED])
+m4trace:configure.ac:5468: -1- AC_SUBST_TRACE([SITELISPDIR_USER_DEFINED])
+m4trace:configure.ac:5468: -1- m4_pattern_allow([^SITELISPDIR_USER_DEFINED$])
+m4trace:configure.ac:5470: -1- AC_SUBST([SITELISPDIR])
+m4trace:configure.ac:5470: -1- AC_SUBST_TRACE([SITELISPDIR])
+m4trace:configure.ac:5470: -1- m4_pattern_allow([^SITELISPDIR$])
+m4trace:configure.ac:5472: -1- AC_SUBST([sitemoduledir])
+m4trace:configure.ac:5472: -1- AC_SUBST_TRACE([sitemoduledir])
+m4trace:configure.ac:5472: -1- m4_pattern_allow([^sitemoduledir$])
+m4trace:configure.ac:5473: -1- AC_SUBST([SITEMODULEDIR_USER_DEFINED])
+m4trace:configure.ac:5473: -1- AC_SUBST_TRACE([SITEMODULEDIR_USER_DEFINED])
+m4trace:configure.ac:5473: -1- m4_pattern_allow([^SITEMODULEDIR_USER_DEFINED$])
+m4trace:configure.ac:5475: -1- AC_SUBST([SITEMODULEDIR])
+m4trace:configure.ac:5475: -1- AC_SUBST_TRACE([SITEMODULEDIR])
+m4trace:configure.ac:5475: -1- m4_pattern_allow([^SITEMODULEDIR$])
+m4trace:configure.ac:5477: -1- AC_SUBST([etcdir], [$with_etcdir])
+m4trace:configure.ac:5477: -1- AC_SUBST_TRACE([etcdir])
+m4trace:configure.ac:5477: -1- m4_pattern_allow([^etcdir$])
+m4trace:configure.ac:5478: -1- AC_SUBST([ETCDIR_USER_DEFINED])
+m4trace:configure.ac:5478: -1- AC_SUBST_TRACE([ETCDIR_USER_DEFINED])
+m4trace:configure.ac:5478: -1- m4_pattern_allow([^ETCDIR_USER_DEFINED$])
+m4trace:configure.ac:5480: -1- AC_SUBST([ETCDIR])
+m4trace:configure.ac:5480: -1- AC_SUBST_TRACE([ETCDIR])
+m4trace:configure.ac:5480: -1- m4_pattern_allow([^ETCDIR$])
+m4trace:configure.ac:5482: -1- AC_SUBST([archlibdir], [$with_archlibdir])
+m4trace:configure.ac:5482: -1- AC_SUBST_TRACE([archlibdir])
+m4trace:configure.ac:5482: -1- m4_pattern_allow([^archlibdir$])
+m4trace:configure.ac:5483: -1- AC_SUBST([ARCHLIBDIR_USER_DEFINED])
+m4trace:configure.ac:5483: -1- AC_SUBST_TRACE([ARCHLIBDIR_USER_DEFINED])
+m4trace:configure.ac:5483: -1- m4_pattern_allow([^ARCHLIBDIR_USER_DEFINED$])
+m4trace:configure.ac:5486: -1- AC_SUBST([ARCHLIBDIR])
+m4trace:configure.ac:5486: -1- AC_SUBST_TRACE([ARCHLIBDIR])
+m4trace:configure.ac:5486: -1- m4_pattern_allow([^ARCHLIBDIR$])
+m4trace:configure.ac:5488: -1- AC_SUBST([docdir], [$with_docdir])
+m4trace:configure.ac:5488: -1- AC_SUBST_TRACE([docdir])
+m4trace:configure.ac:5488: -1- m4_pattern_allow([^docdir$])
+m4trace:configure.ac:5489: -1- AC_SUBST([DOCDIR_USER_DEFINED])
+m4trace:configure.ac:5489: -1- AC_SUBST_TRACE([DOCDIR_USER_DEFINED])
+m4trace:configure.ac:5489: -1- m4_pattern_allow([^DOCDIR_USER_DEFINED$])
+m4trace:configure.ac:5491: -1- AC_SUBST([DOCDIR])
+m4trace:configure.ac:5491: -1- AC_SUBST_TRACE([DOCDIR])
+m4trace:configure.ac:5491: -1- m4_pattern_allow([^DOCDIR$])
+m4trace:configure.ac:5493: -1- AC_SUBST([docdir])
+m4trace:configure.ac:5493: -1- AC_SUBST_TRACE([docdir])
+m4trace:configure.ac:5493: -1- m4_pattern_allow([^docdir$])
+m4trace:configure.ac:5494: -1- AC_SUBST([bitmapdir])
+m4trace:configure.ac:5494: -1- AC_SUBST_TRACE([bitmapdir])
+m4trace:configure.ac:5494: -1- m4_pattern_allow([^bitmapdir$])
+m4trace:configure.ac:5495: -1- AC_SUBST([extra_objs])
+m4trace:configure.ac:5495: -1- AC_SUBST_TRACE([extra_objs])
+m4trace:configure.ac:5495: -1- m4_pattern_allow([^extra_objs$])
+m4trace:configure.ac:5502: -1- AC_SUBST([machfile])
+m4trace:configure.ac:5502: -1- AC_SUBST_TRACE([machfile])
+m4trace:configure.ac:5502: -1- m4_pattern_allow([^machfile$])
+m4trace:configure.ac:5503: -1- AC_SUBST([opsysfile])
+m4trace:configure.ac:5503: -1- AC_SUBST_TRACE([opsysfile])
+m4trace:configure.ac:5503: -1- m4_pattern_allow([^opsysfile$])
+m4trace:configure.ac:5504: -1- AC_SUBST([c_switch_general])
+m4trace:configure.ac:5504: -1- AC_SUBST_TRACE([c_switch_general])
+m4trace:configure.ac:5504: -1- m4_pattern_allow([^c_switch_general$])
+m4trace:configure.ac:5505: -1- AC_SUBST([c_switch_window_system])
+m4trace:configure.ac:5505: -1- AC_SUBST_TRACE([c_switch_window_system])
+m4trace:configure.ac:5505: -1- m4_pattern_allow([^c_switch_window_system$])
+m4trace:configure.ac:5506: -1- AC_SUBST([c_switch_all])
+m4trace:configure.ac:5506: -1- AC_SUBST_TRACE([c_switch_all])
+m4trace:configure.ac:5506: -1- m4_pattern_allow([^c_switch_all$])
+m4trace:configure.ac:5507: -1- AC_SUBST([ld_switch_general])
+m4trace:configure.ac:5507: -1- AC_SUBST_TRACE([ld_switch_general])
+m4trace:configure.ac:5507: -1- m4_pattern_allow([^ld_switch_general$])
+m4trace:configure.ac:5508: -1- AC_SUBST([ld_switch_window_system])
+m4trace:configure.ac:5508: -1- AC_SUBST_TRACE([ld_switch_window_system])
+m4trace:configure.ac:5508: -1- m4_pattern_allow([^ld_switch_window_system$])
+m4trace:configure.ac:5509: -1- AC_SUBST([ld_switch_all])
+m4trace:configure.ac:5509: -1- AC_SUBST_TRACE([ld_switch_all])
+m4trace:configure.ac:5509: -1- m4_pattern_allow([^ld_switch_all$])
+m4trace:configure.ac:5510: -1- AC_SUBST([ld_libs_general])
+m4trace:configure.ac:5510: -1- AC_SUBST_TRACE([ld_libs_general])
+m4trace:configure.ac:5510: -1- m4_pattern_allow([^ld_libs_general$])
+m4trace:configure.ac:5511: -1- AC_SUBST([ld_libs_window_system])
+m4trace:configure.ac:5511: -1- AC_SUBST_TRACE([ld_libs_window_system])
+m4trace:configure.ac:5511: -1- m4_pattern_allow([^ld_libs_window_system$])
+m4trace:configure.ac:5512: -1- AC_SUBST([ld_libs_all])
+m4trace:configure.ac:5512: -1- AC_SUBST_TRACE([ld_libs_all])
+m4trace:configure.ac:5512: -1- m4_pattern_allow([^ld_libs_all$])
+m4trace:configure.ac:5513: -1- AC_SUBST([CFLAGS])
+m4trace:configure.ac:5513: -1- AC_SUBST_TRACE([CFLAGS])
+m4trace:configure.ac:5513: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.ac:5514: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:5514: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:5514: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:5515: -1- AC_SUBST([LDFLAGS])
+m4trace:configure.ac:5515: -1- AC_SUBST_TRACE([LDFLAGS])
+m4trace:configure.ac:5515: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:5517: -1- AC_SUBST([RECURSIVE_MAKE_ARGS])
+m4trace:configure.ac:5517: -1- AC_SUBST_TRACE([RECURSIVE_MAKE_ARGS])
+m4trace:configure.ac:5517: -1- m4_pattern_allow([^RECURSIVE_MAKE_ARGS$])
+m4trace:configure.ac:5519: -1- AC_SUBST([native_sound_lib], [$with_native_sound_lib])
+m4trace:configure.ac:5519: -1- AC_SUBST_TRACE([native_sound_lib])
+m4trace:configure.ac:5519: -1- m4_pattern_allow([^native_sound_lib$])
+m4trace:configure.ac:5520: -1- AC_SUBST([sound_cflags])
+m4trace:configure.ac:5520: -1- AC_SUBST_TRACE([sound_cflags])
+m4trace:configure.ac:5520: -1- m4_pattern_allow([^sound_cflags$])
+m4trace:configure.ac:5521: -1- AC_SUBST([RANLIB])
+m4trace:configure.ac:5521: -1- AC_SUBST_TRACE([RANLIB])
+m4trace:configure.ac:5521: -1- m4_pattern_allow([^RANLIB$])
+m4trace:configure.ac:5523: -1- AC_SUBST([XEMACS_CC])
+m4trace:configure.ac:5523: -1- AC_SUBST_TRACE([XEMACS_CC])
+m4trace:configure.ac:5523: -1- m4_pattern_allow([^XEMACS_CC$])
+m4trace:configure.ac:5524: -1- AC_SUBST([XE_CFLAGS])
+m4trace:configure.ac:5524: -1- AC_SUBST_TRACE([XE_CFLAGS])
+m4trace:configure.ac:5524: -1- m4_pattern_allow([^XE_CFLAGS$])
+m4trace:configure.ac:5528: -1- AC_DEFINE_TRACE_LITERAL([PREFIX_USER_DEFINED])
+m4trace:configure.ac:5528: -1- m4_pattern_allow([^PREFIX_USER_DEFINED$])
+m4trace:configure.ac:5533: -1- AC_DEFINE_TRACE_LITERAL([INHIBIT_SITE_LISP])
+m4trace:configure.ac:5533: -1- m4_pattern_allow([^INHIBIT_SITE_LISP$])
+m4trace:configure.ac:5537: -1- AC_DEFINE_TRACE_LITERAL([INHIBIT_SITE_MODULES])
+m4trace:configure.ac:5537: -1- m4_pattern_allow([^INHIBIT_SITE_MODULES$])
+m4trace:configure.ac:5544: -1- AC_DEFINE_TRACE_LITERAL([EMACS_CONFIGURATION])
+m4trace:configure.ac:5544: -1- m4_pattern_allow([^EMACS_CONFIGURATION$])
+m4trace:configure.ac:5545: -1- AC_DEFINE_TRACE_LITERAL([EMACS_CONFIG_OPTIONS])
+m4trace:configure.ac:5545: -1- m4_pattern_allow([^EMACS_CONFIG_OPTIONS$])
+m4trace:configure.ac:5550: -1- AC_DEFINE_TRACE_LITERAL([LD_SWITCH_X_SITE])
+m4trace:configure.ac:5550: -1- m4_pattern_allow([^LD_SWITCH_X_SITE$])
+m4trace:configure.ac:5551: -1- AC_DEFINE_TRACE_LITERAL([LD_SWITCH_X_SITE_AUX])
+m4trace:configure.ac:5551: -1- m4_pattern_allow([^LD_SWITCH_X_SITE_AUX$])
+m4trace:configure.ac:5552: -1- AC_DEFINE_TRACE_LITERAL([C_SWITCH_X_SITE])
+m4trace:configure.ac:5552: -1- m4_pattern_allow([^C_SWITCH_X_SITE$])
+m4trace:configure.ac:5553: -1- AC_DEFINE_TRACE_LITERAL([LD_SWITCH_SITE])
+m4trace:configure.ac:5553: -1- m4_pattern_allow([^LD_SWITCH_SITE$])
+m4trace:configure.ac:5554: -1- AC_DEFINE_TRACE_LITERAL([C_SWITCH_SITE])
+m4trace:configure.ac:5554: -1- m4_pattern_allow([^C_SWITCH_SITE$])
+m4trace:configure.ac:5562: -1- AC_DEFINE_TRACE_LITERAL([USE_SYSTEM_MALLOC])
+m4trace:configure.ac:5562: -1- m4_pattern_allow([^USE_SYSTEM_MALLOC$])
+m4trace:configure.ac:5563: -1- AC_DEFINE_TRACE_LITERAL([USE_DEBUG_MALLOC])
+m4trace:configure.ac:5563: -1- m4_pattern_allow([^USE_DEBUG_MALLOC$])
+m4trace:configure.ac:5564: -1- AC_DEFINE_TRACE_LITERAL([USE_SYSTEM_MALLOC])
+m4trace:configure.ac:5564: -1- m4_pattern_allow([^USE_SYSTEM_MALLOC$])
+m4trace:configure.ac:5566: -1- AC_DEFINE_TRACE_LITERAL([USE_GCC])
+m4trace:configure.ac:5566: -1- m4_pattern_allow([^USE_GCC$])
+m4trace:configure.ac:5567: -1- AC_DEFINE_TRACE_LITERAL([USE_GPLUSPLUS])
+m4trace:configure.ac:5567: -1- m4_pattern_allow([^USE_GPLUSPLUS$])
+m4trace:configure.ac:5568: -1- AC_DEFINE_TRACE_LITERAL([EXTERNAL_WIDGET])
+m4trace:configure.ac:5568: -1- m4_pattern_allow([^EXTERNAL_WIDGET$])
+m4trace:configure.ac:5569: -1- AC_DEFINE_TRACE_LITERAL([USE_KKCC])
+m4trace:configure.ac:5569: -1- m4_pattern_allow([^USE_KKCC$])
+m4trace:configure.ac:5570: -1- AC_DEFINE_TRACE_LITERAL([NEW_GC])
+m4trace:configure.ac:5570: -1- m4_pattern_allow([^NEW_GC$])
+m4trace:configure.ac:5571: -1- AC_DEFINE_TRACE_LITERAL([VDB_POSIX])
+m4trace:configure.ac:5571: -1- m4_pattern_allow([^VDB_POSIX$])
+m4trace:configure.ac:5572: -1- AC_DEFINE_TRACE_LITERAL([VDB_FAKE])
+m4trace:configure.ac:5572: -1- m4_pattern_allow([^VDB_FAKE$])
+m4trace:configure.ac:5573: -1- AC_DEFINE_TRACE_LITERAL([QUICK_BUILD])
+m4trace:configure.ac:5573: -1- m4_pattern_allow([^QUICK_BUILD$])
+m4trace:configure.ac:5574: -1- AC_DEFINE_TRACE_LITERAL([PURIFY])
+m4trace:configure.ac:5574: -1- m4_pattern_allow([^PURIFY$])
+m4trace:configure.ac:5575: -1- AC_DEFINE_TRACE_LITERAL([QUANTIFY])
+m4trace:configure.ac:5575: -1- m4_pattern_allow([^QUANTIFY$])
+m4trace:configure.ac:5576: -1- AC_DEFINE_TRACE_LITERAL([USE_VALGRIND])
+m4trace:configure.ac:5576: -1- m4_pattern_allow([^USE_VALGRIND$])
+m4trace:configure.ac:5577: -1- AC_DEFINE_TRACE_LITERAL([MAIL_USE_POP])
+m4trace:configure.ac:5577: -1- m4_pattern_allow([^MAIL_USE_POP$])
+m4trace:configure.ac:5578: -1- AC_DEFINE_TRACE_LITERAL([KERBEROS])
+m4trace:configure.ac:5578: -1- m4_pattern_allow([^KERBEROS$])
+m4trace:configure.ac:5579: -1- AC_DEFINE_TRACE_LITERAL([HESIOD])
+m4trace:configure.ac:5579: -1- m4_pattern_allow([^HESIOD$])
+m4trace:configure.ac:5580: -1- AC_DEFINE_TRACE_LITERAL([USE_UNION_TYPE])
+m4trace:configure.ac:5580: -1- m4_pattern_allow([^USE_UNION_TYPE$])
+m4trace:configure.ac:5581: -1- AC_DEFINE_TRACE_LITERAL([PDUMP])
+m4trace:configure.ac:5581: -1- m4_pattern_allow([^PDUMP$])
+m4trace:configure.ac:5582: -1- AC_DEFINE_TRACE_LITERAL([DUMP_IN_EXEC])
+m4trace:configure.ac:5582: -1- m4_pattern_allow([^DUMP_IN_EXEC$])
+m4trace:configure.ac:5583: -1- AC_DEFINE_TRACE_LITERAL([IPV6_CANONICALIZE])
+m4trace:configure.ac:5583: -1- m4_pattern_allow([^IPV6_CANONICALIZE$])
+m4trace:configure.ac:5901: -1- AC_CONFIG_HEADERS([src/config.h lwlib/config.h])
+m4trace:configure.ac:5904: -1- AC_SUBST([internal_makefile_list])
+m4trace:configure.ac:5904: -1- AC_SUBST_TRACE([internal_makefile_list])
+m4trace:configure.ac:5904: -1- m4_pattern_allow([^internal_makefile_list$])
+m4trace:configure.ac:5930: -1- AC_CONFIG_FILES([$file])
+m4trace:configure.ac:5932: -1- AC_CONFIG_FILES([src/paths.h src/xemacs.def.in lib-src/config.values])
+m4trace:configure.ac:5933: -1- AC_CONFIG_FILES([lib-src/ellcc.h])
+m4trace:configure.ac:6047: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.ac:6047: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.ac:6047: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:6047: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.ac:6047: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.ac:6047: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:6047: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.ac:6047: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.ac:6047: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.ac:6047: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.ac:6047: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.ac:6047: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.ac:6047: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.ac:6047: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.ac:6047: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.ac:6047: -1- AC_SUBST_TRACE([INSTALL])
diff --text -u 'xemacs-21.5.30/build-msw-release.sh' 'xemacs-21.5.31/build-msw-release.sh'
Index: ./build-msw-release.sh
--- ./build-msw-release.sh Wed Apr 27 00:57:25 2011
+++ ./build-msw-release.sh Fri Apr 29 22:31:05 2011
@@ -3,21 +3,19 @@
# Copyright (C) 2000 Andy Piper
# This file is part of XEmacs.
-
-# XEmacs is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your
+#
+# XEmacs is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
# option) any later version.
-
-# XEmacs is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-
+#
+# XEmacs is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to the Free
-# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
# This file builds the release kits for both cygwin and win32. You
# must have both environments configured for it to work properly. In
diff --text -u 'xemacs-21.5.30/configure' 'xemacs-21.5.31/configure'
Index: ./configure
--- ./configure Wed Apr 27 00:57:41 2011
+++ ./configure Fri Apr 29 22:31:38 2011
@@ -34,20 +34,18 @@
#
# This file is part of XEmacs.
#
-# XEmacs is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your
+# XEmacs is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
# option) any later version.
#
-# XEmacs is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
+# XEmacs is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to the Free
-# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
#
# For usage, run `./configure --help'
# For more detailed information on building and installing XEmacs,
@@ -2132,20 +2130,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
option) any later version.
-XEmacs is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to the Free
-Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
For usage, run `./configure --help'
For more detailed information on building and installing XEmacs,
diff --text -u 'xemacs-21.5.30/configure.ac' 'xemacs-21.5.31/configure.ac'
Index: ./configure.ac
--- ./configure.ac Wed Apr 27 00:57:25 2011
+++ ./configure.ac Fri Apr 29 22:31:05 2011
@@ -63,20 +63,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
option) any later version.
-XEmacs is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to the Free
-Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
For usage, run `./configure --help'
For more detailed information on building and installing XEmacs,
diff --text -u 'xemacs-21.5.30/etc/COPYING' 'xemacs-21.5.31/etc/COPYING'
Index: ./etc/COPYING
--- ./etc/COPYING Wed Apr 27 00:57:25 2011
+++ ./etc/COPYING Fri Apr 29 22:31:05 2011
@@ -1,286 +1,626 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place - Suite 330
- Boston, MA 02111-1307, USA.
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
this License.
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
@@ -288,15 +628,15 @@
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 19yy <name of author>
+ Copyright (C) <year> <name of author>
- This program is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -305,37 +645,30 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; see the file COPYING. If not, write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) 19yy name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --text -u 'xemacs-21.5.30/etc/ChangeLog' 'xemacs-21.5.31/etc/ChangeLog'
Index: ./etc/ChangeLog
--- ./etc/ChangeLog Wed Apr 27 00:57:41 2011
+++ ./etc/ChangeLog Fri Apr 29 22:31:38 2011
@@ -1,3 +1,28 @@
+2011-04-29 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.5.31 "ginger" is released.
+
+2010-12-31 Mats Lidell <matsl@xemacs.org>
+
+ * xemacs.1: Added copyright and license.
+
+2010-12-31 Mats Lidell <matsl@xemacs.org>
+
+ * emacskeys.sco: remove
+ * emacsstrs.sco: remove
+
+2010-11-07 Mats Lidell <matsl@xemacs.org>
+
+ * gnuserv.1:
+ * gnuserv.README:
+ Added copyright dated 1998.
+
+2010-10-30 Mats Lidell <matsl@xemacs.org>
+
+ * unicode/COPYING:
+ * unicode/ibm/COPYING:
+ New files.
+
2011-04-26 Stephen J. Turnbull <stephen@xemacs.org>
* XEmacs 21.5.30 "garlic" is released.
@@ -2073,3 +2098,23 @@
Thu Dec 5 20:42:35 1996 Steven L Baur <steve@altair.xemacs.org>
* edt-user.doc (File): New file from Emacs 19.34.
+
+
+ChangeLog entries synched from GNU Emacs are the property of the FSF.
+Other ChangeLog entries are usually the property of the author of the
+change.
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
diff --text -u 'xemacs-21.5.30/etc/ETAGS.EBNF' 'xemacs-21.5.31/etc/ETAGS.EBNF'
Index: ./etc/ETAGS.EBNF
--- ./etc/ETAGS.EBNF Wed Apr 27 00:57:25 2011
+++ ./etc/ETAGS.EBNF Fri Apr 29 22:31:05 2011
@@ -99,16 +99,17 @@
COPYING PERMISSIONS:
- This document is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ This file is part of XEmacs.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ XEmacs is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation, either version 3 of the License, or (at your
+ option) any later version.
+
+ XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
diff --text -u 'xemacs-21.5.30/etc/ETAGS.README' 'xemacs-21.5.31/etc/ETAGS.README'
Index: ./etc/ETAGS.README
--- ./etc/ETAGS.README Wed Apr 27 00:57:25 2011
+++ ./etc/ETAGS.README Fri Apr 29 22:31:05 2011
@@ -32,18 +32,17 @@
2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
Free Software Foundation, Inc.
-This file is not considered part of GNU Emacs.
+This file is part of XEmacs.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
diff --text -u 'xemacs-21.5.30/etc/Emacs.ad' 'xemacs-21.5.31/etc/Emacs.ad'
Index: ./etc/Emacs.ad
--- ./etc/Emacs.ad Wed Apr 27 00:57:25 2011
+++ ./etc/Emacs.ad Fri Apr 29 22:31:05 2011
@@ -1,5 +1,29 @@
! This is the app-defaults file for XEmacs.
!
+! Copyright (C) 1997, 1998 Kyle Jones
+! Copyright (C) 1998 SL Baur
+! Copyright (C) 2000 Andy Piper
+! Copyright (C) 2000 Martin Buchholz
+! Copyright (C) 2000-2003 Stephen J. Turnbull
+! Copyright (C) 2002 Ville Skytt��
+! Copyright (C) 2010 Jerry James
+!
+! This file is part of XEmacs.
+!
+! XEmacs is free software: you can redistribute it and/or modify it
+! under the terms of the GNU General Public License as published by the
+! Free Software Foundation, either version 3 of the License, or (at your
+! option) any later version.
+!
+! XEmacs is distributed in the hope that it will be useful, but WITHOUT
+! ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+! FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+! for more details.
+!
+! You should have received a copy of the GNU General Public License
+! along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+!
+!
! This used to be identical to sample.Xresources, but the resources
! below have been rewritten to be as general as possible to avoid
! overriding user resources. Other than the form rewriting, both
diff --text -u 'xemacs-21.5.30/etc/HELLO' 'xemacs-21.5.31/etc/HELLO'
Index: ./etc/HELLO
--- ./etc/HELLO Wed Apr 27 00:57:25 2011
+++ ./etc/HELLO Fri Apr 29 22:31:05 2011
@@ -1,47 +1,95 @@
--*- coding: iso-2022-7 -*-
+This is a list of ways to say hello in various languages.
-You need many fonts to read all.
-Please correct this incomplete list and add more!
+Non-ASCII examples:
+ Europe: �,A!Hola!, Gr�,A|_ Gott, Hyv�,Add p�,Adiv�,Add, Tere �,Auhtust, Bon�,Cuu
+ Cze�,B6f!, Dobr�,B} den, �,L7T`PRabRcYbU!, �,FCei\ �,Fsar, �$,1J2J0J;J0J@JOJ=J1J0
+ Africa: �$(3!A!,!>
+ Middle/Near East: �,Hylem, �$,1-g.$-s.1.$-g.% �$,1-y.$.*.#.%
+ South Asia: �$,19h9n9x:-9d:', �$,15h5n5x6-5d6', �$,1?(?.?8?M>u?>?0, �$,1@H@N@X@m@5@^@P@", �$,1;6;A;#;?;,;G,
+ �$,1AFAzB4AvB=B AqB*, �$,1<U<C<5<m<5<N<m, �$,1=h=n=x>-=U=~=p=B, �$(7"7"!#C!;"E"S"G!;"7"2"[!;"D"["#"G!>
+ South East Asia: �$,1\'\f\:\V\4\?\]\:, �(1JP:R-4U, �$,1H9H$HZHYH"H<HLH5HK, �,TJGQJ4U$CQ:, Ch�,1`o b�,1Un
+ East Asia: �$ADc:C, �$(0*/=(, こんにちは, �$(C>H3gGO<<?d
+ Misc: E�,C6o�,C~an�,Cxo �,Cfiu�,C<a�,C}de, �$,2(3(1('('(5, �$,1x p �$,1x( world �$,1s" hello p �$,2!a
+ CJK variety: GB(�$AT*Fx,�$A?*7"), BIG5(�$(0&x86,�$(0DeBv), JIS(元気,開発), KSC(�$(Cj*Q(,�$(CKR[!)
+ Unicode charset: E�$,1 Eo�$,1 }an�$,1 =o �$,1 )iu�$,1 Ua�$,1!-de, �$,1&s'5'9', �$,1'C'1'B, �$,1-),|,u,}, �$,1(7(T(`(P(R(a(b(R(c(Y(b(U!
----------------------------------------------------------
-Amharic (�$(3"c!<!N"^) �$(3!A!,!>
-Arabic (�[2]�,GIqjHQYdG�[0]) �[2]�,GecjdY�[0] �[2]�,GeGdqSdG�[0]
-Croatian (Hrvatski) Bog (Bok), Dobar dan
-Czech (�,Bhesky) Dobr�,B} den
-Danish (Dansk) Hej, Goddag
-English Hello
-Esperanto Saluton
-Estonian Tere, Tervist
-FORTRAN PROGRAM
-Finnish (Suomi) Hei
-French (Fran�,Agais) Bonjour, Salut
-German (Deutsch Nord) Guten Tag
-German (Deutsch S�,A|d) Gr�,A|_ Gott
-Greek (�,FEkkgmij\) �,FCei\ �,Fsar
-Hebrew �[2]�,Hylem�[0]
-Irish (Gaeilge) Dia duit, Cad �,Ai mar a t�,Aa t�,Az?
-Italiano Ciao, Buon giorno
-Maltese Ciao
-Nederlands, Vlaams Hallo, Hoi, Goedendag
-Norwegian (Norsk) Hei, God dag
-Polish Cze�,B6f!
-Russian (�,L@caaZXY) �,L7T`PRabRcYbU!
-Slovak Dobr�,B} de�,Br
-Spanish (Espa�,Aqol) �,A!Hola!
-Swedish (Svenska) Hej, Goddag
-Tajik �,LAP[^\
-
-Tigrigna (�$(3"8#r!N"^) �$(3!Q!,!<"8
+LANGUAGE (NATIVE NAME) HELLO
+---------------------- -----
+Amharic (�$,1O M[MmN{) �$,1M`MKM]
+Arabic �$,1ro(�$,1-g.$-y-q-h.*.1-i) �$,1-g.$-s.1.$-g.% �$,1-y.$.*.#.%
+Bengali (�$,17,7>6b727>) �$,17(7.787M6u7>70
+Braille �$,2(3(1('('(5
+Burmese (�$,1H9H\H4HZH9HL) �$,1H9H$HZHYH"H<HLH5HK
+C printf ("Hello, world!\n");
+Czech (�,Bhe�,B9tina) Dobr�,A} den
+Danish (dansk) Hej / Goddag / Hall�,Axj
+Dutch (Nederlands) Hallo / Dag
+Emacs emacs --no-splash -f view-hello-file
+English /�$(O+S�,0!�,D?�$(O*yl�,0!�$(O*h/ Hello
+Esperanto Saluton (E�,C6o�,C~an�,Cxo �,Cfiu�,C<a�,C}de)
+Estonian (eesti keel) Tere p�,Adevast / Tere �,Auhtust
+Finnish (suomi) Hei / Hyv�,Add p�,Adiv�,Add
+French (fran�,Agais) Bonjour / Salut
+Georgian (�$,1JEJ0J@J7J5J4J:J8) �$,1J2J0J;J0J@JOJ=J1J0
+German (Deutsch) Guten Tag / Gr�,A|_ Gott
+Greek (�,Fekkgmij\) �,FCei\ �,Fsar
+Gujarati (�$,19W:!9\9p9~9d: ) �$,19h9n9x:-9d:'
+Hebrew �$,1ro(�$,1-",q-(,y-*) �,Hylem
+Hungarian (magyar) Sz�,Bip j�,Bs napot!
+Hindi (�$,15y55B5f6 ) �$,15h5n5x6-5d6' / �$,15h5n5x6-5U5~5p �$,16D
+Italian (italiano) Ciao / Buon giorno
+Javanese (Jawa) System.out.println("Sugeng siang!");
+Kannada (�$,1>u?(?M?(?!) �$,1?(?.?8?M>u?>?0
+Khmer (�$,1\7\V\?\V\!\r\8\b\:) �$,1\'\f\:\V\4\?\]\:
+Lao (�(1>RJRERG) �(1JP:R-4U / �(1"mcKib*!4U
+Malayalam (�$,1@N@R@O@^@S@") �$,1@H@N@X@m@5@^@P@"
+Maltese (il-Malti) Bon�,Cuu / Sa�,C11a
+Mathematics �$,1x p �$,1x( world �$,1s" hello p �$,2!a
+Nederlands, Vlaams Hallo / Dag
+Norwegian (norsk) Hei / God dag
+Oriya (�$,1:s;\;?:f) �$,1;6;A;#;?;,;G
+Polish (j�,Bjzyk polski) Dzie�,Bq dobry! / Cze�,B6f!
+Russian (�,L`caaZXY) �,L7T`P�$(O+Z�,LRabRcYbU!
+Sinhala (�$,1B#B2ABB$A}) �$,1AFAzB4AvB=B AqB*
+Slovak (sloven�,Bhina) Dobr�,A} de�,Br
+Slovenian (sloven�,B9hina) Pozdravljeni!
+Spanish (espa�,Aqol) �,A!Hola!
+Swedish (p�,Ae svenska) Hej / Goddag / Hall�,Ae
+Tamil (�$,1<D<N<_<T<m) �$,1<U<C<5<m<5<N<m
+Telugu (�$,1=d>&=r>!=W>!) �$,1=h=n=x>-=U=~=p=B
+Thai (�,T@RIRd7B) �,TJGQJ4U$CQ: / �,TJGQJ4U$hP
+Tibetan (�$(7"7"]"2!;"G#!"2!;) �$(7"7"!#C!;"E"S"G!;"7"2"[!;"D"["#"G!>
+Tigrigna (�$,1NUP-MmN{) �$,1MpMKM[NU
Turkish (T�,A|rk�,Age) Merhaba
-Vietnamese (Ti�,1*ng Vi�,1.t) Ch�,1`o b�,1Un
+Ukrainian (�,LcZ`Pw]alZP) �,L2vbPn
+Vietnamese (ti�,1*ng Vi�,1.t) Ch�,A`o b�,1Un
-Japanese (日本語) こんにちは, ｺﾝﾆﾁﾊ, 騏�え堤�
+Japanese (日本語) こんにちは / ｺﾝﾆﾁﾊ
Chinese (�$AVPND,�$AFUM(;0,�$A::So) �$ADc:C
-Cantonese (�$(0GnM$,�$(0N]0*Hd) �$(0*/=(, �$(0+$)p
-Hangul (�$(CGQ1[) �$(C>H3gGO<<?d, �$(C>H3gGO=J4O1n
+Cantonese (�$(0GnM$,�$(0N]0*Hd) �$(0*/=(, �$(0+$)p
+Korean (�$(CGQ1[) �$(C>H3gGO<<?d / �$(C>H3gGO=J4O1n
+
+
+
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ Free Software Foundation, Inc.
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
-Difference among chinese characters in GB, JIS, KSC, BIG5:
- GB -- �$AT*Fx �$A?*7"
- JIS -- 元気 開発
- KSC -- �$(Cj*Q( �$(CKR[!
- BIG5 -- �$(0&x86 �$(0DeBv
+;;; Local Variables:
+;;; tab-width: 32
+;;; bidi-display-reordering: t
+;;; End:
diff --text -u 'xemacs-21.5.30/etc/NEWS' 'xemacs-21.5.31/etc/NEWS'
Index: ./etc/NEWS
--- ./etc/NEWS Wed Apr 27 00:57:25 2011
+++ ./etc/NEWS Fri Apr 29 22:31:05 2011
@@ -1,4 +1,27 @@
-*- mode:outline -*-
+
+Copyright (C) 1998-2000 Hrvoje Niksic
+Copyright (C) 2000-2001 Michael Sperber
+Copyright (C) 2001 Ben Wing
+Copyright (C) 2001 Didier Verna
+Copyright (C) 2004 Stephen Turnbull
+Copyright (C) 2005-2006 Aidan Kehoe
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
* Introduction
==============
diff --text -u 'xemacs-21.5.30/etc/ONEWS' 'xemacs-21.5.31/etc/ONEWS'
Index: ./etc/ONEWS
--- ./etc/ONEWS Wed Apr 27 00:57:25 2011
+++ ./etc/ONEWS Fri Apr 29 22:31:05 2011
@@ -1,4 +1,22 @@
-*- mode:outline -*-
+
+Copyright (C) 1996-1997 Steve Baur
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
* Changes in XEmacs 20.4
========================
diff --text -u 'xemacs-21.5.30/etc/OONEWS' 'xemacs-21.5.31/etc/OONEWS'
Index: ./etc/OONEWS
--- ./etc/OONEWS Wed Apr 27 00:57:25 2011
+++ ./etc/OONEWS Fri Apr 29 22:31:05 2011
@@ -1,7 +1,28 @@
+
-*- mode:outline; minor-mode:outl-mouse -*-
C-c TAB This shows subheadings (if any) of current heading.
C-c C-s Show _all_ the text and headings under current heading
+Copyright (C) 1992-1994 Free Software Foundation, Inc.
+Copyright (C) 1995-1996 Chuck Thompson
+Copyright (C) 1996-1997 Steve Baur
+Copyright (C) 1997 Hrvoje Niksic
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
* Introduction
==============
diff --text -u 'xemacs-21.5.30/etc/bundled-packages/README' 'xemacs-21.5.31/etc/bundled-packages/README'
Index: ./etc/bundled-packages/README
--- ./etc/bundled-packages/README Wed Apr 27 00:57:25 2011
+++ ./etc/bundled-packages/README Fri Apr 29 22:31:05 2011
@@ -1,3 +1,21 @@
+Copyright 2007 Free Software Foundation
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
+
Package distributions may be placed in this directory.
If present and a package-path is configured, packages can be installed
using the top-level Makefile.
diff --text -u 'xemacs-21.5.30/etc/bundled-packages/test.sh' 'xemacs-21.5.31/etc/bundled-packages/test.sh'
Index: ./etc/bundled-packages/test.sh
--- ./etc/bundled-packages/test.sh Wed Apr 27 00:57:25 2011
+++ ./etc/bundled-packages/test.sh Fri Apr 29 22:31:05 2011
@@ -1,5 +1,22 @@
# tests for the bundled packages feature
+# Copyright 2007 Free Software Foundation
+
+# This file is part of XEmacs.
+
+# XEmacs is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+
+# XEmacs is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
# usage: sh etc/bundled-packages/tests.sh [TMP_TEST_DIR]
# Always run this script from the top directory of the source tree.
diff --text -u 'xemacs-21.5.30/etc/custom/check0.xpm' 'xemacs-21.5.31/etc/custom/check0.xpm'
Index: ./etc/custom/check0.xpm
--- ./etc/custom/check0.xpm Wed Apr 27 00:57:25 2011
+++ ./etc/custom/check0.xpm Fri Apr 29 22:31:05 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * check0_xpm[] = {
"11 11 3 1",
" c #E6E6E6E6E6E6",
diff --text -u 'xemacs-21.5.30/etc/custom/check1.xpm' 'xemacs-21.5.31/etc/custom/check1.xpm'
Index: ./etc/custom/check1.xpm
--- ./etc/custom/check1.xpm Wed Apr 27 00:57:25 2011
+++ ./etc/custom/check1.xpm Fri Apr 29 22:31:05 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * check1_xpm[] = {
"11 11 3 1",
" c #737373737373",
diff --text -u 'xemacs-21.5.30/etc/custom/down-pushed.xpm' 'xemacs-21.5.31/etc/custom/down-pushed.xpm'
Index: ./etc/custom/down-pushed.xpm
--- ./etc/custom/down-pushed.xpm Wed Apr 27 00:57:25 2011
+++ ./etc/custom/down-pushed.xpm Fri Apr 29 22:31:05 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * down[] = {
"10 10 5 1",
" c Gray40",
@@ -15,4 +31,4 @@
"ooo..XXooo",
"ooo..XXooo",
"oooo.Xoooo",
-"oooo.Xoooo"};
\ No newline at end of file
+"oooo.Xoooo"};
diff --text -u 'xemacs-21.5.30/etc/custom/down.xpm' 'xemacs-21.5.31/etc/custom/down.xpm'
Index: ./etc/custom/down.xpm
--- ./etc/custom/down.xpm Wed Apr 27 00:57:25 2011
+++ ./etc/custom/down.xpm Fri Apr 29 22:31:05 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * down_xpm[] = {
"10 10 5 1",
" c Gray90",
diff --text -u 'xemacs-21.5.30/etc/custom/example-themes/europe-theme.el' 'xemacs-21.5.31/etc/custom/example-themes/europe-theme.el'
Index: ./etc/custom/example-themes/europe-theme.el
--- ./etc/custom/example-themes/europe-theme.el Wed Apr 27 00:57:25 2011
+++ ./etc/custom/example-themes/europe-theme.el Fri Apr 29 22:31:05 2011
@@ -6,20 +6,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
-;; MA 02110-1301, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;;autoload
(deftheme europe
diff --text -u 'xemacs-21.5.30/etc/custom/example-themes/example-theme.el' 'xemacs-21.5.31/etc/custom/example-themes/example-theme.el'
Index: ./etc/custom/example-themes/example-theme.el
--- ./etc/custom/example-themes/example-theme.el Wed Apr 27 00:57:25 2011
+++ ./etc/custom/example-themes/example-theme.el Fri Apr 29 22:31:05 2011
@@ -6,20 +6,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
-;; MA 02110-1301, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;;autoload
(deftheme example
diff --text -u 'xemacs-21.5.30/etc/custom/face.xpm' 'xemacs-21.5.31/etc/custom/face.xpm'
Index: ./etc/custom/face.xpm
--- ./etc/custom/face.xpm Wed Apr 27 00:57:25 2011
+++ ./etc/custom/face.xpm Fri Apr 29 22:31:05 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char *face[] = {
/* width height num_colors chars_per_pixel */
" 17 17 4 1",
diff --text -u 'xemacs-21.5.30/etc/custom/folder.xpm' 'xemacs-21.5.31/etc/custom/folder.xpm'
Index: ./etc/custom/folder.xpm
--- ./etc/custom/folder.xpm Wed Apr 27 00:57:25 2011
+++ ./etc/custom/folder.xpm Fri Apr 29 22:31:05 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char *folder[] = {
/* width height num_colors chars_per_pixel */
" 17 17 4 1",
diff --text -u 'xemacs-21.5.30/etc/custom/option.xpm' 'xemacs-21.5.31/etc/custom/option.xpm'
Index: ./etc/custom/option.xpm
--- ./etc/custom/option.xpm Wed Apr 27 00:57:25 2011
+++ ./etc/custom/option.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char *option[] = {
/* width height num_colors chars_per_pixel */
" 17 17 4 1",
diff --text -u 'xemacs-21.5.30/etc/custom/radio0.xpm' 'xemacs-21.5.31/etc/custom/radio0.xpm'
Index: ./etc/custom/radio0.xpm
--- ./etc/custom/radio0.xpm Wed Apr 27 00:57:25 2011
+++ ./etc/custom/radio0.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * radio0_xpm[] = {
"12 11 4 1",
" c #FFFFFFFFFFFF s background",
diff --text -u 'xemacs-21.5.30/etc/custom/radio1.xpm' 'xemacs-21.5.31/etc/custom/radio1.xpm'
Index: ./etc/custom/radio1.xpm
--- ./etc/custom/radio1.xpm Wed Apr 27 00:57:25 2011
+++ ./etc/custom/radio1.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * radio1_xpm[] = {
"12 11 4 1",
" c #FFFFFFFFFFFF s background",
diff --text -u 'xemacs-21.5.30/etc/custom/right-pushed.xpm' 'xemacs-21.5.31/etc/custom/right-pushed.xpm'
Index: ./etc/custom/right-pushed.xpm
--- ./etc/custom/right-pushed.xpm Wed Apr 27 00:57:25 2011
+++ ./etc/custom/right-pushed.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * right_xpm[] = {
"10 10 5 1",
" c Gray40",
diff --text -u 'xemacs-21.5.30/etc/custom/right.xpm' 'xemacs-21.5.31/etc/custom/right.xpm'
Index: ./etc/custom/right.xpm
--- ./etc/custom/right.xpm Wed Apr 27 00:57:25 2011
+++ ./etc/custom/right.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * right_xpm[] = {
"10 10 5 1",
" c Gray90",
diff --text -u 'xemacs-21.5.30/etc/dbxrc.in' 'xemacs-21.5.31/etc/dbxrc.in'
Index: ./etc/dbxrc.in
--- ./etc/dbxrc.in Wed Apr 27 00:57:25 2011
+++ ./etc/dbxrc.in Fri Apr 29 22:31:06 2011
@@ -8,10 +8,10 @@
## This file is part of XEmacs.
-## XEmacs is free software; you can redistribute it and/or modify it
+## XEmacs is free software: you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by the
-## Free Software Foundation; either version 2, or (at your option) any
-## later version.
+## Free Software Foundation, either version 3 of the License, or (at your
+## option) any later version.
## XEmacs is distributed in the hope that it will be useful, but WITHOUT
## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,9 +19,7 @@
## for more details.
## You should have received a copy of the GNU General Public License
-## along with XEmacs; see the file COPYING. If not, write to
-## the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-## Boston, MA 02110-1301 USA
+## along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
## Author: Martin Buchholz
diff --text -u 'xemacs-21.5.30/etc/eos/eos-build.xbm' 'xemacs-21.5.31/etc/eos/eos-build.xbm'
Index: ./etc/eos/eos-build.xbm
--- ./etc/eos/eos-build.xbm Wed Apr 27 00:57:25 2011
+++ ./etc/eos/eos-build.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/eos/eos-clear-at.xbm' 'xemacs-21.5.31/etc/eos/eos-clear-at.xbm'
Index: ./etc/eos/eos-clear-at.xbm
--- ./etc/eos/eos-clear-at.xbm Wed Apr 27 00:57:25 2011
+++ ./etc/eos/eos-clear-at.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/eos/eos-cont.xbm' 'xemacs-21.5.31/etc/eos/eos-cont.xbm'
Index: ./etc/eos/eos-cont.xbm
--- ./etc/eos/eos-cont.xbm Wed Apr 27 00:57:25 2011
+++ ./etc/eos/eos-cont.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/eos/eos-dismiss.xbm' 'xemacs-21.5.31/etc/eos/eos-dismiss.xbm'
Index: ./etc/eos/eos-dismiss.xbm
--- ./etc/eos/eos-dismiss.xbm Wed Apr 27 00:57:25 2011
+++ ./etc/eos/eos-dismiss.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/eos/eos-down.xbm' 'xemacs-21.5.31/etc/eos/eos-down.xbm'
Index: ./etc/eos/eos-down.xbm
--- ./etc/eos/eos-down.xbm Wed Apr 27 00:57:25 2011
+++ ./etc/eos/eos-down.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/eos/eos-evaluate-star.xbm' 'xemacs-21.5.31/etc/eos/eos-evaluate-star.xbm'
Index: ./etc/eos/eos-evaluate-star.xbm
--- ./etc/eos/eos-evaluate-star.xbm Wed Apr 27 00:57:25 2011
+++ ./etc/eos/eos-evaluate-star.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/eos/eos-evaluate.xbm' 'xemacs-21.5.31/etc/eos/eos-evaluate.xbm'
Index: ./etc/eos/eos-evaluate.xbm
--- ./etc/eos/eos-evaluate.xbm Wed Apr 27 00:57:25 2011
+++ ./etc/eos/eos-evaluate.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/eos/eos-fix.xbm' 'xemacs-21.5.31/etc/eos/eos-fix.xbm'
Index: ./etc/eos/eos-fix.xbm
--- ./etc/eos/eos-fix.xbm Wed Apr 27 00:57:25 2011
+++ ./etc/eos/eos-fix.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/eos/eos-intro.xbm' 'xemacs-21.5.31/etc/eos/eos-intro.xbm'
Index: ./etc/eos/eos-intro.xbm
--- ./etc/eos/eos-intro.xbm Wed Apr 27 00:57:25 2011
+++ ./etc/eos/eos-intro.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/eos/eos-introB.xbm' 'xemacs-21.5.31/etc/eos/eos-introB.xbm'
Index: ./etc/eos/eos-introB.xbm
--- ./etc/eos/eos-introB.xbm Wed Apr 27 00:57:25 2011
+++ ./etc/eos/eos-introB.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/eos/eos-introD.xbm' 'xemacs-21.5.31/etc/eos/eos-introD.xbm'
Index: ./etc/eos/eos-introD.xbm
--- ./etc/eos/eos-introD.xbm Wed Apr 27 00:57:25 2011
+++ ./etc/eos/eos-introD.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/eos/eos-introDB.xbm' 'xemacs-21.5.31/etc/eos/eos-introDB.xbm'
Index: ./etc/eos/eos-introDB.xbm
--- ./etc/eos/eos-introDB.xbm Wed Apr 27 00:57:25 2011
+++ ./etc/eos/eos-introDB.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/eos/eos-run.xbm' 'xemacs-21.5.31/etc/eos/eos-run.xbm'
Index: ./etc/eos/eos-run.xbm
--- ./etc/eos/eos-run.xbm Wed Apr 27 00:57:25 2011
+++ ./etc/eos/eos-run.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/eos/eos-run2.xbm' 'xemacs-21.5.31/etc/eos/eos-run2.xbm'
Index: ./etc/eos/eos-run2.xbm
--- ./etc/eos/eos-run2.xbm Wed Apr 27 00:57:25 2011
+++ ./etc/eos/eos-run2.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/eos/eos-step-into.xbm' 'xemacs-21.5.31/etc/eos/eos-step-into.xbm'
Index: ./etc/eos/eos-step-into.xbm
--- ./etc/eos/eos-step-into.xbm Wed Apr 27 00:57:25 2011
+++ ./etc/eos/eos-step-into.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/eos/eos-step-over.xbm' 'xemacs-21.5.31/etc/eos/eos-step-over.xbm'
Index: ./etc/eos/eos-step-over.xbm
--- ./etc/eos/eos-step-over.xbm Wed Apr 27 00:57:25 2011
+++ ./etc/eos/eos-step-over.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/eos/eos-stop-in.xbm' 'xemacs-21.5.31/etc/eos/eos-stop-in.xbm'
Index: ./etc/eos/eos-stop-in.xbm
--- ./etc/eos/eos-stop-in.xbm Wed Apr 27 00:57:25 2011
+++ ./etc/eos/eos-stop-in.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/eos/eos-stop.xbm' 'xemacs-21.5.31/etc/eos/eos-stop.xbm'
Index: ./etc/eos/eos-stop.xbm
--- ./etc/eos/eos-stop.xbm Wed Apr 27 00:57:25 2011
+++ ./etc/eos/eos-stop.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/eos/eos-type.xbm' 'xemacs-21.5.31/etc/eos/eos-type.xbm'
Index: ./etc/eos/eos-type.xbm
--- ./etc/eos/eos-type.xbm Wed Apr 27 00:57:25 2011
+++ ./etc/eos/eos-type.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/eos/eos-up.xbm' 'xemacs-21.5.31/etc/eos/eos-up.xbm'
Index: ./etc/eos/eos-up.xbm
--- ./etc/eos/eos-up.xbm Wed Apr 27 00:57:25 2011
+++ ./etc/eos/eos-up.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/gnuserv.1' 'xemacs-21.5.31/etc/gnuserv.1'
Index: ./etc/gnuserv.1
--- ./etc/gnuserv.1 Wed Apr 27 00:57:25 2011
+++ ./etc/gnuserv.1 Fri Apr 29 22:31:06 2011
@@ -297,3 +297,26 @@
18.52 distribution. Various modifications from Bob Weiner (weiner@mot.com),
Darrell Kindred (dkindred@cmu.edu), Arup Mukherjee (arup@cmu.edu), Ben
Wing (ben@xemacs.org) and Hrvoje Niksic (hniksic@xemacs.org).
+
+.SH COPYING
+Copyright
+.if t \(co
+.if n (C)
+1998 Andy Norman, Bob Weiner, Darrell Kindred, Arup Mukherjee, Ben
+Wing and Hrvoje Niksic.
+
+.PP
+This file is part of XEmacs.
+.PP
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+.PP
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+.PP
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
diff --text -u 'xemacs-21.5.30/etc/gnuserv.README' 'xemacs-21.5.31/etc/gnuserv.README'
Index: ./etc/gnuserv.README
--- ./etc/gnuserv.README Wed Apr 27 00:57:25 2011
+++ ./etc/gnuserv.README Fri Apr 29 22:31:06 2011
@@ -2,6 +2,25 @@
This file was never meant to be proper documentation, and now is bitrotted.
See the file gnuserv.1 and/or the sources for more information.
+Copyright (C) 1998 Andy Norman, Bob Weiner, Darrell Kindred,
+ Arup Mukherjee, Ben Wing and Hrvoje Niksic.
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
+
****
NOTE: This version of gnuserv has some enhancements over the original version
distributed by Andy Norman. See the end of this file for more details.
diff --text -u 'xemacs-21.5.30/etc/gray1.xbm' 'xemacs-21.5.31/etc/gray1.xbm'
Index: ./etc/gray1.xbm
--- ./etc/gray1.xbm Wed Apr 27 00:57:25 2011
+++ ./etc/gray1.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define bg2_width 16
#define bg2_height 16
static char bg2_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/gtkrc' 'xemacs-21.5.31/etc/gtkrc'
Index: ./etc/gtkrc
--- ./etc/gtkrc Wed Apr 27 00:57:25 2011
+++ ./etc/gtkrc Fri Apr 29 22:31:06 2011
@@ -1,6 +1,11 @@
# Force the window background to be the same as the default face background:
# white.
+# Copyright 1999 Malcolm Purvis
+# This file is part of XEmacs, licensed to you under the GNU
+# General Public License, version 3 or later at your option.
+# There is NO WARRANTY, explicit or implied, on this file.
+
style "default_background"
{
bg[NORMAL] = { 1.0, 1.0, 1.0 }
diff --text -u 'xemacs-21.5.30/etc/recycle.xpm' 'xemacs-21.5.31/etc/recycle.xpm'
Index: ./etc/recycle.xpm
--- ./etc/recycle.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/recycle.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
/* A recycle logo, artist unknown, converted to xpm by jwz */
static char *recycle[] = {
/* width height ncolors chars_per_pixel x_hot y_hot */
diff --text -u 'xemacs-21.5.30/etc/recycle2.xpm' 'xemacs-21.5.31/etc/recycle2.xpm'
Index: ./etc/recycle2.xpm
--- ./etc/recycle2.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/recycle2.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * recycle2_xpm[] = {
/* width height ncolors cpp [x_hot y_hot] */
"32 32 4 1 26 23",
diff --text -u 'xemacs-21.5.30/etc/refcard.tex' 'xemacs-21.5.31/etc/refcard.tex'
Index: ./etc/refcard.tex
--- ./etc/refcard.tex Wed Apr 27 00:57:26 2011
+++ ./etc/refcard.tex Fri Apr 29 22:31:06 2011
@@ -12,19 +12,18 @@
% This file is part of XEmacs.
-% XEmacs is free software; you can redistribute it and/or modify
-% it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 1, or (at your option)
-% any later version.
-
-% XEmacs is distributed in the hope that it will be useful,
-% but WITHOUT ANY WARRANTY; without even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-% GNU General Public License for more details.
+% XEmacs is free software: you can redistribute it and/or modify it
+% under the terms of the GNU General Public License as published by the
+% Free Software Foundation, either version 3 of the License, or (at your
+% option) any later version.
+
+% XEmacs is distributed in the hope that it will be useful, but WITHOUT
+% ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+% FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+% for more details.
% You should have received a copy of the GNU General Public License
-% along with XEmacs; see the file COPYING. If not, write to
-% the Free Software Foundation, 675 Mass Ave, Cambridge MA 02139, USA.
+% along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
% This file is intended to be processed by plain TeX (TeX82).
%
@@ -70,9 +69,9 @@
this card provided the copyright notice and this permission notice
are preserved on all copies.
-For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.
+For copies of the GNU Emacs manual, see:
+
+{\tt http://www.gnu.org/software/emacs/\#Manuals}
\endgroup}
diff --text -u 'xemacs-21.5.30/etc/sample.Xresources' 'xemacs-21.5.31/etc/sample.Xresources'
Index: ./etc/sample.Xresources
--- ./etc/sample.Xresources Wed Apr 27 00:57:26 2011
+++ ./etc/sample.Xresources Fri Apr 29 22:31:06 2011
@@ -1,7 +1,30 @@
-! This is a sample .Xresources file. The resources below are the
-! actual resources used as defaults for XEmacs, although the
-! form of these resources in the XEmacs app-defaults file is
-! slightly different.
+! This is a sample .Xresources file.
+
+! Copyright (C) 1997 Steven L Baur
+! Copyright (C) 1999 Alexandre Oliva
+! Copyright (C) 2002 Giacomo Boffi
+! Copyright (C) 2003 Stephen J. Turnbull
+! Copyright (C) 2005 Aidan Kehoe
+
+! This file is part of XEmacs.
+
+! XEmacs is free software: you can redistribute it and/or modify it
+! under the terms of the GNU General Public License as published by the
+! Free Software Foundation, either version 3 of the License, or (at your
+! option) any later version.
+
+! XEmacs is distributed in the hope that it will be useful, but WITHOUT
+! ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+! FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+! for more details.
+
+! You should have received a copy of the GNU General Public License
+! along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
+
+! The resources below are the actual resources used as defaults for
+! XEmacs, although the form of these resources in the XEmacs
+! app-defaults file is slightly different.
!
! You can use the examples below as a basis for your own customizations:
! copy and modify any of the resources below into your own ~/.Xresources file.
@@ -33,8 +56,8 @@
! The default face colors are the base for most of the other faces'
! colors. The default background is gray80, and the default foreground
! is black.
-XEmacs.default.attributeBackground: gray80
-XEmacs.default.attributeForeground: black
+XEmacs.default.attributeBackground: gray80
+! XEmacs.default.attributeForeground: black
! Set the modeline colors.
XEmacs.modeline*attributeForeground: Black
diff --text -u 'xemacs-21.5.30/etc/sample.init.el' 'xemacs-21.5.31/etc/sample.init.el'
Index: ./etc/sample.init.el
--- ./etc/sample.init.el Wed Apr 27 00:57:26 2011
+++ ./etc/sample.init.el Fri Apr 29 22:31:06 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;; #### to do:
;; -- scan for #### markers and fix the problems noted there.
diff --text -u 'xemacs-21.5.30/etc/tests/external-widget/Makefile' 'xemacs-21.5.31/etc/tests/external-widget/Makefile'
Index: ./etc/tests/external-widget/Makefile
--- ./etc/tests/external-widget/Makefile Wed Apr 27 00:57:26 2011
+++ ./etc/tests/external-widget/Makefile Fri Apr 29 22:31:06 2011
@@ -3,10 +3,10 @@
## This file is part of XEmacs.
-## XEmacs is free software; you can redistribute it and/or modify it
+## XEmacs is free software: you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by the
-## Free Software Foundation; either version 2, or (at your option) any
-## later version.
+## Free Software Foundation, either version 3 of the License, or (at your
+## option) any later version.
## XEmacs is distributed in the hope that it will be useful, but WITHOUT
## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
## for more details.
## You should have received a copy of the GNU General Public License
-## along with XEmacs; see the file COPYING. If not, write to
-## the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-## Boston, MA 02110-1301, USA.
+## along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
CFLAGS += -Xc -g -DTOOLTALK
EMACSHOME = ../../..
diff --text -u 'xemacs-21.5.30/etc/tests/external-widget/test-ew-motif.c' 'xemacs-21.5.31/etc/tests/external-widget/test-ew-motif.c'
Index: ./etc/tests/external-widget/test-ew-motif.c
--- ./etc/tests/external-widget/test-ew-motif.c Wed Apr 27 00:57:26 2011
+++ ./etc/tests/external-widget/test-ew-motif.c Fri Apr 29 22:31:06 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#include <Xm/Xm.h>
#include <Xm/RowColumn.h>
diff --text -u 'xemacs-21.5.30/etc/tests/external-widget/test-ew-xlib.c' 'xemacs-21.5.31/etc/tests/external-widget/test-ew-xlib.c'
Index: ./etc/tests/external-widget/test-ew-xlib.c
--- ./etc/tests/external-widget/test-ew-xlib.c Wed Apr 27 00:57:26 2011
+++ ./etc/tests/external-widget/test-ew-xlib.c Fri Apr 29 22:31:06 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#include <X11/Xlib.h>
#include <X11/Xutil.h>
diff --text -u 'xemacs-21.5.30/etc/toolbar/compile-cap-up.xpm' 'xemacs-21.5.31/etc/toolbar/compile-cap-up.xpm'
Index: ./etc/toolbar/compile-cap-up.xpm
--- ./etc/toolbar/compile-cap-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/compile-cap-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * makefile[] = {
"33 33 7 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/compile-cap-xx.xpm' 'xemacs-21.5.31/etc/toolbar/compile-cap-xx.xpm'
Index: ./etc/toolbar/compile-cap-xx.xpm
--- ./etc/toolbar/compile-cap-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/compile-cap-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * makefile[] = {
"33 33 6 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/compile-dn.xbm' 'xemacs-21.5.31/etc/toolbar/compile-dn.xbm'
Index: ./etc/toolbar/compile-dn.xbm
--- ./etc/toolbar/compile-dn.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/compile-dn.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/compile-up.xbm' 'xemacs-21.5.31/etc/toolbar/compile-up.xbm'
Index: ./etc/toolbar/compile-up.xbm
--- ./etc/toolbar/compile-up.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/compile-up.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/compile-up.xpm' 'xemacs-21.5.31/etc/toolbar/compile-up.xpm'
Index: ./etc/toolbar/compile-up.xpm
--- ./etc/toolbar/compile-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/compile-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * makefile[] = {
"28 28 6 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/compile-xx.xbm' 'xemacs-21.5.31/etc/toolbar/compile-xx.xbm'
Index: ./etc/toolbar/compile-xx.xbm
--- ./etc/toolbar/compile-xx.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/compile-xx.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/compile-xx.xpm' 'xemacs-21.5.31/etc/toolbar/compile-xx.xpm'
Index: ./etc/toolbar/compile-xx.xpm
--- ./etc/toolbar/compile-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/compile-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * makefile[] = {
"28 28 6 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/copy-cap-up.xpm' 'xemacs-21.5.31/etc/toolbar/copy-cap-up.xpm'
Index: ./etc/toolbar/copy-cap-up.xpm
--- ./etc/toolbar/copy-cap-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/copy-cap-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * copy[] = {
"33 33 5 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/copy-cap-xx.xpm' 'xemacs-21.5.31/etc/toolbar/copy-cap-xx.xpm'
Index: ./etc/toolbar/copy-cap-xx.xpm
--- ./etc/toolbar/copy-cap-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/copy-cap-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * copy[] = {
"33 33 4 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/copy-dn.xbm' 'xemacs-21.5.31/etc/toolbar/copy-dn.xbm'
Index: ./etc/toolbar/copy-dn.xbm
--- ./etc/toolbar/copy-dn.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/copy-dn.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/copy-up.xbm' 'xemacs-21.5.31/etc/toolbar/copy-up.xbm'
Index: ./etc/toolbar/copy-up.xbm
--- ./etc/toolbar/copy-up.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/copy-up.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/copy-up.xpm' 'xemacs-21.5.31/etc/toolbar/copy-up.xpm'
Index: ./etc/toolbar/copy-up.xpm
--- ./etc/toolbar/copy-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/copy-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * copy[] = {
"28 28 4 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/copy-xx.xbm' 'xemacs-21.5.31/etc/toolbar/copy-xx.xbm'
Index: ./etc/toolbar/copy-xx.xbm
--- ./etc/toolbar/copy-xx.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/copy-xx.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/copy-xx.xpm' 'xemacs-21.5.31/etc/toolbar/copy-xx.xpm'
Index: ./etc/toolbar/copy-xx.xpm
--- ./etc/toolbar/copy-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/copy-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * copy[] = {
"28 28 4 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/cut-cap-up.xpm' 'xemacs-21.5.31/etc/toolbar/cut-cap-up.xpm'
Index: ./etc/toolbar/cut-cap-up.xpm
--- ./etc/toolbar/cut-cap-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/cut-cap-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * cut[] = {
"33 33 4 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/cut-cap-xx.xpm' 'xemacs-21.5.31/etc/toolbar/cut-cap-xx.xpm'
Index: ./etc/toolbar/cut-cap-xx.xpm
--- ./etc/toolbar/cut-cap-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/cut-cap-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * cut[] = {
"33 33 4 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/cut-dn.xbm' 'xemacs-21.5.31/etc/toolbar/cut-dn.xbm'
Index: ./etc/toolbar/cut-dn.xbm
--- ./etc/toolbar/cut-dn.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/cut-dn.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/cut-up.xbm' 'xemacs-21.5.31/etc/toolbar/cut-up.xbm'
Index: ./etc/toolbar/cut-up.xbm
--- ./etc/toolbar/cut-up.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/cut-up.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/cut-up.xpm' 'xemacs-21.5.31/etc/toolbar/cut-up.xpm'
Index: ./etc/toolbar/cut-up.xpm
--- ./etc/toolbar/cut-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/cut-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * cut[] = {
"28 28 4 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/cut-xx.xbm' 'xemacs-21.5.31/etc/toolbar/cut-xx.xbm'
Index: ./etc/toolbar/cut-xx.xbm
--- ./etc/toolbar/cut-xx.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/cut-xx.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/cut-xx.xpm' 'xemacs-21.5.31/etc/toolbar/cut-xx.xpm'
Index: ./etc/toolbar/cut-xx.xpm
--- ./etc/toolbar/cut-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/cut-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * cut[] = {
"28 28 4 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/debug-cap-up.xpm' 'xemacs-21.5.31/etc/toolbar/debug-cap-up.xpm'
Index: ./etc/toolbar/debug-cap-up.xpm
--- ./etc/toolbar/debug-cap-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/debug-cap-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * bug_xpm[] = {
"33 33 7 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/debug-cap-xx.xpm' 'xemacs-21.5.31/etc/toolbar/debug-cap-xx.xpm'
Index: ./etc/toolbar/debug-cap-xx.xpm
--- ./etc/toolbar/debug-cap-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/debug-cap-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * bug_xpm[] = {
"33 33 6 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/debug-dn.xbm' 'xemacs-21.5.31/etc/toolbar/debug-dn.xbm'
Index: ./etc/toolbar/debug-dn.xbm
--- ./etc/toolbar/debug-dn.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/debug-dn.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/debug-up.xbm' 'xemacs-21.5.31/etc/toolbar/debug-up.xbm'
Index: ./etc/toolbar/debug-up.xbm
--- ./etc/toolbar/debug-up.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/debug-up.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/debug-up.xpm' 'xemacs-21.5.31/etc/toolbar/debug-up.xpm'
Index: ./etc/toolbar/debug-up.xpm
--- ./etc/toolbar/debug-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/debug-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * bug_xpm[] = {
"28 28 6 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/debug-xx.xbm' 'xemacs-21.5.31/etc/toolbar/debug-xx.xbm'
Index: ./etc/toolbar/debug-xx.xbm
--- ./etc/toolbar/debug-xx.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/debug-xx.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/debug-xx.xpm' 'xemacs-21.5.31/etc/toolbar/debug-xx.xpm'
Index: ./etc/toolbar/debug-xx.xpm
--- ./etc/toolbar/debug-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/debug-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * bug_xpm[] = {
"28 28 6 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/disk-cap-up.xpm' 'xemacs-21.5.31/etc/toolbar/disk-cap-up.xpm'
Index: ./etc/toolbar/disk-cap-up.xpm
--- ./etc/toolbar/disk-cap-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/disk-cap-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * disk[] = {
"33 33 6 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/disk-cap-xx.xpm' 'xemacs-21.5.31/etc/toolbar/disk-cap-xx.xpm'
Index: ./etc/toolbar/disk-cap-xx.xpm
--- ./etc/toolbar/disk-cap-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/disk-cap-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * disk[] = {
"33 33 5 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/disk-dn.xbm' 'xemacs-21.5.31/etc/toolbar/disk-dn.xbm'
Index: ./etc/toolbar/disk-dn.xbm
--- ./etc/toolbar/disk-dn.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/disk-dn.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/disk-up.xbm' 'xemacs-21.5.31/etc/toolbar/disk-up.xbm'
Index: ./etc/toolbar/disk-up.xbm
--- ./etc/toolbar/disk-up.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/disk-up.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/disk-up.xpm' 'xemacs-21.5.31/etc/toolbar/disk-up.xpm'
Index: ./etc/toolbar/disk-up.xpm
--- ./etc/toolbar/disk-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/disk-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * disk[] = {
"28 28 5 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/disk-xx.xbm' 'xemacs-21.5.31/etc/toolbar/disk-xx.xbm'
Index: ./etc/toolbar/disk-xx.xbm
--- ./etc/toolbar/disk-xx.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/disk-xx.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/disk-xx.xpm' 'xemacs-21.5.31/etc/toolbar/disk-xx.xpm'
Index: ./etc/toolbar/disk-xx.xpm
--- ./etc/toolbar/disk-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/disk-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * disk[] = {
"28 28 5 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/file-cap-up.xpm' 'xemacs-21.5.31/etc/toolbar/file-cap-up.xpm'
Index: ./etc/toolbar/file-cap-up.xpm
--- ./etc/toolbar/file-cap-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/file-cap-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * file[] = {
"33 33 5 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/file-cap-xx.xpm' 'xemacs-21.5.31/etc/toolbar/file-cap-xx.xpm'
Index: ./etc/toolbar/file-cap-xx.xpm
--- ./etc/toolbar/file-cap-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/file-cap-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * file[] = {
"33 33 4 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/file-dn.xbm' 'xemacs-21.5.31/etc/toolbar/file-dn.xbm'
Index: ./etc/toolbar/file-dn.xbm
--- ./etc/toolbar/file-dn.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/file-dn.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/file-up.xbm' 'xemacs-21.5.31/etc/toolbar/file-up.xbm'
Index: ./etc/toolbar/file-up.xbm
--- ./etc/toolbar/file-up.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/file-up.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/file-up.xpm' 'xemacs-21.5.31/etc/toolbar/file-up.xpm'
Index: ./etc/toolbar/file-up.xpm
--- ./etc/toolbar/file-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/file-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * file[] = {
"28 28 4 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/file-xx.xbm' 'xemacs-21.5.31/etc/toolbar/file-xx.xbm'
Index: ./etc/toolbar/file-xx.xbm
--- ./etc/toolbar/file-xx.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/file-xx.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/file-xx.xpm' 'xemacs-21.5.31/etc/toolbar/file-xx.xpm'
Index: ./etc/toolbar/file-xx.xpm
--- ./etc/toolbar/file-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/file-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * file[] = {
"28 28 4 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/folder-cap-up.xpm' 'xemacs-21.5.31/etc/toolbar/folder-cap-up.xpm'
Index: ./etc/toolbar/folder-cap-up.xpm
--- ./etc/toolbar/folder-cap-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/folder-cap-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * folder[] = {
"33 33 5 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/folder-cap-xx.xpm' 'xemacs-21.5.31/etc/toolbar/folder-cap-xx.xpm'
Index: ./etc/toolbar/folder-cap-xx.xpm
--- ./etc/toolbar/folder-cap-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/folder-cap-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * folder[] = {
"33 33 4 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/folder-dn.xbm' 'xemacs-21.5.31/etc/toolbar/folder-dn.xbm'
Index: ./etc/toolbar/folder-dn.xbm
--- ./etc/toolbar/folder-dn.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/folder-dn.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/folder-up.xbm' 'xemacs-21.5.31/etc/toolbar/folder-up.xbm'
Index: ./etc/toolbar/folder-up.xbm
--- ./etc/toolbar/folder-up.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/folder-up.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/folder-up.xpm' 'xemacs-21.5.31/etc/toolbar/folder-up.xpm'
Index: ./etc/toolbar/folder-up.xpm
--- ./etc/toolbar/folder-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/folder-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * folder[] = {
"28 28 4 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/folder-xx.xbm' 'xemacs-21.5.31/etc/toolbar/folder-xx.xbm'
Index: ./etc/toolbar/folder-xx.xbm
--- ./etc/toolbar/folder-xx.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/folder-xx.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/folder-xx.xpm' 'xemacs-21.5.31/etc/toolbar/folder-xx.xpm'
Index: ./etc/toolbar/folder-xx.xpm
--- ./etc/toolbar/folder-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/folder-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * folder[] = {
"28 28 4 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-def-cap-up.xpm' 'xemacs-21.5.31/etc/toolbar/info-def-cap-up.xpm'
Index: ./etc/toolbar/info-def-cap-up.xpm
--- ./etc/toolbar/info-def-cap-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-def-cap-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * info[] = {
"33 33 2 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-def-cap-xx.xpm' 'xemacs-21.5.31/etc/toolbar/info-def-cap-xx.xpm'
Index: ./etc/toolbar/info-def-cap-xx.xpm
--- ./etc/toolbar/info-def-cap-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-def-cap-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * info[] = {
"33 33 2 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-def-dn.xbm' 'xemacs-21.5.31/etc/toolbar/info-def-dn.xbm'
Index: ./etc/toolbar/info-def-dn.xbm
--- ./etc/toolbar/info-def-dn.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-def-dn.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-def-up.xbm' 'xemacs-21.5.31/etc/toolbar/info-def-up.xbm'
Index: ./etc/toolbar/info-def-up.xbm
--- ./etc/toolbar/info-def-up.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-def-up.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-def-up.xpm' 'xemacs-21.5.31/etc/toolbar/info-def-up.xpm'
Index: ./etc/toolbar/info-def-up.xpm
--- ./etc/toolbar/info-def-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-def-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * info[] = {
"28 28 2 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-def-xx.xbm' 'xemacs-21.5.31/etc/toolbar/info-def-xx.xbm'
Index: ./etc/toolbar/info-def-xx.xbm
--- ./etc/toolbar/info-def-xx.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-def-xx.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-def-xx.xpm' 'xemacs-21.5.31/etc/toolbar/info-def-xx.xpm'
Index: ./etc/toolbar/info-def-xx.xpm
--- ./etc/toolbar/info-def-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-def-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * info[] = {
"28 28 2 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-exit-cap-up.xpm' 'xemacs-21.5.31/etc/toolbar/info-exit-cap-up.xpm'
Index: ./etc/toolbar/info-exit-cap-up.xpm
--- ./etc/toolbar/info-exit-cap-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-exit-cap-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char *exit-up[] = {
/* width height num_colors chars_per_pixel */
"32 32 6 1",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-exit-cap-xx.xpm' 'xemacs-21.5.31/etc/toolbar/info-exit-cap-xx.xpm'
Index: ./etc/toolbar/info-exit-cap-xx.xpm
--- ./etc/toolbar/info-exit-cap-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-exit-cap-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char *exit-up[] = {
/* width height num_colors chars_per_pixel */
"32 32 6 1",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-exit-dn.xbm' 'xemacs-21.5.31/etc/toolbar/info-exit-dn.xbm'
Index: ./etc/toolbar/info-exit-dn.xbm
--- ./etc/toolbar/info-exit-dn.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-exit-dn.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 32
#define noname_height 32
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-exit-up.xbm' 'xemacs-21.5.31/etc/toolbar/info-exit-up.xbm'
Index: ./etc/toolbar/info-exit-up.xbm
--- ./etc/toolbar/info-exit-up.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-exit-up.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 32
#define noname_height 32
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-exit-up.xpm' 'xemacs-21.5.31/etc/toolbar/info-exit-up.xpm'
Index: ./etc/toolbar/info-exit-up.xpm
--- ./etc/toolbar/info-exit-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-exit-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char *exit-up[] = {
/* width height num_colors chars_per_pixel */
"32 32 6 1",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-exit-xx.xbm' 'xemacs-21.5.31/etc/toolbar/info-exit-xx.xbm'
Index: ./etc/toolbar/info-exit-xx.xbm
--- ./etc/toolbar/info-exit-xx.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-exit-xx.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 32
#define noname_height 32
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-exit-xx.xpm' 'xemacs-21.5.31/etc/toolbar/info-exit-xx.xpm'
Index: ./etc/toolbar/info-exit-xx.xpm
--- ./etc/toolbar/info-exit-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-exit-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char *exit-up[] = {
/* width height num_colors chars_per_pixel */
"32 32 6 1",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-exit.xbm' 'xemacs-21.5.31/etc/toolbar/info-exit.xbm'
Index: ./etc/toolbar/info-exit.xbm
--- ./etc/toolbar/info-exit.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-exit.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 32
#define noname_height 32
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-exit.xpm' 'xemacs-21.5.31/etc/toolbar/info-exit.xpm'
Index: ./etc/toolbar/info-exit.xpm
--- ./etc/toolbar/info-exit.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-exit.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char *exit-up[] = {
/* width height num_colors chars_per_pixel */
"32 32 6 1",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-next-cap-up.xpm' 'xemacs-21.5.31/etc/toolbar/info-next-cap-up.xpm'
Index: ./etc/toolbar/info-next-cap-up.xpm
--- ./etc/toolbar/info-next-cap-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-next-cap-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * file[] = {
/* width height num_colors chars_per_pixel */
"28 28 5 1",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-next-cap-xx.xpm' 'xemacs-21.5.31/etc/toolbar/info-next-cap-xx.xpm'
Index: ./etc/toolbar/info-next-cap-xx.xpm
--- ./etc/toolbar/info-next-cap-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-next-cap-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * file[] = {
/* width height num_colors chars_per_pixel */
"28 28 5 1",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-next-dn.xbm' 'xemacs-21.5.31/etc/toolbar/info-next-dn.xbm'
Index: ./etc/toolbar/info-next-dn.xbm
--- ./etc/toolbar/info-next-dn.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-next-dn.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-next-up.xbm' 'xemacs-21.5.31/etc/toolbar/info-next-up.xbm'
Index: ./etc/toolbar/info-next-up.xbm
--- ./etc/toolbar/info-next-up.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-next-up.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-next-up.xpm' 'xemacs-21.5.31/etc/toolbar/info-next-up.xpm'
Index: ./etc/toolbar/info-next-up.xpm
--- ./etc/toolbar/info-next-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-next-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * file[] = {
/* width height num_colors chars_per_pixel */
"28 28 5 1",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-next-xx.xbm' 'xemacs-21.5.31/etc/toolbar/info-next-xx.xbm'
Index: ./etc/toolbar/info-next-xx.xbm
--- ./etc/toolbar/info-next-xx.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-next-xx.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-next-xx.xpm' 'xemacs-21.5.31/etc/toolbar/info-next-xx.xpm'
Index: ./etc/toolbar/info-next-xx.xpm
--- ./etc/toolbar/info-next-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-next-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * file[] = {
/* width height num_colors chars_per_pixel */
"28 28 5 1",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-next.xbm' 'xemacs-21.5.31/etc/toolbar/info-next.xbm'
Index: ./etc/toolbar/info-next.xbm
--- ./etc/toolbar/info-next.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-next.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-next.xpm' 'xemacs-21.5.31/etc/toolbar/info-next.xpm'
Index: ./etc/toolbar/info-next.xpm
--- ./etc/toolbar/info-next.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-next.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * file[] = {
/* width height num_colors chars_per_pixel */
"28 28 5 1",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-prev-cap-up.xpm' 'xemacs-21.5.31/etc/toolbar/info-prev-cap-up.xpm'
Index: ./etc/toolbar/info-prev-cap-up.xpm
--- ./etc/toolbar/info-prev-cap-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-prev-cap-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * left-arrow_xpm[] = {
/* width height num_colors chars_per_pixel */
"28 28 3 1",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-prev-cap-xx.xpm' 'xemacs-21.5.31/etc/toolbar/info-prev-cap-xx.xpm'
Index: ./etc/toolbar/info-prev-cap-xx.xpm
--- ./etc/toolbar/info-prev-cap-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-prev-cap-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * left-arrow_xpm[] = {
/* width height num_colors chars_per_pixel */
"28 28 3 1",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-prev-dn.xbm' 'xemacs-21.5.31/etc/toolbar/info-prev-dn.xbm'
Index: ./etc/toolbar/info-prev-dn.xbm
--- ./etc/toolbar/info-prev-dn.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-prev-dn.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-prev-up.xbm' 'xemacs-21.5.31/etc/toolbar/info-prev-up.xbm'
Index: ./etc/toolbar/info-prev-up.xbm
--- ./etc/toolbar/info-prev-up.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-prev-up.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-prev-up.xpm' 'xemacs-21.5.31/etc/toolbar/info-prev-up.xpm'
Index: ./etc/toolbar/info-prev-up.xpm
--- ./etc/toolbar/info-prev-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-prev-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * left-arrow_xpm[] = {
/* width height num_colors chars_per_pixel */
"28 28 3 1",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-prev-xx.xbm' 'xemacs-21.5.31/etc/toolbar/info-prev-xx.xbm'
Index: ./etc/toolbar/info-prev-xx.xbm
--- ./etc/toolbar/info-prev-xx.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-prev-xx.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-prev-xx.xpm' 'xemacs-21.5.31/etc/toolbar/info-prev-xx.xpm'
Index: ./etc/toolbar/info-prev-xx.xpm
--- ./etc/toolbar/info-prev-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-prev-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * left-arrow_xpm[] = {
/* width height num_colors chars_per_pixel */
"28 28 3 1",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-prev.xbm' 'xemacs-21.5.31/etc/toolbar/info-prev.xbm'
Index: ./etc/toolbar/info-prev.xbm
--- ./etc/toolbar/info-prev.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-prev.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-prev.xpm' 'xemacs-21.5.31/etc/toolbar/info-prev.xpm'
Index: ./etc/toolbar/info-prev.xpm
--- ./etc/toolbar/info-prev.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-prev.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * left-arrow_xpm[] = {
/* width height num_colors chars_per_pixel */
"28 28 3 1",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-up-cap-up.xpm' 'xemacs-21.5.31/etc/toolbar/info-up-cap-up.xpm'
Index: ./etc/toolbar/info-up-cap-up.xpm
--- ./etc/toolbar/info-up-cap-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-up-cap-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * up-arrow_xpm[] = {
/* width height num_colors chars_per_pixel */
"28 28 3 1",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-up-cap-xx.xpm' 'xemacs-21.5.31/etc/toolbar/info-up-cap-xx.xpm'
Index: ./etc/toolbar/info-up-cap-xx.xpm
--- ./etc/toolbar/info-up-cap-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-up-cap-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * up-arrow_xpm[] = {
/* width height num_colors chars_per_pixel */
"28 28 3 1",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-up-dn.xbm' 'xemacs-21.5.31/etc/toolbar/info-up-dn.xbm'
Index: ./etc/toolbar/info-up-dn.xbm
--- ./etc/toolbar/info-up-dn.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-up-dn.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-up-up.xbm' 'xemacs-21.5.31/etc/toolbar/info-up-up.xbm'
Index: ./etc/toolbar/info-up-up.xbm
--- ./etc/toolbar/info-up-up.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-up-up.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-up-up.xpm' 'xemacs-21.5.31/etc/toolbar/info-up-up.xpm'
Index: ./etc/toolbar/info-up-up.xpm
--- ./etc/toolbar/info-up-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-up-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * up-arrow_xpm[] = {
/* width height num_colors chars_per_pixel */
"28 28 3 1",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-up-xx.xbm' 'xemacs-21.5.31/etc/toolbar/info-up-xx.xbm'
Index: ./etc/toolbar/info-up-xx.xbm
--- ./etc/toolbar/info-up-xx.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-up-xx.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-up-xx.xpm' 'xemacs-21.5.31/etc/toolbar/info-up-xx.xpm'
Index: ./etc/toolbar/info-up-xx.xpm
--- ./etc/toolbar/info-up-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-up-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * up-arrow_xpm[] = {
/* width height num_colors chars_per_pixel */
"28 28 3 1",
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-up.xbm' 'xemacs-21.5.31/etc/toolbar/info-up.xbm'
Index: ./etc/toolbar/info-up.xbm
--- ./etc/toolbar/info-up.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-up.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/info-up.xpm' 'xemacs-21.5.31/etc/toolbar/info-up.xpm'
Index: ./etc/toolbar/info-up.xpm
--- ./etc/toolbar/info-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/info-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * up-arrow_xpm[] = {
/* width height num_colors chars_per_pixel */
"28 28 3 1",
diff --text -u 'xemacs-21.5.30/etc/toolbar/last-win-cap-up.xpm' 'xemacs-21.5.31/etc/toolbar/last-win-cap-up.xpm'
Index: ./etc/toolbar/last-win-cap-up.xpm
--- ./etc/toolbar/last-win-cap-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/last-win-cap-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * last_win_xpm[] = {
"33 33 5 1",
" c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/last-win-cap-xx.xpm' 'xemacs-21.5.31/etc/toolbar/last-win-cap-xx.xpm'
Index: ./etc/toolbar/last-win-cap-xx.xpm
--- ./etc/toolbar/last-win-cap-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/last-win-cap-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * last_win_xpm[] = {
"33 33 5 1",
" c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/last-win-dn.xbm' 'xemacs-21.5.31/etc/toolbar/last-win-dn.xbm'
Index: ./etc/toolbar/last-win-dn.xbm
--- ./etc/toolbar/last-win-dn.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/last-win-dn.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/last-win-up.xbm' 'xemacs-21.5.31/etc/toolbar/last-win-up.xbm'
Index: ./etc/toolbar/last-win-up.xbm
--- ./etc/toolbar/last-win-up.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/last-win-up.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/last-win-up.xpm' 'xemacs-21.5.31/etc/toolbar/last-win-up.xpm'
Index: ./etc/toolbar/last-win-up.xpm
--- ./etc/toolbar/last-win-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/last-win-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * last_win_xpm[] = {
"28 28 5 1",
" c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/last-win-xx.xbm' 'xemacs-21.5.31/etc/toolbar/last-win-xx.xbm'
Index: ./etc/toolbar/last-win-xx.xbm
--- ./etc/toolbar/last-win-xx.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/last-win-xx.xbm Fri Apr 29 22:31:06 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/last-win-xx.xpm' 'xemacs-21.5.31/etc/toolbar/last-win-xx.xpm'
Index: ./etc/toolbar/last-win-xx.xpm
--- ./etc/toolbar/last-win-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/last-win-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * last_win_xpm[] = {
"28 28 5 1",
" c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/mail-cap-up.xpm' 'xemacs-21.5.31/etc/toolbar/mail-cap-up.xpm'
Index: ./etc/toolbar/mail-cap-up.xpm
--- ./etc/toolbar/mail-cap-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/mail-cap-up.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * mail[] = {
"33 33 6 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/mail-cap-xx.xpm' 'xemacs-21.5.31/etc/toolbar/mail-cap-xx.xpm'
Index: ./etc/toolbar/mail-cap-xx.xpm
--- ./etc/toolbar/mail-cap-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/mail-cap-xx.xpm Fri Apr 29 22:31:06 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * mail[] = {
"33 33 5 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/mail-dn.xbm' 'xemacs-21.5.31/etc/toolbar/mail-dn.xbm'
Index: ./etc/toolbar/mail-dn.xbm
--- ./etc/toolbar/mail-dn.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/mail-dn.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/mail-up.xbm' 'xemacs-21.5.31/etc/toolbar/mail-up.xbm'
Index: ./etc/toolbar/mail-up.xbm
--- ./etc/toolbar/mail-up.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/mail-up.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/mail-up.xpm' 'xemacs-21.5.31/etc/toolbar/mail-up.xpm'
Index: ./etc/toolbar/mail-up.xpm
--- ./etc/toolbar/mail-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/mail-up.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * mail[] = {
"28 28 5 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/mail-xx.xbm' 'xemacs-21.5.31/etc/toolbar/mail-xx.xbm'
Index: ./etc/toolbar/mail-xx.xbm
--- ./etc/toolbar/mail-xx.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/mail-xx.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/mail-xx.xpm' 'xemacs-21.5.31/etc/toolbar/mail-xx.xpm'
Index: ./etc/toolbar/mail-xx.xpm
--- ./etc/toolbar/mail-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/mail-xx.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * mail[] = {
"28 28 5 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/news-cap-up.xpm' 'xemacs-21.5.31/etc/toolbar/news-cap-up.xpm'
Index: ./etc/toolbar/news-cap-up.xpm
--- ./etc/toolbar/news-cap-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/news-cap-up.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * news_xpm[] = {
"33 33 6 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/news-cap-xx.xpm' 'xemacs-21.5.31/etc/toolbar/news-cap-xx.xpm'
Index: ./etc/toolbar/news-cap-xx.xpm
--- ./etc/toolbar/news-cap-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/news-cap-xx.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * news_xpm[] = {
"33 33 5 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/news-dn.xbm' 'xemacs-21.5.31/etc/toolbar/news-dn.xbm'
Index: ./etc/toolbar/news-dn.xbm
--- ./etc/toolbar/news-dn.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/news-dn.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/news-up.xbm' 'xemacs-21.5.31/etc/toolbar/news-up.xbm'
Index: ./etc/toolbar/news-up.xbm
--- ./etc/toolbar/news-up.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/news-up.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/news-up.xpm' 'xemacs-21.5.31/etc/toolbar/news-up.xpm'
Index: ./etc/toolbar/news-up.xpm
--- ./etc/toolbar/news-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/news-up.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * news_xpm[] = {
"28 28 5 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/news-xx.xbm' 'xemacs-21.5.31/etc/toolbar/news-xx.xbm'
Index: ./etc/toolbar/news-xx.xbm
--- ./etc/toolbar/news-xx.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/news-xx.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/news-xx.xpm' 'xemacs-21.5.31/etc/toolbar/news-xx.xpm'
Index: ./etc/toolbar/news-xx.xpm
--- ./etc/toolbar/news-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/news-xx.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * news_xpm[] = {
"28 28 5 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/next-win-cap-up.xpm' 'xemacs-21.5.31/etc/toolbar/next-win-cap-up.xpm'
Index: ./etc/toolbar/next-win-cap-up.xpm
--- ./etc/toolbar/next-win-cap-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/next-win-cap-up.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * next_win_xpm[] = {
"33 33 5 1",
" c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/next-win-cap-xx.xpm' 'xemacs-21.5.31/etc/toolbar/next-win-cap-xx.xpm'
Index: ./etc/toolbar/next-win-cap-xx.xpm
--- ./etc/toolbar/next-win-cap-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/next-win-cap-xx.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * next_win_xpm[] = {
"33 33 5 1",
" c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/next-win-dn.xbm' 'xemacs-21.5.31/etc/toolbar/next-win-dn.xbm'
Index: ./etc/toolbar/next-win-dn.xbm
--- ./etc/toolbar/next-win-dn.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/next-win-dn.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/next-win-up.xbm' 'xemacs-21.5.31/etc/toolbar/next-win-up.xbm'
Index: ./etc/toolbar/next-win-up.xbm
--- ./etc/toolbar/next-win-up.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/next-win-up.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/next-win-up.xpm' 'xemacs-21.5.31/etc/toolbar/next-win-up.xpm'
Index: ./etc/toolbar/next-win-up.xpm
--- ./etc/toolbar/next-win-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/next-win-up.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * next_win_xpm[] = {
"28 28 5 1",
" c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/next-win-xx.xbm' 'xemacs-21.5.31/etc/toolbar/next-win-xx.xbm'
Index: ./etc/toolbar/next-win-xx.xbm
--- ./etc/toolbar/next-win-xx.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/next-win-xx.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/next-win-xx.xpm' 'xemacs-21.5.31/etc/toolbar/next-win-xx.xpm'
Index: ./etc/toolbar/next-win-xx.xpm
--- ./etc/toolbar/next-win-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/next-win-xx.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * next_win_xpm[] = {
"28 28 5 1",
" c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/paste-cap-up.xpm' 'xemacs-21.5.31/etc/toolbar/paste-cap-up.xpm'
Index: ./etc/toolbar/paste-cap-up.xpm
--- ./etc/toolbar/paste-cap-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/paste-cap-up.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * paste[] = {
"33 33 6 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/paste-cap-xx.xpm' 'xemacs-21.5.31/etc/toolbar/paste-cap-xx.xpm'
Index: ./etc/toolbar/paste-cap-xx.xpm
--- ./etc/toolbar/paste-cap-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/paste-cap-xx.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * paste[] = {
"33 33 5 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/paste-dn.xbm' 'xemacs-21.5.31/etc/toolbar/paste-dn.xbm'
Index: ./etc/toolbar/paste-dn.xbm
--- ./etc/toolbar/paste-dn.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/paste-dn.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/paste-up.xbm' 'xemacs-21.5.31/etc/toolbar/paste-up.xbm'
Index: ./etc/toolbar/paste-up.xbm
--- ./etc/toolbar/paste-up.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/paste-up.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/paste-up.xpm' 'xemacs-21.5.31/etc/toolbar/paste-up.xpm'
Index: ./etc/toolbar/paste-up.xpm
--- ./etc/toolbar/paste-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/paste-up.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * paste[] = {
"28 28 5 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/paste-xx.xbm' 'xemacs-21.5.31/etc/toolbar/paste-xx.xbm'
Index: ./etc/toolbar/paste-xx.xbm
--- ./etc/toolbar/paste-xx.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/paste-xx.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/paste-xx.xpm' 'xemacs-21.5.31/etc/toolbar/paste-xx.xpm'
Index: ./etc/toolbar/paste-xx.xpm
--- ./etc/toolbar/paste-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/paste-xx.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * paste[] = {
"28 28 5 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/printer-cap-up.xpm' 'xemacs-21.5.31/etc/toolbar/printer-cap-up.xpm'
Index: ./etc/toolbar/printer-cap-up.xpm
--- ./etc/toolbar/printer-cap-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/printer-cap-up.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * printer[] = {
"33 33 7 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/printer-cap-xx.xpm' 'xemacs-21.5.31/etc/toolbar/printer-cap-xx.xpm'
Index: ./etc/toolbar/printer-cap-xx.xpm
--- ./etc/toolbar/printer-cap-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/printer-cap-xx.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * printer[] = {
"33 33 6 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/printer-dn.xbm' 'xemacs-21.5.31/etc/toolbar/printer-dn.xbm'
Index: ./etc/toolbar/printer-dn.xbm
--- ./etc/toolbar/printer-dn.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/printer-dn.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/printer-up.xbm' 'xemacs-21.5.31/etc/toolbar/printer-up.xbm'
Index: ./etc/toolbar/printer-up.xbm
--- ./etc/toolbar/printer-up.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/printer-up.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/printer-up.xpm' 'xemacs-21.5.31/etc/toolbar/printer-up.xpm'
Index: ./etc/toolbar/printer-up.xpm
--- ./etc/toolbar/printer-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/printer-up.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * printer[] = {
"28 28 6 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/printer-xx.xbm' 'xemacs-21.5.31/etc/toolbar/printer-xx.xbm'
Index: ./etc/toolbar/printer-xx.xbm
--- ./etc/toolbar/printer-xx.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/printer-xx.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/printer-xx.xpm' 'xemacs-21.5.31/etc/toolbar/printer-xx.xpm'
Index: ./etc/toolbar/printer-xx.xpm
--- ./etc/toolbar/printer-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/printer-xx.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * printer[] = {
"28 28 6 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/replace-cap-up.xpm' 'xemacs-21.5.31/etc/toolbar/replace-cap-up.xpm'
Index: ./etc/toolbar/replace-cap-up.xpm
--- ./etc/toolbar/replace-cap-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/replace-cap-up.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * replace[] = {
"33 33 2 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/replace-cap-xx.xpm' 'xemacs-21.5.31/etc/toolbar/replace-cap-xx.xpm'
Index: ./etc/toolbar/replace-cap-xx.xpm
--- ./etc/toolbar/replace-cap-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/replace-cap-xx.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * replace[] = {
"33 33 2 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/replace-dn.xbm' 'xemacs-21.5.31/etc/toolbar/replace-dn.xbm'
Index: ./etc/toolbar/replace-dn.xbm
--- ./etc/toolbar/replace-dn.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/replace-dn.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/replace-up.xbm' 'xemacs-21.5.31/etc/toolbar/replace-up.xbm'
Index: ./etc/toolbar/replace-up.xbm
--- ./etc/toolbar/replace-up.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/replace-up.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/replace-up.xpm' 'xemacs-21.5.31/etc/toolbar/replace-up.xpm'
Index: ./etc/toolbar/replace-up.xpm
--- ./etc/toolbar/replace-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/replace-up.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * replace[] = {
"28 28 2 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/replace-xx.xbm' 'xemacs-21.5.31/etc/toolbar/replace-xx.xbm'
Index: ./etc/toolbar/replace-xx.xbm
--- ./etc/toolbar/replace-xx.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/replace-xx.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/replace-xx.xpm' 'xemacs-21.5.31/etc/toolbar/replace-xx.xpm'
Index: ./etc/toolbar/replace-xx.xpm
--- ./etc/toolbar/replace-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/replace-xx.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * replace[] = {
"28 28 2 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/spell-cap-up.xpm' 'xemacs-21.5.31/etc/toolbar/spell-cap-up.xpm'
Index: ./etc/toolbar/spell-cap-up.xpm
--- ./etc/toolbar/spell-cap-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/spell-cap-up.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * dict[] = {
"33 33 7 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/spell-cap-xx.xpm' 'xemacs-21.5.31/etc/toolbar/spell-cap-xx.xpm'
Index: ./etc/toolbar/spell-cap-xx.xpm
--- ./etc/toolbar/spell-cap-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/spell-cap-xx.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * dict[] = {
"33 33 6 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/spell-dn.xbm' 'xemacs-21.5.31/etc/toolbar/spell-dn.xbm'
Index: ./etc/toolbar/spell-dn.xbm
--- ./etc/toolbar/spell-dn.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/spell-dn.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/spell-up.xbm' 'xemacs-21.5.31/etc/toolbar/spell-up.xbm'
Index: ./etc/toolbar/spell-up.xbm
--- ./etc/toolbar/spell-up.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/spell-up.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/spell-up.xpm' 'xemacs-21.5.31/etc/toolbar/spell-up.xpm'
Index: ./etc/toolbar/spell-up.xpm
--- ./etc/toolbar/spell-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/spell-up.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * dict[] = {
"28 28 6 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/spell-xx.xbm' 'xemacs-21.5.31/etc/toolbar/spell-xx.xbm'
Index: ./etc/toolbar/spell-xx.xbm
--- ./etc/toolbar/spell-xx.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/spell-xx.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/spell-xx.xpm' 'xemacs-21.5.31/etc/toolbar/spell-xx.xpm'
Index: ./etc/toolbar/spell-xx.xpm
--- ./etc/toolbar/spell-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/spell-xx.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * dict[] = {
"28 28 6 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/undo-cap-up.xpm' 'xemacs-21.5.31/etc/toolbar/undo-cap-up.xpm'
Index: ./etc/toolbar/undo-cap-up.xpm
--- ./etc/toolbar/undo-cap-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/undo-cap-up.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * undo[] = {
"33 33 6 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/undo-cap-xx.xpm' 'xemacs-21.5.31/etc/toolbar/undo-cap-xx.xpm'
Index: ./etc/toolbar/undo-cap-xx.xpm
--- ./etc/toolbar/undo-cap-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/undo-cap-xx.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * undo[] = {
"33 33 5 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/undo-dn.xbm' 'xemacs-21.5.31/etc/toolbar/undo-dn.xbm'
Index: ./etc/toolbar/undo-dn.xbm
--- ./etc/toolbar/undo-dn.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/undo-dn.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/undo-up.xbm' 'xemacs-21.5.31/etc/toolbar/undo-up.xbm'
Index: ./etc/toolbar/undo-up.xbm
--- ./etc/toolbar/undo-up.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/undo-up.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/undo-up.xpm' 'xemacs-21.5.31/etc/toolbar/undo-up.xpm'
Index: ./etc/toolbar/undo-up.xpm
--- ./etc/toolbar/undo-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/undo-up.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * undo[] = {
"28 28 5 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/undo-xx.xbm' 'xemacs-21.5.31/etc/toolbar/undo-xx.xbm'
Index: ./etc/toolbar/undo-xx.xbm
--- ./etc/toolbar/undo-xx.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/undo-xx.xbm Fri Apr 29 22:31:07 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/toolbar/undo-xx.xpm' 'xemacs-21.5.31/etc/toolbar/undo-xx.xpm'
Index: ./etc/toolbar/undo-xx.xpm
--- ./etc/toolbar/undo-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/undo-xx.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * undo[] = {
"28 28 5 1",
"X c Gray75 s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/workshop-cap-up.xpm' 'xemacs-21.5.31/etc/toolbar/workshop-cap-up.xpm'
Index: ./etc/toolbar/workshop-cap-up.xpm
--- ./etc/toolbar/workshop-cap-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/workshop-cap-up.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * xemacs-cap-workshop_xpm[] = {
"33 33 9 1",
" c #BDBDBDBDBDBD s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/workshop-cap-xx.xpm' 'xemacs-21.5.31/etc/toolbar/workshop-cap-xx.xpm'
Index: ./etc/toolbar/workshop-cap-xx.xpm
--- ./etc/toolbar/workshop-cap-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/workshop-cap-xx.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * xemacs-cap-workshop-xx_xpm[] = {
"33 33 8 1",
" c #BDBDBDBDBDBD s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/workshop-up.xpm' 'xemacs-21.5.31/etc/toolbar/workshop-up.xpm'
Index: ./etc/toolbar/workshop-up.xpm
--- ./etc/toolbar/workshop-up.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/workshop-up.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * xemacs-workshop_xpm[] = {
"28 28 8 1",
" c #BDBDBDBDBDBD s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/toolbar/workshop-xx.xpm' 'xemacs-21.5.31/etc/toolbar/workshop-xx.xpm'
Index: ./etc/toolbar/workshop-xx.xpm
--- ./etc/toolbar/workshop-xx.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/toolbar/workshop-xx.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * xemacs-workshop-xx_xpm[] = {
"28 28 8 1",
" c #BDBDBDBDBDBD s backgroundToolBarColor",
diff --text -u 'xemacs-21.5.30/etc/trash.xpm' 'xemacs-21.5.31/etc/trash.xpm'
Index: ./etc/trash.xpm
--- ./etc/trash.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/trash.xpm Fri Apr 29 22:31:07 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
/* A trash can, drawn by jwz */
static char *trash[] = {
/* width height ncolors chars_per_pixel x_hot y_hot */
diff --text -u /dev/null 'xemacs-21.5.31/etc/unicode/COPYING'
Index: ./etc/unicode/COPYING
--- ./etc/unicode/COPYING Thu Jan 1 09:00:00 1970
+++ ./etc/unicode/COPYING Fri Apr 29 22:31:07 2011
@@ -0,0 +1,9 @@
+These files are *not* part of XEmacs.
+
+They are all available publicly from O'Reilly Associates or the
+Unicode Consortium, and are collected here *unchanged* for the
+convenience of the user/builder of XEmacs. Redistribution is governed
+by their own licensing notices.
+
+See "ibm/COPYING", "mule-ucs/README" and "unicode-consortium/COPYING"
+for details.
diff --text -u /dev/null 'xemacs-21.5.31/etc/unicode/ibm/COPYING'
Index: ./etc/unicode/ibm/COPYING
--- ./etc/unicode/ibm/COPYING Thu Jan 1 09:00:00 1970
+++ ./etc/unicode/ibm/COPYING Fri Apr 29 22:31:07 2011
@@ -0,0 +1,48 @@
+UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
+
+ Unicode Data Files include all data files under the directories
+http://www.unicode.org/Public/, http://www.unicode.org/reports/, and
+http://www.unicode.org/cldr/data/ . Unicode Software includes any source code
+published in the Unicode Standard or under the directories
+http://www.unicode.org/Public/, http://www.unicode.org/reports/, and
+http://www.unicode.org/cldr/data/.
+
+ NOTICE TO USER: Carefully read the following legal agreement. BY
+DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES
+("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND
+AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU
+DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES
+OR SOFTWARE.
+
+ COPYRIGHT AND PERMISSION NOTICE
+
+ Copyright ���� 1991-2009 Unicode, Inc. All rights reserved. Distributed under
+the Terms of Use in http://www.unicode.org/copyright.html.
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+of the Unicode data files and any associated documentation (the "Data Files") or
+Unicode software and any associated documentation (the "Software") to deal in
+the Data Files or Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files or
+Software are furnished to do so, provided that (a) the above copyright notice(s)
+and this permission notice appear with all copies of the Data Files or Software,
+(b) both the above copyright notice(s) and this permission notice appear in
+associated documentation, and (c) there is clear notice in each modified Data
+File or in the Software as well as in the documentation associated with the Data
+File(s) or Software that the data or software has been modified.
+
+ THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD
+PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR
+SOFTWARE.
+
+ Except as contained in this notice, the name of a copyright holder shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in these Data Files or Software without prior written authorization of the
+copyright holder.
diff --text -u 'xemacs-21.5.30/etc/unicode/other/lao.txt' 'xemacs-21.5.31/etc/unicode/other/lao.txt'
Index: ./etc/unicode/other/lao.txt
--- ./etc/unicode/other/lao.txt Wed Apr 27 00:57:26 2011
+++ ./etc/unicode/other/lao.txt Fri Apr 29 22:31:07 2011
@@ -3,10 +3,10 @@
## This file is part of XEmacs.
-## XEmacs is free software; you can redistribute it and/or modify it
+## XEmacs is free software: you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by the
-## Free Software Foundation; either version 2, or (at your option) any
-## later version.
+## Free Software Foundation, either version 3 of the License, or (at your
+## option) any later version.
## XEmacs is distributed in the hope that it will be useful, but WITHOUT
## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
## for more details.
## You should have received a copy of the GNU General Public License
-## along with XEmacs; see the file COPYING. If not, write to
-## the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-## Boston, MA 02110-1301, USA.
+## along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
## Made up based on the comment in lao.el:
diff --text -u 'xemacs-21.5.30/etc/unicode/unicode-consortium/COPYING' 'xemacs-21.5.31/etc/unicode/unicode-consortium/COPYING'
Index: ./etc/unicode/unicode-consortium/COPYING
--- ./etc/unicode/unicode-consortium/COPYING Wed Apr 27 00:57:26 2011
+++ ./etc/unicode/unicode-consortium/COPYING Fri Apr 29 22:31:07 2011
@@ -2,9 +2,20 @@
Copyright (c) 2007 The Free Software Foundation, Inc.
-This file is part of XEmacs. It is licensed to you under the
-conditions of the GNU General Public License, version 2 or any later
-version published by the FSF, at your option.
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
Other files in this directory are subject to O'Reilly Media and
Unicode Consortium licenses. The files oreilly.html and
diff --text -u 'xemacs-21.5.30/etc/xemacs-beta.xpm' 'xemacs-21.5.31/etc/xemacs-beta.xpm'
Index: ./etc/xemacs-beta.xpm
--- ./etc/xemacs-beta.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/xemacs-beta.xpm Fri Apr 29 22:31:08 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char *magick[] = {
/* columns rows colors chars-per-pixel */
"388 145 19 1",
diff --text -u 'xemacs-21.5.30/etc/xemacs-fe.sh' 'xemacs-21.5.31/etc/xemacs-fe.sh'
Index: ./etc/xemacs-fe.sh
--- ./etc/xemacs-fe.sh Wed Apr 27 00:57:26 2011
+++ ./etc/xemacs-fe.sh Fri Apr 29 22:31:08 2011
@@ -8,20 +8,20 @@
# $.Id: emacs-fe,v 1.8 1996/03/07 04:32:33 friedman Exp $
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
+# This file is part of XEmacs.
+
+# XEmacs is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+
+# XEmacs is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+
# You should have received a copy of the GNU General Public License
-# along with this program; if not, you can either send email to this
-# program's maintainer or write to: The Free Software Foundation,
-# Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
# Commentary:
diff --text -u 'xemacs-21.5.30/etc/xemacs-icon.xpm' 'xemacs-21.5.31/etc/xemacs-icon.xpm'
Index: ./etc/xemacs-icon.xpm
--- ./etc/xemacs-icon.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/xemacs-icon.xpm Fri Apr 29 22:31:08 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char *XEmacs48_xpm[] = {
/* width height ncolors chars_per_pixel */
"48 48 12 1",
diff --text -u 'xemacs-21.5.30/etc/xemacs-icon2.xbm' 'xemacs-21.5.31/etc/xemacs-icon2.xbm'
Index: ./etc/xemacs-icon2.xbm
--- ./etc/xemacs-icon2.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/xemacs-icon2.xbm Fri Apr 29 22:31:08 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define noname_width 50
#define noname_height 50
static char noname_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/xemacs-icon2.xpm' 'xemacs-21.5.31/etc/xemacs-icon2.xpm'
Index: ./etc/xemacs-icon2.xpm
--- ./etc/xemacs-icon2.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/xemacs-icon2.xpm Fri Apr 29 22:31:08 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * xemacs_xpm[] = {
/* XEmacs pixmap
* width height ncolors chars_per_pixel */
diff --text -u 'xemacs-21.5.30/etc/xemacs-icon3.xpm' 'xemacs-21.5.31/etc/xemacs-icon3.xpm'
Index: ./etc/xemacs-icon3.xpm
--- ./etc/xemacs-icon3.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/xemacs-icon3.xpm Fri Apr 29 22:31:08 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char * xemacs_xpm[] = {
/* width height num_colors chars_per_pixel */
"48 48 11 1",
diff --text -u 'xemacs-21.5.30/etc/xemacs.1' 'xemacs-21.5.31/etc/xemacs.1'
Index: ./etc/xemacs.1
--- ./etc/xemacs.1 Wed Apr 27 00:57:26 2011
+++ ./etc/xemacs.1 Fri Apr 29 22:31:08 2011
@@ -1,3 +1,4 @@
+.\" See section COPYING for copyright and redistribution information.
.TH XEMACS 1 "2000-09-20"
.UC 4
.SH NAME
@@ -795,3 +796,49 @@
or from a mirror site near you. Mirror sites are listed in the file
etc/FTP in the XEmacs distribution or see the Web site for an up-to-date
list of mirror sites.
+
+.SH COPYING
+Copyright
+.if t \(co
+.if n (C)
+2004 Shyamal Prasad
+.br
+Copyright
+.if t \(co
+.if n (C)
+1998, 2000 Martin Buchholz
+.br
+Copyright
+.if t \(co
+.if n (C)
+1998 Andreas Jaeger
+.br
+Copyright
+.if t \(co
+.if n (C)
+1998 Michael Sperber
+.br
+Copyright
+.if t \(co
+.if n (C)
+1997, 1998 SL Baur
+.br
+Copyright
+.if t \(co
+.if n (C)
+1992-1997 Ben Wing
+.PP
+This file is part of XEmacs.
+.PP
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+.PP
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+.PP
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
diff --text -u 'xemacs-21.5.30/etc/xemacs.xbm' 'xemacs-21.5.31/etc/xemacs.xbm'
Index: ./etc/xemacs.xbm
--- ./etc/xemacs.xbm Wed Apr 27 00:57:26 2011
+++ ./etc/xemacs.xbm Fri Apr 29 22:31:08 2011
@@ -1,3 +1,18 @@
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define xemacs_width 266
#define xemacs_height 61
static unsigned char xemacs_bits[] = {
diff --text -u 'xemacs-21.5.30/etc/xemacs.xpm' 'xemacs-21.5.31/etc/xemacs.xpm'
Index: ./etc/xemacs.xpm
--- ./etc/xemacs.xpm Wed Apr 27 00:57:26 2011
+++ ./etc/xemacs.xpm Fri Apr 29 22:31:08 2011
@@ -1,4 +1,20 @@
/* XPM */
+
+/* This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
static char *noname[] = {
/* width height ncolors chars_per_pixel */
"388 145 25 1",
diff --text -u 'xemacs-21.5.30/lib-src/ChangeLog' 'xemacs-21.5.31/lib-src/ChangeLog'
Index: ./lib-src/ChangeLog
--- ./lib-src/ChangeLog Wed Apr 27 00:57:41 2011
+++ ./lib-src/ChangeLog Fri Apr 29 22:31:39 2011
@@ -1,3 +1,7 @@
+2011-04-29 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.5.31 "ginger" is released.
+
2011-04-26 Stephen J. Turnbull <stephen@xemacs.org>
* XEmacs 21.5.30 "garlic" is released.
@@ -2204,3 +2208,22 @@
* update-elc.sh: Corrections to protect against too smart /bin/sh'es.
+
+ChangeLog entries synched from GNU Emacs are the property of the FSF.
+Other ChangeLog entries are usually the property of the author of the
+change.
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
diff --text -u 'xemacs-21.5.30/lib-src/Makefile.in.in' 'xemacs-21.5.31/lib-src/Makefile.in.in'
Index: ./lib-src/Makefile.in.in
--- ./lib-src/Makefile.in.in Wed Apr 27 00:57:26 2011
+++ ./lib-src/Makefile.in.in Fri Apr 29 22:31:08 2011
@@ -5,10 +5,10 @@
## This file is part of XEmacs.
-## XEmacs is free software; you can redistribute it and/or modify it
+## XEmacs is free software: you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by the
-## Free Software Foundation; either version 2, or (at your option) any
-## later version.
+## Free Software Foundation, either version 3 of the License, or (at your
+## option) any later version.
## XEmacs is distributed in the hope that it will be useful, but WITHOUT
## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
## for more details.
## You should have received a copy of the GNU General Public License
-## along with XEmacs; see the file COPYING. If not, write to
-## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-## Boston, MA 02111-1307, USA.
+## along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
## Note: FSF Makefile.in.in does something weird so that the comments
## above a certain point in this file are in shell format instead of
diff --text -u 'xemacs-21.5.30/lib-src/ad2c' 'xemacs-21.5.31/lib-src/ad2c'
Index: ./lib-src/ad2c
--- ./lib-src/ad2c Wed Apr 27 00:57:26 2011
+++ ./lib-src/ad2c Fri Apr 29 22:31:08 2011
@@ -17,21 +17,19 @@
# Escape quotes after escaping backslashes.
#
# This file is part of XEmacs.
-#
-# XEmacs is free software; you can redistribute it and/or modify it
+#
+# XEmacs is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any
-# later version.
-#
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
# XEmacs is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-# Boston, MA 02110-1301, USA. */
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
#
# Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lib-src/add-big-package.sh' 'xemacs-21.5.31/lib-src/add-big-package.sh'
Index: ./lib-src/add-big-package.sh
--- ./lib-src/add-big-package.sh Wed Apr 27 00:57:26 2011
+++ ./lib-src/add-big-package.sh Fri Apr 29 22:31:08 2011
@@ -7,21 +7,19 @@
# Keywords: packages internal
# This file is part of XEmacs.
-
-# XEmacs is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# XEmacs is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-
+#
+# XEmacs is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# XEmacs is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
### Commentary:
diff --text -u 'xemacs-21.5.30/lib-src/b2m.c' 'xemacs-21.5.31/lib-src/b2m.c'
Index: ./lib-src/b2m.c
--- ./lib-src/b2m.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/b2m.c Fri Apr 29 22:31:08 2011
@@ -1,12 +1,13 @@
/*
* b2m - a filter for Babyl -> Unix mail files
+ * The copyright on this file has been disclaimed.
*
* usage: b2m < babyl > mailbox
*
* I find this useful whenever I have to use a
* system which - shock horror! - doesn't run
- * Gnu emacs. At least now I can read all my
- * Gnumacs Babyl format mail files!
+ * GNU Emacs. At least now I can read all my
+ * GNU Emacs Babyl format mail files!
*
* it's not much but it's free!
*
@@ -30,7 +31,8 @@
#include <string.h>
#include <time.h>
#include <sys/types.h>
-#ifdef WIN32_NATIVE
+#include <getopt.h>
+#ifdef MSDOS
#include <fcntl.h>
#endif
@@ -39,20 +41,20 @@
#undef FALSE
#define FALSE 0
-/* Exit codes for success and failure. */
-#ifdef VMS
-#define GOOD 1
-#define BAD 0
-#else
-#define GOOD 0
-#define BAD 1
-#endif
-
#define streq(s,t) (strcmp (s, t) == 0)
#define strneq(s,t,n) (strncmp (s, t, n) == 0)
typedef int logical;
+#define TM_YEAR_BASE 1900
+
+/* Nonzero if TM_YEAR is a struct tm's tm_year value that causes
+ asctime to have well-defined behavior. */
+#ifndef TM_YEAR_IN_ASCTIME_RANGE
+# define TM_YEAR_IN_ASCTIME_RANGE(tm_year) \
+ (1000 - TM_YEAR_BASE <= (tm_year) && (tm_year) <= 9999 - TM_YEAR_BASE)
+#endif
+
/*
* A `struct linebuffer' is a structure which holds a line of text.
* `readline' reads a line from a stream into a linebuffer and works
@@ -64,12 +66,10 @@
char *buffer;
};
-
-static long *xmalloc (unsigned int);
-static long *xrealloc (void *, unsigned int);
-static char *concat (char *s1, char *s2, char *s3);
-static long readline (struct linebuffer *, FILE *);
-static void fatal (char *);
+long *xmalloc (unsigned int), *xrealloc (char *, unsigned int);
+char *concat (char *, char *, char *);
+long readline (struct linebuffer *, register FILE *);
+void fatal (char *);
/*
* xnew -- allocate storage. SYNOPSIS: Type *xnew (int n, Type);
@@ -80,31 +80,73 @@
char *progname;
+struct option longopts[] =
+{
+ { "help", no_argument, NULL, 'h' },
+ { "version", no_argument, NULL, 'V' },
+ { 0 }
+};
+
+extern int optind;
+
int
-main (int argc, char *argv[])
+main (int argc, char **argv)
{
- logical labels_saved, printing, header;
+ logical labels_saved, printing, header, first, last_was_blank_line;
time_t ltoday;
- char *labels = NULL, *p, *today;
+ struct tm *tm;
+ char *labels, *p, *today;
struct linebuffer data;
-#ifdef WIN32_NATIVE
+#ifdef MSDOS
_fmode = O_BINARY; /* all of files are treated as binary files */
+#if __DJGPP__ > 1
if (!isatty (fileno (stdout)))
setmode (fileno (stdout), O_BINARY);
if (!isatty (fileno (stdin)))
setmode (fileno (stdin), O_BINARY);
+#else /* not __DJGPP__ > 1 */
+ (stdout)->_flag &= ~_IOTEXT;
+ (stdin)->_flag &= ~_IOTEXT;
+#endif /* not __DJGPP__ > 1 */
#endif
progname = argv[0];
- if (argc != 1)
+ while (1)
+ {
+ int opt = getopt_long (argc, argv, "hV", longopts, 0);
+ if (opt == EOF)
+ break;
+
+ switch (opt)
+ {
+ case 'V':
+ printf ("%s (XEmacs %s)\n", "b2m", EMACS_VERSION);
+ puts ("b2m is in the public domain.");
+ exit (EXIT_SUCCESS);
+
+ case 'h':
+ fprintf (stderr, "Usage: %s <babylmailbox >unixmailbox\n", progname);
+ exit (EXIT_SUCCESS);
+ }
+ }
+
+ if (optind != argc)
{
fprintf (stderr, "Usage: %s <babylmailbox >unixmailbox\n", progname);
- exit (GOOD);
+ exit (EXIT_SUCCESS);
}
- labels_saved = printing = header = FALSE;
+
+ labels_saved = printing = header = last_was_blank_line = FALSE;
+ first = TRUE;
ltoday = time (0);
- today = ctime (<oday);
+ /* Convert to a string, checking for out-of-range time stamps.
+ Don't use 'ctime', as that might dump core if the hardware clock
+ is set to a bizarre value. */
+ tm = localtime (<oday);
+ if (! (tm && TM_YEAR_IN_ASCTIME_RANGE (tm->tm_year)
+ && (today = asctime (tm))))
+ fatal ("current time is out of range");
data.size = 200;
data.buffer = xnew (200, char);
@@ -127,6 +169,10 @@
continue;
else if (data.buffer[1] == '\f')
{
+ if (first)
+ first = FALSE;
+ else if (! last_was_blank_line)
+ puts("");
/* Save labels. */
readline (&data, stdin);
p = strtok (data.buffer, " ,\r\n\t");
@@ -152,9 +198,16 @@
}
if (printing)
- puts (data.buffer);
+ {
+ puts (data.buffer);
+ if (data.buffer[0] == '\0')
+ last_was_blank_line = TRUE;
+ else
+ last_was_blank_line = FALSE;
+ }
}
- return 0;
+
+ return EXIT_SUCCESS;
}
@@ -163,7 +216,7 @@
* Return a newly-allocated string whose contents
* concatenate those of s1, s2, s3.
*/
-static char *
+char *
concat (char *s1, char *s2, char *s3)
{
int len1 = strlen (s1), len2 = strlen (s2), len3 = strlen (s3);
@@ -182,8 +235,9 @@
* Return the number of characters read from `stream',
* which is the length of the line including the newline, if any.
*/
-static long
-readline (struct linebuffer *linebuffer, FILE *stream)
+long
+readline (struct linebuffer *linebuffer, register FILE *stream)
+
{
char *buffer = linebuffer->buffer;
register char *p = linebuffer->buffer;
@@ -205,12 +259,13 @@
}
if (c == EOF)
{
+ *p = '\0';
chars_deleted = 0;
break;
}
if (c == '\n')
{
- if (p[-1] == '\r' && p > buffer)
+ if (p > buffer && p[-1] == '\r')
{
*--p = '\0';
chars_deleted = 2;
@@ -231,7 +286,7 @@
/*
* Like malloc but get fatal error if memory is exhausted.
*/
-static long *
+long *
xmalloc (unsigned int size)
{
long *result = (long *) malloc (size);
@@ -240,8 +295,8 @@
return result;
}
-static long *
-xrealloc (void *ptr, unsigned int size)
+long *
+xrealloc (char *ptr, unsigned int size)
{
long *result = (long *) realloc (ptr, size);
if (result == NULL)
@@ -249,10 +304,11 @@
return result;
}
-static void
+void
fatal (char *message)
{
fprintf (stderr, "%s: %s\n", progname, message);
- exit (BAD);
+ exit (EXIT_FAILURE);
}
+/* b2m.c ends here */
diff --text -u 'xemacs-21.5.30/lib-src/config.values.sh' 'xemacs-21.5.31/lib-src/config.values.sh'
Index: ./lib-src/config.values.sh
--- ./lib-src/config.values.sh Wed Apr 27 00:57:26 2011
+++ ./lib-src/config.values.sh Fri Apr 29 22:31:08 2011
@@ -11,21 +11,19 @@
# Keywords: configure elisp report-xemacs-bugs
# This file is part of XEmacs.
-
-# XEmacs is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# XEmacs is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-
+#
+# XEmacs is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# XEmacs is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
### Commentary:
diff --text -u 'xemacs-21.5.30/lib-src/cvtmail.c' 'xemacs-21.5.31/lib-src/cvtmail.c'
Index: ./lib-src/cvtmail.c
--- ./lib-src/cvtmail.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/cvtmail.c Fri Apr 29 22:31:08 2011
@@ -1,20 +1,18 @@
/* Copyright (C) 1985, 1993, 1994 Free Software Foundation
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.28. */
diff --text -u 'xemacs-21.5.30/lib-src/digest-doc.c' 'xemacs-21.5.31/lib-src/digest-doc.c'
Index: ./lib-src/digest-doc.c
--- ./lib-src/digest-doc.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/digest-doc.c Fri Apr 29 22:31:08 2011
@@ -1,21 +1,47 @@
-/* Give this program DOCSTR.mm.nn as standard input
- and it outputs to standard output
- a file of nroff output containing the doc strings.
+/* Give this program DOC-mm.nn.oo as standard input and it outputs to
+ standard output a file of nroff output containing the doc strings.
- See also sorted-doc.c, which produces similar output
- but in texinfo format and sorted by function/variable name. */
+Copyright (C) 1987, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+ 2008, 2009, 2010 Free Software Foundation, Inc.
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+XEmacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
+
+See also sorted-doc.c, which produces similar output
+but in texinfo format and sorted by function/variable name. */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
#include <stdio.h>
+#ifdef DOS_NT
+#include <fcntl.h> /* for O_BINARY */
+#include <io.h> /* for setmode */
+#endif
+
int
-main (int argc, char **argv)
+main ()
{
register int ch;
register int notfirst = 0;
+#ifdef DOS_NT
+ /* DOC is a binary file. */
+ if (!isatty (fileno (stdin)))
+ setmode (fileno (stdin), O_BINARY);
+#endif
+
printf (".TL\n");
printf ("Command Summary for XEmacs\n");
printf (".AU\nThe XEmacs Advocacy Group\n");
diff --text -u 'xemacs-21.5.30/lib-src/ellcc.c' 'xemacs-21.5.31/lib-src/ellcc.c'
Index: ./lib-src/ellcc.c
--- ./lib-src/ellcc.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/ellcc.c Fri Apr 29 22:31:08 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,10 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
-
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
Author: J. Kean Johnston (jkj@sco.com).
Please mail bugs and suggestions to the XEmacs maintainer.
*/
diff --text -u 'xemacs-21.5.30/lib-src/ellcc.h.in' 'xemacs-21.5.31/lib-src/ellcc.h.in'
Index: ./lib-src/ellcc.h.in
--- ./lib-src/ellcc.h.in Wed Apr 27 00:57:26 2011
+++ ./lib-src/ellcc.h.in Fri Apr 29 22:31:08 2011
@@ -3,7 +3,22 @@
/* Most of this is required due to a bug in the GCC compiler driver
which prevents us from passing this on the command line. It also
reduces the compiler command line length, which can be a problem
- on some systems. */
+ on some systems.
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#ifndef ELLCC_HDR
#define ELLCC_HDR
diff --text -u 'xemacs-21.5.30/lib-src/etags.c' 'xemacs-21.5.31/lib-src/etags.c'
Index: ./lib-src/etags.c
--- ./lib-src/etags.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/etags.c Fri Apr 29 22:31:08 2011
@@ -34,19 +34,18 @@
This file is not considered part of GNU Emacs.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* NB To comply with the above BSD license, copyright information is
diff --text -u 'xemacs-21.5.30/lib-src/fakemail.c' 'xemacs-21.5.31/lib-src/fakemail.c'
Index: ./lib-src/fakemail.c
--- ./lib-src/fakemail.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/fakemail.c Fri Apr 29 22:31:08 2011
@@ -3,20 +3,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.28. */
diff --text -u 'xemacs-21.5.30/lib-src/fix-perms.sh' 'xemacs-21.5.31/lib-src/fix-perms.sh'
Index: ./lib-src/fix-perms.sh
--- ./lib-src/fix-perms.sh Wed Apr 27 00:57:26 2011
+++ ./lib-src/fix-perms.sh Fri Apr 29 22:31:08 2011
@@ -7,21 +7,19 @@
# Keywords: internal
# This file is part of XEmacs.
-
-# XEmacs is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# XEmacs is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-
+#
+# XEmacs is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# XEmacs is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
### Commentary:
diff --text -u 'xemacs-21.5.30/lib-src/getopt.c' 'xemacs-21.5.31/lib-src/getopt.c'
Index: ./lib-src/getopt.c
--- ./lib-src/getopt.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/getopt.c Fri Apr 29 22:31:08 2011
@@ -9,20 +9,18 @@
NOTE: The canonical source of this file is maintained with the GNU C Library.
Bugs can be reported to bug-glibc@prep.ai.mit.edu.
-This program is free software; you can redistribute it and/or modify it
+This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA. */
+along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
Ditto for AIX 3.2 and <stdlib.h>. */
diff --text -u 'xemacs-21.5.30/lib-src/getopt.h' 'xemacs-21.5.31/lib-src/getopt.h'
Index: ./lib-src/getopt.h
--- ./lib-src/getopt.h Wed Apr 27 00:57:26 2011
+++ ./lib-src/getopt.h Fri Apr 29 22:31:08 2011
@@ -4,20 +4,18 @@
NOTE: The canonical source of this file is maintained with the GNU C Library.
Bugs can be reported to bug-glibc@prep.ai.mit.edu.
-This program is free software; you can redistribute it and/or modify it
+This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA. */
+along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifndef _GETOPT_H
#define _GETOPT_H 1
diff --text -u 'xemacs-21.5.30/lib-src/getopt1.c' 'xemacs-21.5.31/lib-src/getopt1.c'
Index: ./lib-src/getopt1.c
--- ./lib-src/getopt1.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/getopt1.c Fri Apr 29 22:31:08 2011
@@ -4,20 +4,18 @@
NOTE: The canonical source of this file is maintained with the GNU C Library.
Bugs can be reported to bug-glibc@prep.ai.mit.edu.
-This program is free software; you can redistribute it and/or modify it
+This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA. */
+along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --text -u 'xemacs-21.5.30/lib-src/gnuattach' 'xemacs-21.5.31/lib-src/gnuattach'
Index: ./lib-src/gnuattach
--- ./lib-src/gnuattach Wed Apr 27 00:57:26 2011
+++ ./lib-src/gnuattach Fri Apr 29 22:31:08 2011
@@ -4,20 +4,18 @@
# Copyright (C) 1997 Free Software Foundation, Inc.
-# XEmacs is free software; you can redistribute it and/or modify it
+# XEmacs is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any
-# later version.
-
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
# XEmacs is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-
+#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
echo "$0: Please use \`gnuclient -nw' instead." >&2
exit 1
diff --text -u 'xemacs-21.5.30/lib-src/gnuclient.c' 'xemacs-21.5.31/lib-src/gnuclient.c'
Index: ./lib-src/gnuclient.c
--- ./lib-src/gnuclient.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/gnuclient.c Fri Apr 29 22:31:08 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,10 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
-
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
Author: Andy Norman (ange@hplb.hpl.hp.com), based on
'etc/emacsclient.c' from the GNU Emacs 18.52 distribution.
diff --text -u 'xemacs-21.5.30/lib-src/gnudoit' 'xemacs-21.5.31/lib-src/gnudoit'
Index: ./lib-src/gnudoit
--- ./lib-src/gnudoit Wed Apr 27 00:57:26 2011
+++ ./lib-src/gnudoit Fri Apr 29 22:31:08 2011
@@ -4,20 +4,18 @@
# Copyright (C) 1997 Free Software Foundation, Inc.
-# XEmacs is free software; you can redistribute it and/or modify it
+# XEmacs is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any
-# later version.
-
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
# XEmacs is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-
+#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
if [ x"$1" = x-q ]
then
diff --text -u 'xemacs-21.5.30/lib-src/gnuserv.c' 'xemacs-21.5.31/lib-src/gnuserv.c'
Index: ./lib-src/gnuserv.c
--- ./lib-src/gnuserv.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/gnuserv.c Fri Apr 29 22:31:08 2011
@@ -2,24 +2,22 @@
Server code for handling requests from clients and forwarding them
on to the XEmacs process.
- Copyright (C) 1989 Free Software Foundation, Inc.
+ This file is part of XEmacs.
+
+ XEmacs is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation, either version 3 of the License, or (at your
+ option) any later version.
+
+ XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
- This file is part of XEmacs.
+ You should have received a copy of the GNU General Public License
+ along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
- XEmacs is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- XEmacs is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with XEmacs; see the file COPYING. If not, write to the Free
- Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ Copyright (C) 1989 Free Software Foundation, Inc.
Author: Andy Norman (ange@hplb.hpl.hp.com), based on 'etc/server.c'
from the 18.52 GNU Emacs distribution.
diff --text -u 'xemacs-21.5.30/lib-src/gnuserv.h' 'xemacs-21.5.31/lib-src/gnuserv.h'
Index: ./lib-src/gnuserv.h
--- ./lib-src/gnuserv.h Wed Apr 27 00:57:26 2011
+++ ./lib-src/gnuserv.h Fri Apr 29 22:31:08 2011
@@ -6,20 +6,18 @@
This file is part of XEmacs.
- XEmacs is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- XEmacs is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ XEmacs is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation, either version 3 of the License, or (at your
+ option) any later version.
+
+ XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
You should have received a copy of the GNU General Public License
- along with XEmacs; see the file COPYING. If not, write to the Free
- Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
Author: Andy Norman (ange@hplb.hpl.hp.com), based on
'etc/server.c' and 'etc/emacsclient.c' from the 18.52 GNU
diff --text -u 'xemacs-21.5.30/lib-src/gnuslib.c' 'xemacs-21.5.31/lib-src/gnuslib.c'
Index: ./lib-src/gnuslib.c
--- ./lib-src/gnuslib.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/gnuslib.c Fri Apr 29 22:31:08 2011
@@ -1,24 +1,24 @@
/* -*-C-*-
Common library code for the XEmacs server and client.
- Copyright (C) 1989 Free Software Foundation, Inc.
+
This file is part of XEmacs.
- XEmacs is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- XEmacs is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with XEmacs; see the file COPYING. If not, write to the Free
- Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ XEmacs is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation, either version 3 of the License, or (at your
+ option) any later version.
+
+ XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
+ Copyright (C) 1989 Free Software Foundation, Inc.
Author: Andy Norman (ange@hplb.hpl.hp.com), based on
'etc/server.c' and 'etc/emacsclient.c' from the 18.52 GNU
diff --text -u 'xemacs-21.5.30/lib-src/gzip-el.sh' 'xemacs-21.5.31/lib-src/gzip-el.sh'
Index: ./lib-src/gzip-el.sh
--- ./lib-src/gzip-el.sh Wed Apr 27 00:57:26 2011
+++ ./lib-src/gzip-el.sh Fri Apr 29 22:31:08 2011
@@ -9,21 +9,19 @@
# Keywords: internal
# This file is part of XEmacs.
-
-# XEmacs is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# XEmacs is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-
+#
+# XEmacs is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# XEmacs is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
#
#
diff --text -u 'xemacs-21.5.30/lib-src/hexl.c' 'xemacs-21.5.31/lib-src/hexl.c'
Index: ./lib-src/hexl.c
--- ./lib-src/hexl.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/hexl.c Fri Apr 29 22:31:08 2011
@@ -1,20 +1,42 @@
-/* Synched up with: FSF 19.28. */
+/* Convert files for Emacs Hexl mode.
+ Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+ 2009, 2010 Free Software Foundation, Inc.
+Author: Keith Gabryelski
+(according to authors.el)
+
+This file is not considered part of GNU Emacs.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include <ctype.h>
-#ifdef WIN32_NATIVE
-#include <io.h>
+#ifdef DOS_NT
#include <fcntl.h>
+#if __DJGPP__ >= 2
+#include <io.h>
#endif
-
-#if __STDC__ || defined(STDC_HEADERS)
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
#endif
-#include <string.h>
+#ifdef WINDOWSNT
+#include <io.h>
#endif
#define DEFAULT_GROUPING 0x01
@@ -29,7 +51,7 @@
int group_by = DEFAULT_GROUPING;
char *progname;
-void usage (void);
+void usage(void);
int
main (int argc, char *argv[])
@@ -37,25 +59,25 @@
register long address;
char string[18];
FILE *fp;
-
+
progname = *argv++; --argc;
-
+
/*
- ** -hex hex dump
- ** -oct Octal dump
- ** -group-by-8-bits
- ** -group-by-16-bits
- ** -group-by-32-bits
- ** -group-by-64-bits
- ** -iso iso character set.
- ** -big-endian Big Endian
- ** -little-endian Little Endian
- ** -un || -de from hexl format to binary.
- ** -- End switch list.
- ** <filename> dump filename
- ** - (as filename == stdin)
- */
-
+ ** -hex hex dump
+ ** -oct Octal dump
+ ** -group-by-8-bits
+ ** -group-by-16-bits
+ ** -group-by-32-bits
+ ** -group-by-64-bits
+ ** -iso iso character set.
+ ** -big-endian Big Endian
+ ** -little-endian Little Endian
+ ** -un || -de from hexl format to binary.
+ ** -- End switch list.
+ ** <filename> dump filename
+ ** - (as filename == stdin)
+ */
+
while (*argv && *argv[0] == '-' && (*argv)[1])
{
/* A switch! */
@@ -117,7 +139,7 @@
}
else
{
- (void) fprintf (stderr, "%s: invalid switch: \"%s\".\n", progname,
+ fprintf (stderr, "%s: invalid switch: \"%s\".\n", progname,
*argv);
usage ();
}
@@ -144,8 +166,14 @@
{
char buf[18];
-#ifdef WIN32_NATIVE
- _setmode (_fileno (stdout), O_BINARY);
+#ifdef DOS_NT
+#if (__DJGPP__ >= 2) || (defined WINDOWSNT)
+ if (!isatty (fileno (stdout)))
+ setmode (fileno (stdout), O_BINARY);
+#else
+ (stdout)->_flag &= ~_IOTEXT; /* print binary */
+ _setmode (fileno (stdout), O_BINARY);
+#endif
#endif
for (;;)
{
@@ -187,8 +215,14 @@
}
else
{
-#ifdef WIN32_NATIVE
- _setmode (_fileno (fp), O_BINARY);
+#ifdef DOS_NT
+#if (__DJGPP__ >= 2) || (defined WINDOWSNT)
+ if (!isatty (fileno (fp)))
+ setmode (fileno (fp), O_BINARY);
+#else
+ (fp)->_flag &= ~_IOTEXT; /* read binary */
+ _setmode (fileno (fp), O_BINARY);
+#endif
#endif
address = 0;
string[0] = ' ';
@@ -210,7 +244,7 @@
else
{
if (!i)
- (void) printf ("%08lx: ", address);
+ printf ("%08lx: ", address);
if (iso_flag)
string[i+1] =
@@ -218,7 +252,7 @@
else
string[i+1] = (c < 0x20 || c >= 0x7F) ? '.' : c;
- (void) printf ("%02x", c);
+ printf ("%02x", c);
}
if ((i&group_by) == group_by)
@@ -237,15 +271,17 @@
}
if (fp != stdin)
- (void) fclose (fp);
+ fclose (fp);
} while (*argv != NULL);
- return 0;
+ return EXIT_SUCCESS;
}
void
usage (void)
{
- fprintf (stderr, "Usage: %s [-de] [-iso]\n", progname);
- exit (1);
+ fprintf (stderr, "usage: %s [-de] [-iso]\n", progname);
+ exit (EXIT_FAILURE);
}
+
+/* hexl.c ends here */
diff --text -u 'xemacs-21.5.30/lib-src/i.c' 'xemacs-21.5.31/lib-src/i.c'
Index: ./lib-src/i.c
--- ./lib-src/i.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/i.c Fri Apr 29 22:31:08 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* When run with an argument, i treats it as a command line, and pipes
command stdin, stdout and stderr to its own respective streams. How
diff --text -u 'xemacs-21.5.30/lib-src/installexe.sh' 'xemacs-21.5.31/lib-src/installexe.sh'
Index: ./lib-src/installexe.sh
--- ./lib-src/installexe.sh Wed Apr 27 00:57:26 2011
+++ ./lib-src/installexe.sh Fri Apr 29 22:31:08 2011
@@ -3,21 +3,19 @@
# Copyright (C) 1998 Andy Piper
# This file is part of XEmacs.
-
-# XEmacs is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your
+#
+# XEmacs is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
# option) any later version.
-
-# XEmacs is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-
+#
+# XEmacs is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to the Free
-# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
install_prog=$1
shift
diff --text -u 'xemacs-21.5.30/lib-src/make-docfile.c' 'xemacs-21.5.31/lib-src/make-docfile.c'
Index: ./lib-src/make-docfile.c
--- ./lib-src/make-docfile.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/make-docfile.c Fri Apr 29 22:31:08 2011
@@ -7,20 +7,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 21.3. */
diff --text -u 'xemacs-21.5.30/lib-src/make-dump-id.c' 'xemacs-21.5.31/lib-src/make-dump-id.c'
Index: ./lib-src/make-dump-id.c
--- ./lib-src/make-dump-id.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/make-dump-id.c Fri Apr 29 22:31:08 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <stdio.h>
diff --text -u 'xemacs-21.5.30/lib-src/make-msgfile.lex' 'xemacs-21.5.31/lib-src/make-msgfile.lex'
Index: ./lib-src/make-msgfile.lex
--- ./lib-src/make-msgfile.lex Wed Apr 27 00:57:26 2011
+++ ./lib-src/make-msgfile.lex Fri Apr 29 22:31:08 2011
@@ -8,20 +8,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Written by Ben Wing, November 1994. Some code based on earlier
make-msgfile.c. */
diff --text -u 'xemacs-21.5.30/lib-src/make-mswin-unicode.pl' 'xemacs-21.5.31/lib-src/make-mswin-unicode.pl'
Index: ./lib-src/make-mswin-unicode.pl
--- ./lib-src/make-mswin-unicode.pl Wed Apr 27 00:57:26 2011
+++ ./lib-src/make-mswin-unicode.pl Fri Apr 29 22:31:08 2011
@@ -10,20 +10,18 @@
## This file is part of XEmacs.
-## XEmacs is free software; you can redistribute it and/or modify it
-## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-
-## XEmacs is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
+## XEmacs is free software: you can redistribute it and/or modify it
+## under the terms of the GNU General Public License as published by the
+## Free Software Foundation, either version 3 of the License, or (at your
+## option) any later version.
+
+## XEmacs is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+## for more details.
## You should have received a copy of the GNU General Public License
-## along with XEmacs; see the file COPYING. If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
eval 'exec perl -w -S $0 ${1+"$@"}'
if 0;
diff --text -u 'xemacs-21.5.30/lib-src/make-path.c' 'xemacs-21.5.31/lib-src/make-path.c'
Index: ./lib-src/make-path.c
--- ./lib-src/make-path.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/make-path.c Fri Apr 29 22:31:08 2011
@@ -3,20 +3,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.28. */
diff --text -u 'xemacs-21.5.30/lib-src/movemail.c' 'xemacs-21.5.31/lib-src/movemail.c'
Index: ./lib-src/movemail.c
--- ./lib-src/movemail.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/movemail.c Fri Apr 29 22:31:08 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,10 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
-
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
Please mail bugs and suggestions to the XEmacs maintainer.
*/
diff --text -u 'xemacs-21.5.30/lib-src/ootags.c' 'xemacs-21.5.31/lib-src/ootags.c'
Index: ./lib-src/ootags.c
--- ./lib-src/ootags.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/ootags.c Fri Apr 29 22:31:08 2011
@@ -4,19 +4,18 @@
This file is not considered part of GNU Emacs.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+along with this program. If not, see <http://www.gnu.org/licenses/>. */
/*
* Authors:
diff --text -u 'xemacs-21.5.30/lib-src/pop.c' 'xemacs-21.5.31/lib-src/pop.c'
Index: ./lib-src/pop.c
--- ./lib-src/pop.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/pop.c Fri Apr 29 22:31:08 2011
@@ -6,20 +6,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 22.0.50. */
diff --text -u 'xemacs-21.5.30/lib-src/pop.h' 'xemacs-21.5.31/lib-src/pop.h'
Index: ./lib-src/pop.h
--- ./lib-src/pop.h Wed Apr 27 00:57:26 2011
+++ ./lib-src/pop.h Fri Apr 29 22:31:08 2011
@@ -5,20 +5,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 22.0.50. */
diff --text -u 'xemacs-21.5.30/lib-src/profile.c' 'xemacs-21.5.31/lib-src/profile.c'
Index: ./lib-src/profile.c
--- ./lib-src/profile.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/profile.c Fri Apr 29 22:31:08 2011
@@ -4,22 +4,20 @@
Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>
- This file is part of XEmacs.
+ This file is part of XEmacs.
- XEmacs is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- XEmacs is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with XEmacs; see the file COPYING. If not, write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ XEmacs is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation, either version 3 of the License, or (at your
+ option) any later version.
+
+ XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.28. */
/* #### Not sure if this is needed for XEmacs. */
diff --text -u 'xemacs-21.5.30/lib-src/qsort.c' 'xemacs-21.5.31/lib-src/qsort.c'
Index: ./lib-src/qsort.c
--- ./lib-src/qsort.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/qsort.c Fri Apr 29 22:31:08 2011
@@ -4,20 +4,18 @@
This file is part of GNU CC.
-GNU QSORT is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU QSORT is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+GNU QSORT is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+GNU QSORT is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with GNU QSORT; see the file COPYING. If not, write to
-the Free the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with GNU QSORT. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.28. */
diff --text -u 'xemacs-21.5.30/lib-src/rcs2log' 'xemacs-21.5.31/lib-src/rcs2log'
Index: ./lib-src/rcs2log
Prereq: 1.3
--- ./lib-src/rcs2log Wed Apr 27 00:57:26 2011
+++ ./lib-src/rcs2log Fri Apr 29 22:31:08 2011
@@ -34,20 +34,18 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002
# Free Software Foundation, Inc.
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
# You should have received a copy of the GNU General Public License
-# along with this program; see the file COPYING. If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
Copyright='Copyright (C) 2002 Free Software Foundation, Inc.
This program comes with NO WARRANTY, to the extent permitted by law.
diff --text -u 'xemacs-21.5.30/lib-src/sorted-doc.c' 'xemacs-21.5.31/lib-src/sorted-doc.c'
Index: ./lib-src/sorted-doc.c
--- ./lib-src/sorted-doc.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/sorted-doc.c Fri Apr 29 22:31:08 2011
@@ -1,28 +1,48 @@
-/* Give this program DOCSTR.mm.nn as standard input
- and it outputs to standard output
- a file of texinfo input containing the doc strings.
-
- This version sorts the output by function name.
- */
+/* Give this program DOC-mm.nn.oo as standard input and it outputs to
+ standard output a file of texinfo input containing the doc strings.
-/* Synched up with: FSF 19.28. */
+Copyright (C) 1989, 1992, 1994, 1996, 1999, 2000, 2001, 2002, 2003,
+ 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+XEmacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
+
+/* This version sorts the output by function name. */
+
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h> /* for qsort() and malloc() */
+#include <stdlib.h>
#include <string.h>
-static void *xmalloc (size_t);
+#include <ctype.h>
+#ifdef DOS_NT
+#include <fcntl.h> /* for O_BINARY */
+#include <io.h> /* for setmode */
+#endif
#define NUL '\0'
#define MARKER '\037'
#define DEBUG 0
-typedef struct LINE LINE;
+typedef struct line LINE;
-struct LINE
+struct line
{
LINE *next; /* ptr to next or NULL */
char *line; /* text of the line */
@@ -38,10 +58,18 @@
char type; /* 'F' for function, 'V' for variable */
};
+void error (char *s1, char *s2);
+void fatal (char *s1, char *s2);
+char *xmalloc (int size);
+char *xstrdup (char *str);
+int cmpdoc (DOCSTR **a, DOCSTR **b);
+
+typedef int (*sort_function_t)(const void *, const void *);
+
/* Print error message. `s1' is printf control string, `s2' is arg for it. */
-static void
+void
error (char *s1, char *s2)
{
fprintf (stderr, "sorted-doc: ");
@@ -51,35 +79,35 @@
/* Print error message and exit. */
-static void
+void
fatal (char *s1, char *s2)
{
error (s1, s2);
- exit (1);
+ exit (EXIT_FAILURE);
}
/* Like malloc but get fatal error if memory is exhausted. */
-static void *
-xmalloc (size_t size)
+char *
+xmalloc (int size)
{
- void *result = malloc (size);
+ char *result = malloc ((unsigned)size);
if (result == NULL)
fatal ("%s", "virtual memory exhausted");
return result;
}
-static char *
-strsav (char *str)
+char *
+xstrdup (char *str)
{
- char *buf = (char *) xmalloc (strlen (str) + 1);
- strcpy (buf, str);
- return buf;
+ char *buf = xmalloc (strlen (str) + 1);
+ (void) strcpy (buf, str);
+ return (buf);
}
/* Comparison function for qsort to call. */
-static int
+int
cmpdoc (DOCSTR **a, DOCSTR **b)
{
register int val = strcmp ((*a)->name, (*b)->name);
@@ -93,24 +121,31 @@
WAITING, BEG_NAME, NAME_GET, BEG_DESC, DESC_GET
};
-const char *states[] =
+char *states[] =
{
"WAITING", "BEG_NAME", "NAME_GET", "BEG_DESC", "DESC_GET"
};
-
+
int
-main (int argc, char **argv)
+main (void)
{
register DOCSTR *dp = NULL; /* allocated DOCSTR */
register LINE *lp = NULL; /* allocated line */
- register char *bp = 0; /* ptr inside line buffer */
- /* int notfirst = 0; / * set after read something */
+ register char *bp; /* ptr inside line buffer */
register enum state state = WAITING; /* state at start */
int cnt = 0; /* number of DOCSTRs read */
- DOCSTR *docs = 0; /* chain of allocated DOCSTRS */
+ DOCSTR *docs = NULL; /* chain of allocated DOCSTRS */
char buf[512]; /* line buffer */
-
+
+#ifdef DOS_NT
+ /* DOC is a binary file. */
+ if (!isatty (fileno (stdin)))
+ setmode (fileno (stdin), O_BINARY);
+#endif
+
+ bp = buf;
+
while (1) /* process one char at a time */
{
/* this char from the DOCSTR file */
@@ -158,7 +193,7 @@
bp = buf;
state = DESC_GET;
}
-
+
/* process gets */
if (state == NAME_GET || state == DESC_GET)
@@ -170,7 +205,7 @@
else /* saving and changing state */
{
*bp = NUL;
- bp = strsav (buf);
+ bp = xstrdup (buf);
if (state == NAME_GET)
dp->name = bp;
@@ -197,19 +232,19 @@
/* sort the array by name; within each name, by type */
- qsort ((char*)array, cnt, sizeof (DOCSTR*),
- (int (*)(const void *, const void *)) cmpdoc);
+ qsort ((char*)array, cnt, sizeof (DOCSTR*), (sort_function_t)cmpdoc);
/* write the output header */
printf ("\\input texinfo @c -*-texinfo-*-\n");
printf ("@setfilename ../info/summary\n");
printf ("@settitle Command Summary for XEmacs\n");
+ printf ("@finalout\n");
printf ("@unnumbered Command Summary for XEmacs\n");
printf ("@table @asis\n");
printf ("\n");
printf ("@iftex\n");
- printf ("@global@let@ITEM=@item\n");
+ printf ("@global@let@ITEM@item\n");
printf ("@def@item{@filbreak@vskip5pt@ITEM}\n");
printf ("@font@tensy cmsy10 scaled @magstephalf\n");
printf ("@font@teni cmmi10 scaled @magstephalf\n");
@@ -246,12 +281,17 @@
putchar ('\n');
}
printf("@end display\n");
- if ( i%200 == 0 && i != 0 ) printf("@end table\n\n@table @asis\n");
+ /* Try to avoid a save size overflow in the TeX output
+ routine. */
+ if (i%100 == 0 && i > 0 && i != cnt)
+ printf("\n@end table\n@table @asis\n");
}
printf ("@end table\n");
printf ("@bye\n");
}
- return 0;
+ return EXIT_SUCCESS;
}
+
+/* sorted-doc.c ends here */
diff --text -u 'xemacs-21.5.30/lib-src/tcp.c' 'xemacs-21.5.31/lib-src/tcp.c'
Index: ./lib-src/tcp.c
--- ./lib-src/tcp.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/tcp.c Fri Apr 29 22:31:08 2011
@@ -7,20 +7,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
*
* Yasunari, Itoh at PFU limited contributed for Fujitsu UTS and SX/A.
diff --text -u 'xemacs-21.5.30/lib-src/update-autoloads.sh' 'xemacs-21.5.31/lib-src/update-autoloads.sh'
Index: ./lib-src/update-autoloads.sh
--- ./lib-src/update-autoloads.sh Wed Apr 27 00:57:26 2011
+++ ./lib-src/update-autoloads.sh Fri Apr 29 22:31:08 2011
@@ -6,21 +6,19 @@
# Keywords: internal
# This file is part of XEmacs.
-
-# XEmacs is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# XEmacs is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-
+#
+# XEmacs is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# XEmacs is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
### Commentary:
diff --text -u 'xemacs-21.5.30/lib-src/update-custom.sh' 'xemacs-21.5.31/lib-src/update-custom.sh'
Index: ./lib-src/update-custom.sh
--- ./lib-src/update-custom.sh Wed Apr 27 00:57:26 2011
+++ ./lib-src/update-custom.sh Fri Apr 29 22:31:08 2011
@@ -7,21 +7,19 @@
# Keywords: internal
# This file is part of XEmacs.
-
-# XEmacs is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# XEmacs is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-
+#
+# XEmacs is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# XEmacs is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
### Commentary:
diff --text -u 'xemacs-21.5.30/lib-src/vcdiff' 'xemacs-21.5.31/lib-src/vcdiff'
Index: ./lib-src/vcdiff
--- ./lib-src/vcdiff Wed Apr 27 00:57:26 2011
+++ ./lib-src/vcdiff Fri Apr 29 22:31:08 2011
@@ -1,23 +1,37 @@
-#!/bin/sh
-#
+#! /bin/sh
+
# Enhanced sccs diff utility for use with vc mode.
# This version is more compatible with rcsdiff(1).
-#
-# !Id: vcdiff,v 1.4 1993/12/03 09:29:18 eggert Exp !
-#
-# Modified by: vladimir@Eng.Sun.COM on 95-06-07
-# * Made sure that file arguments are specifed as s.<filename>.
-# * Switched the assignments to $f inside the 3rd and 4th case statements of
-# the first for-loop
-# * Removed the incorrect initialization of sid1 before the first for-loop.
-#
+
+# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+# Author: Paul Eggert
+# (according to authors.el)
+
+# This file is part of XEmacs.
+
+# XEmacs is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# XEmacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
DIFF="diff"
usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
-PATH=$PATH:/usr/ccs/bin:/usr/sccs # common SCCS hangouts
+# Now that we use `sccs get' rather than just `get', we don't need this.
+# PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts
-echo=
+echo="echo"
sid1= sid2=
for f
@@ -31,14 +45,14 @@
echo=:;;
-r?*)
case $sid1 in
- -r*)
- sid2=$f
+ '')
+ sid1=$f
;;
- *)
+ *)
case $sid2 in
- ?*) echo "$usage" >&2; exit 2 ;;
+ ?*) echo "$usage" >&2; exit 2 ;;
esac
- sid1=$f
+ sid2=$f
;;
esac
;;
@@ -67,31 +81,24 @@
for f
do
- s=2
-
- # For files under SCCS control, fixup the file name to be the s. filename
- if [ -d SCCS ]; then
- if [ $f = `echo $f | sed -e 's|SCCS/s.||'` ]; then
- f="SCCS/s.$f"
- fi
- fi
+ s=2
case $f in
s.* | */s.*)
if
- rev1=/tmp/geta$$
- get -s -p -k $sid1 "$f" > $rev1 &&
+ rev1=`mktemp /tmp/geta.XXXXXXXX`
+ sccs get -s -p -k $sid1 "$f" > $rev1 &&
case $sid2 in
'')
workfile=`expr " /$f" : '.*/s.\(.*\)'`
;;
*)
- rev2=/tmp/getb$$
- get -s -p -k $sid2 "$f" > $rev2
+ rev2=`mktemp /tmp/getb.XXXXXXXX`
+ sccs get -s -p -k $sid2 "$f" > $rev2
workfile=$rev2
esac
then
- $echo $DIFF $options $sid1 $sid2 $workfile >&2
+ $echo $DIFF $options $rev1 $workfile >&2
$DIFF $options $rev1 $workfile
s=$?
fi
@@ -104,3 +111,4 @@
then status=$s
fi
done
+
diff --text -u 'xemacs-21.5.30/lib-src/winclient.c' 'xemacs-21.5.31/lib-src/winclient.c'
Index: ./lib-src/winclient.c
--- ./lib-src/winclient.c Wed Apr 27 00:57:26 2011
+++ ./lib-src/winclient.c Fri Apr 29 22:31:08 2011
@@ -3,20 +3,18 @@
This file is part of XEmacs.
- XEmacs is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any
- later version.
-
- XEmacs is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with XEmacs; see the file COPYING. If not, write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/lisp/ChangeLog' 'xemacs-21.5.31/lisp/ChangeLog'
Index: ./lisp/ChangeLog
--- ./lisp/ChangeLog Wed Apr 27 00:57:41 2011
+++ ./lisp/ChangeLog Fri Apr 29 22:31:39 2011
@@ -1,3 +1,7 @@
+2011-04-29 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.5.31 "ginger" is released.
+
2011-04-26 Stephen J. Turnbull <stephen@xemacs.org>
* XEmacs 21.5.30 "garlic" is released.
@@ -30439,3 +30443,23 @@
standard font-lock faces).
* version.el: Bumped up to b31.
+
+
+ChangeLog entries synched from GNU Emacs are the property of the FSF.
+Other ChangeLog entries are usually the property of the author of the
+change.
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
diff --text -u 'xemacs-21.5.30/lisp/ChangeLog.GTK' 'xemacs-21.5.31/lisp/ChangeLog.GTK'
Index: ./lisp/ChangeLog.GTK
--- ./lisp/ChangeLog.GTK Wed Apr 27 00:57:27 2011
+++ ./lisp/ChangeLog.GTK Fri Apr 29 22:31:09 2011
@@ -247,3 +247,20 @@
* gtk-faces.el (gtk-init-face-from-resources): Set the highlight
face as well.
+
+Copyright (C) 2000 William M. Perry
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
diff --text -u 'xemacs-21.5.30/lisp/abbrev.el' 'xemacs-21.5.31/lisp/abbrev.el'
Index: ./lisp/abbrev.el
--- ./lisp/abbrev.el Wed Apr 27 00:57:27 2011
+++ ./lisp/abbrev.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.34 (With some additions)
diff --text -u 'xemacs-21.5.30/lisp/about.el' 'xemacs-21.5.31/lisp/about.el'
Index: ./lisp/about.el
--- ./lisp/about.el Wed Apr 27 00:57:27 2011
+++ ./lisp/about.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/alist.el' 'xemacs-21.5.31/lisp/alist.el'
Index: ./lisp/alist.el
--- ./lisp/alist.el Wed Apr 27 00:57:27 2011
+++ ./lisp/alist.el Fri Apr 29 22:31:09 2011
@@ -5,22 +5,20 @@
;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
;; Keywords: alist
-;; This file is part of XEmacs.
+;; This file is part of APEL (A Portable Emacs Library).
-;; XEmacs is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
-;; your option) any later version.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
-;; XEmacs is distributed in the hope that it will be useful, but
+;; This program is distributed in the hope that it will be useful, but
;; WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
;; General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;;###autoload
diff --text -u 'xemacs-21.5.30/lisp/apropos.el' 'xemacs-21.5.31/lisp/apropos.el'
Index: ./lisp/apropos.el
--- ./lisp/apropos.el Wed Apr 27 00:57:27 2011
+++ ./lisp/apropos.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Last synched with FSF 19.34, diverged since.
diff --text -u 'xemacs-21.5.30/lisp/auto-save.el' 'xemacs-21.5.31/lisp/auto-save.el'
Index: ./lisp/auto-save.el
--- ./lisp/auto-save.el Wed Apr 27 00:57:27 2011
+++ ./lisp/auto-save.el Fri Apr 29 22:31:09 2011
@@ -11,20 +11,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/auto-show.el' 'xemacs-21.5.31/lisp/auto-show.el'
Index: ./lisp/auto-show.el
--- ./lisp/auto-show.el Wed Apr 27 00:57:27 2011
+++ ./lisp/auto-show.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Emacs/Mule zeta.
diff --text -u 'xemacs-21.5.30/lisp/autoload.el' 'xemacs-21.5.31/lisp/autoload.el'
Index: ./lisp/autoload.el
--- ./lisp/autoload.el Wed Apr 27 00:57:27 2011
+++ ./lisp/autoload.el Fri Apr 29 22:31:09 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 21.2 by Ben Wing.
;;; Note that update-file-autoloads is seriously modified and not really
diff --text -u 'xemacs-21.5.30/lisp/backquote.el' 'xemacs-21.5.31/lisp/backquote.el'
Index: ./lisp/backquote.el
--- ./lisp/backquote.el Wed Apr 27 00:57:27 2011
+++ ./lisp/backquote.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,20 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; This file is part of XEmacs.
+
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched with FSF.
diff --text -u 'xemacs-21.5.30/lisp/behavior-defs.el' 'xemacs-21.5.31/lisp/behavior-defs.el'
Index: ./lisp/behavior-defs.el
--- ./lisp/behavior-defs.el Wed Apr 27 00:57:27 2011
+++ ./lisp/behavior-defs.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/behavior.el' 'xemacs-21.5.31/lisp/behavior.el'
Index: ./lisp/behavior.el
--- ./lisp/behavior.el Wed Apr 27 00:57:27 2011
+++ ./lisp/behavior.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/blessmail.el' 'xemacs-21.5.31/lisp/blessmail.el'
Index: ./lisp/blessmail.el
--- ./lisp/blessmail.el Wed Apr 27 00:57:27 2011
+++ ./lisp/blessmail.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.34.
diff --text -u 'xemacs-21.5.30/lisp/buff-menu.el' 'xemacs-21.5.31/lisp/buff-menu.el'
Index: ./lisp/buff-menu.el
--- ./lisp/buff-menu.el Wed Apr 27 00:57:27 2011
+++ ./lisp/buff-menu.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.34 except as noted.
diff --text -u 'xemacs-21.5.30/lisp/buffer.el' 'xemacs-21.5.31/lisp/buffer.el'
Index: ./lisp/buffer.el
--- ./lisp/buffer.el Wed Apr 27 00:57:27 2011
+++ ./lisp/buffer.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.30 buffer.c.
diff --text -u 'xemacs-21.5.30/lisp/build-report.el' 'xemacs-21.5.31/lisp/build-report.el'
Index: ./lisp/build-report.el
--- ./lisp/build-report.el Wed Apr 27 00:57:27 2011
+++ ./lisp/build-report.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: XEmacs build package build-report.el Revision 1.49.
diff --text -u 'xemacs-21.5.30/lisp/byte-optimize.el' 'xemacs-21.5.31/lisp/byte-optimize.el'
Index: ./lisp/byte-optimize.el
--- ./lisp/byte-optimize.el Wed Apr 27 00:57:27 2011
+++ ./lisp/byte-optimize.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 20.7 except where marked.
;;; [[ Synched up with: FSF 20.7. ]]
diff --text -u 'xemacs-21.5.30/lisp/bytecomp-runtime.el' 'xemacs-21.5.31/lisp/bytecomp-runtime.el'
Index: ./lisp/bytecomp-runtime.el
--- ./lisp/bytecomp-runtime.el Wed Apr 27 00:57:27 2011
+++ ./lisp/bytecomp-runtime.el Fri Apr 29 22:31:09 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.30.
diff --text -u 'xemacs-21.5.30/lisp/bytecomp.el' 'xemacs-21.5.31/lisp/bytecomp.el'
Index: ./lisp/bytecomp.el
--- ./lisp/bytecomp.el Wed Apr 27 00:57:27 2011
+++ ./lisp/bytecomp.el Fri Apr 29 22:31:09 2011
@@ -14,20 +14,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.30.
diff --text -u 'xemacs-21.5.30/lisp/callers-of-rpt.el' 'xemacs-21.5.31/lisp/callers-of-rpt.el'
Index: ./lisp/callers-of-rpt.el
--- ./lisp/callers-of-rpt.el Wed Apr 27 00:57:27 2011
+++ ./lisp/callers-of-rpt.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: not in FSF
diff --text -u 'xemacs-21.5.30/lisp/check-features.el' 'xemacs-21.5.31/lisp/check-features.el'
Index: ./lisp/check-features.el
--- ./lisp/check-features.el Wed Apr 27 00:57:27 2011
+++ ./lisp/check-features.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/cl-compat.el' 'xemacs-21.5.31/lisp/cl-compat.el'
Index: ./lisp/cl-compat.el
--- ./lisp/cl-compat.el Wed Apr 27 00:57:27 2011
+++ ./lisp/cl-compat.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 21.3.
diff --text -u 'xemacs-21.5.30/lisp/cl-extra.el' 'xemacs-21.5.31/lisp/cl-extra.el'
Index: ./lisp/cl-extra.el
--- ./lisp/cl-extra.el Wed Apr 27 00:57:27 2011
+++ ./lisp/cl-extra.el Fri Apr 29 22:31:09 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 21.3.
diff --text -u 'xemacs-21.5.30/lisp/cl-macs.el' 'xemacs-21.5.31/lisp/cl-macs.el'
Index: ./lisp/cl-macs.el
--- ./lisp/cl-macs.el Wed Apr 27 00:57:27 2011
+++ ./lisp/cl-macs.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 21.3.
diff --text -u 'xemacs-21.5.30/lisp/cl-seq.el' 'xemacs-21.5.31/lisp/cl-seq.el'
Index: ./lisp/cl-seq.el
--- ./lisp/cl-seq.el Wed Apr 27 00:57:27 2011
+++ ./lisp/cl-seq.el Fri Apr 29 22:31:09 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 21.3.
diff --text -u 'xemacs-21.5.30/lisp/cl.el' 'xemacs-21.5.31/lisp/cl.el'
Index: ./lisp/cl.el
--- ./lisp/cl.el Wed Apr 27 00:57:27 2011
+++ ./lisp/cl.el Fri Apr 29 22:31:09 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 21.3.
diff --text -u 'xemacs-21.5.30/lisp/cmdloop.el' 'xemacs-21.5.31/lisp/cmdloop.el'
Index: ./lisp/cmdloop.el
--- ./lisp/cmdloop.el Wed Apr 27 00:57:27 2011
+++ ./lisp/cmdloop.el Fri Apr 29 22:31:09 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.30. (Some of the stuff below is in FSF's subr.el.)
;;; Some parts synched with FSF 21.2.
diff --text -u 'xemacs-21.5.30/lisp/code-cmds.el' 'xemacs-21.5.31/lisp/code-cmds.el'
Index: ./lisp/code-cmds.el
--- ./lisp/code-cmds.el Wed Apr 27 00:57:27 2011
+++ ./lisp/code-cmds.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;
;; This code defines the keybindings and utility commands for the
diff --text -u 'xemacs-21.5.30/lisp/code-files.el' 'xemacs-21.5.31/lisp/code-files.el'
Index: ./lisp/code-files.el
--- ./lisp/code-files.el Wed Apr 27 00:57:27 2011
+++ ./lisp/code-files.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched.
diff --text -u 'xemacs-21.5.30/lisp/code-init.el' 'xemacs-21.5.31/lisp/code-init.el'
Index: ./lisp/code-init.el
--- ./lisp/code-init.el Wed Apr 27 00:57:27 2011
+++ ./lisp/code-init.el Fri Apr 29 22:31:09 2011
@@ -4,20 +4,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/code-process.el' 'xemacs-21.5.31/lisp/code-process.el'
Index: ./lisp/code-process.el
--- ./lisp/code-process.el Wed Apr 27 00:57:27 2011
+++ ./lisp/code-process.el Fri Apr 29 22:31:09 2011
@@ -13,20 +13,18 @@
;; This file is very similar to code-process.el
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Code:
diff --text -u 'xemacs-21.5.30/lisp/coding.el' 'xemacs-21.5.31/lisp/coding.el'
Index: ./lisp/coding.el
--- ./lisp/coding.el Wed Apr 27 00:57:27 2011
+++ ./lisp/coding.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/compat.el' 'xemacs-21.5.31/lisp/compat.el'
Index: ./lisp/compat.el
--- ./lisp/compat.el Wed Apr 27 00:57:27 2011
+++ ./lisp/compat.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
@@ -727,4 +725,5 @@
(fmakunbound 'compat-define-compat-functions)
+
)
\ No newline at end of file
diff --text -u 'xemacs-21.5.30/lisp/config.el' 'xemacs-21.5.31/lisp/config.el'
Index: ./lisp/config.el
--- ./lisp/config.el Wed Apr 27 00:57:27 2011
+++ ./lisp/config.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/console.el' 'xemacs-21.5.31/lisp/console.el'
Index: ./lisp/console.el
--- ./lisp/console.el Wed Apr 27 00:57:27 2011
+++ ./lisp/console.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/cus-dep.el' 'xemacs-21.5.31/lisp/cus-dep.el'
Index: ./lisp/cus-dep.el
--- ./lisp/cus-dep.el Wed Apr 27 00:57:27 2011
+++ ./lisp/cus-dep.el Fri Apr 29 22:31:09 2011
@@ -11,20 +11,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched with FSF.
diff --text -u 'xemacs-21.5.30/lisp/cus-edit.el' 'xemacs-21.5.31/lisp/cus-edit.el'
Index: ./lisp/cus-edit.el
--- ./lisp/cus-edit.el Wed Apr 27 00:57:27 2011
+++ ./lisp/cus-edit.el Fri Apr 29 22:31:09 2011
@@ -12,20 +12,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;
diff --text -u 'xemacs-21.5.30/lisp/cus-face.el' 'xemacs-21.5.31/lisp/cus-face.el'
Index: ./lisp/cus-face.el
--- ./lisp/cus-face.el Wed Apr 27 00:57:27 2011
+++ ./lisp/cus-face.el Fri Apr 29 22:31:09 2011
@@ -9,6 +9,21 @@
;; Version: 1.9960-x
;; X-URL: http://www.dina.kvl.dk/~abraham/custom/
+;; This file is part of XEmacs.
+
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
;;; Synched with: Not synched.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/cus-file.el' 'xemacs-21.5.31/lisp/cus-file.el'
Index: ./lisp/cus-file.el
--- ./lisp/cus-file.el Wed Apr 27 00:57:27 2011
+++ ./lisp/cus-file.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/cus-load.el' 'xemacs-21.5.31/lisp/cus-load.el'
Index: ./lisp/cus-load.el
--- ./lisp/cus-load.el Wed Apr 27 00:57:27 2011
+++ ./lisp/cus-load.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/cus-start.el' 'xemacs-21.5.31/lisp/cus-start.el'
Index: ./lisp/cus-start.el
--- ./lisp/cus-start.el Wed Apr 27 00:57:27 2011
+++ ./lisp/cus-start.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched with FSF.
diff --text -u 'xemacs-21.5.30/lisp/custom.el' 'xemacs-21.5.31/lisp/custom.el'
Index: ./lisp/custom.el
--- ./lisp/custom.el Wed Apr 27 00:57:27 2011
+++ ./lisp/custom.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched with: FSF 21.3.
diff --text -u 'xemacs-21.5.30/lisp/derived.el' 'xemacs-21.5.31/lisp/derived.el'
Index: ./lisp/derived.el
--- ./lisp/derived.el Wed Apr 27 00:57:27 2011
+++ ./lisp/derived.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 21.3.
diff --text -u 'xemacs-21.5.30/lisp/descr-text.el' 'xemacs-21.5.31/lisp/descr-text.el'
Index: ./lisp/descr-text.el
--- ./lisp/descr-text.el Wed Apr 27 00:57:27 2011
+++ ./lisp/descr-text.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/device.el' 'xemacs-21.5.31/lisp/device.el'
Index: ./lisp/device.el
--- ./lisp/device.el Wed Apr 27 00:57:27 2011
+++ ./lisp/device.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/diagnose.el' 'xemacs-21.5.31/lisp/diagnose.el'
Index: ./lisp/diagnose.el
--- ./lisp/diagnose.el Wed Apr 27 00:57:27 2011
+++ ./lisp/diagnose.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/dialog-gtk.el' 'xemacs-21.5.31/lisp/dialog-gtk.el'
Index: ./lisp/dialog-gtk.el
--- ./lisp/dialog-gtk.el Wed Apr 27 00:57:27 2011
+++ ./lisp/dialog-gtk.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/dialog-items.el' 'xemacs-21.5.31/lisp/dialog-items.el'
Index: ./lisp/dialog-items.el
--- ./lisp/dialog-items.el Wed Apr 27 00:57:27 2011
+++ ./lisp/dialog-items.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/dialog.el' 'xemacs-21.5.31/lisp/dialog.el'
Index: ./lisp/dialog.el
--- ./lisp/dialog.el Wed Apr 27 00:57:27 2011
+++ ./lisp/dialog.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/disass.el' 'xemacs-21.5.31/lisp/disass.el'
Index: ./lisp/disass.el
--- ./lisp/disass.el Wed Apr 27 00:57:27 2011
+++ ./lisp/disass.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.28.
diff --text -u 'xemacs-21.5.30/lisp/disp-table.el' 'xemacs-21.5.31/lisp/disp-table.el'
Index: ./lisp/disp-table.el
--- ./lisp/disp-table.el Wed Apr 27 00:57:27 2011
+++ ./lisp/disp-table.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched with FSF.
diff --text -u 'xemacs-21.5.30/lisp/dragdrop.el' 'xemacs-21.5.31/lisp/dragdrop.el'
Index: ./lisp/dragdrop.el
--- ./lisp/dragdrop.el Wed Apr 27 00:57:27 2011
+++ ./lisp/dragdrop.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/dumped-lisp.el' 'xemacs-21.5.31/lisp/dumped-lisp.el'
Index: ./lisp/dumped-lisp.el
--- ./lisp/dumped-lisp.el Wed Apr 27 00:57:27 2011
+++ ./lisp/dumped-lisp.el Fri Apr 29 22:31:09 2011
@@ -1,3 +1,18 @@
+;; This file is part of XEmacs.
+
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
(defvar packages-hardcoded-lisp
'(
;; Nothing at this time
diff --text -u 'xemacs-21.5.30/lisp/easy-mmode.el' 'xemacs-21.5.31/lisp/easy-mmode.el'
Index: ./lisp/easy-mmode.el
--- ./lisp/easy-mmode.el Wed Apr 27 00:57:27 2011
+++ ./lisp/easy-mmode.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: GNU Emacs 21.3.
diff --text -u 'xemacs-21.5.30/lisp/easymenu.el' 'xemacs-21.5.31/lisp/easymenu.el'
Index: ./lisp/easymenu.el
--- ./lisp/easymenu.el Wed Apr 27 00:57:27 2011
+++ ./lisp/easymenu.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched with FSF but coordinated with the FSF
;;; easymenu maintainer for compatibility with FSF 20.4.
diff --text -u 'xemacs-21.5.30/lisp/etags.el' 'xemacs-21.5.31/lisp/etags.el'
Index: ./lisp/etags.el
--- ./lisp/etags.el Wed Apr 27 00:57:27 2011
+++ ./lisp/etags.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched with FSF.
diff --text -u 'xemacs-21.5.30/lisp/events.el' 'xemacs-21.5.31/lisp/events.el'
Index: ./lisp/events.el
--- ./lisp/events.el Wed Apr 27 00:57:27 2011
+++ ./lisp/events.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/extents.el' 'xemacs-21.5.31/lisp/extents.el'
Index: ./lisp/extents.el
--- ./lisp/extents.el Wed Apr 27 00:57:27 2011
+++ ./lisp/extents.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/faces.el' 'xemacs-21.5.31/lisp/faces.el'
Index: ./lisp/faces.el
--- ./lisp/faces.el Wed Apr 27 00:57:27 2011
+++ ./lisp/faces.el Fri Apr 29 22:31:09 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched with FSF. Almost completely divergent.
diff --text -u 'xemacs-21.5.30/lisp/files.el' 'xemacs-21.5.31/lisp/files.el'
Index: ./lisp/files.el
--- ./lisp/files.el Wed Apr 27 00:57:27 2011
+++ ./lisp/files.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc. 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; [[ Synched up with: FSF 20.3 (but diverging)
;;; Warning: Merging this file is tough. Beware.]]
diff --text -u 'xemacs-21.5.30/lisp/fill.el' 'xemacs-21.5.31/lisp/fill.el'
Index: ./lisp/fill.el
--- ./lisp/fill.el Wed Apr 27 00:57:27 2011
+++ ./lisp/fill.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.34.
;;; NOTE: Merging past 19.34 is currently impossible. Later versions
diff --text -u 'xemacs-21.5.30/lisp/find-paths.el' 'xemacs-21.5.31/lisp/find-paths.el'
Index: ./lisp/find-paths.el
--- ./lisp/find-paths.el Wed Apr 27 00:57:27 2011
+++ ./lisp/find-paths.el Fri Apr 29 22:31:09 2011
@@ -11,20 +11,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/finder.el' 'xemacs-21.5.31/lisp/finder.el'
Index: ./lisp/finder.el
--- ./lisp/finder.el Wed Apr 27 00:57:27 2011
+++ ./lisp/finder.el Fri Apr 29 22:31:09 2011
@@ -19,20 +19,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.34.
diff --text -u 'xemacs-21.5.30/lisp/float-sup.el' 'xemacs-21.5.31/lisp/float-sup.el'
Index: ./lisp/float-sup.el
--- ./lisp/float-sup.el Wed Apr 27 00:57:27 2011
+++ ./lisp/float-sup.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.34.
diff --text -u 'xemacs-21.5.30/lisp/font-lock.el' 'xemacs-21.5.31/lisp/font-lock.el'
Index: ./lisp/font-lock.el
--- ./lisp/font-lock.el Wed Apr 27 00:57:27 2011
+++ ./lisp/font-lock.el Fri Apr 29 22:31:09 2011
@@ -15,20 +15,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.30 except for the code to initialize the faces.
diff --text -u 'xemacs-21.5.30/lisp/font-menu.el' 'xemacs-21.5.31/lisp/font-menu.el'
Index: ./lisp/font-menu.el
--- ./lisp/font-menu.el Wed Apr 27 00:57:27 2011
+++ ./lisp/font-menu.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;; This file contains the device-nospecific font menu stuff
diff --text -u 'xemacs-21.5.30/lisp/font-mgr.el' 'xemacs-21.5.31/lisp/font-mgr.el'
Index: ./lisp/font-mgr.el
--- ./lisp/font-mgr.el Wed Apr 27 00:57:27 2011
+++ ./lisp/font-mgr.el Fri Apr 29 22:31:09 2011
@@ -7,10 +7,10 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
+;; XEmacs is free software: you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by the
-;; Free Software Foundation; either version 2, or (at your option) any
-;; later version.
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;; Synched up with: Not in GNU Emacs.
diff --text -u 'xemacs-21.5.30/lisp/font.el' 'xemacs-21.5.31/lisp/font.el'
Index: ./lisp/font.el
--- ./lisp/font.el Wed Apr 27 00:57:27 2011
+++ ./lisp/font.el Fri Apr 29 22:31:09 2011
@@ -12,20 +12,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/fontcolor.el' 'xemacs-21.5.31/lisp/fontcolor.el'
Index: ./lisp/fontcolor.el
--- ./lisp/fontcolor.el Wed Apr 27 00:57:27 2011
+++ ./lisp/fontcolor.el Fri Apr 29 22:31:09 2011
@@ -11,20 +11,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/fontconfig.el' 'xemacs-21.5.31/lisp/fontconfig.el'
Index: ./lisp/fontconfig.el
--- ./lisp/fontconfig.el Wed Apr 27 00:57:27 2011
+++ ./lisp/fontconfig.el Fri Apr 29 22:31:09 2011
@@ -12,20 +12,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in GNU
diff --text -u 'xemacs-21.5.30/lisp/fontl-hooks.el' 'xemacs-21.5.31/lisp/fontl-hooks.el'
Index: ./lisp/fontl-hooks.el
--- ./lisp/fontl-hooks.el Wed Apr 27 00:57:27 2011
+++ ./lisp/fontl-hooks.el Fri Apr 29 22:31:09 2011
@@ -6,20 +6,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.30. (font-lock.el)
diff --text -u 'xemacs-21.5.30/lisp/format.el' 'xemacs-21.5.31/lisp/format.el'
Index: ./lisp/format.el
--- ./lisp/format.el Wed Apr 27 00:57:27 2011
+++ ./lisp/format.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Emacs 20.2.
diff --text -u 'xemacs-21.5.30/lisp/frame.el' 'xemacs-21.5.31/lisp/frame.el'
Index: ./lisp/frame.el
--- ./lisp/frame.el Wed Apr 27 00:57:27 2011
+++ ./lisp/frame.el Fri Apr 29 22:31:09 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 21.3.
diff --text -u 'xemacs-21.5.30/lisp/gdk.el' 'xemacs-21.5.31/lisp/gdk.el'
Index: ./lisp/gdk.el
--- ./lisp/gdk.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gdk.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/generic-widgets.el' 'xemacs-21.5.31/lisp/generic-widgets.el'
Index: ./lisp/generic-widgets.el
--- ./lisp/generic-widgets.el Wed Apr 27 00:57:27 2011
+++ ./lisp/generic-widgets.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/glade.el' 'xemacs-21.5.31/lisp/glade.el'
Index: ./lisp/glade.el
--- ./lisp/glade.el Wed Apr 27 00:57:27 2011
+++ ./lisp/glade.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/glyphs.el' 'xemacs-21.5.31/lisp/glyphs.el'
Index: ./lisp/glyphs.el
--- ./lisp/glyphs.el Wed Apr 27 00:57:27 2011
+++ ./lisp/glyphs.el Fri Apr 29 22:31:09 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/gnome-widgets.el' 'xemacs-21.5.31/lisp/gnome-widgets.el'
Index: ./lisp/gnome-widgets.el
--- ./lisp/gnome-widgets.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gnome-widgets.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/gnome.el' 'xemacs-21.5.31/lisp/gnome.el'
Index: ./lisp/gnome.el
--- ./lisp/gnome.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gnome.el Fri Apr 29 22:31:09 2011
@@ -3,21 +3,19 @@
;; Copyright (C) 2000, 2001 William M. Perry
;;
;; This file is part of XEmacs.
-;;
-;; XEmacs is free software; you can redistribute it and/or modify it
+
+;; XEmacs is free software: you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by the
-;; Free Software Foundation; either version 2, or (at your option) any
-;; later version.
-;;
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
;; for more details.
-;;
+
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA. */
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
(globally-declare-fboundp
'(gtk-type-from-name
diff --text -u 'xemacs-21.5.30/lisp/gnuserv.el' 'xemacs-21.5.31/lisp/gnuserv.el'
Index: ./lisp/gnuserv.el
--- ./lisp/gnuserv.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gnuserv.el Fri Apr 29 22:31:09 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/gpm.el' 'xemacs-21.5.31/lisp/gpm.el'
Index: ./lisp/gpm.el
--- ./lisp/gpm.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gpm.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
(defvar gpm-enabled-devices (make-hash-table :test 'eq
:size 13
diff --text -u 'xemacs-21.5.30/lisp/gtk-compose.el' 'xemacs-21.5.31/lisp/gtk-compose.el'
Index: ./lisp/gtk-compose.el
--- ./lisp/gtk-compose.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gtk-compose.el Fri Apr 29 22:31:09 2011
@@ -3,21 +3,19 @@
;; Copyright (C) 2000, 2001 William M. Perry
;;
;; This file is part of XEmacs.
-;;
-;; XEmacs is free software; you can redistribute it and/or modify it
+
+;; XEmacs is free software: you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by the
-;; Free Software Foundation; either version 2, or (at your option) any
-;; later version.
-;;
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
;; for more details.
-;;
+
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA. */
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
(require 'x-compose)
diff --text -u 'xemacs-21.5.30/lisp/gtk-extra.el' 'xemacs-21.5.31/lisp/gtk-extra.el'
Index: ./lisp/gtk-extra.el
--- ./lisp/gtk-extra.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gtk-extra.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/gtk-faces.el' 'xemacs-21.5.31/lisp/gtk-faces.el'
Index: ./lisp/gtk-faces.el
--- ./lisp/gtk-faces.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gtk-faces.el Fri Apr 29 22:31:09 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched.
diff --text -u 'xemacs-21.5.30/lisp/gtk-ffi.el' 'xemacs-21.5.31/lisp/gtk-ffi.el'
Index: ./lisp/gtk-ffi.el
--- ./lisp/gtk-ffi.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gtk-ffi.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/gtk-file-dialog.el' 'xemacs-21.5.31/lisp/gtk-file-dialog.el'
Index: ./lisp/gtk-file-dialog.el
--- ./lisp/gtk-file-dialog.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gtk-file-dialog.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/gtk-font-menu.el' 'xemacs-21.5.31/lisp/gtk-font-menu.el'
Index: ./lisp/gtk-font-menu.el
--- ./lisp/gtk-font-menu.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gtk-font-menu.el Fri Apr 29 22:31:09 2011
@@ -12,20 +12,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Code:
;; #### - The comment that this file was GTK-ized by Wm Perry is a lie;
diff --text -u 'xemacs-21.5.30/lisp/gtk-glyphs.el' 'xemacs-21.5.31/lisp/gtk-glyphs.el'
Index: ./lisp/gtk-glyphs.el
--- ./lisp/gtk-glyphs.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gtk-glyphs.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/gtk-init.el' 'xemacs-21.5.31/lisp/gtk-init.el'
Index: ./lisp/gtk-init.el
--- ./lisp/gtk-init.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gtk-init.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
(globally-declare-boundp
'(gtk-initial-argv-list gtk-initial-geometry))
diff --text -u 'xemacs-21.5.30/lisp/gtk-marshal.el' 'xemacs-21.5.31/lisp/gtk-marshal.el'
Index: ./lisp/gtk-marshal.el
--- ./lisp/gtk-marshal.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gtk-marshal.el Fri Apr 29 22:31:09 2011
@@ -3,21 +3,19 @@
;; Copyright (C) 2000, 2001 William M. Perry
;;
;; This file is part of XEmacs.
-;;
-;; XEmacs is free software; you can redistribute it and/or modify it
+
+;; XEmacs is free software: you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by the
-;; Free Software Foundation; either version 2, or (at your option) any
-;; later version.
-;;
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
;; for more details.
-;;
+
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA. */
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;
;; To regenerate ../src/emacs-marshals.c just load this file.
;;
diff --text -u 'xemacs-21.5.30/lisp/gtk-mouse.el' 'xemacs-21.5.31/lisp/gtk-mouse.el'
Index: ./lisp/gtk-mouse.el
--- ./lisp/gtk-mouse.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gtk-mouse.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched.
diff --text -u 'xemacs-21.5.30/lisp/gtk-package.el' 'xemacs-21.5.31/lisp/gtk-package.el'
Index: ./lisp/gtk-package.el
--- ./lisp/gtk-package.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gtk-package.el Fri Apr 29 22:31:09 2011
@@ -3,22 +3,20 @@
;; Copyright (C) 2000, 2001 William M. Perry
;;
;; This file is part of XEmacs.
-;;
-;; XEmacs is free software; you can redistribute it and/or modify it
+
+;; XEmacs is free software: you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by the
-;; Free Software Foundation; either version 2, or (at your option) any
-;; later version.
-;;
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
;; for more details.
-;;
+
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA. */
-;;
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
;; A GTK version of package-ui.el
(globally-declare-fboundp
diff --text -u 'xemacs-21.5.30/lisp/gtk-password-dialog.el' 'xemacs-21.5.31/lisp/gtk-password-dialog.el'
Index: ./lisp/gtk-password-dialog.el
--- ./lisp/gtk-password-dialog.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gtk-password-dialog.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/gtk-select.el' 'xemacs-21.5.31/lisp/gtk-select.el'
Index: ./lisp/gtk-select.el
--- ./lisp/gtk-select.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gtk-select.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/gtk-widget-accessors.el' 'xemacs-21.5.31/lisp/gtk-widget-accessors.el'
Index: ./lisp/gtk-widget-accessors.el
--- ./lisp/gtk-widget-accessors.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gtk-widget-accessors.el Fri Apr 29 22:31:09 2011
@@ -3,21 +3,19 @@
;; Copyright (C) 2000, 2001 William M. Perry
;;
;; This file is part of XEmacs.
-;;
-;; XEmacs is free software; you can redistribute it and/or modify it
+
+;; XEmacs is free software: you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by the
-;; Free Software Foundation; either version 2, or (at your option) any
-;; later version.
-;;
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
;; for more details.
-;;
+
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA. */
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
(globally-declare-fboundp
'(gtk-fundamental-type))
diff --text -u 'xemacs-21.5.30/lisp/gtk-widgets.el' 'xemacs-21.5.31/lisp/gtk-widgets.el'
Index: ./lisp/gtk-widgets.el
--- ./lisp/gtk-widgets.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gtk-widgets.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/gtk.el' 'xemacs-21.5.31/lisp/gtk.el'
Index: ./lisp/gtk.el
--- ./lisp/gtk.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gtk.el Fri Apr 29 22:31:09 2011
@@ -3,21 +3,19 @@
;; Copyright (C) 2000, 2001 William M. Perry
;;
;; This file is part of XEmacs.
-;;
-;; XEmacs is free software; you can redistribute it and/or modify it
+
+;; XEmacs is free software: you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by the
-;; Free Software Foundation; either version 2, or (at your option) any
-;; later version.
-;;
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
;; for more details.
-;;
+
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA. */
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
(globally-declare-fboundp
'(gtk-import-function-internal
diff --text -u 'xemacs-21.5.30/lisp/gui.el' 'xemacs-21.5.31/lisp/gui.el'
Index: ./lisp/gui.el
--- ./lisp/gui.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gui.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/gutter-items.el' 'xemacs-21.5.31/lisp/gutter-items.el'
Index: ./lisp/gutter-items.el
--- ./lisp/gutter-items.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gutter-items.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Gutter-specific buffers tab code
diff --text -u 'xemacs-21.5.30/lisp/gutter.el' 'xemacs-21.5.31/lisp/gutter.el'
Index: ./lisp/gutter.el
--- ./lisp/gutter.el Wed Apr 27 00:57:27 2011
+++ ./lisp/gutter.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;; Some of this is taken from the buffer-menu stuff in menubar-items.el
;; and the custom specs in toolbar.el.
diff --text -u 'xemacs-21.5.30/lisp/hash-table.el' 'xemacs-21.5.31/lisp/hash-table.el'
Index: ./lisp/hash-table.el
--- ./lisp/hash-table.el Wed Apr 27 00:57:27 2011
+++ ./lisp/hash-table.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/help-macro.el' 'xemacs-21.5.31/lisp/help-macro.el'
Index: ./lisp/help-macro.el
--- ./lisp/help-macro.el Wed Apr 27 00:57:27 2011
+++ ./lisp/help-macro.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/help.el' 'xemacs-21.5.31/lisp/help.el'
Index: ./lisp/help.el
--- ./lisp/help.el Wed Apr 27 00:57:27 2011
+++ ./lisp/help.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.30.
diff --text -u 'xemacs-21.5.30/lisp/hyper-apropos.el' 'xemacs-21.5.31/lisp/hyper-apropos.el'
Index: ./lisp/hyper-apropos.el
--- ./lisp/hyper-apropos.el Wed Apr 27 00:57:27 2011
+++ ./lisp/hyper-apropos.el Fri Apr 29 22:31:09 2011
@@ -11,20 +11,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2 of the License, or
-;; (at your option) any later version.
-;;
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-;;
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
+
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/indent.el' 'xemacs-21.5.31/lisp/indent.el'
Index: ./lisp/indent.el
--- ./lisp/indent.el Wed Apr 27 00:57:27 2011
+++ ./lisp/indent.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.30.
diff --text -u 'xemacs-21.5.30/lisp/info.el' 'xemacs-21.5.31/lisp/info.el'
Index: ./lisp/info.el
--- ./lisp/info.el Wed Apr 27 00:57:27 2011
+++ ./lisp/info.el Fri Apr 29 22:31:09 2011
@@ -12,20 +12,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched with FSF. Highly divergent, and with
;;; many new features added for XEmacs.
diff --text -u 'xemacs-21.5.30/lisp/isearch-mode.el' 'xemacs-21.5.31/lisp/isearch-mode.el'
Index: ./lisp/isearch-mode.el
--- ./lisp/isearch-mode.el Wed Apr 27 00:57:27 2011
+++ ./lisp/isearch-mode.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 20.4.
diff --text -u 'xemacs-21.5.30/lisp/iso8859-1.el' 'xemacs-21.5.31/lisp/iso8859-1.el'
Index: ./lisp/iso8859-1.el
--- ./lisp/iso8859-1.el Wed Apr 27 00:57:27 2011
+++ ./lisp/iso8859-1.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/itimer-autosave.el' 'xemacs-21.5.31/lisp/itimer-autosave.el'
Index: ./lisp/itimer-autosave.el
--- ./lisp/itimer-autosave.el Wed Apr 27 00:57:27 2011
+++ ./lisp/itimer-autosave.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/itimer.el' 'xemacs-21.5.31/lisp/itimer.el'
Index: ./lisp/itimer.el
--- ./lisp/itimer.el Wed Apr 27 00:57:27 2011
+++ ./lisp/itimer.el Fri Apr 29 22:31:09 2011
@@ -1,22 +1,20 @@
-;;; Interval timers for XEmacs
-;;; Copyright (C) 1988, 1991, 1993, 1997, 1998 Kyle E. Jones
-;;;
-;;; This program is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2, or (at your option)
-;;; any later version.
-;;;
-;;; This program is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;;; GNU General Public License for more details.
-;;;
-;;; A copy of the GNU General Public License can be obtained from this
-;;; program's author (send electronic mail to kyle@uunet.uu.net) or from
-;;; the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA
-;;; 02139, USA.
-;;;
-;;; Send bug reports to kyle_jones@wonderworks.com
+;; Interval timers for XEmacs
+;; Copyright (C) 1988, 1991, 1993, 1997, 1998 Kyle E. Jones
+;;
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+;;
+;; Send bug reports to kyle_jones@wonderworks.com
(provide 'itimer)
diff --text -u 'xemacs-21.5.30/lisp/keydefs.el' 'xemacs-21.5.31/lisp/keydefs.el'
Index: ./lisp/keydefs.el
--- ./lisp/keydefs.el Wed Apr 27 00:57:27 2011
+++ ./lisp/keydefs.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;; All the global bindings should be here so that one can reload things
;; like files.el without trashing one's personal bindings.
diff --text -u 'xemacs-21.5.30/lisp/keymap.el' 'xemacs-21.5.31/lisp/keymap.el'
Index: ./lisp/keymap.el
--- ./lisp/keymap.el Wed Apr 27 00:57:27 2011
+++ ./lisp/keymap.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.28.
diff --text -u 'xemacs-21.5.30/lisp/ldap.el' 'xemacs-21.5.31/lisp/ldap.el'
Index: ./lisp/ldap.el
--- ./lisp/ldap.el Wed Apr 27 00:57:27 2011
+++ ./lisp/ldap.el Fri Apr 29 22:31:09 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;; This file provides mid-level and user-level functions to access directory
diff --text -u 'xemacs-21.5.30/lisp/lib-complete.el' 'xemacs-21.5.31/lisp/lib-complete.el'
Index: ./lisp/lib-complete.el
--- ./lisp/lib-complete.el Wed Apr 27 00:57:27 2011
+++ ./lisp/lib-complete.el Fri Apr 29 22:31:09 2011
@@ -11,20 +11,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/lisp-mnt.el' 'xemacs-21.5.31/lisp/lisp-mnt.el'
Index: ./lisp/lisp-mnt.el
--- ./lisp/lisp-mnt.el Wed Apr 27 00:57:27 2011
+++ ./lisp/lisp-mnt.el Fri Apr 29 22:31:09 2011
@@ -12,20 +12,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 20.2.
@@ -582,20 +580,18 @@
(defconst lm-standard-permission
"\n;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.\n"
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.\n"
"Standard permissions notice for Lisp files that are part of XEmacs.
License version and FSF address are current as of 2009-04-01.")
diff --text -u 'xemacs-21.5.30/lisp/lisp-mode.el' 'xemacs-21.5.31/lisp/lisp-mode.el'
Index: ./lisp/lisp-mode.el
--- ./lisp/lisp-mode.el Wed Apr 27 00:57:27 2011
+++ ./lisp/lisp-mode.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.34 (but starting to diverge).
diff --text -u 'xemacs-21.5.30/lisp/lisp.el' 'xemacs-21.5.31/lisp/lisp.el'
Index: ./lisp/lisp.el
--- ./lisp/lisp.el Wed Apr 27 00:57:27 2011
+++ ./lisp/lisp.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Emacs/Mule zeta.
diff --text -u 'xemacs-21.5.30/lisp/list-mode.el' 'xemacs-21.5.31/lisp/list-mode.el'
Index: ./lisp/list-mode.el
--- ./lisp/list-mode.el Wed Apr 27 00:57:27 2011
+++ ./lisp/list-mode.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched
diff --text -u 'xemacs-21.5.30/lisp/loaddefs.el' 'xemacs-21.5.31/lisp/loaddefs.el'
Index: ./lisp/loaddefs.el
--- ./lisp/loaddefs.el Wed Apr 27 00:57:27 2011
+++ ./lisp/loaddefs.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched with FSF.
diff --text -u 'xemacs-21.5.30/lisp/loadhist.el' 'xemacs-21.5.31/lisp/loadhist.el'
Index: ./lisp/loadhist.el
--- ./lisp/loadhist.el Wed Apr 27 00:57:27 2011
+++ ./lisp/loadhist.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 20.2.
diff --text -u 'xemacs-21.5.30/lisp/loadup-el.el' 'xemacs-21.5.31/lisp/loadup-el.el'
Index: ./lisp/loadup-el.el
--- ./lisp/loadup-el.el Wed Apr 27 00:57:27 2011
+++ ./lisp/loadup-el.el Fri Apr 29 22:31:09 2011
@@ -1,19 +1,17 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/loadup.el' 'xemacs-21.5.31/lisp/loadup.el'
Index: ./lisp/loadup.el
--- ./lisp/loadup.el Wed Apr 27 00:57:27 2011
+++ ./lisp/loadup.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Last synched with FSF 19.30, with wild divergence since.
diff --text -u 'xemacs-21.5.30/lisp/make-docfile.el' 'xemacs-21.5.31/lisp/make-docfile.el'
Index: ./lisp/make-docfile.el
--- ./lisp/make-docfile.el Wed Apr 27 00:57:27 2011
+++ ./lisp/make-docfile.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/map-ynp.el' 'xemacs-21.5.31/lisp/map-ynp.el'
Index: ./lisp/map-ynp.el
--- ./lisp/map-ynp.el Wed Apr 27 00:57:27 2011
+++ ./lisp/map-ynp.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Emacs/Mule zeta.
diff --text -u 'xemacs-21.5.30/lisp/menubar-items.el' 'xemacs-21.5.31/lisp/menubar-items.el'
Index: ./lisp/menubar-items.el
--- ./lisp/menubar-items.el Wed Apr 27 00:57:27 2011
+++ ./lisp/menubar-items.el Fri Apr 29 22:31:09 2011
@@ -11,20 +11,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Authorship:
diff --text -u 'xemacs-21.5.30/lisp/menubar.el' 'xemacs-21.5.31/lisp/menubar.el'
Index: ./lisp/menubar.el
--- ./lisp/menubar.el Wed Apr 27 00:57:27 2011
+++ ./lisp/menubar.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF. (Completely divergent from FSF menu-bar.el)
diff --text -u 'xemacs-21.5.30/lisp/minibuf.el' 'xemacs-21.5.31/lisp/minibuf.el'
Index: ./lisp/minibuf.el
--- ./lisp/minibuf.el Wed Apr 27 00:57:27 2011
+++ ./lisp/minibuf.el Fri Apr 29 22:31:09 2011
@@ -11,20 +11,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: all the minibuffer history stuff is synched with
;;; 19.30. Not sure about the rest.
diff --text -u 'xemacs-21.5.30/lisp/misc.el' 'xemacs-21.5.31/lisp/misc.el'
Index: ./lisp/misc.el
--- ./lisp/misc.el Wed Apr 27 00:57:27 2011
+++ ./lisp/misc.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.34.
diff --text -u 'xemacs-21.5.30/lisp/mode-motion.el' 'xemacs-21.5.31/lisp/mode-motion.el'
Index: ./lisp/mode-motion.el
--- ./lisp/mode-motion.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mode-motion.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/modeline.el' 'xemacs-21.5.31/lisp/modeline.el'
Index: ./lisp/modeline.el
--- ./lisp/modeline.el Wed Apr 27 00:57:27 2011
+++ ./lisp/modeline.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/mouse.el' 'xemacs-21.5.31/lisp/mouse.el'
Index: ./lisp/mouse.el
--- ./lisp/mouse.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mouse.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched with FSF. Almost completely divergent.
diff --text -u 'xemacs-21.5.30/lisp/movemail.el' 'xemacs-21.5.31/lisp/movemail.el'
Index: ./lisp/movemail.el
--- ./lisp/movemail.el Wed Apr 27 00:57:27 2011
+++ ./lisp/movemail.el Fri Apr 29 22:31:09 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/msw-faces.el' 'xemacs-21.5.31/lisp/msw-faces.el'
Index: ./lisp/msw-faces.el
--- ./lisp/msw-faces.el Wed Apr 27 00:57:27 2011
+++ ./lisp/msw-faces.el Fri Apr 29 22:31:09 2011
@@ -11,20 +11,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;; This file does the magic to parse mswindows font names, and make sure that
;; the default and modeline attributes of new frames are specified enough.
diff --text -u 'xemacs-21.5.30/lisp/msw-font-menu.el' 'xemacs-21.5.31/lisp/msw-font-menu.el'
Index: ./lisp/msw-font-menu.el
--- ./lisp/msw-font-menu.el Wed Apr 27 00:57:27 2011
+++ ./lisp/msw-font-menu.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Known Problems:
;;; ===============
diff --text -u 'xemacs-21.5.30/lisp/msw-glyphs.el' 'xemacs-21.5.31/lisp/msw-glyphs.el'
Index: ./lisp/msw-glyphs.el
--- ./lisp/msw-glyphs.el Wed Apr 27 00:57:27 2011
+++ ./lisp/msw-glyphs.el Fri Apr 29 22:31:09 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/msw-init.el' 'xemacs-21.5.31/lisp/msw-init.el'
Index: ./lisp/msw-init.el
--- ./lisp/msw-init.el Wed Apr 27 00:57:27 2011
+++ ./lisp/msw-init.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
(defvar make-device-early-mswindows-entry-point-called-p nil
"Whether `make-device-early-mswindows-entry-point' has been called")
diff --text -u 'xemacs-21.5.30/lisp/msw-mouse.el' 'xemacs-21.5.31/lisp/msw-mouse.el'
Index: ./lisp/msw-mouse.el
--- ./lisp/msw-mouse.el Wed Apr 27 00:57:27 2011
+++ ./lisp/msw-mouse.el Fri Apr 29 22:31:09 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched.
diff --text -u 'xemacs-21.5.30/lisp/msw-select.el' 'xemacs-21.5.31/lisp/msw-select.el'
Index: ./lisp/msw-select.el
--- ./lisp/msw-select.el Wed Apr 27 00:57:27 2011
+++ ./lisp/msw-select.el Fri Apr 29 22:31:09 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/mule/arabic.el' 'xemacs-21.5.31/lisp/mule/arabic.el'
Index: ./lisp/mule/arabic.el
--- ./lisp/mule/arabic.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/arabic.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/mule/canna-leim.el' 'xemacs-21.5.31/lisp/mule/canna-leim.el'
Index: ./lisp/mule/canna-leim.el
--- ./lisp/mule/canna-leim.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/canna-leim.el Fri Apr 29 22:31:10 2011
@@ -1,5 +1,5 @@
;;; canna-leim.el --- Canna-related code for LEIM -*- coding: iso-2022-7bit; -*-
-;;
+;; Copyright (C) 1997 Stephen Turnbull <turnbull@sk.tsukuba.ac.jp>
;; Copyright (C) 1997 Free Software Foundation, Inc.
;;
;; Shamelessly ripped off from
@@ -15,20 +15,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either versions 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs, see the file COPYING. If not, write to the Free
-;; Software Foundation Inc., 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; TODO
;;
diff --text -u 'xemacs-21.5.30/lisp/mule/ccl.el' 'xemacs-21.5.31/lisp/mule/ccl.el'
Index: ./lisp/mule/ccl.el
--- ./lisp/mule/ccl.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/ccl.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;; Synched up with: FSF 21.0.90
diff --text -u 'xemacs-21.5.30/lisp/mule/china-util.el' 'xemacs-21.5.31/lisp/mule/china-util.el'
Index: ./lisp/mule/china-util.el
--- ./lisp/mule/china-util.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/china-util.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Emacs 21.1 (language/china-util.el).
diff --text -u 'xemacs-21.5.30/lisp/mule/chinese.el' 'xemacs-21.5.31/lisp/mule/chinese.el'
Index: ./lisp/mule/chinese.el
--- ./lisp/mule/chinese.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/chinese.el Fri Apr 29 22:31:10 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/mule/cyrillic.el' 'xemacs-21.5.31/lisp/mule/cyrillic.el'
Index: ./lisp/mule/cyrillic.el
--- ./lisp/mule/cyrillic.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/cyrillic.el Fri Apr 29 22:31:10 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/mule/devan-util.el' 'xemacs-21.5.31/lisp/mule/devan-util.el'
Index: ./lisp/mule/devan-util.el
--- ./lisp/mule/devan-util.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/devan-util.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Emacs 21.1 (language/devan-util.el).
diff --text -u 'xemacs-21.5.30/lisp/mule/devanagari.el' 'xemacs-21.5.31/lisp/mule/devanagari.el'
Index: ./lisp/mule/devanagari.el
--- ./lisp/mule/devanagari.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/devanagari.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Emacs 21.1 (language/devanagari.el).
diff --text -u 'xemacs-21.5.30/lisp/mule/english.el' 'xemacs-21.5.31/lisp/mule/english.el'
Index: ./lisp/mule/english.el
--- ./lisp/mule/english.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/english.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/mule/ethio-util.el' 'xemacs-21.5.31/lisp/mule/ethio-util.el'
Index: ./lisp/mule/ethio-util.el
--- ./lisp/mule/ethio-util.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/ethio-util.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Emacs 21.1 (language/ethio-util.el).
diff --text -u 'xemacs-21.5.30/lisp/mule/ethiopic.el' 'xemacs-21.5.31/lisp/mule/ethiopic.el'
Index: ./lisp/mule/ethiopic.el
--- ./lisp/mule/ethiopic.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/ethiopic.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;; Author: TAKAHASHI Naoto <ntakahas@etl.go.jp>
;; modified by MORIOKA Tomohiko <morioka@jaist.ac.jp> for XEmacs.
diff --text -u 'xemacs-21.5.30/lisp/mule/general-late.el' 'xemacs-21.5.31/lisp/mule/general-late.el'
Index: ./lisp/mule/general-late.el
--- ./lisp/mule/general-late.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/general-late.el Fri Apr 29 22:31:10 2011
@@ -6,20 +6,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/mule/greek.el' 'xemacs-21.5.31/lisp/mule/greek.el'
Index: ./lisp/mule/greek.el
--- ./lisp/mule/greek.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/greek.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/mule/hebrew.el' 'xemacs-21.5.31/lisp/mule/hebrew.el'
Index: ./lisp/mule/hebrew.el
--- ./lisp/mule/hebrew.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/hebrew.el Fri Apr 29 22:31:10 2011
@@ -5,22 +5,20 @@
;; Keywords: multilingual, Hebrew
-;; This file is part of GNU Emacs.
+;; This file is part of XEmacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/mule/indian.el' 'xemacs-21.5.31/lisp/mule/indian.el'
Index: ./lisp/mule/indian.el
--- ./lisp/mule/indian.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/indian.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Emacs 21.1 (language/indian.el).
diff --text -u 'xemacs-21.5.30/lisp/mule/iso-with-esc.el' 'xemacs-21.5.31/lisp/mule/iso-with-esc.el'
Index: ./lisp/mule/iso-with-esc.el
--- ./lisp/mule/iso-with-esc.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/iso-with-esc.el Fri Apr 29 22:31:10 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/mule/japan-util.el' 'xemacs-21.5.31/lisp/mule/japan-util.el'
Index: ./lisp/mule/japan-util.el
--- ./lisp/mule/japan-util.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/japan-util.el Fri Apr 29 22:31:10 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Emacs 21.1 (language/japan-util.el).
diff --text -u 'xemacs-21.5.30/lisp/mule/japanese.el' 'xemacs-21.5.31/lisp/mule/japanese.el'
Index: ./lisp/mule/japanese.el
--- ./lisp/mule/japanese.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/japanese.el Fri Apr 29 22:31:10 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Emacs 20.6 (international/japanese.el).
diff --text -u 'xemacs-21.5.30/lisp/mule/kinsoku.el' 'xemacs-21.5.31/lisp/mule/kinsoku.el'
Index: ./lisp/mule/kinsoku.el
--- ./lisp/mule/kinsoku.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/kinsoku.el Fri Apr 29 22:31:10 2011
@@ -4,22 +4,15 @@
;; This file is part of Mule (MULtilingual Enhancement of XEmacs).
;; This file contains Japanese and Chinese characters.
-;; This file is part of XEmacs.
-
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; Written by Jareth Hein (jhod@po.iijnet.or.jp) based off of
;; code by S.Tomura, Electrotechnical Lab. (tomura@etl.go.jp) from
diff --text -u 'xemacs-21.5.30/lisp/mule/korea-util.el' 'xemacs-21.5.31/lisp/mule/korea-util.el'
Index: ./lisp/mule/korea-util.el
--- ./lisp/mule/korea-util.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/korea-util.el Fri Apr 29 22:31:10 2011
@@ -6,20 +6,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Emacs 21.1 (language/korea-util.el).
diff --text -u 'xemacs-21.5.30/lisp/mule/korean.el' 'xemacs-21.5.31/lisp/mule/korean.el'
Index: ./lisp/mule/korean.el
--- ./lisp/mule/korean.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/korean.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/mule/lao-util.el' 'xemacs-21.5.31/lisp/mule/lao-util.el'
Index: ./lisp/mule/lao-util.el
--- ./lisp/mule/lao-util.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/lao-util.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Emacs 21.1 (language/lao-util.el).
diff --text -u 'xemacs-21.5.30/lisp/mule/lao.el' 'xemacs-21.5.31/lisp/mule/lao.el'
Index: ./lisp/mule/lao.el
--- ./lisp/mule/lao.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/lao.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Emacs 21.1 (language/lao.el).
diff --text -u 'xemacs-21.5.30/lisp/mule/latin.el' 'xemacs-21.5.31/lisp/mule/latin.el'
Index: ./lisp/mule/latin.el
--- ./lisp/mule/latin.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/latin.el Fri Apr 29 22:31:10 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/mule/make-coding-system.el' 'xemacs-21.5.31/lisp/mule/make-coding-system.el'
Index: ./lisp/mule/make-coding-system.el
--- ./lisp/mule/make-coding-system.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/make-coding-system.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/mule/misc-lang.el' 'xemacs-21.5.31/lisp/mule/misc-lang.el'
Index: ./lisp/mule/misc-lang.el
--- ./lisp/mule/misc-lang.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/misc-lang.el Fri Apr 29 22:31:10 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Code:
diff --text -u 'xemacs-21.5.30/lisp/mule/mule-category.el' 'xemacs-21.5.31/lisp/mule/mule-category.el'
Index: ./lisp/mule/mule-category.el
--- ./lisp/mule/mule-category.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/mule-category.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/mule/mule-charset.el' 'xemacs-21.5.31/lisp/mule/mule-charset.el'
Index: ./lisp/mule/mule-charset.el
--- ./lisp/mule/mule-charset.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/mule-charset.el Fri Apr 29 22:31:10 2011
@@ -12,20 +12,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched. API at source level synched with FSF 20.3.9.
diff --text -u 'xemacs-21.5.30/lisp/mule/mule-cmds.el' 'xemacs-21.5.31/lisp/mule/mule-cmds.el'
Index: ./lisp/mule/mule-cmds.el
--- ./lisp/mule/mule-cmds.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/mule-cmds.el Fri Apr 29 22:31:10 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;; Note: Some of the code here is now in code-cmds.el
diff --text -u 'xemacs-21.5.30/lisp/mule/mule-coding.el' 'xemacs-21.5.31/lisp/mule/mule-coding.el'
Index: ./lisp/mule/mule-coding.el
--- ./lisp/mule/mule-coding.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/mule-coding.el Fri Apr 29 22:31:10 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/mule/mule-composite-stub.el' 'xemacs-21.5.31/lisp/mule/mule-composite-stub.el'
Index: ./lisp/mule/mule-composite-stub.el
--- ./lisp/mule/mule-composite-stub.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/mule-composite-stub.el Fri Apr 29 22:31:10 2011
@@ -6,20 +6,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Emacs 21.1 (src/fontset.c, src/composite.c).
diff --text -u 'xemacs-21.5.30/lisp/mule/mule-composite.el' 'xemacs-21.5.31/lisp/mule/mule-composite.el'
Index: ./lisp/mule/mule-composite.el
--- ./lisp/mule/mule-composite.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/mule-composite.el Fri Apr 29 22:31:10 2011
@@ -5,22 +5,20 @@
;; Keywords: mule, multilingual, character composition
-;; This file is part of GNU Emacs.
+;; This file is part of XEmacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Emacs 21.1 (lisp/composite.el).
diff --text -u 'xemacs-21.5.30/lisp/mule/mule-msw-init-late.el' 'xemacs-21.5.31/lisp/mule/mule-msw-init-late.el'
Index: ./lisp/mule/mule-msw-init-late.el
--- ./lisp/mule/mule-msw-init-late.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/mule-msw-init-late.el Fri Apr 29 22:31:10 2011
@@ -3,20 +3,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;; mapping between XEmacs charsets and code pages. something like this
;; will might around once all the Unicode code is written, so we know how
diff --text -u 'xemacs-21.5.30/lisp/mule/mule-tty-init.el' 'xemacs-21.5.31/lisp/mule/mule-tty-init.el'
Index: ./lisp/mule/mule-tty-init.el
--- ./lisp/mule/mule-tty-init.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/mule-tty-init.el Fri Apr 29 22:31:10 2011
@@ -7,21 +7,19 @@
;; Keywords: mule, tty, console, dumped
;; This file is part of XEmacs.
-;;
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-;;
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-;;
+
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
+
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/mule/mule-win32-init.el' 'xemacs-21.5.31/lisp/mule/mule-win32-init.el'
Index: ./lisp/mule/mule-win32-init.el
--- ./lisp/mule/mule-win32-init.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/mule-win32-init.el Fri Apr 29 22:31:10 2011
@@ -3,20 +3,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
(make-coding-system
'mswindows-multibyte 'mswindows-multibyte
diff --text -u 'xemacs-21.5.30/lisp/mule/mule-x-init.el' 'xemacs-21.5.31/lisp/mule/mule-x-init.el'
Index: ./lisp/mule/mule-x-init.el
--- ./lisp/mule/mule-x-init.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/mule-x-init.el Fri Apr 29 22:31:10 2011
@@ -6,21 +6,19 @@
;; Keywords: mule X11
;; This file is part of XEmacs.
-;;
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-;;
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-;;
+
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
+
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/mule/thai.el' 'xemacs-21.5.31/lisp/mule/thai.el'
Index: ./lisp/mule/thai.el
--- ./lisp/mule/thai.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/thai.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Emacs 21.1 (language/thai.el).
diff --text -u 'xemacs-21.5.30/lisp/mule/tibet-util.el' 'xemacs-21.5.31/lisp/mule/tibet-util.el'
Index: ./lisp/mule/tibet-util.el
--- ./lisp/mule/tibet-util.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/tibet-util.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Emacs 21.1 (language/tibet-util.el).
diff --text -u 'xemacs-21.5.30/lisp/mule/tibetan.el' 'xemacs-21.5.31/lisp/mule/tibetan.el'
Index: ./lisp/mule/tibetan.el
--- ./lisp/mule/tibetan.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/tibetan.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Emacs 21.1 (language/tibetan.el).
diff --text -u 'xemacs-21.5.30/lisp/mule/viet-util.el' 'xemacs-21.5.31/lisp/mule/viet-util.el'
Index: ./lisp/mule/viet-util.el
--- ./lisp/mule/viet-util.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/viet-util.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Emacs 21.1 (language/viet-util.el).
diff --text -u 'xemacs-21.5.30/lisp/mule/vietnamese.el' 'xemacs-21.5.31/lisp/mule/vietnamese.el'
Index: ./lisp/mule/vietnamese.el
--- ./lisp/mule/vietnamese.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mule/vietnamese.el Fri Apr 29 22:31:10 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/multicast.el' 'xemacs-21.5.31/lisp/multicast.el'
Index: ./lisp/multicast.el
--- ./lisp/multicast.el Wed Apr 27 00:57:27 2011
+++ ./lisp/multicast.el Fri Apr 29 22:31:10 2011
@@ -12,20 +12,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2 of the License, or
-;; (at your option) any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/mwheel.el' 'xemacs-21.5.31/lisp/mwheel.el'
Index: ./lisp/mwheel.el
--- ./lisp/mwheel.el Wed Apr 27 00:57:27 2011
+++ ./lisp/mwheel.el Fri Apr 29 22:31:10 2011
@@ -6,20 +6,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched.
diff --text -u 'xemacs-21.5.30/lisp/newcomment.el' 'xemacs-21.5.31/lisp/newcomment.el'
Index: ./lisp/newcomment.el
--- ./lisp/newcomment.el Wed Apr 27 00:57:27 2011
+++ ./lisp/newcomment.el Fri Apr 29 22:31:10 2011
@@ -6,22 +6,20 @@
;; Maintainer: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: comment uncomment
-;; This file is part of GNU Emacs.
+;; This file is part of XEmacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 21.3.
diff --text -u 'xemacs-21.5.30/lisp/next-error.el' 'xemacs-21.5.31/lisp/next-error.el'
Index: ./lisp/next-error.el
--- ./lisp/next-error.el Wed Apr 27 00:57:27 2011
+++ ./lisp/next-error.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 22.0.50.1 (CVS)
;;; Some functions renamed with the next-error-framework prefix to avoid
diff --text -u 'xemacs-21.5.30/lisp/obsolete.el' 'xemacs-21.5.31/lisp/obsolete.el'
Index: ./lisp/obsolete.el
--- ./lisp/obsolete.el Wed Apr 27 00:57:27 2011
+++ ./lisp/obsolete.el Fri Apr 29 22:31:10 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/occur.el' 'xemacs-21.5.31/lisp/occur.el'
Index: ./lisp/occur.el
--- ./lisp/occur.el Wed Apr 27 00:57:27 2011
+++ ./lisp/occur.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 22.0.50.1 (CVS)
diff --text -u 'xemacs-21.5.30/lisp/package-admin.el' 'xemacs-21.5.31/lisp/package-admin.el'
Index: ./lisp/package-admin.el
--- ./lisp/package-admin.el Wed Apr 27 00:57:27 2011
+++ ./lisp/package-admin.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/package-get.el' 'xemacs-21.5.31/lisp/package-get.el'
Index: ./lisp/package-get.el
--- ./lisp/package-get.el Wed Apr 27 00:57:27 2011
+++ ./lisp/package-get.el Fri Apr 29 22:31:10 2011
@@ -12,20 +12,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/package-info.el' 'xemacs-21.5.31/lisp/package-info.el'
Index: ./lisp/package-info.el
--- ./lisp/package-info.el Wed Apr 27 00:57:27 2011
+++ ./lisp/package-info.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/package-net.el' 'xemacs-21.5.31/lisp/package-net.el'
Index: ./lisp/package-net.el
--- ./lisp/package-net.el Wed Apr 27 00:57:27 2011
+++ ./lisp/package-net.el Fri Apr 29 22:31:10 2011
@@ -6,20 +6,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/package-ui.el' 'xemacs-21.5.31/lisp/package-ui.el'
Index: ./lisp/package-ui.el
--- ./lisp/package-ui.el Wed Apr 27 00:57:27 2011
+++ ./lisp/package-ui.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/packages.el' 'xemacs-21.5.31/lisp/packages.el'
Index: ./lisp/packages.el
--- ./lisp/packages.el Wed Apr 27 00:57:27 2011
+++ ./lisp/packages.el Fri Apr 29 22:31:10 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/page.el' 'xemacs-21.5.31/lisp/page.el'
Index: ./lisp/page.el
--- ./lisp/page.el Wed Apr 27 00:57:27 2011
+++ ./lisp/page.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 21.3.
diff --text -u 'xemacs-21.5.30/lisp/paragraphs.el' 'xemacs-21.5.31/lisp/paragraphs.el'
Index: ./lisp/paragraphs.el
--- ./lisp/paragraphs.el Wed Apr 27 00:57:27 2011
+++ ./lisp/paragraphs.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 21.3.
diff --text -u 'xemacs-21.5.30/lisp/paths.el' 'xemacs-21.5.31/lisp/paths.el'
Index: ./lisp/paths.el
--- ./lisp/paths.el Wed Apr 27 00:57:27 2011
+++ ./lisp/paths.el Fri Apr 29 22:31:10 2011
@@ -7,19 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.30.
diff --text -u 'xemacs-21.5.30/lisp/picture.el' 'xemacs-21.5.31/lisp/picture.el'
Index: ./lisp/picture.el
--- ./lisp/picture.el Wed Apr 27 00:57:27 2011
+++ ./lisp/picture.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.30.
diff --text -u 'xemacs-21.5.30/lisp/post-gc.el' 'xemacs-21.5.31/lisp/post-gc.el'
Index: ./lisp/post-gc.el
--- ./lisp/post-gc.el Wed Apr 27 00:57:27 2011
+++ ./lisp/post-gc.el Fri Apr 29 22:31:10 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/printer.el' 'xemacs-21.5.31/lisp/printer.el'
Index: ./lisp/printer.el
--- ./lisp/printer.el Wed Apr 27 00:57:27 2011
+++ ./lisp/printer.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/process.el' 'xemacs-21.5.31/lisp/process.el'
Index: ./lisp/process.el
--- ./lisp/process.el Wed Apr 27 00:57:27 2011
+++ ./lisp/process.el Fri Apr 29 22:31:10 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.30, except for setenv/getenv (synched with FSF
;;; 21.2.1).
diff --text -u 'xemacs-21.5.30/lisp/raw-process.el' 'xemacs-21.5.31/lisp/raw-process.el'
Index: ./lisp/raw-process.el
--- ./lisp/raw-process.el Wed Apr 27 00:57:27 2011
+++ ./lisp/raw-process.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/rect.el' 'xemacs-21.5.31/lisp/rect.el'
Index: ./lisp/rect.el
--- ./lisp/rect.el Wed Apr 27 00:57:27 2011
+++ ./lisp/rect.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: to be incorporated in a forthcoming GNU Emacs
diff --text -u 'xemacs-21.5.30/lisp/regexp-opt.el' 'xemacs-21.5.31/lisp/regexp-opt.el'
Index: ./lisp/regexp-opt.el
--- ./lisp/regexp-opt.el Wed Apr 27 00:57:27 2011
+++ ./lisp/regexp-opt.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: GNU Emacs 21.3 + paren-in-char-set fix from CVS
;;; revision 1.25. Some implementation differences in
diff --text -u 'xemacs-21.5.30/lisp/register.el' 'xemacs-21.5.31/lisp/register.el'
Index: ./lisp/register.el
--- ./lisp/register.el Wed Apr 27 00:57:27 2011
+++ ./lisp/register.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 21.3
diff --text -u 'xemacs-21.5.30/lisp/replace.el' 'xemacs-21.5.31/lisp/replace.el'
Index: ./lisp/replace.el
--- ./lisp/replace.el Wed Apr 27 00:57:27 2011
+++ ./lisp/replace.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.34 [Partially].
diff --text -u 'xemacs-21.5.30/lisp/resize-minibuffer.el' 'xemacs-21.5.31/lisp/resize-minibuffer.el'
Index: ./lisp/resize-minibuffer.el
--- ./lisp/resize-minibuffer.el Wed Apr 27 00:57:27 2011
+++ ./lisp/resize-minibuffer.el Fri Apr 29 22:31:10 2011
@@ -11,21 +11,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, you can either
-;; send email to this program's maintainer or write to: The Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched. Copied from rsz-minibuf.el to
;;; resize-minibuffer.el to avoid current problems where, when there's a
diff --text -u 'xemacs-21.5.30/lisp/scrollbar.el' 'xemacs-21.5.31/lisp/scrollbar.el'
Index: ./lisp/scrollbar.el
--- ./lisp/scrollbar.el Wed Apr 27 00:57:27 2011
+++ ./lisp/scrollbar.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF. (Completely divergent from FSF scroll-bar.el)
diff --text -u 'xemacs-21.5.30/lisp/select.el' 'xemacs-21.5.31/lisp/select.el'
Index: ./lisp/select.el
--- ./lisp/select.el Wed Apr 27 00:57:27 2011
+++ ./lisp/select.el Fri Apr 29 22:31:10 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/setup-paths.el' 'xemacs-21.5.31/lisp/setup-paths.el'
Index: ./lisp/setup-paths.el
--- ./lisp/setup-paths.el Wed Apr 27 00:57:27 2011
+++ ./lisp/setup-paths.el Fri Apr 29 22:31:10 2011
@@ -11,20 +11,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/shadow.el' 'xemacs-21.5.31/lisp/shadow.el'
Index: ./lisp/shadow.el
--- ./lisp/shadow.el Wed Apr 27 00:57:27 2011
+++ ./lisp/shadow.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/simple.el' 'xemacs-21.5.31/lisp/simple.el'
Index: ./lisp/simple.el
--- ./lisp/simple.el Wed Apr 27 00:57:27 2011
+++ ./lisp/simple.el Fri Apr 29 22:31:10 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.34 [But not very closely].
;;; Occasional synching to FSF 21.2 and FSF 22.0, as marked. Comment stuff
diff --text -u 'xemacs-21.5.30/lisp/site-load.el' 'xemacs-21.5.31/lisp/site-load.el'
Index: ./lisp/site-load.el
--- ./lisp/site-load.el Wed Apr 27 00:57:27 2011
+++ ./lisp/site-load.el Fri Apr 29 22:31:10 2011
@@ -6,20 +6,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/sound.el' 'xemacs-21.5.31/lisp/sound.el'
Index: ./lisp/sound.el
--- ./lisp/sound.el Wed Apr 27 00:57:27 2011
+++ ./lisp/sound.el Fri Apr 29 22:31:10 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/specifier.el' 'xemacs-21.5.31/lisp/specifier.el'
Index: ./lisp/specifier.el
--- ./lisp/specifier.el Wed Apr 27 00:57:27 2011
+++ ./lisp/specifier.el Fri Apr 29 22:31:10 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/startup.el' 'xemacs-21.5.31/lisp/startup.el'
Index: ./lisp/startup.el
--- ./lisp/startup.el Wed Apr 27 00:57:27 2011
+++ ./lisp/startup.el Fri Apr 29 22:31:10 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.34.
diff --text -u 'xemacs-21.5.30/lisp/subr.el' 'xemacs-21.5.31/lisp/subr.el'
Index: ./lisp/subr.el
--- ./lisp/subr.el Wed Apr 27 00:57:27 2011
+++ ./lisp/subr.el Fri Apr 29 22:31:10 2011
@@ -11,20 +11,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.34. Some things synched up with later versions.
diff --text -u 'xemacs-21.5.30/lisp/symbol-syntax.el' 'xemacs-21.5.31/lisp/symbol-syntax.el'
Index: ./lisp/symbol-syntax.el
--- ./lisp/symbol-syntax.el Wed Apr 27 00:57:27 2011
+++ ./lisp/symbol-syntax.el Fri Apr 29 22:31:10 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/symbols.el' 'xemacs-21.5.31/lisp/symbols.el'
Index: ./lisp/symbols.el
--- ./lisp/symbols.el Wed Apr 27 00:57:27 2011
+++ ./lisp/symbols.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/syntax.el' 'xemacs-21.5.31/lisp/syntax.el'
Index: ./lisp/syntax.el
--- ./lisp/syntax.el Wed Apr 27 00:57:27 2011
+++ ./lisp/syntax.el Fri Apr 29 22:31:10 2011
@@ -6,20 +6,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.28.
diff --text -u 'xemacs-21.5.30/lisp/term/AT386.el' 'xemacs-21.5.31/lisp/term/AT386.el'
Index: ./lisp/term/AT386.el
--- ./lisp/term/AT386.el Wed Apr 27 00:57:27 2011
+++ ./lisp/term/AT386.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/term/README' 'xemacs-21.5.31/lisp/term/README'
Index: ./lisp/term/README
--- ./lisp/term/README Wed Apr 27 00:57:27 2011
+++ ./lisp/term/README Fri Apr 29 22:31:10 2011
@@ -1,14 +1,48 @@
+Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
+
This directory contains files of elisp that customize Emacs for certain
terminal types.
- When Emacs starts, it checks the TERM environment variable to see what type
-of terminal the user is running on, checks for an elisp file named
-"term/${TERM}.el", and if one exists, loads it. If that doesn't yield a file
-that exists, the last hyphen and what follows it is stripped. If that doesn't
-yield a file that exists, the previous hyphen is stripped, and so on until all
-hyphens are gone. For example, if the terminal type is `aaa-48-foo', Emacs
-will try first `term/aaa-48-foo.el', then `term/aaa-48.el' and finally
-`term/aaa.el'.
+ When Emacs opens a new terminal, it checks the TERM environment variable to
+see what type of terminal the user is running on, searches for an elisp file
+named "term/${TERM}.el", and if one exists, loads it. If Emacs finds no
+suitable file, then it strips the last hyphen and what follows it from TERM,
+and tries again. If that still doesn't yield a file, then the previous hyphen
+is stripped, and so on until all hyphens are gone. For example, if the
+terminal type is `aaa-48-foo', Emacs will try first `term/aaa-48-foo.el', then
+`term/aaa-48.el' and finally `term/aaa.el'. Emacs stops searching at the
+first file found, and will not load more than one file for any terminal. Note
+that it is not an error if Emacs is unable to find a terminal initialization
+file; in that case, it will simply proceed with the next step without loading
+any files.
+
+ Once the file has been loaded (or the search failed), Emacs tries to call a
+function named `terminal-init-TERMINALNAME' (eg `terminal-init-aaa-48' for the
+`aaa-48' terminal) in order to initialize the terminal. Once again, if the
+function is not found, Emacs strips the last component of the name and tries
+again using the shorter name. This search is independent of the previous file
+search, so that you can have terminal initialization functions for a family of
+terminals collected in a single file named after the family name, and users
+may put terminal initialization functions directly in their .emacs files.
+
+ Note that an individual terminal file is loaded only once in an Emacs
+session; if the same terminal type is opened again, Emacs will simply call the
+initialization function without reloading the file. Therefore, all the actual
+initialization actions should be collected in terminal-init-* functions; the
+file should not contain any top-level form that is not a function or variable
+declaration. Simply loading the file should not have any side effect.
+
+ Similarly, the terminal initialization function is called only once on any
+given terminal, when the first frame is created on it. The function is not
+called for subsequent frames on the same terminal. Therefore, terminal-init-*
+functions should only modify terminal-local variables (such as
+`local-function-key-map') and terminal parameters. For example, it is not
+correct to modify frame parameters, since the modifications will only be
+applied for the first frame opened on the terminal.
+
When writing terminal packages, there are some things it is good to keep in
mind.
@@ -36,7 +70,7 @@
else someday.
For example, if your terminal has a `find' key, observe that terminfo
-supports a key_find capability and call your cookie [key-find].
+supports a key_find capability and call your cookie [find].
Here is a complete list, with corresponding X keysyms.
@@ -212,3 +246,19 @@
Before writing a terminal-support package, it's a good idea to read the
existing ones and learn the common conventions.
+
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
diff --text -u 'xemacs-21.5.30/lisp/term/apollo.el' 'xemacs-21.5.31/lisp/term/apollo.el'
Index: ./lisp/term/apollo.el
--- ./lisp/term/apollo.el Wed Apr 27 00:57:27 2011
+++ ./lisp/term/apollo.el Fri Apr 29 22:31:10 2011
@@ -2,20 +2,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 21.0.103.
diff --text -u 'xemacs-21.5.30/lisp/term/bg-mouse.el' 'xemacs-21.5.31/lisp/term/bg-mouse.el'
Index: ./lisp/term/bg-mouse.el
--- ./lisp/term/bg-mouse.el Wed Apr 27 00:57:27 2011
+++ ./lisp/term/bg-mouse.el Fri Apr 29 22:31:10 2011
@@ -1,6 +1,6 @@
;;; bg-mouse.el --- GNU Emacs code for BBN Bitgraph mouse.
-;; Copyright (C) 1985 Free Software Foundation, Inc.
+;; Copyright (C) Free Software Foundation, Inc. Oct 1985.
;; Author: John Robinson <jr@bbn-unix.arpa>
;; Stephen Gildea <gildea@bbn.com>
@@ -9,19 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Code:
diff --text -u 'xemacs-21.5.30/lisp/term/cygwin.el' 'xemacs-21.5.31/lisp/term/cygwin.el'
Index: ./lisp/term/cygwin.el
--- ./lisp/term/cygwin.el Wed Apr 27 00:57:27 2011
+++ ./lisp/term/cygwin.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/term/keyswap.el' 'xemacs-21.5.31/lisp/term/keyswap.el'
Index: ./lisp/term/keyswap.el
--- ./lisp/term/keyswap.el Wed Apr 27 00:57:27 2011
+++ ./lisp/term/keyswap.el Fri Apr 29 22:31:10 2011
@@ -5,21 +5,20 @@
;; Copyright (C) 1992 Free Software Foundation, Inc.
-;; This file is part of GNU Emacs.
+;; This file is part of XEmacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/term/linux.el' 'xemacs-21.5.31/lisp/term/linux.el'
Index: ./lisp/term/linux.el
--- ./lisp/term/linux.el Wed Apr 27 00:57:27 2011
+++ ./lisp/term/linux.el Fri Apr 29 22:31:10 2011
@@ -6,20 +6,18 @@
;; Copyright (C) 1996 Ben Wing.
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 21.0.103.
;;; (All the define-keys are our own.)
diff --text -u 'xemacs-21.5.30/lisp/term/lk201.el' 'xemacs-21.5.31/lisp/term/lk201.el'
Index: ./lisp/term/lk201.el
--- ./lisp/term/lk201.el Wed Apr 27 00:57:27 2011
+++ ./lisp/term/lk201.el Fri Apr 29 22:31:10 2011
@@ -2,20 +2,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 21.0.103.
diff --text -u 'xemacs-21.5.30/lisp/term/news.el' 'xemacs-21.5.31/lisp/term/news.el'
Index: ./lisp/term/news.el
--- ./lisp/term/news.el Wed Apr 27 00:57:27 2011
+++ ./lisp/term/news.el Fri Apr 29 22:31:10 2011
@@ -5,22 +5,20 @@
;; Copyright (C) 1989, 1993 Free Software Foundation, Inc.
-;;; This file is part of XEmacs.
-;;;
-;;; XEmacs is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2, or (at your
-;;; option) any later version.
-;;;
-;;; XEmacs is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;;; General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with XEmacs; see the file COPYING. If not, write to the
-;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;;; Boston, MA 02111-1307, USA.
+;; This file is part of XEmacs.
+;;
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+;;
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 21.0.103.
diff --text -u 'xemacs-21.5.30/lisp/term/scoansi.el' 'xemacs-21.5.31/lisp/term/scoansi.el'
Index: ./lisp/term/scoansi.el
--- ./lisp/term/scoansi.el Wed Apr 27 00:57:27 2011
+++ ./lisp/term/scoansi.el Fri Apr 29 22:31:10 2011
@@ -4,21 +4,20 @@
;; Author: Kean Johnston <jkj@paradigm.co.za>
-;; This file is part of GNU Emacs.
+;; This file is part of XEmacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;; HISTORY
;; jkj - Jan 18, 1993: Created.
diff --text -u 'xemacs-21.5.30/lisp/term/sup-mouse.el' 'xemacs-21.5.31/lisp/term/sup-mouse.el'
Index: ./lisp/term/sup-mouse.el
--- ./lisp/term/sup-mouse.el Wed Apr 27 00:57:27 2011
+++ ./lisp/term/sup-mouse.el Fri Apr 29 22:31:10 2011
@@ -1,6 +1,6 @@
;;; sup-mouse.el --- supdup mouse support for lisp machines
-;; Copyright (C) 1985, 1986 Free Software Foundation
+;; Copyright (C) Free Software Foundation 1985, 1986
;; Author: Wolfgang Rupprecht
;; Maintainer: FSF
@@ -11,19 +11,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Code:
diff --text -u 'xemacs-21.5.30/lisp/term/tvi970.el' 'xemacs-21.5.31/lisp/term/tvi970.el'
Index: ./lisp/term/tvi970.el
--- ./lisp/term/tvi970.el Wed Apr 27 00:57:27 2011
+++ ./lisp/term/tvi970.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/term/vt-control.el' 'xemacs-21.5.31/lisp/term/vt-control.el'
Index: ./lisp/term/vt-control.el
--- ./lisp/term/vt-control.el Wed Apr 27 00:57:28 2011
+++ ./lisp/term/vt-control.el Fri Apr 29 22:31:10 2011
@@ -6,21 +6,20 @@
;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
;; Keywords: terminals
-;; This file is part of GNU Emacs.
+;; This file is part of XEmacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/term/vt100-led.el' 'xemacs-21.5.31/lisp/term/vt100-led.el'
Index: ./lisp/term/vt100-led.el
--- ./lisp/term/vt100-led.el Wed Apr 27 00:57:28 2011
+++ ./lisp/term/vt100-led.el Fri Apr 29 22:31:10 2011
@@ -8,19 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Code:
diff --text -u 'xemacs-21.5.30/lisp/term/vt100.el' 'xemacs-21.5.31/lisp/term/vt100.el'
Index: ./lisp/term/vt100.el
--- ./lisp/term/vt100.el Wed Apr 27 00:57:28 2011
+++ ./lisp/term/vt100.el Fri Apr 29 22:31:10 2011
@@ -5,21 +5,20 @@
;; Author: FSF
;; Keywords: terminals
-;;; This file is part of XEmacs.
-;;;
-;;; XEmacs is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2, or (at your option)
-;;; any later version.
-;;;
-;;; XEmacs is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with XEmacs; see the file COPYING. If not, write to
-;;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; This file is part of XEmacs.
+;;
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+;;
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 21.0.103.
diff --text -u 'xemacs-21.5.30/lisp/term/wyse50.el' 'xemacs-21.5.31/lisp/term/wyse50.el'
Index: ./lisp/term/wyse50.el
--- ./lisp/term/wyse50.el Wed Apr 27 00:57:28 2011
+++ ./lisp/term/wyse50.el Fri Apr 29 22:31:10 2011
@@ -6,21 +6,20 @@
;; Jim Blandy <jimb@occs.cs.oberlin.edu>
;; Keywords: terminals
-;;; This file is part of GNU Emacs.
-;;;
-;;; GNU Emacs is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2, or (at your option)
-;;; any later version.
-;;;
-;;; GNU Emacs is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Emacs; see the file COPYING. If not, write to
-;;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; This file is part of XEmacs.
+;;
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+;;
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/term/xterm.el' 'xemacs-21.5.31/lisp/term/xterm.el'
Index: ./lisp/term/xterm.el
--- ./lisp/term/xterm.el Wed Apr 27 00:57:28 2011
+++ ./lisp/term/xterm.el Fri Apr 29 22:31:10 2011
@@ -7,19 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;;; Code:
diff --text -u 'xemacs-21.5.30/lisp/test-harness.el' 'xemacs-21.5.31/lisp/test-harness.el'
Index: ./lisp/test-harness.el
--- ./lisp/test-harness.el Wed Apr 27 00:57:28 2011
+++ ./lisp/test-harness.el Fri Apr 29 22:31:10 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/text-mode.el' 'xemacs-21.5.31/lisp/text-mode.el'
Index: ./lisp/text-mode.el
--- ./lisp/text-mode.el Wed Apr 27 00:57:28 2011
+++ ./lisp/text-mode.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 20.2.
diff --text -u 'xemacs-21.5.30/lisp/text-props.el' 'xemacs-21.5.31/lisp/text-props.el'
Index: ./lisp/text-props.el
--- ./lisp/text-props.el Wed Apr 27 00:57:28 2011
+++ ./lisp/text-props.el Fri Apr 29 22:31:10 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/toolbar-items.el' 'xemacs-21.5.31/lisp/toolbar-items.el'
Index: ./lisp/toolbar-items.el
--- ./lisp/toolbar-items.el Wed Apr 27 00:57:28 2011
+++ ./lisp/toolbar-items.el Fri Apr 29 22:31:10 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/toolbar.el' 'xemacs-21.5.31/lisp/toolbar.el'
Index: ./lisp/toolbar.el
--- ./lisp/toolbar.el Wed Apr 27 00:57:28 2011
+++ ./lisp/toolbar.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/tty-init.el' 'xemacs-21.5.31/lisp/tty-init.el'
Index: ./lisp/tty-init.el
--- ./lisp/tty-init.el Wed Apr 27 00:57:28 2011
+++ ./lisp/tty-init.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched.
diff --text -u 'xemacs-21.5.30/lisp/undo-stack.el' 'xemacs-21.5.31/lisp/undo-stack.el'
Index: ./lisp/undo-stack.el
--- ./lisp/undo-stack.el Wed Apr 27 00:57:28 2011
+++ ./lisp/undo-stack.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/unicode.el' 'xemacs-21.5.31/lisp/unicode.el'
Index: ./lisp/unicode.el
--- ./lisp/unicode.el Wed Apr 27 00:57:28 2011
+++ ./lisp/unicode.el Fri Apr 29 22:31:10 2011
@@ -6,20 +6,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/update-elc-2.el' 'xemacs-21.5.31/lisp/update-elc-2.el'
Index: ./lisp/update-elc-2.el
--- ./lisp/update-elc-2.el Wed Apr 27 00:57:28 2011
+++ ./lisp/update-elc-2.el Fri Apr 29 22:31:10 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/lisp/update-elc.el' 'xemacs-21.5.31/lisp/update-elc.el'
Index: ./lisp/update-elc.el
--- ./lisp/update-elc.el Wed Apr 27 00:57:28 2011
+++ ./lisp/update-elc.el Fri Apr 29 22:31:10 2011
@@ -11,20 +11,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/userlock.el' 'xemacs-21.5.31/lisp/userlock.el'
Index: ./lisp/userlock.el
--- ./lisp/userlock.el Wed Apr 27 00:57:28 2011
+++ ./lisp/userlock.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.34.
diff --text -u 'xemacs-21.5.30/lisp/version.el' 'xemacs-21.5.31/lisp/version.el'
Index: ./lisp/version.el
--- ./lisp/version.el Wed Apr 27 00:57:28 2011
+++ ./lisp/version.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.34.
diff --text -u 'xemacs-21.5.30/lisp/view-less.el' 'xemacs-21.5.31/lisp/view-less.el'
Index: ./lisp/view-less.el
--- ./lisp/view-less.el Wed Apr 27 00:57:28 2011
+++ ./lisp/view-less.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
;;
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2 of the License, or
-;; (at your option) any later version.
-;;
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-;;
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
+
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/wid-browse.el' 'xemacs-21.5.31/lisp/wid-browse.el'
Index: ./lisp/wid-browse.el
--- ./lisp/wid-browse.el Wed Apr 27 00:57:28 2011
+++ ./lisp/wid-browse.el Fri Apr 29 22:31:10 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;
diff --text -u 'xemacs-21.5.30/lisp/wid-edit.el' 'xemacs-21.5.31/lisp/wid-edit.el'
Index: ./lisp/wid-edit.el
--- ./lisp/wid-edit.el Wed Apr 27 00:57:28 2011
+++ ./lisp/wid-edit.el Fri Apr 29 22:31:10 2011
@@ -11,20 +11,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;
diff --text -u 'xemacs-21.5.30/lisp/widget.el' 'xemacs-21.5.31/lisp/widget.el'
Index: ./lisp/widget.el
--- ./lisp/widget.el Wed Apr 27 00:57:28 2011
+++ ./lisp/widget.el Fri Apr 29 22:31:10 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/widgets-gtk.el' 'xemacs-21.5.31/lisp/widgets-gtk.el'
Index: ./lisp/widgets-gtk.el
--- ./lisp/widgets-gtk.el Wed Apr 27 00:57:28 2011
+++ ./lisp/widgets-gtk.el Fri Apr 29 22:31:10 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/win32-native.el' 'xemacs-21.5.31/lisp/win32-native.el'
Index: ./lisp/win32-native.el
--- ./lisp/win32-native.el Wed Apr 27 00:57:28 2011
+++ ./lisp/win32-native.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
;;; (FSF has stuff in w32-fns.el and term/w32-win.el.)
diff --text -u 'xemacs-21.5.30/lisp/window-xemacs.el' 'xemacs-21.5.31/lisp/window-xemacs.el'
Index: ./lisp/window-xemacs.el
--- ./lisp/window-xemacs.el Wed Apr 27 00:57:28 2011
+++ ./lisp/window-xemacs.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched.
diff --text -u 'xemacs-21.5.30/lisp/window.el' 'xemacs-21.5.31/lisp/window.el'
Index: ./lisp/window.el
--- ./lisp/window.el Wed Apr 27 00:57:28 2011
+++ ./lisp/window.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Emacs/Mule zeta.
diff --text -u 'xemacs-21.5.30/lisp/x-compose.el' 'xemacs-21.5.31/lisp/x-compose.el'
Index: ./lisp/x-compose.el
--- ./lisp/x-compose.el Wed Apr 27 00:57:28 2011
+++ ./lisp/x-compose.el Fri Apr 29 22:31:10 2011
@@ -12,20 +12,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/lisp/x-faces.el' 'xemacs-21.5.31/lisp/x-faces.el'
Index: ./lisp/x-faces.el
--- ./lisp/x-faces.el Wed Apr 27 00:57:28 2011
+++ ./lisp/x-faces.el Fri Apr 29 22:31:10 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched.
diff --text -u 'xemacs-21.5.30/lisp/x-font-menu.el' 'xemacs-21.5.31/lisp/x-font-menu.el'
Index: ./lisp/x-font-menu.el
--- ./lisp/x-font-menu.el Wed Apr 27 00:57:28 2011
+++ ./lisp/x-font-menu.el Fri Apr 29 22:31:10 2011
@@ -11,20 +11,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Code:
;; #### - implement these...
diff --text -u 'xemacs-21.5.30/lisp/x-init.el' 'xemacs-21.5.31/lisp/x-init.el'
Index: ./lisp/x-init.el
--- ./lisp/x-init.el Wed Apr 27 00:57:28 2011
+++ ./lisp/x-init.el Fri Apr 29 22:31:10 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched.
diff --text -u 'xemacs-21.5.30/lisp/x-misc.el' 'xemacs-21.5.31/lisp/x-misc.el'
Index: ./lisp/x-misc.el
--- ./lisp/x-misc.el Wed Apr 27 00:57:28 2011
+++ ./lisp/x-misc.el Fri Apr 29 22:31:10 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/x-mouse.el' 'xemacs-21.5.31/lisp/x-mouse.el'
Index: ./lisp/x-mouse.el
--- ./lisp/x-mouse.el Wed Apr 27 00:57:28 2011
+++ ./lisp/x-mouse.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched.
diff --text -u 'xemacs-21.5.30/lisp/x-scrollbar.el' 'xemacs-21.5.31/lisp/x-scrollbar.el'
Index: ./lisp/x-scrollbar.el
--- ./lisp/x-scrollbar.el Wed Apr 27 00:57:28 2011
+++ ./lisp/x-scrollbar.el Fri Apr 29 22:31:10 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched.
diff --text -u 'xemacs-21.5.30/lisp/x-select.el' 'xemacs-21.5.31/lisp/x-select.el'
Index: ./lisp/x-select.el
--- ./lisp/x-select.el Wed Apr 27 00:57:28 2011
+++ ./lisp/x-select.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.30 (select.el).
diff --text -u 'xemacs-21.5.30/lisp/x-win-sun.el' 'xemacs-21.5.31/lisp/x-win-sun.el'
Index: ./lisp/x-win-sun.el
--- ./lisp/x-win-sun.el Wed Apr 27 00:57:28 2011
+++ ./lisp/x-win-sun.el Fri Apr 29 22:31:10 2011
@@ -6,20 +6,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lisp/x-win-xfree86.el' 'xemacs-21.5.31/lisp/x-win-xfree86.el'
Index: ./lisp/x-win-xfree86.el
--- ./lisp/x-win-xfree86.el Wed Apr 27 00:57:28 2011
+++ ./lisp/x-win-xfree86.el Fri Apr 29 22:31:10 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --text -u 'xemacs-21.5.30/lwlib/ChangeLog' 'xemacs-21.5.31/lwlib/ChangeLog'
Index: ./lwlib/ChangeLog
--- ./lwlib/ChangeLog Wed Apr 27 00:57:41 2011
+++ ./lwlib/ChangeLog Fri Apr 29 22:31:39 2011
@@ -1,3 +1,7 @@
+2011-04-29 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.5.31 "ginger" is released.
+
2011-04-26 Stephen J. Turnbull <stephen@xemacs.org>
* XEmacs 21.5.30 "garlic" is released.
@@ -1451,3 +1455,23 @@
* lwlib/xlwmenu.c (massage_resource_name): Fix compiler warning
- Have to toupper ((int) (unsigned char) x) to be portable.
+
+
+ChangeLog entries synched from GNU Emacs are the property of the FSF.
+Other ChangeLog entries are usually the property of the author of the
+change.
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
diff --text -u 'xemacs-21.5.30/lwlib/Makefile.in.in' 'xemacs-21.5.31/lwlib/Makefile.in.in'
Index: ./lwlib/Makefile.in.in
--- ./lwlib/Makefile.in.in Wed Apr 27 00:57:28 2011
+++ ./lwlib/Makefile.in.in Fri Apr 29 22:31:10 2011
@@ -5,22 +5,21 @@
## Copyright (C) 1996, 1997 Sun Microsystems, Inc.
## Copyright (C) 2005 Ben Wing.
-## This file is part of the Lucid Widget Library.
+## This file is part of Lucid Widget Library.
-## The Lucid Widget Library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-
-## The Lucid Widget Library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## The Lucid Widget Library is free software: you can redistribute it
+## and/or modify it under the terms of the GNU General Public License
+## as published by the Free Software Foundation, either version 3 of
+## the License, or (at your option) any later version.
+
+## The Lucid Widget Library is distributed in the hope that it will be
+## useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+## of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with XEmacs; see the file COPYING. If not, write to
-## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-## Boston, MA 02111-1307, USA.
+## along with the Lucid Widget Library. If not, see
+## <http://www.gnu.org/licenses/>.
## For performance and consistency, no built-in rules
.SUFFIXES:
diff --text -u 'xemacs-21.5.30/lwlib/config.h.in' 'xemacs-21.5.31/lwlib/config.h.in'
Index: ./lwlib/config.h.in
--- ./lwlib/config.h.in Wed Apr 27 00:57:28 2011
+++ ./lwlib/config.h.in Fri Apr 29 22:31:10 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Not in FSF. */
diff --text -u 'xemacs-21.5.30/lwlib/lwlib-Xaw.c' 'xemacs-21.5.31/lwlib/lwlib-Xaw.c'
Index: ./lwlib/lwlib-Xaw.c
--- ./lwlib/lwlib-Xaw.c Wed Apr 27 00:57:28 2011
+++ ./lwlib/lwlib-Xaw.c Fri Apr 29 22:31:10 2011
@@ -3,20 +3,20 @@
This file is part of the Lucid Widget Library.
-The Lucid Widget Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
-any later version.
-
-The Lucid Widget Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+The Lucid Widget Library is free software: you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+The Lucid Widget Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with the Lucid Widget Library. If not, see
+<http://www.gnu.org/licenses/>.
+*/
#include <config.h>
#include <stdio.h>
diff --text -u 'xemacs-21.5.30/lwlib/lwlib-Xaw.h' 'xemacs-21.5.31/lwlib/lwlib-Xaw.h'
Index: ./lwlib/lwlib-Xaw.h
--- ./lwlib/lwlib-Xaw.h Wed Apr 27 00:57:28 2011
+++ ./lwlib/lwlib-Xaw.h Fri Apr 29 22:31:10 2011
@@ -1,3 +1,22 @@
+/* The lwlib interface to Athena widgets.
+ Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+
+This file is part of the Lucid Widget Library.
+
+The Lucid Widget Library is free software: you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+The Lucid Widget Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with the Lucid Widget Library. If not, see
+<http://www.gnu.org/licenses/>. */
+
#ifndef INCLUDED_lwlib_Xaw_h_
#define INCLUDED_lwlib_Xaw_h_
diff --text -u 'xemacs-21.5.30/lwlib/lwlib-Xlw.c' 'xemacs-21.5.31/lwlib/lwlib-Xlw.c'
Index: ./lwlib/lwlib-Xlw.c
--- ./lwlib/lwlib-Xlw.c Wed Apr 27 00:57:28 2011
+++ ./lwlib/lwlib-Xlw.c Fri Apr 29 22:31:10 2011
@@ -3,20 +3,19 @@
This file is part of the Lucid Widget Library.
-The Lucid Widget Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-The Lucid Widget Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+The Lucid Widget Library is free software: you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+The Lucid Widget Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with the Lucid Widget Library. If not, see
+<http://www.gnu.org/licenses/>. */
#include <config.h>
#include <stdlib.h> /* for abort () */
diff --text -u 'xemacs-21.5.30/lwlib/lwlib-Xlw.h' 'xemacs-21.5.31/lwlib/lwlib-Xlw.h'
Index: ./lwlib/lwlib-Xlw.h
--- ./lwlib/lwlib-Xlw.h Wed Apr 27 00:57:28 2011
+++ ./lwlib/lwlib-Xlw.h Fri Apr 29 22:31:10 2011
@@ -1,3 +1,22 @@
+/* The lwlib interface to "xlwmenu" menus.
+ Copyright (C) 1992, 1994 Lucid, Inc.
+
+This file is part of the Lucid Widget Library.
+
+The Lucid Widget Library is free software: you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+The Lucid Widget Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with the Lucid Widget Library. If not, see
+<http://www.gnu.org/licenses/>. */
+
#ifndef LWLIB_XLW_H
#define LWLIB_XLW_H
diff --text -u 'xemacs-21.5.30/lwlib/lwlib-Xm.c' 'xemacs-21.5.31/lwlib/lwlib-Xm.c'
Index: ./lwlib/lwlib-Xm.c
--- ./lwlib/lwlib-Xm.c Wed Apr 27 00:57:28 2011
+++ ./lwlib/lwlib-Xm.c Fri Apr 29 22:31:10 2011
@@ -4,20 +4,19 @@
This file is part of the Lucid Widget Library.
-The Lucid Widget Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-The Lucid Widget Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+The Lucid Widget Library is free software: you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+The Lucid Widget Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with the Lucid Widget Library. If not, see
+<http://www.gnu.org/licenses/>. */
#include <config.h>
#include <stdlib.h>
diff --text -u 'xemacs-21.5.30/lwlib/lwlib-Xm.h' 'xemacs-21.5.31/lwlib/lwlib-Xm.h'
Index: ./lwlib/lwlib-Xm.h
--- ./lwlib/lwlib-Xm.h Wed Apr 27 00:57:28 2011
+++ ./lwlib/lwlib-Xm.h Fri Apr 29 22:31:10 2011
@@ -1,3 +1,23 @@
+/* The lwlib interface to Motif widgets.
+ Copyright (C) 1992, 1993, 1994 Lucid, Inc.
+ Copyright (C) 1995 Tinker Systems and INS Engineering Corp.
+
+This file is part of the Lucid Widget Library.
+
+The Lucid Widget Library is free software: you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+The Lucid Widget Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with the Lucid Widget Library. If not, see
+<http://www.gnu.org/licenses/>. */
+
#ifndef INCLUDED_lwlib_Xm_h_
#define INCLUDED_lwlib_Xm_h_
diff --text -u 'xemacs-21.5.30/lwlib/lwlib-colors.c' 'xemacs-21.5.31/lwlib/lwlib-colors.c'
Index: ./lwlib/lwlib-colors.c
--- ./lwlib/lwlib-colors.c Wed Apr 27 00:57:28 2011
+++ ./lwlib/lwlib-colors.c Fri Apr 29 22:31:10 2011
@@ -7,10 +7,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in GNU Emacs. */
diff --text -u 'xemacs-21.5.30/lwlib/lwlib-colors.h' 'xemacs-21.5.31/lwlib/lwlib-colors.h'
Index: ./lwlib/lwlib-colors.h
--- ./lwlib/lwlib-colors.h Wed Apr 27 00:57:28 2011
+++ ./lwlib/lwlib-colors.h Fri Apr 29 22:31:10 2011
@@ -7,10 +7,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in GNU Emacs. */
diff --text -u 'xemacs-21.5.30/lwlib/lwlib-fonts.c' 'xemacs-21.5.31/lwlib/lwlib-fonts.c'
Index: ./lwlib/lwlib-fonts.c
--- ./lwlib/lwlib-fonts.c Wed Apr 27 00:57:28 2011
+++ ./lwlib/lwlib-fonts.c Fri Apr 29 22:31:10 2011
@@ -8,10 +8,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,9 +19,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in GNU Emacs. */
diff --text -u 'xemacs-21.5.30/lwlib/lwlib-fonts.h' 'xemacs-21.5.31/lwlib/lwlib-fonts.h'
Index: ./lwlib/lwlib-fonts.h
--- ./lwlib/lwlib-fonts.h Wed Apr 27 00:57:28 2011
+++ ./lwlib/lwlib-fonts.h Fri Apr 29 22:31:10 2011
@@ -7,10 +7,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in GNU Emacs. */
diff --text -u 'xemacs-21.5.30/lwlib/lwlib-internal.h' 'xemacs-21.5.31/lwlib/lwlib-internal.h'
Index: ./lwlib/lwlib-internal.h
--- ./lwlib/lwlib-internal.h Wed Apr 27 00:57:28 2011
+++ ./lwlib/lwlib-internal.h Fri Apr 29 22:31:10 2011
@@ -4,20 +4,19 @@
This file is part of the Lucid Widget Library.
-The Lucid Widget Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
-any later version.
-
-The Lucid Widget Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+The Lucid Widget Library is free software: you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+The Lucid Widget Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with the Lucid Widget Library. If not, see
+<http://www.gnu.org/licenses/>. */
#ifndef INCLUDED_lwlib_internal_h_
#define INCLUDED_lwlib_internal_h_
diff --text -u 'xemacs-21.5.30/lwlib/lwlib-utils.c' 'xemacs-21.5.31/lwlib/lwlib-utils.c'
Index: ./lwlib/lwlib-utils.c
--- ./lwlib/lwlib-utils.c Wed Apr 27 00:57:28 2011
+++ ./lwlib/lwlib-utils.c Fri Apr 29 22:31:10 2011
@@ -3,20 +3,19 @@
This file is part of the Lucid Widget Library.
-The Lucid Widget Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
-any later version.
-
-The Lucid Widget Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+The Lucid Widget Library is free software: you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+The Lucid Widget Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with the Lucid Widget Library. If not, see
+<http://www.gnu.org/licenses/>. */
#include <config.h>
#include <stdlib.h>
diff --text -u 'xemacs-21.5.30/lwlib/lwlib-utils.h' 'xemacs-21.5.31/lwlib/lwlib-utils.h'
Index: ./lwlib/lwlib-utils.h
--- ./lwlib/lwlib-utils.h Wed Apr 27 00:57:28 2011
+++ ./lwlib/lwlib-utils.h Fri Apr 29 22:31:10 2011
@@ -1,3 +1,22 @@
+/* Defines some widget utility functions.
+ Copyright (C) 1992 Lucid, Inc.
+
+This file is part of the Lucid Widget Library.
+
+The Lucid Widget Library is free software: you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+The Lucid Widget Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with the Lucid Widget Library. If not, see
+<http://www.gnu.org/licenses/>. */
+
#ifndef INCLUDED_lwlib_utils_h_
#define INCLUDED_lwlib_utils_h_
diff --text -u 'xemacs-21.5.30/lwlib/lwlib.c' 'xemacs-21.5.31/lwlib/lwlib.c'
Index: ./lwlib/lwlib.c
--- ./lwlib/lwlib.c Wed Apr 27 00:57:28 2011
+++ ./lwlib/lwlib.c Fri Apr 29 22:31:10 2011
@@ -4,20 +4,19 @@
This file is part of the Lucid Widget Library.
-The Lucid Widget Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-The Lucid Widget Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+The Lucid Widget Library is free software: you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+The Lucid Widget Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with the Lucid Widget Library. If not, see
+<http://www.gnu.org/licenses/>. */
#include <config.h>
#include <stdio.h>
diff --text -u 'xemacs-21.5.30/lwlib/lwlib.h' 'xemacs-21.5.31/lwlib/lwlib.h'
Index: ./lwlib/lwlib.h
--- ./lwlib/lwlib.h Wed Apr 27 00:57:28 2011
+++ ./lwlib/lwlib.h Fri Apr 29 22:31:10 2011
@@ -1,3 +1,23 @@
+/* A general interface to the widgets of different toolkits.
+ Copyright (C) 1992, 1993, 1994 Lucid, Inc.
+ Copyright (C) 1995 Tinker Systems and INS Engineering Corp.
+
+This file is part of the Lucid Widget Library.
+
+The Lucid Widget Library is free software: you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+The Lucid Widget Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with the Lucid Widget Library. If not, see
+<http://www.gnu.org/licenses/>. */
+
#ifndef INCLUDED_lwlib_h_
#define INCLUDED_lwlib_h_
diff --text -u 'xemacs-21.5.30/lwlib/xlwcheckbox.c' 'xemacs-21.5.31/lwlib/xlwcheckbox.c'
Index: ./lwlib/xlwcheckbox.c
--- ./lwlib/xlwcheckbox.c Wed Apr 27 00:57:28 2011
+++ ./lwlib/xlwcheckbox.c Fri Apr 29 22:31:10 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Checkbox.c 1.1 */
diff --text -u 'xemacs-21.5.30/lwlib/xlwcheckbox.h' 'xemacs-21.5.31/lwlib/xlwcheckbox.h'
Index: ./lwlib/xlwcheckbox.h
--- ./lwlib/xlwcheckbox.h Wed Apr 27 00:57:28 2011
+++ ./lwlib/xlwcheckbox.h Fri Apr 29 22:31:10 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Checkbox.h 1.1 */
diff --text -u 'xemacs-21.5.30/lwlib/xlwcheckboxP.h' 'xemacs-21.5.31/lwlib/xlwcheckboxP.h'
Index: ./lwlib/xlwcheckboxP.h
--- ./lwlib/xlwcheckboxP.h Wed Apr 27 00:57:28 2011
+++ ./lwlib/xlwcheckboxP.h Fri Apr 29 22:31:10 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/*
* CheckboxP.h - Private definitions for Checkbox widget
diff --text -u 'xemacs-21.5.30/lwlib/xlwgauge.c' 'xemacs-21.5.31/lwlib/xlwgauge.c'
Index: ./lwlib/xlwgauge.c
--- ./lwlib/xlwgauge.c Wed Apr 27 00:57:28 2011
+++ ./lwlib/xlwgauge.c Fri Apr 29 22:31:10 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Gauge.c 1.2 */
diff --text -u 'xemacs-21.5.30/lwlib/xlwgauge.h' 'xemacs-21.5.31/lwlib/xlwgauge.h'
Index: ./lwlib/xlwgauge.h
--- ./lwlib/xlwgauge.h Wed Apr 27 00:57:28 2011
+++ ./lwlib/xlwgauge.h Fri Apr 29 22:31:10 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Gauge.h 1.1 */
diff --text -u 'xemacs-21.5.30/lwlib/xlwgaugeP.h' 'xemacs-21.5.31/lwlib/xlwgaugeP.h'
Index: ./lwlib/xlwgaugeP.h
--- ./lwlib/xlwgaugeP.h Wed Apr 27 00:57:28 2011
+++ ./lwlib/xlwgaugeP.h Fri Apr 29 22:31:10 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/*
* GaugeP.h - Gauge widget
diff --text -u 'xemacs-21.5.30/lwlib/xlwgcs.c' 'xemacs-21.5.31/lwlib/xlwgcs.c'
Index: ./lwlib/xlwgcs.c
--- ./lwlib/xlwgcs.c Wed Apr 27 00:57:28 2011
+++ ./lwlib/xlwgcs.c Fri Apr 29 22:31:11 2011
@@ -3,20 +3,18 @@
This file is part of XEmacs.
- XEmacs is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any
- later version.
-
- XEmacs is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with XEmacs; see the file COPYING. If not, write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Gcs.c 1.7 */
diff --text -u 'xemacs-21.5.30/lwlib/xlwgcs.h' 'xemacs-21.5.31/lwlib/xlwgcs.h'
Index: ./lwlib/xlwgcs.h
--- ./lwlib/xlwgcs.h Wed Apr 27 00:57:28 2011
+++ ./lwlib/xlwgcs.h Fri Apr 29 22:31:11 2011
@@ -3,20 +3,18 @@
This file is part of XEmacs.
- XEmacs is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any
- later version.
-
- XEmacs is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with XEmacs; see the file COPYING. If not, write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Gcs 1.7 */
diff --text -u 'xemacs-21.5.30/lwlib/xlwmenu.c' 'xemacs-21.5.31/lwlib/xlwmenu.c'
Index: ./lwlib/xlwmenu.c
--- ./lwlib/xlwmenu.c Wed Apr 27 00:57:28 2011
+++ ./lwlib/xlwmenu.c Fri Apr 29 22:31:11 2011
@@ -4,20 +4,19 @@
This file is part of the Lucid Widget Library.
-The Lucid Widget Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-The Lucid Widget Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+The Lucid Widget Library is free software: you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+The Lucid Widget Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with the Lucid Widget Library. If not, see
+<http://www.gnu.org/licenses/>. */
/* Created by devin@lucid.com */
diff --text -u 'xemacs-21.5.30/lwlib/xlwmenu.h' 'xemacs-21.5.31/lwlib/xlwmenu.h'
Index: ./lwlib/xlwmenu.h
--- ./lwlib/xlwmenu.h Wed Apr 27 00:57:28 2011
+++ ./lwlib/xlwmenu.h Fri Apr 29 22:31:11 2011
@@ -1,3 +1,23 @@
+/* Implements a lightweight menubar widget.
+ Copyright (C) 1992, 1993, 1994 Lucid, Inc.
+ Copyright (C) 1995 Tinker Systems and INS Engineering Corp.
+
+This file is part of the Lucid Widget Library.
+
+The Lucid Widget Library is free software: you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+The Lucid Widget Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with the Lucid Widget Library. If not, see
+<http://www.gnu.org/licenses/>. */
+
#ifndef INCLUDED_xlwmenu_h_
#define INCLUDED_xlwmenu_h_
diff --text -u 'xemacs-21.5.30/lwlib/xlwmenuP.h' 'xemacs-21.5.31/lwlib/xlwmenuP.h'
Index: ./lwlib/xlwmenuP.h
--- ./lwlib/xlwmenuP.h Wed Apr 27 00:57:28 2011
+++ ./lwlib/xlwmenuP.h Fri Apr 29 22:31:11 2011
@@ -1,3 +1,23 @@
+/* Implements a lightweight menubar widget.
+ Copyright (C) 1992, 1993, 1994 Lucid, Inc.
+ Copyright (C) 1995 Tinker Systems and INS Engineering Corp.
+
+This file is part of the Lucid Widget Library.
+
+The Lucid Widget Library is free software: you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+The Lucid Widget Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with the Lucid Widget Library. If not, see
+<http://www.gnu.org/licenses/>. */
+
#ifndef INCLUDED_xlwmenuP_h_
#define INCLUDED_xlwmenuP_h_
diff --text -u 'xemacs-21.5.30/lwlib/xlwradio.c' 'xemacs-21.5.31/lwlib/xlwradio.c'
Index: ./lwlib/xlwradio.c
--- ./lwlib/xlwradio.c Wed Apr 27 00:57:28 2011
+++ ./lwlib/xlwradio.c Fri Apr 29 22:31:11 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Radio.c 1.1 */
diff --text -u 'xemacs-21.5.30/lwlib/xlwradio.h' 'xemacs-21.5.31/lwlib/xlwradio.h'
Index: ./lwlib/xlwradio.h
--- ./lwlib/xlwradio.h Wed Apr 27 00:57:28 2011
+++ ./lwlib/xlwradio.h Fri Apr 29 22:31:11 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Radio.h 1.1 */
diff --text -u 'xemacs-21.5.30/lwlib/xlwradioP.h' 'xemacs-21.5.31/lwlib/xlwradioP.h'
Index: ./lwlib/xlwradioP.h
--- ./lwlib/xlwradioP.h Wed Apr 27 00:57:28 2011
+++ ./lwlib/xlwradioP.h Fri Apr 29 22:31:11 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/*
* RadioP.h - Private definitions for Radio widget
diff --text -u 'xemacs-21.5.30/lwlib/xlwscrollbar.c' 'xemacs-21.5.31/lwlib/xlwscrollbar.c'
Index: ./lwlib/xlwscrollbar.c
--- ./lwlib/xlwscrollbar.c Wed Apr 27 00:57:28 2011
+++ ./lwlib/xlwscrollbar.c Fri Apr 29 22:31:11 2011
@@ -4,20 +4,19 @@
This file is part of the Lucid Widget Library.
-The Lucid Widget Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-The Lucid Widget Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+The Lucid Widget Library is free software: you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+The Lucid Widget Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with the Lucid Widget Library. If not, see
+<http://www.gnu.org/licenses/>. */
/* Created by Douglas Keller <dkeller@vnet.ibm.com> */
/* Lots of hacking by Martin Buchholz */
diff --text -u 'xemacs-21.5.30/lwlib/xlwscrollbar.h' 'xemacs-21.5.31/lwlib/xlwscrollbar.h'
Index: ./lwlib/xlwscrollbar.h
--- ./lwlib/xlwscrollbar.h Wed Apr 27 00:57:28 2011
+++ ./lwlib/xlwscrollbar.h Fri Apr 29 22:31:11 2011
@@ -3,20 +3,19 @@
This file is part of the Lucid Widget Library.
-The Lucid Widget Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-The Lucid Widget Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+The Lucid Widget Library is free software: you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+The Lucid Widget Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with the Lucid Widget Library. If not, see
+<http://www.gnu.org/licenses/>. */
/* Created by Douglas Keller <dkeller@vnet.ibm.com> */
diff --text -u 'xemacs-21.5.30/lwlib/xlwscrollbarP.h' 'xemacs-21.5.31/lwlib/xlwscrollbarP.h'
Index: ./lwlib/xlwscrollbarP.h
--- ./lwlib/xlwscrollbarP.h Wed Apr 27 00:57:28 2011
+++ ./lwlib/xlwscrollbarP.h Fri Apr 29 22:31:11 2011
@@ -1,22 +1,21 @@
-/* Implements a lightweight scrollbar widget.
+/* Implements a lightweight scrollbar widget.
Copyright (C) 1992, 1993, 1994 Lucid, Inc.
This file is part of the Lucid Widget Library.
-The Lucid Widget Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-The Lucid Widget Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+The Lucid Widget Library is free software: you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+The Lucid Widget Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with the Lucid Widget Library. If not, see
+<http://www.gnu.org/licenses/>. */
/* Created by Douglas Keller <dkeller@vnet.ibm.com> */
diff --text -u 'xemacs-21.5.30/lwlib/xlwtabs.c' 'xemacs-21.5.31/lwlib/xlwtabs.c'
Index: ./lwlib/xlwtabs.c
--- ./lwlib/xlwtabs.c Wed Apr 27 00:57:28 2011
+++ ./lwlib/xlwtabs.c Fri Apr 29 22:31:11 2011
@@ -3,20 +3,18 @@
This file is part of XEmacs.
- XEmacs is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any
- later version.
-
- XEmacs is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with XEmacs; see the file COPYING. If not, write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/*
* Tabs.c - Index Tabs composite widget
diff --text -u 'xemacs-21.5.30/lwlib/xlwtabs.h' 'xemacs-21.5.31/lwlib/xlwtabs.h'
Index: ./lwlib/xlwtabs.h
--- ./lwlib/xlwtabs.h Wed Apr 27 00:57:28 2011
+++ ./lwlib/xlwtabs.h Fri Apr 29 22:31:11 2011
@@ -1,22 +1,20 @@
-/* Tabs Widget for XEmacs.
+ /* Tabs Widget for XEmacs.
Copyright (C) 1999 Edward A. Falk
-
+
This file is part of XEmacs.
-
- XEmacs is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any
- later version.
-
- XEmacs is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with XEmacs; see the file COPYING. If not, write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/*
* This widget manages one or more child widgets, exactly one of which is
diff --text -u 'xemacs-21.5.30/lwlib/xlwtabsP.h' 'xemacs-21.5.31/lwlib/xlwtabsP.h'
Index: ./lwlib/xlwtabsP.h
--- ./lwlib/xlwtabsP.h Wed Apr 27 00:57:28 2011
+++ ./lwlib/xlwtabsP.h Fri Apr 29 22:31:11 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: TabsP.h 1.8 */
diff --text -u 'xemacs-21.5.30/lwlib/xt-wrappers.h' 'xemacs-21.5.31/lwlib/xt-wrappers.h'
Index: ./lwlib/xt-wrappers.h
--- ./lwlib/xt-wrappers.h Wed Apr 27 00:57:28 2011
+++ ./lwlib/xt-wrappers.h Fri Apr 29 22:31:11 2011
@@ -4,19 +4,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
+
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/man/ChangeLog' 'xemacs-21.5.31/man/ChangeLog'
Index: ./man/ChangeLog
--- ./man/ChangeLog Wed Apr 27 00:57:41 2011
+++ ./man/ChangeLog Fri Apr 29 22:31:39 2011
@@ -1,3 +1,7 @@
+2011-04-29 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.5.31 "ginger" is released.
+
2011-04-26 Stephen J. Turnbull <stephen@xemacs.org>
* XEmacs 21.5.30 "garlic" is released.
@@ -6504,3 +6508,23 @@
* emacs.tex: Update information for obtaining TeX distribution from the
University of Washington.
+
+
+ChangeLog entries synched from GNU Emacs are the property of the FSF.
+Other ChangeLog entries are usually the property of the author of the
+change.
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
diff --text -u 'xemacs-21.5.30/man/Makefile' 'xemacs-21.5.31/man/Makefile'
Index: ./man/Makefile
--- ./man/Makefile Wed Apr 27 00:57:28 2011
+++ ./man/Makefile Fri Apr 29 22:31:11 2011
@@ -4,21 +4,19 @@
# Copyright (C) 2005 Ben Wing.
# This file is part of XEmacs.
-
-# XEmacs is free software; you can redistribute it and/or modify it
+#
+# XEmacs is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any
-# later version.
-
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
# XEmacs is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-
+#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
SHELL = /bin/sh
MAKEINFO = makeinfo
diff --text -u 'xemacs-21.5.30/man/beta.texi' 'xemacs-21.5.31/man/beta.texi'
Index: ./man/beta.texi
--- ./man/beta.texi Wed Apr 27 00:57:28 2011
+++ ./man/beta.texi Fri Apr 29 22:31:11 2011
@@ -23,10 +23,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -34,10 +34,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
-@end ifinfo
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.@end ifinfo
@c Combine indices.
@syncodeindex fn cp
diff --text -u 'xemacs-21.5.30/man/lispref/packaging.texi' 'xemacs-21.5.31/man/lispref/packaging.texi'
Index: ./man/lispref/packaging.texi
--- ./man/lispref/packaging.texi Wed Apr 27 00:57:28 2011
+++ ./man/lispref/packaging.texi Fri Apr 29 22:31:11 2011
@@ -993,21 +993,19 @@
# Makefile for build lisp code
# This file is part of XEmacs.
-
-# XEmacs is free software; you can redistribute it and/or modify it
+#
+# XEmacs is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any
-# later version.
-
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
# XEmacs is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-
+#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
# For the time being, remove MULE_ELCS from the all dependencies if
# building without Mule.
diff --text -u 'xemacs-21.5.30/man/texinfo.tex' 'xemacs-21.5.31/man/texinfo.tex'
Index: ./man/texinfo.tex
--- ./man/texinfo.tex Wed Apr 27 00:57:28 2011
+++ ./man/texinfo.tex Fri Apr 29 22:31:12 2011
@@ -3,15 +3,17 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{1999-09-25.10}
+\def\texinfoversion{2010-11-07.00}
%
% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99
% Free Software Foundation, Inc.
%
-% This texinfo.tex file is free software; you can redistribute it and/or
-% modify it under the terms of the GNU General Public License as
-% published by the Free Software Foundation; either version 2, or (at
-% your option) any later version.
+% This file is part of XEmacs.
+%
+% This texinfo.tex file is free software: you can redistribute it
+% and/or modify it under the terms of the GNU General Public License
+% as published by the Free Software Foundation, either version 3 of
+% the License, or (at your option) any later version.
%
% This texinfo.tex file is distributed in the hope that it will be
% useful, but WITHOUT ANY WARRANTY; without even the implied warranty
@@ -19,9 +21,8 @@
% General Public License for more details.
%
% You should have received a copy of the GNU General Public License
-% along with this texinfo.tex file; see the file COPYING. If not, write
-% to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% along with this texinfo.tex file. If not, see
+% <http://www.gnu.org/licenses/>.
%
% In other words, you are welcome to use, share and improve this program.
% You are forbidden to forbid anyone else to use, share and improve
diff --text -u 'xemacs-21.5.30/modules/ChangeLog' 'xemacs-21.5.31/modules/ChangeLog'
Index: ./modules/ChangeLog
--- ./modules/ChangeLog Wed Apr 27 00:57:41 2011
+++ ./modules/ChangeLog Fri Apr 29 22:31:39 2011
@@ -1,3 +1,7 @@
+2011-04-29 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.5.31 "ginger" is released.
+
2011-04-26 Stephen J. Turnbull <stephen@xemacs.org>
* XEmacs 21.5.30 "garlic" is released.
@@ -659,3 +663,21 @@
* base64/base64.c - update Bufpos => Charbpos
+ChangeLog entries synched from GNU Emacs are the property of the FSF.
+Other ChangeLog entries are usually the property of the author of the
+change.
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
diff --text -u 'xemacs-21.5.30/modules/README' 'xemacs-21.5.31/modules/README'
Index: ./modules/README
--- ./modules/README Wed Apr 27 00:57:28 2011
+++ ./modules/README Fri Apr 29 22:31:12 2011
@@ -1,3 +1,19 @@
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
+
This directory contains a number of XEmacs dynamic modules. These
modules can be loaded directly with the command 'M-x load-module'.
However, the preferred method of loading a module is to issue a
diff --text -u 'xemacs-21.5.30/modules/base64/Makefile' 'xemacs-21.5.31/modules/base64/Makefile'
Index: ./modules/base64/Makefile
--- ./modules/base64/Makefile Wed Apr 27 00:57:28 2011
+++ ./modules/base64/Makefile Fri Apr 29 22:31:12 2011
@@ -1,3 +1,21 @@
+# Copyright (C) 1998, 1999 William Perry.
+
+# This file is part of XEmacs.
+
+# XEmacs is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+
+# XEmacs is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
+
#
# This is slightly more complicated than would normally be the case,
# as this makefile has been tailored to work in the Emacs source tree.
diff --text -u 'xemacs-21.5.30/modules/base64/base64.c' 'xemacs-21.5.31/modules/base64/base64.c'
Index: ./modules/base64/base64.c
--- ./modules/base64/base64.c Wed Apr 27 00:57:28 2011
+++ ./modules/base64/base64.c Fri Apr 29 22:31:12 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/modules/canna/Makefile.in.in' 'xemacs-21.5.31/modules/canna/Makefile.in.in'
Index: ./modules/canna/Makefile.in.in
--- ./modules/canna/Makefile.in.in Wed Apr 27 00:57:28 2011
+++ ./modules/canna/Makefile.in.in Fri Apr 29 22:31:12 2011
@@ -3,10 +3,10 @@
## This file is part of XEmacs.
-## XEmacs is free software; you can redistribute it and/or modify it
+## XEmacs is free software: you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by the
-## Free Software Foundation; either version 2, or (at your option) any
-## later version.
+## Free Software Foundation, either version 3 of the License, or (at your
+## option) any later version.
## XEmacs is distributed in the hope that it will be useful, but WITHOUT
## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
## for more details.
## You should have received a copy of the GNU General Public License
-## along with XEmacs; see the file COPYING. If not, write to
-## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-## Boston, MA 02111-1307, USA.
+## along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
## Synched up with: Not synched with FSF.
diff --text -u 'xemacs-21.5.30/modules/canna/canna_api.c' 'xemacs-21.5.31/modules/canna/canna_api.c'
Index: ./modules/canna/canna_api.c
--- ./modules/canna/canna_api.c Wed Apr 27 00:57:28 2011
+++ ./modules/canna/canna_api.c Fri Apr 29 22:31:12 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.3. Not in FSF. */
diff --text -u 'xemacs-21.5.30/modules/canna/configure' 'xemacs-21.5.31/modules/canna/configure'
Index: ./modules/canna/configure
--- ./modules/canna/configure Wed Apr 27 00:57:28 2011
+++ ./modules/canna/configure Fri Apr 29 22:31:12 2011
@@ -14,20 +14,18 @@
#
# This file is part of XEmacs.
#
-# XEmacs is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your
+# XEmacs is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
# option) any later version.
#
-# XEmacs is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
+# XEmacs is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
diff --text -u 'xemacs-21.5.30/modules/canna/configure.ac' 'xemacs-21.5.31/modules/canna/configure.ac'
Index: ./modules/canna/configure.ac
--- ./modules/canna/configure.ac Wed Apr 27 00:57:28 2011
+++ ./modules/canna/configure.ac Fri Apr 29 22:31:12 2011
@@ -8,20 +8,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
option) any later version.
-XEmacs is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.])
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.])
AC_CONFIG_SRCDIR([sample.c])
AC_PROG_CC
diff --text -u 'xemacs-21.5.30/modules/common/Makefile.common' 'xemacs-21.5.31/modules/common/Makefile.common'
Index: ./modules/common/Makefile.common
--- ./modules/common/Makefile.common Wed Apr 27 00:57:28 2011
+++ ./modules/common/Makefile.common Fri Apr 29 22:31:12 2011
@@ -4,10 +4,10 @@
## This file is part of XEmacs.
-## XEmacs is free software; you can redistribute it and/or modify it
+## XEmacs is free software: you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by the
-## Free Software Foundation; either version 2, or (at your option) any
-## later version.
+## Free Software Foundation, either version 3 of the License, or (at your
+## option) any later version.
## XEmacs is distributed in the hope that it will be useful, but WITHOUT
## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
## for more details.
## You should have received a copy of the GNU General Public License
-## along with XEmacs; see the file COPYING. If not, write to
-## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-## Boston, MA 02111-1307, USA.
+## along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
## Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/modules/common/configure-post.ac' 'xemacs-21.5.31/modules/common/configure-post.ac'
Index: ./modules/common/configure-post.ac
--- ./modules/common/configure-post.ac Wed Apr 27 00:57:28 2011
+++ ./modules/common/configure-post.ac Fri Apr 29 22:31:12 2011
@@ -1,3 +1,19 @@
+dnl Copyright (C) 2002 Ben Wing
+
+dnl This file is part of XEmacs.
+
+dnl XEmacs is free software: you can redistribute it and/or modify it
+dnl under the terms of the GNU General Public License as published by the
+dnl Free Software Foundation, either version 3 of the License, or (at your
+dnl option) any later version.
+
+dnl XEmacs is distributed in the hope that it will be useful, but WITHOUT
+dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+dnl for more details.
+
+dnl You should have received a copy of the GNU General Public License
+dnl along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
# This part should appear unchanged in every module configure.ac
AC_SUBST(PROGNAME, "module")
diff --text -u 'xemacs-21.5.30/modules/common/configure-pre.ac' 'xemacs-21.5.31/modules/common/configure-pre.ac'
Index: ./modules/common/configure-pre.ac
--- ./modules/common/configure-pre.ac Wed Apr 27 00:57:28 2011
+++ ./modules/common/configure-pre.ac Fri Apr 29 22:31:12 2011
@@ -1,3 +1,20 @@
+dnl Copyright (C) 2002 Ben Wing
+
+dnl This file is part of XEmacs.
+
+dnl XEmacs is free software: you can redistribute it and/or modify it
+dnl under the terms of the GNU General Public License as published by the
+dnl Free Software Foundation, either version 3 of the License, or (at your
+dnl option) any later version.
+
+dnl XEmacs is distributed in the hope that it will be useful, but WITHOUT
+dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+dnl for more details.
+
+dnl You should have received a copy of the GNU General Public License
+dnl along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
AC_PROG_CC
AC_PROG_INSTALL
AC_SUBST(CFLAGS)
diff --text -u 'xemacs-21.5.30/modules/ldap/Makefile.in.in' 'xemacs-21.5.31/modules/ldap/Makefile.in.in'
Index: ./modules/ldap/Makefile.in.in
--- ./modules/ldap/Makefile.in.in Wed Apr 27 00:57:28 2011
+++ ./modules/ldap/Makefile.in.in Fri Apr 29 22:31:12 2011
@@ -3,10 +3,10 @@
## This file is part of XEmacs.
-## XEmacs is free software; you can redistribute it and/or modify it
+## XEmacs is free software: you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by the
-## Free Software Foundation; either version 2, or (at your option) any
-## later version.
+## Free Software Foundation, either version 3 of the License, or (at your
+## option) any later version.
## XEmacs is distributed in the hope that it will be useful, but WITHOUT
## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
## for more details.
## You should have received a copy of the GNU General Public License
-## along with XEmacs; see the file COPYING. If not, write to
-## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-## Boston, MA 02111-1307, USA.
+## along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
## Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/modules/ldap/configure' 'xemacs-21.5.31/modules/ldap/configure'
Index: ./modules/ldap/configure
--- ./modules/ldap/configure Wed Apr 27 00:57:28 2011
+++ ./modules/ldap/configure Fri Apr 29 22:31:12 2011
@@ -15,20 +15,18 @@
#
# This file is part of XEmacs.
#
-# XEmacs is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your
+# XEmacs is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
# option) any later version.
#
-# XEmacs is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
+# XEmacs is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
diff --text -u 'xemacs-21.5.30/modules/ldap/configure.ac' 'xemacs-21.5.31/modules/ldap/configure.ac'
Index: ./modules/ldap/configure.ac
--- ./modules/ldap/configure.ac Wed Apr 27 00:57:28 2011
+++ ./modules/ldap/configure.ac Fri Apr 29 22:31:12 2011
@@ -8,20 +8,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
option) any later version.
-XEmacs is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.])
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.])
AC_CONFIG_SRCDIR([eldap.c])
diff --text -u 'xemacs-21.5.30/modules/ldap/eldap.c' 'xemacs-21.5.31/modules/ldap/eldap.c'
Index: ./modules/ldap/eldap.c
--- ./modules/ldap/eldap.c Wed Apr 27 00:57:28 2011
+++ ./modules/ldap/eldap.c Fri Apr 29 22:31:12 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/modules/ldap/eldap.h' 'xemacs-21.5.31/modules/ldap/eldap.h'
Index: ./modules/ldap/eldap.h
--- ./modules/ldap/eldap.h Wed Apr 27 00:57:28 2011
+++ ./modules/ldap/eldap.h Fri Apr 29 22:31:12 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#ifndef INCLUDED_eldap_h_
#define INCLUDED_eldap_h_
diff --text -u 'xemacs-21.5.30/modules/postgresql/Makefile.in.in' 'xemacs-21.5.31/modules/postgresql/Makefile.in.in'
Index: ./modules/postgresql/Makefile.in.in
--- ./modules/postgresql/Makefile.in.in Wed Apr 27 00:57:28 2011
+++ ./modules/postgresql/Makefile.in.in Fri Apr 29 22:31:13 2011
@@ -3,10 +3,10 @@
## This file is part of XEmacs.
-## XEmacs is free software; you can redistribute it and/or modify it
+## XEmacs is free software: you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by the
-## Free Software Foundation; either version 2, or (at your option) any
-## later version.
+## Free Software Foundation, either version 3 of the License, or (at your
+## option) any later version.
## XEmacs is distributed in the hope that it will be useful, but WITHOUT
## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
## for more details.
## You should have received a copy of the GNU General Public License
-## along with XEmacs; see the file COPYING. If not, write to
-## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-## Boston, MA 02111-1307, USA.
+## along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
## Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/modules/postgresql/configure' 'xemacs-21.5.31/modules/postgresql/configure'
Index: ./modules/postgresql/configure
--- ./modules/postgresql/configure Wed Apr 27 00:57:28 2011
+++ ./modules/postgresql/configure Fri Apr 29 22:31:13 2011
@@ -15,20 +15,18 @@
#
# This file is part of XEmacs.
#
-# XEmacs is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your
+# XEmacs is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
# option) any later version.
#
-# XEmacs is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
+# XEmacs is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
diff --text -u 'xemacs-21.5.30/modules/postgresql/configure.ac' 'xemacs-21.5.31/modules/postgresql/configure.ac'
Index: ./modules/postgresql/configure.ac
--- ./modules/postgresql/configure.ac Wed Apr 27 00:57:28 2011
+++ ./modules/postgresql/configure.ac Fri Apr 29 22:31:13 2011
@@ -8,20 +8,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
option) any later version.
-XEmacs is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.])
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.])
AC_CONFIG_SRCDIR([postgresql.c])
diff --text -u 'xemacs-21.5.30/modules/postgresql/postgresql.c' 'xemacs-21.5.31/modules/postgresql/postgresql.c'
Index: ./modules/postgresql/postgresql.c
--- ./modules/postgresql/postgresql.c Wed Apr 27 00:57:28 2011
+++ ./modules/postgresql/postgresql.c Fri Apr 29 22:31:13 2011
@@ -6,6 +6,21 @@
Author: SL Baur <steve@xemacs.org>
Maintainer: SL Baur <steve@xemacs.org>
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
Please send patches to this file to me first before submitting them to
xemacs-patches.
diff --text -u 'xemacs-21.5.30/modules/postgresql/postgresql.h' 'xemacs-21.5.31/modules/postgresql/postgresql.h'
Index: ./modules/postgresql/postgresql.h
--- ./modules/postgresql/postgresql.h Wed Apr 27 00:57:28 2011
+++ ./modules/postgresql/postgresql.h Fri Apr 29 22:31:13 2011
@@ -6,6 +6,21 @@
Author: SL Baur <steve@xemacs.org>
Maintainer: SL Baur <steve@xemacs.org>
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
Please send patches to this file to me first before submitting them to
xemacs-patches.
*/
diff --text -u 'xemacs-21.5.30/modules/sample/external/Makefile.in.in' 'xemacs-21.5.31/modules/sample/external/Makefile.in.in'
Index: ./modules/sample/external/Makefile.in.in
--- ./modules/sample/external/Makefile.in.in Wed Apr 27 00:57:28 2011
+++ ./modules/sample/external/Makefile.in.in Fri Apr 29 22:31:13 2011
@@ -3,8 +3,8 @@
##
## This sample Makefile is free; you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by the
-## Free Software Foundation; either version 2, or (at your option) any
-## later version.
+## Free Software Foundation, either version 3 of the License, or (at your
+## option) any later version.
## This file is not part of XEmacs.
diff --text -u 'xemacs-21.5.30/modules/sample/external/configure.ac' 'xemacs-21.5.31/modules/sample/external/configure.ac'
Index: ./modules/sample/external/configure.ac
--- ./modules/sample/external/configure.ac Wed Apr 27 00:57:28 2011
+++ ./modules/sample/external/configure.ac Fri Apr 29 22:31:13 2011
@@ -1,8 +1,8 @@
# Process this file with autoconf to produce a configure script.
# This sample autoconf input script is free; you can redistribute it and/or
# modify it under the terms of the GNU General Public LIcense as published by
-# the Free Software Foundation; either version 2, or (at your option) any
-# later version.
+# the Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
AC_INIT([Sample module], [1.0], [xemacs-beta@xemacs.org])
AC_PREREQ(2.53)
AC_REVISION($Revision: 1.1 $)
diff --text -u 'xemacs-21.5.30/modules/sample/external/sample.c' 'xemacs-21.5.31/modules/sample/external/sample.c'
Index: ./modules/sample/external/sample.c
--- ./modules/sample/external/sample.c Wed Apr 27 00:57:28 2011
+++ ./modules/sample/external/sample.c Fri Apr 29 22:31:13 2011
@@ -4,10 +4,10 @@
* (C) Copyright 1998, 1999 J. Kean Johnston. All rights reserved.
* (C) Copyright 2002 Jerry James.
*
- * This sample module code is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your option)
- * any later version.
+ * This sample is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
*/
#include <config.h>
diff --text -u 'xemacs-21.5.30/modules/sample/internal/Makefile.in.in' 'xemacs-21.5.31/modules/sample/internal/Makefile.in.in'
Index: ./modules/sample/internal/Makefile.in.in
--- ./modules/sample/internal/Makefile.in.in Wed Apr 27 00:57:28 2011
+++ ./modules/sample/internal/Makefile.in.in Fri Apr 29 22:31:13 2011
@@ -3,10 +3,10 @@
## This file is part of XEmacs.
-## XEmacs is free software; you can redistribute it and/or modify it
+## XEmacs is free software: you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by the
-## Free Software Foundation; either version 2, or (at your option) any
-## later version.
+## Free Software Foundation, either version 3 of the License, or (at your
+## option) any later version.
## XEmacs is distributed in the hope that it will be useful, but WITHOUT
## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
## for more details.
## You should have received a copy of the GNU General Public License
-## along with XEmacs; see the file COPYING. If not, write to
-## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-## Boston, MA 02111-1307, USA.
+## along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
## Synched up with: Not synched with FSF.
diff --text -u 'xemacs-21.5.30/modules/sample/internal/configure.ac' 'xemacs-21.5.31/modules/sample/internal/configure.ac'
Index: ./modules/sample/internal/configure.ac
--- ./modules/sample/internal/configure.ac Wed Apr 27 00:57:28 2011
+++ ./modules/sample/internal/configure.ac Fri Apr 29 22:31:13 2011
@@ -8,20 +8,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
option) any later version.
-XEmacs is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.])
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.])
AC_CONFIG_SRCDIR([sample.c])
AC_PROG_CC
diff --text -u 'xemacs-21.5.30/modules/sample/internal/sample.c' 'xemacs-21.5.31/modules/sample/internal/sample.c'
Index: ./modules/sample/internal/sample.c
--- ./modules/sample/internal/sample.c Wed Apr 27 00:57:28 2011
+++ ./modules/sample/internal/sample.c Fri Apr 29 22:31:13 2011
@@ -4,10 +4,10 @@
* (C) Copyright 1998, 1999 J. Kean Johnston. All rights reserved.
* (C) Copyright 2002 Jerry James.
*
- * This sample module code is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your option)
- * any later version.
+ * This sample is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
*/
#include <config.h>
diff --text -u 'xemacs-21.5.30/modules/zlib/Makefile' 'xemacs-21.5.31/modules/zlib/Makefile'
Index: ./modules/zlib/Makefile
--- ./modules/zlib/Makefile Wed Apr 27 00:57:28 2011
+++ ./modules/zlib/Makefile Fri Apr 29 22:31:13 2011
@@ -1,3 +1,21 @@
+# Copyright (C) 1998, 1999 William Perry.
+
+# This file is part of XEmacs.
+
+# XEmacs is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+
+# XEmacs is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
+
#
# Sample makefile for a simple Emacs module.
# This is slightly more complicated than would normally be the case,
diff --text -u 'xemacs-21.5.30/modules/zlib/zlib.c' 'xemacs-21.5.31/modules/zlib/zlib.c'
Index: ./modules/zlib/zlib.c
--- ./modules/zlib/zlib.c Wed Apr 27 00:57:28 2011
+++ ./modules/zlib/zlib.c Fri Apr 29 22:31:13 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/nt/ChangeLog' 'xemacs-21.5.31/nt/ChangeLog'
Index: ./nt/ChangeLog
--- ./nt/ChangeLog Wed Apr 27 00:57:41 2011
+++ ./nt/ChangeLog Fri Apr 29 22:31:39 2011
@@ -1,3 +1,7 @@
+2011-04-29 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.5.31 "ginger" is released.
+
2011-04-26 Stephen J. Turnbull <stephen@xemacs.org>
* XEmacs 21.5.30 "garlic" is released.
@@ -2473,3 +2477,23 @@
* cpp.exe not used: cl.exe from VC++4.2 seems to handle everything
properly.
+
+
+ChangeLog entries synched from GNU Emacs are the property of the FSF.
+Other ChangeLog entries are usually the property of the author of the
+change.
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
diff --text -u 'xemacs-21.5.30/nt/Emacs.ad.h' 'xemacs-21.5.31/nt/Emacs.ad.h'
Index: ./nt/Emacs.ad.h
--- ./nt/Emacs.ad.h Wed Apr 27 00:57:28 2011
+++ ./nt/Emacs.ad.h Fri Apr 29 22:31:13 2011
@@ -1,3 +1,21 @@
+/* Copyright (C) 1997 David Hobley
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
+
(String) "Emacs.modeline*attributeForeground: Black",
(String) "Emacs.modeline*attributeBackground: Gray75",
(String) "Emacs.text-cursor*attributeBackground: Red3",
diff --text -u 'xemacs-21.5.30/nt/Xpm.def' 'xemacs-21.5.31/nt/Xpm.def'
Index: ./nt/Xpm.def
--- ./nt/Xpm.def Wed Apr 27 00:57:28 2011
+++ ./nt/Xpm.def Fri Apr 29 22:31:13 2011
@@ -2,21 +2,19 @@
; Copyright (C) 2000 Kirill 'Big K' Katsnelson
;
; This file is part of XEmacs.
-;
-; XEmacs is free software; you can redistribute it and/or modify it
+
+; XEmacs is free software: you can redistribute it and/or modify it
; under the terms of the GNU General Public License as published by the
-; Free Software Foundation; either version 2, or (at your option) any
-; later version.
-;
+; Free Software Foundation, either version 3 of the License, or (at your
+; option) any later version.
+
; XEmacs is distributed in the hope that it will be useful, but WITHOUT
; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
; for more details.
-;
+
; You should have received a copy of the GNU General Public License
-; along with XEmacs; see the file COPYING. If not, write to
-; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-; Boston, MA 02111-1307, USA.
+; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;
; Synched up with: Not in FSF.
;
diff --text -u 'xemacs-21.5.30/nt/compface.mak' 'xemacs-21.5.31/nt/compface.mak'
Index: ./nt/compface.mak
--- ./nt/compface.mak Wed Apr 27 00:57:28 2011
+++ ./nt/compface.mak Fri Apr 29 22:31:13 2011
@@ -4,10 +4,10 @@
## This file is part of XEmacs.
-## XEmacs is free software; you can redistribute it and/or modify it
+## XEmacs is free software: you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by the
-## Free Software Foundation; either version 2, or (at your option) any
-## later version.
+## Free Software Foundation, either version 3 of the License, or (at your
+## option) any later version.
## XEmacs is distributed in the hope that it will be useful, but WITHOUT
## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
## for more details.
## You should have received a copy of the GNU General Public License
-## along with XEmacs; see the file COPYING. If not, write to
-## the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-## Boston, MA 02110-1301, USA.
+## along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
!if !defined(DEBUG_XEMACS)
DEBUG_XEMACS=0
diff --text -u 'xemacs-21.5.30/nt/config.inc.samp' 'xemacs-21.5.31/nt/config.inc.samp'
Index: ./nt/config.inc.samp
--- ./nt/config.inc.samp Wed Apr 27 00:57:28 2011
+++ ./nt/config.inc.samp Fri Apr 29 22:31:13 2011
@@ -1,5 +1,25 @@
# -*- mode: makefile -*-
+# Copyright 2000-2003, 2005 Ben Wing
+# Copyright 2003, 2009 Jerry James
+# Copyright 2005, 2006 Marcus Crestani
+# Copyright 2006, 2008 Vin Shelton
+
+# This file is part of XEmacs.
+
+# XEmacs is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+
+# XEmacs is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
############################################################################
# Install options #
############################################################################
diff --text -u 'xemacs-21.5.30/nt/make-build-dir' 'xemacs-21.5.31/nt/make-build-dir'
Index: ./nt/make-build-dir
--- ./nt/make-build-dir Wed Apr 27 00:57:28 2011
+++ ./nt/make-build-dir Fri Apr 29 22:31:13 2011
@@ -5,21 +5,19 @@
# Copyright (C) 2003 Ben Wing.
#
# This file is part of XEmacs.
-#
-# XEmacs is free software; you can redistribute it and/or modify it
+#
+# XEmacs is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any
-# later version.
-#
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
# XEmacs is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
#
# Author: Ben Wing <ben@xemacs.org>
#
diff --text -u 'xemacs-21.5.30/nt/make-nt-depend' 'xemacs-21.5.31/nt/make-nt-depend'
Index: ./nt/make-nt-depend
--- ./nt/make-nt-depend Wed Apr 27 00:57:28 2011
+++ ./nt/make-nt-depend Fri Apr 29 22:31:13 2011
@@ -5,21 +5,19 @@
# Copyright (C) 2000, 2002 Jonathan Harris.
#
# This file is part of XEmacs.
-#
-# XEmacs is free software; you can redistribute it and/or modify it
+#
+# XEmacs is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any
-# later version.
-#
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
# XEmacs is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
#
# Author: Jonathan Harris <jonathan@xemacs.org>
#
diff --text -u 'xemacs-21.5.30/nt/tiff.mak' 'xemacs-21.5.31/nt/tiff.mak'
Index: ./nt/tiff.mak
--- ./nt/tiff.mak Wed Apr 27 00:57:28 2011
+++ ./nt/tiff.mak Fri Apr 29 22:31:13 2011
@@ -3,10 +3,10 @@
## This file is part of XEmacs.
-## XEmacs is free software; you can redistribute it and/or modify it
+## XEmacs is free software: you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by the
-## Free Software Foundation; either version 2, or (at your option) any
-## later version.
+## Free Software Foundation, either version 3 of the License, or (at your
+## option) any later version.
## XEmacs is distributed in the hope that it will be useful, but WITHOUT
## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
## for more details.
## You should have received a copy of the GNU General Public License
-## along with XEmacs; see the file COPYING. If not, write to
-## the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-## Boston, MA 02110-1301, USA.
+## along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
!if !defined(DEBUG_XEMACS)
DEBUG_XEMACS=0
diff --text -u 'xemacs-21.5.30/nt/xemacs.dsp' 'xemacs-21.5.31/nt/xemacs.dsp'
Index: ./nt/xemacs.dsp
--- ./nt/xemacs.dsp Wed Apr 27 00:57:28 2011
+++ ./nt/xemacs.dsp Fri Apr 29 22:31:13 2011
@@ -1,5 +1,27 @@
# Microsoft Developer Studio Project File - Name="xemacs" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
+
+# Copyright (C) 2000, 2002, 2003, 2010 Ben Wing
+# Copyright (C) 2000 Jonathan Harris
+# Copyright (C) 2004, 2009 Jerry James
+# Copyright (C) 2005 Marcus Crestani
+# Copyright (C) 2006 Adrian Aichner
+
+# This file is part of XEmacs.
+
+# XEmacs is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+
+# XEmacs is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) External Target" 0x0106
diff --text -u 'xemacs-21.5.30/nt/xemacs.mak' 'xemacs-21.5.31/nt/xemacs.mak'
Index: ./nt/xemacs.mak
--- ./nt/xemacs.mak Wed Apr 27 00:57:28 2011
+++ ./nt/xemacs.mak Fri Apr 29 22:31:13 2011
@@ -7,21 +7,19 @@
# Copyright (C) 1998 Free Software Foundation, Inc.
#
# This file is part of XEmacs.
-#
-# XEmacs is free software; you can redistribute it and/or modify it
+#
+# XEmacs is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any
-# later version.
-#
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
# XEmacs is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
#
# Synched up with: Not in FSF.
#
diff --text -u 'xemacs-21.5.30/nt/xemacs.rc' 'xemacs-21.5.31/nt/xemacs.rc'
Index: ./nt/xemacs.rc
--- ./nt/xemacs.rc Wed Apr 27 00:57:28 2011
+++ ./nt/xemacs.rc Fri Apr 29 22:31:13 2011
@@ -2,10 +2,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -13,9 +13,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#ifdef INCLUDE_DUMP
101 DUMP "xemacs.dmp"
diff --text -u 'xemacs-21.5.30/nt/xpm.mak' 'xemacs-21.5.31/nt/xpm.mak'
Index: ./nt/xpm.mak
--- ./nt/xpm.mak Wed Apr 27 00:57:28 2011
+++ ./nt/xpm.mak Fri Apr 29 22:31:13 2011
@@ -4,21 +4,19 @@
# Copyright (C) 1997 Free Software Foundation, Inc.
#
# This file is part of XEmacs.
-#
-# XEmacs is free software; you can redistribute it and/or modify it
+#
+# XEmacs is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any
-# later version.
-#
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
# XEmacs is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
#
!if !defined(DEBUG)
!if defined(DEBUG_XEMACS)
diff --text -u 'xemacs-21.5.30/src/.gdbinit.in.in' 'xemacs-21.5.31/src/.gdbinit.in.in'
Index: ./src/.gdbinit.in.in
--- ./src/.gdbinit.in.in Wed Apr 27 00:57:28 2011
+++ ./src/.gdbinit.in.in Fri Apr 29 22:31:13 2011
@@ -16,10 +16,10 @@
## This file is part of XEmacs.
-## XEmacs is free software; you can redistribute it and/or modify it
+## XEmacs is free software: you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by the
-## Free Software Foundation; either version 2, or (at your option) any
-## later version.
+## Free Software Foundation, either version 3 of the License, or (at your
+## option) any later version.
## XEmacs is distributed in the hope that it will be useful, but WITHOUT
## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -27,9 +27,7 @@
## for more details.
## You should have received a copy of the GNU General Public License
-## along with XEmacs; see the file COPYING. If not, write to
-## the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-## Boston, MA 02110-1301 USA
+## along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
## Author: Martin Buchholz
diff --text -u 'xemacs-21.5.30/src/ChangeLog' 'xemacs-21.5.31/src/ChangeLog'
Index: ./src/ChangeLog
--- ./src/ChangeLog Wed Apr 27 00:57:42 2011
+++ ./src/ChangeLog Fri Apr 29 22:31:39 2011
@@ -1,3 +1,7 @@
+2011-04-29 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.5.31 "ginger" is released.
+
2011-04-26 Stephen J. Turnbull <stephen@xemacs.org>
* XEmacs 21.5.30 "garlic" is released.
@@ -58782,3 +58786,23 @@
Wed Dec 4 23:38:03 1996 Steven L Baur <steve@altair.xemacs.org>
* redisplay.c: Allow column numbers in modeline to start from 1.
+
+
+ChangeLog entries synched from GNU Emacs are the property of the FSF.
+Other ChangeLog entries are usually the property of the author of the
+change.
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
diff --text -u 'xemacs-21.5.30/src/ChangeLog.GTK' 'xemacs-21.5.31/src/ChangeLog.GTK'
Index: ./src/ChangeLog.GTK
--- ./src/ChangeLog.GTK Wed Apr 27 00:57:29 2011
+++ ./src/ChangeLog.GTK Fri Apr 29 22:31:14 2011
@@ -866,3 +866,20 @@
* device-gtk.c (Fgtk_style_info): Attempt to expose the background
pixmaps from a Gtk style.
+
+Copyright (C) 2000 William M. Perry
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
diff --text -u 'xemacs-21.5.30/src/EmacsFrame.c' 'xemacs-21.5.31/src/EmacsFrame.c'
Index: ./src/EmacsFrame.c
--- ./src/EmacsFrame.c Wed Apr 27 00:57:29 2011
+++ ./src/EmacsFrame.c Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/EmacsFrame.h' 'xemacs-21.5.31/src/EmacsFrame.h'
Index: ./src/EmacsFrame.h
--- ./src/EmacsFrame.h Wed Apr 27 00:57:29 2011
+++ ./src/EmacsFrame.h Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/EmacsFrameP.h' 'xemacs-21.5.31/src/EmacsFrameP.h'
Index: ./src/EmacsFrameP.h
--- ./src/EmacsFrameP.h Wed Apr 27 00:57:29 2011
+++ ./src/EmacsFrameP.h Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/EmacsManager.c' 'xemacs-21.5.31/src/EmacsManager.c'
Index: ./src/EmacsManager.c
--- ./src/EmacsManager.c Wed Apr 27 00:57:29 2011
+++ ./src/EmacsManager.c Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/EmacsManager.h' 'xemacs-21.5.31/src/EmacsManager.h'
Index: ./src/EmacsManager.h
--- ./src/EmacsManager.h Wed Apr 27 00:57:29 2011
+++ ./src/EmacsManager.h Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/EmacsManagerP.h' 'xemacs-21.5.31/src/EmacsManagerP.h'
Index: ./src/EmacsManagerP.h
--- ./src/EmacsManagerP.h Wed Apr 27 00:57:29 2011
+++ ./src/EmacsManagerP.h Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/EmacsShell-sub.c' 'xemacs-21.5.31/src/EmacsShell-sub.c'
Index: ./src/EmacsShell-sub.c
--- ./src/EmacsShell-sub.c Wed Apr 27 00:57:29 2011
+++ ./src/EmacsShell-sub.c Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/EmacsShell.c' 'xemacs-21.5.31/src/EmacsShell.c'
Index: ./src/EmacsShell.c
--- ./src/EmacsShell.c Wed Apr 27 00:57:29 2011
+++ ./src/EmacsShell.c Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/EmacsShell.h' 'xemacs-21.5.31/src/EmacsShell.h'
Index: ./src/EmacsShell.h
--- ./src/EmacsShell.h Wed Apr 27 00:57:29 2011
+++ ./src/EmacsShell.h Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/EmacsShellP.h' 'xemacs-21.5.31/src/EmacsShellP.h'
Index: ./src/EmacsShellP.h
--- ./src/EmacsShellP.h Wed Apr 27 00:57:29 2011
+++ ./src/EmacsShellP.h Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/ExternalClient-Xlib.c' 'xemacs-21.5.31/src/ExternalClient-Xlib.c'
Index: ./src/ExternalClient-Xlib.c
--- ./src/ExternalClient-Xlib.c Wed Apr 27 00:57:29 2011
+++ ./src/ExternalClient-Xlib.c Fri Apr 29 22:31:14 2011
@@ -1,20 +1,18 @@
/* External client, raw Xlib version.
Copyright (C) 1993, 1994 Sun Microsystems, Inc.
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+This library is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this library. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/ExternalClient.c' 'xemacs-21.5.31/src/ExternalClient.c'
Index: ./src/ExternalClient.c
--- ./src/ExternalClient.c Wed Apr 27 00:57:29 2011
+++ ./src/ExternalClient.c Fri Apr 29 22:31:14 2011
@@ -1,20 +1,18 @@
/* External client widget.
Copyright (C) 1993, 1994 Sun Microsystems, Inc.
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+This library is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this library. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/ExternalClient.h' 'xemacs-21.5.31/src/ExternalClient.h'
Index: ./src/ExternalClient.h
--- ./src/ExternalClient.h Wed Apr 27 00:57:29 2011
+++ ./src/ExternalClient.h Fri Apr 29 22:31:14 2011
@@ -1,20 +1,18 @@
/* External client widget external header file.
Copyright (C) 1993, 1994 Sun Microsystems, Inc.
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+This library is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this library. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/ExternalClientP.h' 'xemacs-21.5.31/src/ExternalClientP.h'
Index: ./src/ExternalClientP.h
--- ./src/ExternalClientP.h Wed Apr 27 00:57:29 2011
+++ ./src/ExternalClientP.h Fri Apr 29 22:31:14 2011
@@ -1,20 +1,18 @@
/* External client widget internal header file.
Copyright (C) 1993, 1994 Sun Microsystems, Inc.
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+This library is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this library. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/ExternalShell.c' 'xemacs-21.5.31/src/ExternalShell.c'
Index: ./src/ExternalShell.c
--- ./src/ExternalShell.c Wed Apr 27 00:57:29 2011
+++ ./src/ExternalShell.c Fri Apr 29 22:31:14 2011
@@ -1,20 +1,18 @@
/* External shell widget.
Copyright (C) 1993, 1994 Sun Microsystems, Inc.
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+This library is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this library. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/ExternalShell.h' 'xemacs-21.5.31/src/ExternalShell.h'
Index: ./src/ExternalShell.h
--- ./src/ExternalShell.h Wed Apr 27 00:57:29 2011
+++ ./src/ExternalShell.h Fri Apr 29 22:31:14 2011
@@ -1,20 +1,18 @@
/* External shell widget external header file.
Copyright (C) 1993, 1994 Sun Microsystems, Inc.
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+This library is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this library. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/ExternalShellP.h' 'xemacs-21.5.31/src/ExternalShellP.h'
Index: ./src/ExternalShellP.h
--- ./src/ExternalShellP.h Wed Apr 27 00:57:29 2011
+++ ./src/ExternalShellP.h Fri Apr 29 22:31:14 2011
@@ -1,20 +1,18 @@
/* External shell widget internal header file.
Copyright (C) 1993, 1994 Sun Microsystems, Inc.
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+This library is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this library. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/Makefile.in.in' 'xemacs-21.5.31/src/Makefile.in.in'
Index: ./src/Makefile.in.in
--- ./src/Makefile.in.in Wed Apr 27 00:57:29 2011
+++ ./src/Makefile.in.in Fri Apr 29 22:31:14 2011
@@ -7,10 +7,10 @@
## This file is part of XEmacs.
-## XEmacs is free software; you can redistribute it and/or modify it
+## XEmacs is free software: you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by the
-## Free Software Foundation; either version 2, or (at your option) any
-## later version.
+## Free Software Foundation, either version 3 of the License, or (at your
+## option) any later version.
## XEmacs is distributed in the hope that it will be useful, but WITHOUT
## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
## for more details.
## You should have received a copy of the GNU General Public License
-## along with XEmacs; see the file COPYING. If not, write to
-## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-## Boston, MA 02111-1307, USA.
+## along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
## Synched up with: Not synched with FSF.
diff --text -u 'xemacs-21.5.30/src/README.global-renaming' 'xemacs-21.5.31/src/README.global-renaming'
Index: ./src/README.global-renaming
--- ./src/README.global-renaming Wed Apr 27 00:57:29 2011
+++ ./src/README.global-renaming Fri Apr 29 22:31:14 2011
@@ -71,20 +71,18 @@
## Maintainer: Ben Wing <ben@xemacs.org>
## Current Version: 1.2, March 12, 2002
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
eval 'exec perl -w -S $0 ${1+"$@"}'
if 0;
diff --text -u 'xemacs-21.5.30/src/abbrev.c' 'xemacs-21.5.31/src/abbrev.c'
Index: ./src/abbrev.c
--- ./src/abbrev.c Wed Apr 27 00:57:29 2011
+++ ./src/abbrev.c Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. Note that there are many more functions in
FSF's abbrev.c. These have been moved into Lisp in XEmacs. */
diff --text -u 'xemacs-21.5.30/src/alloc.c' 'xemacs-21.5.31/src/alloc.c'
Index: ./src/alloc.c
--- ./src/alloc.c Wed Apr 27 00:57:29 2011
+++ ./src/alloc.c Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.28, Mule 2.0. Substantially different from
FSF. */
diff --text -u 'xemacs-21.5.30/src/alloca.s' 'xemacs-21.5.31/src/alloca.s'
Index: ./src/alloca.s
--- ./src/alloca.s Wed Apr 27 00:57:29 2011
+++ ./src/alloca.s Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/alsaplay.c' 'xemacs-21.5.31/src/alsaplay.c'
Index: ./src/alsaplay.c
--- ./src/alsaplay.c Wed Apr 27 00:57:29 2011
+++ ./src/alsaplay.c Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/array.c' 'xemacs-21.5.31/src/array.c'
Index: ./src/array.c
--- ./src/array.c Wed Apr 27 00:57:29 2011
+++ ./src/array.c Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/array.h' 'xemacs-21.5.31/src/array.h'
Index: ./src/array.h
--- ./src/array.h Wed Apr 27 00:57:29 2011
+++ ./src/array.h Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/backtrace.h' 'xemacs-21.5.31/src/backtrace.h'
Index: ./src/backtrace.h
--- ./src/backtrace.h Wed Apr 27 00:57:29 2011
+++ ./src/backtrace.h Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. Contained redundantly in various C files
in FSFmacs. */
diff --text -u 'xemacs-21.5.30/src/balloon-x.c' 'xemacs-21.5.31/src/balloon-x.c'
Index: ./src/balloon-x.c
--- ./src/balloon-x.c Wed Apr 27 00:57:29 2011
+++ ./src/balloon-x.c Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/balloon_help.c' 'xemacs-21.5.31/src/balloon_help.c'
Index: ./src/balloon_help.c
--- ./src/balloon_help.c Wed Apr 27 00:57:29 2011
+++ ./src/balloon_help.c Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/balloon_help.h' 'xemacs-21.5.31/src/balloon_help.h'
Index: ./src/balloon_help.h
--- ./src/balloon_help.h Wed Apr 27 00:57:29 2011
+++ ./src/balloon_help.h Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/bitmaps.h' 'xemacs-21.5.31/src/bitmaps.h'
Index: ./src/bitmaps.h
--- ./src/bitmaps.h Wed Apr 27 00:57:29 2011
+++ ./src/bitmaps.h Fri Apr 29 22:31:14 2011
@@ -1,9 +1,9 @@
/* This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -11,9 +11,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/blocktype.c' 'xemacs-21.5.31/src/blocktype.c'
Index: ./src/blocktype.c
--- ./src/blocktype.c Wed Apr 27 00:57:29 2011
+++ ./src/blocktype.c Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,10 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
-*/
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/blocktype.h' 'xemacs-21.5.31/src/blocktype.h'
Index: ./src/blocktype.h
--- ./src/blocktype.h Wed Apr 27 00:57:29 2011
+++ ./src/blocktype.h Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,10 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
-*/
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/buffer.c' 'xemacs-21.5.31/src/buffer.c'
Index: ./src/buffer.c
--- ./src/buffer.c Wed Apr 27 00:57:29 2011
+++ ./src/buffer.c Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.0, FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/buffer.h' 'xemacs-21.5.31/src/buffer.h'
Index: ./src/buffer.h
--- ./src/buffer.h Wed Apr 27 00:57:29 2011
+++ ./src/buffer.h Fri Apr 29 22:31:14 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/bufslots.h' 'xemacs-21.5.31/src/bufslots.h'
Index: ./src/bufslots.h
--- ./src/bufslots.h Wed Apr 27 00:57:29 2011
+++ ./src/bufslots.h Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.0, FSF 19.30. Split out of buffer.h. */
diff --text -u 'xemacs-21.5.30/src/bytecode-ops.h' 'xemacs-21.5.31/src/bytecode-ops.h'
Index: ./src/bytecode-ops.h
--- ./src/bytecode-ops.h Wed Apr 27 00:57:29 2011
+++ ./src/bytecode-ops.h Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.0, FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/bytecode.c' 'xemacs-21.5.31/src/bytecode.c'
Index: ./src/bytecode.c
--- ./src/bytecode.c Wed Apr 27 00:57:29 2011
+++ ./src/bytecode.c Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.0, FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/bytecode.h' 'xemacs-21.5.31/src/bytecode.h'
Index: ./src/bytecode.h
--- ./src/bytecode.h Wed Apr 27 00:57:29 2011
+++ ./src/bytecode.h Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/callint.c' 'xemacs-21.5.31/src/callint.c'
Index: ./src/callint.c
--- ./src/callint.c Wed Apr 27 00:57:29 2011
+++ ./src/callint.c Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30, Mule 2.0. */
diff --text -u 'xemacs-21.5.30/src/casefiddle.c' 'xemacs-21.5.31/src/casefiddle.c'
Index: ./src/casefiddle.c
--- ./src/casefiddle.c Wed Apr 27 00:57:29 2011
+++ ./src/casefiddle.c Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.34, but substantially rewritten by Martin. */
diff --text -u 'xemacs-21.5.30/src/casetab.c' 'xemacs-21.5.31/src/casetab.c'
Index: ./src/casetab.c
--- ./src/casetab.c Wed Apr 27 00:57:29 2011
+++ ./src/casetab.c Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.28. Between FSF 19.28 and 19.30, casetab.c
was rewritten to use junky FSF char tables. Meanwhile I rewrote it
diff --text -u 'xemacs-21.5.30/src/casetab.h' 'xemacs-21.5.31/src/casetab.h'
Index: ./src/casetab.h
--- ./src/casetab.h Wed Apr 27 00:57:29 2011
+++ ./src/casetab.h Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
Copyright (C) 2002 Ben Wing.
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/charset.h' 'xemacs-21.5.31/src/charset.h'
Index: ./src/charset.h
--- ./src/charset.h Wed Apr 27 00:57:29 2011
+++ ./src/charset.h Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.3. Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/chartab.c' 'xemacs-21.5.31/src/chartab.c'
Index: ./src/chartab.c
--- ./src/chartab.c Wed Apr 27 00:57:29 2011
+++ ./src/chartab.c Fri Apr 29 22:31:14 2011
@@ -7,10 +7,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.3. Not synched with FSF.
diff --text -u 'xemacs-21.5.30/src/chartab.h' 'xemacs-21.5.31/src/chartab.h'
Index: ./src/chartab.h
--- ./src/chartab.h Wed Apr 27 00:57:29 2011
+++ ./src/chartab.h Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.3. Not synched with FSF.
diff --text -u 'xemacs-21.5.30/src/cm.c' 'xemacs-21.5.31/src/cm.c'
Index: ./src/cm.c
--- ./src/cm.c Wed Apr 27 00:57:29 2011
+++ ./src/cm.c Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. Substantially different from FSF. */
diff --text -u 'xemacs-21.5.30/src/cm.h' 'xemacs-21.5.31/src/cm.h'
Index: ./src/cm.h
--- ./src/cm.h Wed Apr 27 00:57:29 2011
+++ ./src/cm.h Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/cmdloop.c' 'xemacs-21.5.31/src/cmdloop.c'
Index: ./src/cmdloop.c
--- ./src/cmdloop.c Wed Apr 27 00:57:29 2011
+++ ./src/cmdloop.c Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.0. Not synched with FSF.
This was renamed from keyboard.c. However, it only contains the
diff --text -u 'xemacs-21.5.30/src/cmds.c' 'xemacs-21.5.31/src/cmds.c'
Index: ./src/cmds.c
--- ./src/cmds.c Wed Apr 27 00:57:29 2011
+++ ./src/cmds.c Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.0, FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/coding-system-slots.h' 'xemacs-21.5.31/src/coding-system-slots.h'
Index: ./src/coding-system-slots.h
--- ./src/coding-system-slots.h Wed Apr 27 00:57:29 2011
+++ ./src/coding-system-slots.h Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: ????. Split out of file-coding.h. */
diff --text -u 'xemacs-21.5.30/src/commands.h' 'xemacs-21.5.31/src/commands.h'
Index: ./src/commands.h
--- ./src/commands.h Wed Apr 27 00:57:29 2011
+++ ./src/commands.h Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/compiler.h' 'xemacs-21.5.31/src/compiler.h'
Index: ./src/compiler.h
--- ./src/compiler.h Wed Apr 27 00:57:29 2011
+++ ./src/compiler.h Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: not in FSF. */
diff --text -u 'xemacs-21.5.30/src/config.h.in' 'xemacs-21.5.31/src/config.h.in'
Index: ./src/config.h.in
--- ./src/config.h.in Wed Apr 27 00:57:29 2011
+++ ./src/config.h.in Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Significantly divergent from FSF. */
diff --text -u 'xemacs-21.5.30/src/conslots.h' 'xemacs-21.5.31/src/conslots.h'
Index: ./src/conslots.h
--- ./src/conslots.h Wed Apr 27 00:57:29 2011
+++ ./src/conslots.h Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.0, FSF 19.30. (see FSF keyboard.h.) */
diff --text -u 'xemacs-21.5.30/src/console-gtk-impl.h' 'xemacs-21.5.31/src/console-gtk-impl.h'
Index: ./src/console-gtk-impl.h
--- ./src/console-gtk-impl.h Wed Apr 27 00:57:29 2011
+++ ./src/console-gtk-impl.h Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/console-gtk.c' 'xemacs-21.5.31/src/console-gtk.c'
Index: ./src/console-gtk.c
--- ./src/console-gtk.c Wed Apr 27 00:57:29 2011
+++ ./src/console-gtk.c Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/console-gtk.h' 'xemacs-21.5.31/src/console-gtk.h'
Index: ./src/console-gtk.h
--- ./src/console-gtk.h Wed Apr 27 00:57:29 2011
+++ ./src/console-gtk.h Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/console-impl.h' 'xemacs-21.5.31/src/console-impl.h'
Index: ./src/console-impl.h
--- ./src/console-impl.h Wed Apr 27 00:57:29 2011
+++ ./src/console-impl.h Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/console-msw-impl.h' 'xemacs-21.5.31/src/console-msw-impl.h'
Index: ./src/console-msw-impl.h
--- ./src/console-msw-impl.h Wed Apr 27 00:57:29 2011
+++ ./src/console-msw-impl.h Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/console-msw.c' 'xemacs-21.5.31/src/console-msw.c'
Index: ./src/console-msw.c
--- ./src/console-msw.c Wed Apr 27 00:57:29 2011
+++ ./src/console-msw.c Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/console-msw.h' 'xemacs-21.5.31/src/console-msw.h'
Index: ./src/console-msw.h
--- ./src/console-msw.h Wed Apr 27 00:57:29 2011
+++ ./src/console-msw.h Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/console-stream-impl.h' 'xemacs-21.5.31/src/console-stream-impl.h'
Index: ./src/console-stream-impl.h
--- ./src/console-stream-impl.h Wed Apr 27 00:57:29 2011
+++ ./src/console-stream-impl.h Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/console-stream.c' 'xemacs-21.5.31/src/console-stream.c'
Index: ./src/console-stream.c
--- ./src/console-stream.c Wed Apr 27 00:57:29 2011
+++ ./src/console-stream.c Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/console-stream.h' 'xemacs-21.5.31/src/console-stream.h'
Index: ./src/console-stream.h
--- ./src/console-stream.h Wed Apr 27 00:57:29 2011
+++ ./src/console-stream.h Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/console-tty-impl.h' 'xemacs-21.5.31/src/console-tty-impl.h'
Index: ./src/console-tty-impl.h
--- ./src/console-tty-impl.h Wed Apr 27 00:57:29 2011
+++ ./src/console-tty-impl.h Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/console-tty.c' 'xemacs-21.5.31/src/console-tty.c'
Index: ./src/console-tty.c
--- ./src/console-tty.c Wed Apr 27 00:57:29 2011
+++ ./src/console-tty.c Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/console-tty.h' 'xemacs-21.5.31/src/console-tty.h'
Index: ./src/console-tty.h
--- ./src/console-tty.h Wed Apr 27 00:57:29 2011
+++ ./src/console-tty.h Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/console-x-impl.h' 'xemacs-21.5.31/src/console-x-impl.h'
Index: ./src/console-x-impl.h
--- ./src/console-x-impl.h Wed Apr 27 00:57:29 2011
+++ ./src/console-x-impl.h Fri Apr 29 22:31:14 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/console-x.c' 'xemacs-21.5.31/src/console-x.c'
Index: ./src/console-x.c
--- ./src/console-x.c Wed Apr 27 00:57:29 2011
+++ ./src/console-x.c Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/console-x.h' 'xemacs-21.5.31/src/console-x.h'
Index: ./src/console-x.h
--- ./src/console-x.h Wed Apr 27 00:57:29 2011
+++ ./src/console-x.h Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/console-xlike-inc.h' 'xemacs-21.5.31/src/console-xlike-inc.h'
Index: ./src/console-xlike-inc.h
--- ./src/console-xlike-inc.h Wed Apr 27 00:57:29 2011
+++ ./src/console-xlike-inc.h Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/console.c' 'xemacs-21.5.31/src/console.c'
Index: ./src/console.c
--- ./src/console.c Wed Apr 27 00:57:29 2011
+++ ./src/console.c Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/console.h' 'xemacs-21.5.31/src/console.h'
Index: ./src/console.h
--- ./src/console.h Wed Apr 27 00:57:29 2011
+++ ./src/console.h Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/data.c' 'xemacs-21.5.31/src/data.c'
Index: ./src/data.c
--- ./src/data.c Wed Apr 27 00:57:29 2011
+++ ./src/data.c Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.0, FSF 19.30. Some of FSF's data.c is in
XEmacs' symbols.c. */
diff --text -u 'xemacs-21.5.30/src/database.c' 'xemacs-21.5.31/src/database.c'
Index: ./src/database.c
--- ./src/database.c Wed Apr 27 00:57:29 2011
+++ ./src/database.c Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/database.h' 'xemacs-21.5.31/src/database.h'
Index: ./src/database.h
--- ./src/database.h Wed Apr 27 00:57:29 2011
+++ ./src/database.h Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* This file is only necessary to get inline handling correct.
See inline.c */
diff --text -u 'xemacs-21.5.30/src/debug.c' 'xemacs-21.5.31/src/debug.c'
Index: ./src/debug.c
--- ./src/debug.c Wed Apr 27 00:57:29 2011
+++ ./src/debug.c Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/debug.h' 'xemacs-21.5.31/src/debug.h'
Index: ./src/debug.h
--- ./src/debug.h Wed Apr 27 00:57:29 2011
+++ ./src/debug.h Fri Apr 29 22:31:14 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/device-gtk.c' 'xemacs-21.5.31/src/device-gtk.c'
Index: ./src/device-gtk.c
--- ./src/device-gtk.c Wed Apr 27 00:57:29 2011
+++ ./src/device-gtk.c Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/device-impl.h' 'xemacs-21.5.31/src/device-impl.h'
Index: ./src/device-impl.h
--- ./src/device-impl.h Wed Apr 27 00:57:29 2011
+++ ./src/device-impl.h Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/device-msw.c' 'xemacs-21.5.31/src/device-msw.c'
Index: ./src/device-msw.c
--- ./src/device-msw.c Wed Apr 27 00:57:29 2011
+++ ./src/device-msw.c Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/device-tty.c' 'xemacs-21.5.31/src/device-tty.c'
Index: ./src/device-tty.c
--- ./src/device-tty.c Wed Apr 27 00:57:29 2011
+++ ./src/device-tty.c Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/device-x.c' 'xemacs-21.5.31/src/device-x.c'
Index: ./src/device-x.c
--- ./src/device-x.c Wed Apr 27 00:57:29 2011
+++ ./src/device-x.c Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/device.c' 'xemacs-21.5.31/src/device.c'
Index: ./src/device.c
--- ./src/device.c Wed Apr 27 00:57:29 2011
+++ ./src/device.c Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/device.h' 'xemacs-21.5.31/src/device.h'
Index: ./src/device.h
--- ./src/device.h Wed Apr 27 00:57:29 2011
+++ ./src/device.h Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/devslots.h' 'xemacs-21.5.31/src/devslots.h'
Index: ./src/devslots.h
--- ./src/devslots.h Wed Apr 27 00:57:29 2011
+++ ./src/devslots.h Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/dialog-gtk.c' 'xemacs-21.5.31/src/dialog-gtk.c'
Index: ./src/dialog-gtk.c
--- ./src/dialog-gtk.c Wed Apr 27 00:57:29 2011
+++ ./src/dialog-gtk.c Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/dialog-msw.c' 'xemacs-21.5.31/src/dialog-msw.c'
Index: ./src/dialog-msw.c
--- ./src/dialog-msw.c Wed Apr 27 00:57:29 2011
+++ ./src/dialog-msw.c Fri Apr 29 22:31:14 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/dialog-x.c' 'xemacs-21.5.31/src/dialog-x.c'
Index: ./src/dialog-x.c
--- ./src/dialog-x.c Wed Apr 27 00:57:29 2011
+++ ./src/dialog-x.c Fri Apr 29 22:31:14 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/dialog.c' 'xemacs-21.5.31/src/dialog.c'
Index: ./src/dialog.c
--- ./src/dialog.c Wed Apr 27 00:57:29 2011
+++ ./src/dialog.c Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/dired-msw.c' 'xemacs-21.5.31/src/dired-msw.c'
Index: ./src/dired-msw.c
--- ./src/dired-msw.c Wed Apr 27 00:57:29 2011
+++ ./src/dired-msw.c Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/dired.c' 'xemacs-21.5.31/src/dired.c'
Index: ./src/dired.c
--- ./src/dired.c Wed Apr 27 00:57:29 2011
+++ ./src/dired.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/doc.c' 'xemacs-21.5.31/src/doc.c'
Index: ./src/doc.c
--- ./src/doc.c Wed Apr 27 00:57:29 2011
+++ ./src/doc.c Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/doprnt.c' 'xemacs-21.5.31/src/doprnt.c'
Index: ./src/doprnt.c
--- ./src/doprnt.c Wed Apr 27 00:57:29 2011
+++ ./src/doprnt.c Fri Apr 29 22:31:15 2011
@@ -10,10 +10,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -21,9 +21,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Rewritten by Ben Wing. Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/dragdrop.c' 'xemacs-21.5.31/src/dragdrop.c'
Index: ./src/dragdrop.c
--- ./src/dragdrop.c Wed Apr 27 00:57:29 2011
+++ ./src/dragdrop.c Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/dragdrop.h' 'xemacs-21.5.31/src/dragdrop.h'
Index: ./src/dragdrop.h
--- ./src/dragdrop.h Wed Apr 27 00:57:29 2011
+++ ./src/dragdrop.h Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/dump-data.c' 'xemacs-21.5.31/src/dump-data.c'
Index: ./src/dump-data.c
--- ./src/dump-data.c Wed Apr 27 00:57:29 2011
+++ ./src/dump-data.c Fri Apr 29 22:31:15 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/dump-data.h' 'xemacs-21.5.31/src/dump-data.h'
Index: ./src/dump-data.h
--- ./src/dump-data.h Wed Apr 27 00:57:29 2011
+++ ./src/dump-data.h Fri Apr 29 22:31:15 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/dumper.c' 'xemacs-21.5.31/src/dumper.c'
Index: ./src/dumper.c
--- ./src/dumper.c Wed Apr 27 00:57:29 2011
+++ ./src/dumper.c Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/dumper.h' 'xemacs-21.5.31/src/dumper.h'
Index: ./src/dumper.h
--- ./src/dumper.h Wed Apr 27 00:57:29 2011
+++ ./src/dumper.h Fri Apr 29 22:31:15 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/ecrt0.c' 'xemacs-21.5.31/src/ecrt0.c'
Index: ./src/ecrt0.c
--- ./src/ecrt0.c Wed Apr 27 00:57:29 2011
+++ ./src/ecrt0.c Fri Apr 29 22:31:15 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/editfns.c' 'xemacs-21.5.31/src/editfns.c'
Index: ./src/editfns.c
--- ./src/editfns.c Wed Apr 27 00:57:29 2011
+++ ./src/editfns.c Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.0, FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/elhash.c' 'xemacs-21.5.31/src/elhash.c'
Index: ./src/elhash.c
--- ./src/elhash.c Wed Apr 27 00:57:29 2011
+++ ./src/elhash.c Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/elhash.h' 'xemacs-21.5.31/src/elhash.h'
Index: ./src/elhash.h
--- ./src/elhash.h Wed Apr 27 00:57:29 2011
+++ ./src/elhash.h Fri Apr 29 22:31:15 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/emacs.c' 'xemacs-21.5.31/src/emacs.c'
Index: ./src/emacs.c
--- ./src/emacs.c Wed Apr 27 00:57:29 2011
+++ ./src/emacs.c Fri Apr 29 22:31:15 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.0, FSF 19.28. */
diff --text -u 'xemacs-21.5.30/src/emodules.c' 'xemacs-21.5.31/src/emodules.c'
Index: ./src/emodules.c
--- ./src/emodules.c Wed Apr 27 00:57:29 2011
+++ ./src/emodules.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* This file has been Mule-ized, Ben Wing, 1-26-10. */
diff --text -u 'xemacs-21.5.30/src/emodules.h' 'xemacs-21.5.31/src/emodules.h'
Index: ./src/emodules.h
--- ./src/emodules.h Wed Apr 27 00:57:29 2011
+++ ./src/emodules.h Fri Apr 29 22:31:15 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#ifndef EMODULES_HDR
diff --text -u 'xemacs-21.5.30/src/esd.c' 'xemacs-21.5.31/src/esd.c'
Index: ./src/esd.c
--- ./src/esd.c Wed Apr 27 00:57:29 2011
+++ ./src/esd.c Fri Apr 29 22:31:15 2011
@@ -1,11 +1,13 @@
/* esd.c - play a sound over ESD
+Copyright 1999 Robert Bihlmeyer <robbe@orcus.priv.at>
+
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -13,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/eval.c' 'xemacs-21.5.31/src/eval.c'
Index: ./src/eval.c
--- ./src/eval.c Wed Apr 27 00:57:29 2011
+++ ./src/eval.c Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30 (except for Fsignal), Mule 2.0. */
diff --text -u 'xemacs-21.5.30/src/event-Xt.c' 'xemacs-21.5.31/src/event-Xt.c'
Index: ./src/event-Xt.c
--- ./src/event-Xt.c Wed Apr 27 00:57:29 2011
+++ ./src/event-Xt.c Fri Apr 29 22:31:15 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/event-gtk.c' 'xemacs-21.5.31/src/event-gtk.c'
Index: ./src/event-gtk.c
--- ./src/event-gtk.c Wed Apr 27 00:57:29 2011
+++ ./src/event-gtk.c Fri Apr 29 22:31:15 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* This file is heavily based upon event-Xt.c */
diff --text -u 'xemacs-21.5.30/src/event-msw.c' 'xemacs-21.5.31/src/event-msw.c'
Index: ./src/event-msw.c
--- ./src/event-msw.c Wed Apr 27 00:57:29 2011
+++ ./src/event-msw.c Fri Apr 29 22:31:15 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/event-stream.c' 'xemacs-21.5.31/src/event-stream.c'
Index: ./src/event-stream.c
--- ./src/event-stream.c Wed Apr 27 00:57:29 2011
+++ ./src/event-stream.c Fri Apr 29 22:31:15 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/event-tty.c' 'xemacs-21.5.31/src/event-tty.c'
Index: ./src/event-tty.c
--- ./src/event-tty.c Wed Apr 27 00:57:29 2011
+++ ./src/event-tty.c Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/event-unixoid.c' 'xemacs-21.5.31/src/event-unixoid.c'
Index: ./src/event-unixoid.c
--- ./src/event-unixoid.c Wed Apr 27 00:57:29 2011
+++ ./src/event-unixoid.c Fri Apr 29 22:31:15 2011
@@ -7,10 +7,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/event-xlike-inc.c' 'xemacs-21.5.31/src/event-xlike-inc.c'
Index: ./src/event-xlike-inc.c
--- ./src/event-xlike-inc.c Wed Apr 27 00:57:29 2011
+++ ./src/event-xlike-inc.c Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/events.c' 'xemacs-21.5.31/src/events.c'
Index: ./src/events.c
--- ./src/events.c Wed Apr 27 00:57:29 2011
+++ ./src/events.c Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/events.h' 'xemacs-21.5.31/src/events.h'
Index: ./src/events.h
--- ./src/events.h Wed Apr 27 00:57:29 2011
+++ ./src/events.h Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/extents-impl.h' 'xemacs-21.5.31/src/extents-impl.h'
Index: ./src/extents-impl.h
--- ./src/extents-impl.h Wed Apr 27 00:57:29 2011
+++ ./src/extents-impl.h Fri Apr 29 22:31:15 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/extents.c' 'xemacs-21.5.31/src/extents.c'
Index: ./src/extents.c
--- ./src/extents.c Wed Apr 27 00:57:29 2011
+++ ./src/extents.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/extents.h' 'xemacs-21.5.31/src/extents.h'
Index: ./src/extents.h
--- ./src/extents.h Wed Apr 27 00:57:29 2011
+++ ./src/extents.h Fri Apr 29 22:31:15 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/extw-Xlib.c' 'xemacs-21.5.31/src/extw-Xlib.c'
Index: ./src/extw-Xlib.c
--- ./src/extw-Xlib.c Wed Apr 27 00:57:29 2011
+++ ./src/extw-Xlib.c Fri Apr 29 22:31:15 2011
@@ -1,20 +1,18 @@
/* Common code between client and shell widgets; not Xt-specific.
Copyright (C) 1993, 1994 Sun Microsystems, Inc.
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+This library is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this library. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/extw-Xlib.h' 'xemacs-21.5.31/src/extw-Xlib.h'
Index: ./src/extw-Xlib.h
--- ./src/extw-Xlib.h Wed Apr 27 00:57:29 2011
+++ ./src/extw-Xlib.h Fri Apr 29 22:31:15 2011
@@ -1,19 +1,17 @@
/* Copyright (C) 1993, 1994 Sun Microsystems, Inc.
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+This library is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this library. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/extw-Xt.c' 'xemacs-21.5.31/src/extw-Xt.c'
Index: ./src/extw-Xt.c
--- ./src/extw-Xt.c Wed Apr 27 00:57:29 2011
+++ ./src/extw-Xt.c Fri Apr 29 22:31:15 2011
@@ -1,20 +1,18 @@
/* Common code between client and shell widgets -- Xt only.
Copyright (C) 1993, 1994 Sun Microsystems, Inc.
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+This library is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this library. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/extw-Xt.h' 'xemacs-21.5.31/src/extw-Xt.h'
Index: ./src/extw-Xt.h
--- ./src/extw-Xt.h Wed Apr 27 00:57:29 2011
+++ ./src/extw-Xt.h Fri Apr 29 22:31:15 2011
@@ -2,20 +2,18 @@
This file is part of XEmacs.
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+This library is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this library. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/faces.c' 'xemacs-21.5.31/src/faces.c'
Index: ./src/faces.c
--- ./src/faces.c Wed Apr 27 00:57:29 2011
+++ ./src/faces.c Fri Apr 29 22:31:15 2011
@@ -7,10 +7,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/faces.h' 'xemacs-21.5.31/src/faces.h'
Index: ./src/faces.h
--- ./src/faces.h Wed Apr 27 00:57:29 2011
+++ ./src/faces.h Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/file-coding.c' 'xemacs-21.5.31/src/file-coding.c'
Index: ./src/file-coding.c
--- ./src/file-coding.c Wed Apr 27 00:57:29 2011
+++ ./src/file-coding.c Fri Apr 29 22:31:15 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/file-coding.h' 'xemacs-21.5.31/src/file-coding.h'
Index: ./src/file-coding.h
--- ./src/file-coding.h Wed Apr 27 00:57:29 2011
+++ ./src/file-coding.h Fri Apr 29 22:31:15 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.3. Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/fileio.c' 'xemacs-21.5.31/src/fileio.c'
Index: ./src/fileio.c
--- ./src/fileio.c Wed Apr 27 00:57:29 2011
+++ ./src/fileio.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.0, FSF 19.30. */
/* More syncing: FSF Emacs 19.34.6 by Marc Paquette <marcpa@cam.org>
diff --text -u 'xemacs-21.5.30/src/filelock.c' 'xemacs-21.5.31/src/filelock.c'
Index: ./src/filelock.c
--- ./src/filelock.c Wed Apr 27 00:57:29 2011
+++ ./src/filelock.c Fri Apr 29 22:31:15 2011
@@ -3,20 +3,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synced with FSF 20.2 */
diff --text -u 'xemacs-21.5.30/src/filemode.c' 'xemacs-21.5.31/src/filemode.c'
Index: ./src/filemode.c
--- ./src/filemode.c Wed Apr 27 00:57:29 2011
+++ ./src/filemode.c Fri Apr 29 22:31:15 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/floatfns.c' 'xemacs-21.5.31/src/floatfns.c'
Index: ./src/floatfns.c
--- ./src/floatfns.c Wed Apr 27 00:57:29 2011
+++ ./src/floatfns.c Fri Apr 29 22:31:15 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/fns.c' 'xemacs-21.5.31/src/fns.c'
Index: ./src/fns.c
--- ./src/fns.c Wed Apr 27 00:57:29 2011
+++ ./src/fns.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.0, FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/font-lock.c' 'xemacs-21.5.31/src/font-lock.c'
Index: ./src/font-lock.c
--- ./src/font-lock.c Wed Apr 27 00:57:29 2011
+++ ./src/font-lock.c Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/font-mgr.c' 'xemacs-21.5.31/src/font-mgr.c'
Index: ./src/font-mgr.c
--- ./src/font-mgr.c Wed Apr 27 00:57:29 2011
+++ ./src/font-mgr.c Fri Apr 29 22:31:15 2011
@@ -13,10 +13,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -24,9 +24,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in GNU Emacs. */
diff --text -u 'xemacs-21.5.30/src/font-mgr.h' 'xemacs-21.5.31/src/font-mgr.h'
Index: ./src/font-mgr.h
--- ./src/font-mgr.h Wed Apr 27 00:57:29 2011
+++ ./src/font-mgr.h Fri Apr 29 22:31:15 2011
@@ -12,10 +12,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -23,9 +23,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in GNU Emacs. */
diff --text -u 'xemacs-21.5.30/src/fontcolor-gtk-impl.h' 'xemacs-21.5.31/src/fontcolor-gtk-impl.h'
Index: ./src/fontcolor-gtk-impl.h
--- ./src/fontcolor-gtk-impl.h Wed Apr 27 00:57:29 2011
+++ ./src/fontcolor-gtk-impl.h Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
/* Gtk version by William Perry */
diff --text -u 'xemacs-21.5.30/src/fontcolor-gtk.c' 'xemacs-21.5.31/src/fontcolor-gtk.c'
Index: ./src/fontcolor-gtk.c
--- ./src/fontcolor-gtk.c Wed Apr 27 00:57:29 2011
+++ ./src/fontcolor-gtk.c Fri Apr 29 22:31:15 2011
@@ -7,10 +7,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/fontcolor-gtk.h' 'xemacs-21.5.31/src/fontcolor-gtk.h'
Index: ./src/fontcolor-gtk.h
--- ./src/fontcolor-gtk.h Wed Apr 27 00:57:29 2011
+++ ./src/fontcolor-gtk.h Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
/* Gtk version by William Perry */
diff --text -u 'xemacs-21.5.30/src/fontcolor-impl.h' 'xemacs-21.5.31/src/fontcolor-impl.h'
Index: ./src/fontcolor-impl.h
--- ./src/fontcolor-impl.h Wed Apr 27 00:57:29 2011
+++ ./src/fontcolor-impl.h Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/fontcolor-msw-impl.h' 'xemacs-21.5.31/src/fontcolor-msw-impl.h'
Index: ./src/fontcolor-msw-impl.h
--- ./src/fontcolor-msw-impl.h Wed Apr 27 00:57:29 2011
+++ ./src/fontcolor-msw-impl.h Fri Apr 29 22:31:15 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/fontcolor-msw.c' 'xemacs-21.5.31/src/fontcolor-msw.c'
Index: ./src/fontcolor-msw.c
--- ./src/fontcolor-msw.c Wed Apr 27 00:57:29 2011
+++ ./src/fontcolor-msw.c Fri Apr 29 22:31:15 2011
@@ -8,10 +8,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,9 +19,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/fontcolor-msw.h' 'xemacs-21.5.31/src/fontcolor-msw.h'
Index: ./src/fontcolor-msw.h
--- ./src/fontcolor-msw.h Wed Apr 27 00:57:29 2011
+++ ./src/fontcolor-msw.h Fri Apr 29 22:31:15 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/fontcolor-tty-impl.h' 'xemacs-21.5.31/src/fontcolor-tty-impl.h'
Index: ./src/fontcolor-tty-impl.h
--- ./src/fontcolor-tty-impl.h Wed Apr 27 00:57:29 2011
+++ ./src/fontcolor-tty-impl.h Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/fontcolor-tty.c' 'xemacs-21.5.31/src/fontcolor-tty.c'
Index: ./src/fontcolor-tty.c
--- ./src/fontcolor-tty.c Wed Apr 27 00:57:29 2011
+++ ./src/fontcolor-tty.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/fontcolor-tty.h' 'xemacs-21.5.31/src/fontcolor-tty.h'
Index: ./src/fontcolor-tty.h
--- ./src/fontcolor-tty.h Wed Apr 27 00:57:29 2011
+++ ./src/fontcolor-tty.h Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/fontcolor-x-impl.h' 'xemacs-21.5.31/src/fontcolor-x-impl.h'
Index: ./src/fontcolor-x-impl.h
--- ./src/fontcolor-x-impl.h Wed Apr 27 00:57:29 2011
+++ ./src/fontcolor-x-impl.h Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/fontcolor-x.c' 'xemacs-21.5.31/src/fontcolor-x.c'
Index: ./src/fontcolor-x.c
--- ./src/fontcolor-x.c Wed Apr 27 00:57:29 2011
+++ ./src/fontcolor-x.c Fri Apr 29 22:31:15 2011
@@ -7,10 +7,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/fontcolor-x.h' 'xemacs-21.5.31/src/fontcolor-x.h'
Index: ./src/fontcolor-x.h
--- ./src/fontcolor-x.h Wed Apr 27 00:57:29 2011
+++ ./src/fontcolor-x.h Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/fontcolor-xlike-inc.c' 'xemacs-21.5.31/src/fontcolor-xlike-inc.c'
Index: ./src/fontcolor-xlike-inc.c
--- ./src/fontcolor-xlike-inc.c Wed Apr 27 00:57:29 2011
+++ ./src/fontcolor-xlike-inc.c Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/fontcolor.c' 'xemacs-21.5.31/src/fontcolor.c'
Index: ./src/fontcolor.c
--- ./src/fontcolor.c Wed Apr 27 00:57:29 2011
+++ ./src/fontcolor.c Fri Apr 29 22:31:15 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/fontcolor.h' 'xemacs-21.5.31/src/fontcolor.h'
Index: ./src/fontcolor.h
--- ./src/fontcolor.h Wed Apr 27 00:57:29 2011
+++ ./src/fontcolor.h Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/frame-gtk.c' 'xemacs-21.5.31/src/frame-gtk.c'
Index: ./src/frame-gtk.c
--- ./src/frame-gtk.c Wed Apr 27 00:57:29 2011
+++ ./src/frame-gtk.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not synched with FSF. */
diff --text -u 'xemacs-21.5.30/src/frame-impl.h' 'xemacs-21.5.31/src/frame-impl.h'
Index: ./src/frame-impl.h
--- ./src/frame-impl.h Wed Apr 27 00:57:29 2011
+++ ./src/frame-impl.h Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/frame-msw.c' 'xemacs-21.5.31/src/frame-msw.c'
Index: ./src/frame-msw.c
--- ./src/frame-msw.c Wed Apr 27 00:57:29 2011
+++ ./src/frame-msw.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not synched with FSF. */
diff --text -u 'xemacs-21.5.30/src/frame-tty.c' 'xemacs-21.5.31/src/frame-tty.c'
Index: ./src/frame-tty.c
--- ./src/frame-tty.c Wed Apr 27 00:57:29 2011
+++ ./src/frame-tty.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/frame-x.c' 'xemacs-21.5.31/src/frame-x.c'
Index: ./src/frame-x.c
--- ./src/frame-x.c Wed Apr 27 00:57:29 2011
+++ ./src/frame-x.c Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not synched with FSF. */
diff --text -u 'xemacs-21.5.30/src/frame.c' 'xemacs-21.5.31/src/frame.c'
Index: ./src/frame.c
--- ./src/frame.c Wed Apr 27 00:57:29 2011
+++ ./src/frame.c Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/frame.h' 'xemacs-21.5.31/src/frame.h'
Index: ./src/frame.h
--- ./src/frame.h Wed Apr 27 00:57:29 2011
+++ ./src/frame.h Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/frameslots.h' 'xemacs-21.5.31/src/frameslots.h'
Index: ./src/frameslots.h
--- ./src/frameslots.h Wed Apr 27 00:57:29 2011
+++ ./src/frameslots.h Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. Split out of frame.h. */
diff --text -u 'xemacs-21.5.30/src/free-hook.c' 'xemacs-21.5.31/src/free-hook.c'
Index: ./src/free-hook.c
--- ./src/free-hook.c Wed Apr 27 00:57:29 2011
+++ ./src/free-hook.c Fri Apr 29 22:31:15 2011
@@ -1,10 +1,10 @@
/* Copyright (C) 2010 Ben Wing.
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -12,9 +12,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/gc.c' 'xemacs-21.5.31/src/gc.c'
Index: ./src/gc.c
--- ./src/gc.c Wed Apr 27 00:57:29 2011
+++ ./src/gc.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/gc.h' 'xemacs-21.5.31/src/gc.h'
Index: ./src/gc.h
--- ./src/gc.h Wed Apr 27 00:57:29 2011
+++ ./src/gc.h Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/gccache-gtk.c' 'xemacs-21.5.31/src/gccache-gtk.c'
Index: ./src/gccache-gtk.c
--- ./src/gccache-gtk.c Wed Apr 27 00:57:29 2011
+++ ./src/gccache-gtk.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/gccache-gtk.h' 'xemacs-21.5.31/src/gccache-gtk.h'
Index: ./src/gccache-gtk.h
--- ./src/gccache-gtk.h Wed Apr 27 00:57:29 2011
+++ ./src/gccache-gtk.h Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/gccache-x.c' 'xemacs-21.5.31/src/gccache-x.c'
Index: ./src/gccache-x.c
--- ./src/gccache-x.c Wed Apr 27 00:57:29 2011
+++ ./src/gccache-x.c Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/gccache-x.h' 'xemacs-21.5.31/src/gccache-x.h'
Index: ./src/gccache-x.h
--- ./src/gccache-x.h Wed Apr 27 00:57:29 2011
+++ ./src/gccache-x.h Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/general-slots.h' 'xemacs-21.5.31/src/general-slots.h'
Index: ./src/general-slots.h
--- ./src/general-slots.h Wed Apr 27 00:57:29 2011
+++ ./src/general-slots.h Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/general.c' 'xemacs-21.5.31/src/general.c'
Index: ./src/general.c
--- ./src/general.c Wed Apr 27 00:57:29 2011
+++ ./src/general.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/getloadavg.c' 'xemacs-21.5.31/src/getloadavg.c'
Index: ./src/getloadavg.c
--- ./src/getloadavg.c Wed Apr 27 00:57:29 2011
+++ ./src/getloadavg.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Compile-time symbols that this file uses:
diff --text -u 'xemacs-21.5.30/src/getpagesize.h' 'xemacs-21.5.31/src/getpagesize.h'
Index: ./src/getpagesize.h
--- ./src/getpagesize.h Wed Apr 27 00:57:29 2011
+++ ./src/getpagesize.h Fri Apr 29 22:31:15 2011
@@ -1,9 +1,9 @@
/* This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -11,9 +11,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/glade.c' 'xemacs-21.5.31/src/glade.c'
Index: ./src/glade.c
--- ./src/glade.c Wed Apr 27 00:57:29 2011
+++ ./src/glade.c Fri Apr 29 22:31:15 2011
@@ -9,21 +9,18 @@
**
** This file is part of XEmacs.
**
-** XEmacs is free software; you can redistribute it and/or modify it
+** XEmacs is free software: you can redistribute it and/or modify it
** under the terms of the GNU General Public License as published by the
-** Free Software Foundation; either version 2, or (at your option) any
-** later version.
-**
+** Free Software Foundation, either version 3 of the License, or (at your
+** option) any later version.
+**
** XEmacs is distributed in the hope that it will be useful, but WITHOUT
** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
** FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
** for more details.
-**
+**
** You should have received a copy of the GNU General Public License
-** along with XEmacs; see the file COPYING. If not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-** Boston, MA 02110-1301, USA. */
-*/
+** along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#if defined(HAVE_GLADE_H) || defined(HAVE_GLADE_GLADE_H)
diff --text -u 'xemacs-21.5.30/src/glyphs-eimage.c' 'xemacs-21.5.31/src/glyphs-eimage.c'
Index: ./src/glyphs-eimage.c
--- ./src/glyphs-eimage.c Wed Apr 27 00:57:29 2011
+++ ./src/glyphs-eimage.c Fri Apr 29 22:31:15 2011
@@ -7,10 +7,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/glyphs-gtk.c' 'xemacs-21.5.31/src/glyphs-gtk.c'
Index: ./src/glyphs-gtk.c
--- ./src/glyphs-gtk.c Wed Apr 27 00:57:29 2011
+++ ./src/glyphs-gtk.c Fri Apr 29 22:31:15 2011
@@ -7,10 +7,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/glyphs-gtk.h' 'xemacs-21.5.31/src/glyphs-gtk.h'
Index: ./src/glyphs-gtk.h
--- ./src/glyphs-gtk.h Wed Apr 27 00:57:29 2011
+++ ./src/glyphs-gtk.h Fri Apr 29 22:31:15 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
/* Gtk version by William Perry */
diff --text -u 'xemacs-21.5.30/src/glyphs-msw.c' 'xemacs-21.5.31/src/glyphs-msw.c'
Index: ./src/glyphs-msw.c
--- ./src/glyphs-msw.c Wed Apr 27 00:57:29 2011
+++ ./src/glyphs-msw.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/glyphs-msw.h' 'xemacs-21.5.31/src/glyphs-msw.h'
Index: ./src/glyphs-msw.h
--- ./src/glyphs-msw.h Wed Apr 27 00:57:29 2011
+++ ./src/glyphs-msw.h Fri Apr 29 22:31:15 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/glyphs-shared.c' 'xemacs-21.5.31/src/glyphs-shared.c'
Index: ./src/glyphs-shared.c
--- ./src/glyphs-shared.c Wed Apr 27 00:57:29 2011
+++ ./src/glyphs-shared.c Fri Apr 29 22:31:15 2011
@@ -8,10 +8,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,9 +19,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/glyphs-widget.c' 'xemacs-21.5.31/src/glyphs-widget.c'
Index: ./src/glyphs-widget.c
--- ./src/glyphs-widget.c Wed Apr 27 00:57:29 2011
+++ ./src/glyphs-widget.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/glyphs-x.c' 'xemacs-21.5.31/src/glyphs-x.c'
Index: ./src/glyphs-x.c
--- ./src/glyphs-x.c Wed Apr 27 00:57:29 2011
+++ ./src/glyphs-x.c Fri Apr 29 22:31:15 2011
@@ -8,19 +8,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
+
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/glyphs-x.h' 'xemacs-21.5.31/src/glyphs-x.h'
Index: ./src/glyphs-x.h
--- ./src/glyphs-x.h Wed Apr 27 00:57:29 2011
+++ ./src/glyphs-x.h Fri Apr 29 22:31:15 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/glyphs.c' 'xemacs-21.5.31/src/glyphs.c'
Index: ./src/glyphs.c
--- ./src/glyphs.c Wed Apr 27 00:57:29 2011
+++ ./src/glyphs.c Fri Apr 29 22:31:15 2011
@@ -8,10 +8,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,9 +19,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/glyphs.h' 'xemacs-21.5.31/src/glyphs.h'
Index: ./src/glyphs.h
--- ./src/glyphs.h Wed Apr 27 00:57:29 2011
+++ ./src/glyphs.h Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/gmalloc.c' 'xemacs-21.5.31/src/gmalloc.c'
Index: ./src/gmalloc.c
--- ./src/gmalloc.c Wed Apr 27 00:57:29 2011
+++ ./src/gmalloc.c Fri Apr 29 22:31:15 2011
@@ -40,20 +40,18 @@
Copyright 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
Written May 1989 by Mike Haertel.
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
+This library is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with this library; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+along with this library. If not, see <http://www.gnu.org/licenses/>.
The author may be reached (Email) at the address mike@ai.mit.edu,
or (US mail) as Mike Haertel c/o Free Software Foundation, Inc. */
@@ -302,20 +300,18 @@
/* Allocate memory on a page boundary.
Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
+This library is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with this library; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+along with this library. If not, see <http://www.gnu.org/licenses/>.
The author may be reached (Email) at the address mike@ai.mit.edu,
or (US mail) as Mike Haertel c/o Free Software Foundation, Inc. */
@@ -350,20 +346,18 @@
Copyright 1990, 1991, 1992, 1993, 1994 Free Software Foundation
Written May 1989 by Mike Haertel.
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
+This library is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with this library; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+along with this library. If not, see <http://www.gnu.org/licenses/>.
The author may be reached (Email) at the address mike@ai.mit.edu,
or (US mail) as Mike Haertel c/o Free Software Foundation, Inc. */
@@ -744,20 +738,18 @@
Copyright 1990, 1991, 1992, 1994 Free Software Foundation
Written May 1989 by Mike Haertel.
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
+This library is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with this library; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+along with this library. If not, see <http://www.gnu.org/licenses/>.
The author may be reached (Email) at the address mike@ai.mit.edu,
or (US mail) as Mike Haertel c/o Free Software Foundation, Inc. */
@@ -957,20 +949,18 @@
/* Copyright (C) 1991, 1993, 1994 Free Software Foundation, Inc.
This file is part of the GNU C Library.
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
+The GNU C Library is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with this library; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with the GNU C Library. If not, see <http://www.gnu.org/licenses/>. */
#ifndef _MALLOC_INTERNAL
#define _MALLOC_INTERNAL
@@ -1001,20 +991,18 @@
Copyright 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
Written May 1989 by Mike Haertel.
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
+This library is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with this library; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+along with this library. If not, see <http://www.gnu.org/licenses/>.
The author may be reached (Email) at the address mike@ai.mit.edu,
or (US mail) as Mike Haertel c/o Free Software Foundation, Inc. */
@@ -1157,20 +1145,18 @@
}
/* Copyright (C) 1991, 1992, 1994 Free Software Foundation, Inc.
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
+This library is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with this library; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+along with this library. If not, see <http://www.gnu.org/licenses/>.
The author may be reached (Email) at the address mike@ai.mit.edu,
or (US mail) as Mike Haertel c/o Free Software Foundation, Inc. */
@@ -1195,20 +1181,18 @@
/* Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
This file is part of the GNU C Library.
-The GNU C Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+The GNU C Library is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with the GNU C Library; see the file COPYING. If not, write to
-the Free the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with the GNU C Library. If not, see <http://www.gnu.org/licenses/>. */
#ifndef _MALLOC_INTERNAL
#define _MALLOC_INTERNAL
@@ -1244,20 +1228,18 @@
}
/* Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
+This library is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with this library; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with this library. If not, see <http://www.gnu.org/licenses/>. */
#ifndef _MALLOC_INTERNAL
#define _MALLOC_INTERNAL
diff --text -u 'xemacs-21.5.30/src/gpmevent.c' 'xemacs-21.5.31/src/gpmevent.c'
Index: ./src/gpmevent.c
--- ./src/gpmevent.c Wed Apr 27 00:57:29 2011
+++ ./src/gpmevent.c Fri Apr 29 22:31:15 2011
@@ -5,20 +5,18 @@
This file is part of XEmacs.
- XEmacs is free software; you can redistribute it and/or modify it
+ XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any
- later version.
-
+ Free Software Foundation, either version 3 of the License, or (at your
+ option) any later version.
+
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
-
+
You should have received a copy of the GNU General Public License
- along with XEmacs; see the file COPYING. If not, write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/gpmevent.h' 'xemacs-21.5.31/src/gpmevent.h'
Index: ./src/gpmevent.h
--- ./src/gpmevent.h Wed Apr 27 00:57:29 2011
+++ ./src/gpmevent.h Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#ifndef INCLUDED_gpmevent_h_
#define INCLUDED_gpmevent_h_
diff --text -u 'xemacs-21.5.30/src/gtk-glue.c' 'xemacs-21.5.31/src/gtk-glue.c'
Index: ./src/gtk-glue.c
--- ./src/gtk-glue.c Wed Apr 27 00:57:29 2011
+++ ./src/gtk-glue.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
GtkType GTK_TYPE_ARRAY = 0;
GtkType GTK_TYPE_STRING_ARRAY = 0;
diff --text -u 'xemacs-21.5.30/src/gtk-xemacs.c' 'xemacs-21.5.31/src/gtk-xemacs.c'
Index: ./src/gtk-xemacs.c
--- ./src/gtk-xemacs.c Wed Apr 27 00:57:29 2011
+++ ./src/gtk-xemacs.c Fri Apr 29 22:31:15 2011
@@ -8,20 +8,18 @@
**
** This file is part of XEmacs.
**
-** XEmacs is free software; you can redistribute it and/or modify it
+** XEmacs is free software: you can redistribute it and/or modify it
** under the terms of the GNU General Public License as published by the
-** Free Software Foundation; either version 2, or (at your option) any
-** later version.
-**
+** Free Software Foundation, either version 3 of the License, or (at your
+** option) any later version.
+**
** XEmacs is distributed in the hope that it will be useful, but WITHOUT
** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
** FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
** for more details.
-**
+**
** You should have received a copy of the GNU General Public License
-** along with XEmacs; see the file COPYING. If not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-** Boston, MA 02110-1301, USA. */
+** along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
diff --text -u 'xemacs-21.5.30/src/gtk-xemacs.h' 'xemacs-21.5.31/src/gtk-xemacs.h'
Index: ./src/gtk-xemacs.h
--- ./src/gtk-xemacs.h Wed Apr 27 00:57:30 2011
+++ ./src/gtk-xemacs.h Fri Apr 29 22:31:15 2011
@@ -7,20 +7,18 @@
**
** This file is part of XEmacs.
**
-** XEmacs is free software; you can redistribute it and/or modify it
+** XEmacs is free software: you can redistribute it and/or modify it
** under the terms of the GNU General Public License as published by the
-** Free Software Foundation; either version 2, or (at your option) any
-** later version.
-**
+** Free Software Foundation, either version 3 of the License, or (at your
+** option) any later version.
+**
** XEmacs is distributed in the hope that it will be useful, but WITHOUT
** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
** FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
** for more details.
-**
+**
** You should have received a copy of the GNU General Public License
-** along with XEmacs; see the file COPYING. If not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-** Boston, MA 02110-1301, USA. */
+** along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#ifndef __GTK_XEMACS_H__
#define __GTK_XEMACS_H__
diff --text -u 'xemacs-21.5.30/src/gui-gtk.c' 'xemacs-21.5.31/src/gui-gtk.c'
Index: ./src/gui-gtk.c
--- ./src/gui-gtk.c Wed Apr 27 00:57:30 2011
+++ ./src/gui-gtk.c Fri Apr 29 22:31:15 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/gui-msw.c' 'xemacs-21.5.31/src/gui-msw.c'
Index: ./src/gui-msw.c
--- ./src/gui-msw.c Wed Apr 27 00:57:30 2011
+++ ./src/gui-msw.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/gui-x.c' 'xemacs-21.5.31/src/gui-x.c'
Index: ./src/gui-x.c
--- ./src/gui-x.c Wed Apr 27 00:57:30 2011
+++ ./src/gui-x.c Fri Apr 29 22:31:15 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/gui.c' 'xemacs-21.5.31/src/gui.c'
Index: ./src/gui.c
--- ./src/gui.c Wed Apr 27 00:57:30 2011
+++ ./src/gui.c Fri Apr 29 22:31:15 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/gui.h' 'xemacs-21.5.31/src/gui.h'
Index: ./src/gui.h
--- ./src/gui.h Wed Apr 27 00:57:30 2011
+++ ./src/gui.h Fri Apr 29 22:31:15 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/gutter.c' 'xemacs-21.5.31/src/gutter.c'
Index: ./src/gutter.c
--- ./src/gutter.c Wed Apr 27 00:57:30 2011
+++ ./src/gutter.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/gutter.h' 'xemacs-21.5.31/src/gutter.h'
Index: ./src/gutter.h
--- ./src/gutter.h Wed Apr 27 00:57:30 2011
+++ ./src/gutter.h Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/hash.c' 'xemacs-21.5.31/src/hash.c'
Index: ./src/hash.c
--- ./src/hash.c Wed Apr 27 00:57:30 2011
+++ ./src/hash.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/hash.h' 'xemacs-21.5.31/src/hash.h'
Index: ./src/hash.h
--- ./src/hash.h Wed Apr 27 00:57:30 2011
+++ ./src/hash.h Fri Apr 29 22:31:15 2011
@@ -1,10 +1,10 @@
/* Copyright (C) 2003 Ben Wing.
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -12,9 +12,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/hpplay.c' 'xemacs-21.5.31/src/hpplay.c'
Index: ./src/hpplay.c
--- ./src/hpplay.c Wed Apr 27 00:57:30 2011
+++ ./src/hpplay.c Fri Apr 29 22:31:15 2011
@@ -2,10 +2,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -13,9 +13,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/imgproc.c' 'xemacs-21.5.31/src/imgproc.c'
Index: ./src/imgproc.c
--- ./src/imgproc.c Wed Apr 27 00:57:30 2011
+++ ./src/imgproc.c Fri Apr 29 22:31:15 2011
@@ -1,12 +1,12 @@
/* Image processing functions
Copyright (C) 1998 Jareth Hein
-This file is a part of XEmacs
+This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/imgproc.h' 'xemacs-21.5.31/src/imgproc.h'
Index: ./src/imgproc.h
--- ./src/imgproc.h Wed Apr 27 00:57:30 2011
+++ ./src/imgproc.h Fri Apr 29 22:31:15 2011
@@ -3,10 +3,10 @@
This file is a part of XEmacs
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#ifndef INCLUDED_imgproc_h_
#define INCLUDED_imgproc_h_
diff --text -u 'xemacs-21.5.30/src/indent.c' 'xemacs-21.5.31/src/indent.c'
Index: ./src/indent.c
--- ./src/indent.c Wed Apr 27 00:57:30 2011
+++ ./src/indent.c Fri Apr 29 22:31:15 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* This file has been Mule-ized. */
diff --text -u 'xemacs-21.5.30/src/inline.c' 'xemacs-21.5.31/src/inline.c'
Index: ./src/inline.c
--- ./src/inline.c Wed Apr 27 00:57:30 2011
+++ ./src/inline.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/input-method-motif.c' 'xemacs-21.5.31/src/input-method-motif.c'
Index: ./src/input-method-motif.c
--- ./src/input-method-motif.c Wed Apr 27 00:57:30 2011
+++ ./src/input-method-motif.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/input-method-xlib.c' 'xemacs-21.5.31/src/input-method-xlib.c'
Index: ./src/input-method-xlib.c
--- ./src/input-method-xlib.c Wed Apr 27 00:57:30 2011
+++ ./src/input-method-xlib.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/insdel.c' 'xemacs-21.5.31/src/insdel.c'
Index: ./src/insdel.c
--- ./src/insdel.c Wed Apr 27 00:57:30 2011
+++ ./src/insdel.c Fri Apr 29 22:31:15 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.0, FSF 19.30. Diverges significantly. */
diff --text -u 'xemacs-21.5.30/src/insdel.h' 'xemacs-21.5.31/src/insdel.h'
Index: ./src/insdel.h
--- ./src/insdel.h Wed Apr 27 00:57:30 2011
+++ ./src/insdel.h Fri Apr 29 22:31:15 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/intl-encap-win32.c' 'xemacs-21.5.31/src/intl-encap-win32.c'
Index: ./src/intl-encap-win32.c
--- ./src/intl-encap-win32.c Wed Apr 27 00:57:30 2011
+++ ./src/intl-encap-win32.c Fri Apr 29 22:31:15 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/intl-win32.c' 'xemacs-21.5.31/src/intl-win32.c'
Index: ./src/intl-win32.c
--- ./src/intl-win32.c Wed Apr 27 00:57:30 2011
+++ ./src/intl-win32.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/intl-x.c' 'xemacs-21.5.31/src/intl-x.c'
Index: ./src/intl-x.c
--- ./src/intl-x.c Wed Apr 27 00:57:30 2011
+++ ./src/intl-x.c Fri Apr 29 22:31:15 2011
@@ -2,12 +2,12 @@
Copyright (C) 1996 Sun Microsystems.
Copyright (C) 2000, 2001 Ben Wing.
-This file is a part of XEmacs.
+This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include "lisp.h"
diff --text -u 'xemacs-21.5.30/src/intl.c' 'xemacs-21.5.31/src/intl.c'
Index: ./src/intl.c
--- ./src/intl.c Wed Apr 27 00:57:30 2011
+++ ./src/intl.c Fri Apr 29 22:31:15 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/keymap-buttons.h' 'xemacs-21.5.31/src/keymap-buttons.h'
Index: ./src/keymap-buttons.h
--- ./src/keymap-buttons.h Wed Apr 27 00:57:30 2011
+++ ./src/keymap-buttons.h Fri Apr 29 22:31:15 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. Split out of keymap.c. */
diff --text -u 'xemacs-21.5.30/src/keymap-slots.h' 'xemacs-21.5.31/src/keymap-slots.h'
Index: ./src/keymap-slots.h
--- ./src/keymap-slots.h Wed Apr 27 00:57:30 2011
+++ ./src/keymap-slots.h Fri Apr 29 22:31:15 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. Split out of keymap.c. */
diff --text -u 'xemacs-21.5.30/src/keymap.c' 'xemacs-21.5.31/src/keymap.c'
Index: ./src/keymap.c
--- ./src/keymap.c Wed Apr 27 00:57:30 2011
+++ ./src/keymap.c Fri Apr 29 22:31:15 2011
@@ -7,10 +7,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.0. Not synched with FSF. Substantially
different from FSF. */
diff --text -u 'xemacs-21.5.30/src/keymap.h' 'xemacs-21.5.31/src/keymap.h'
Index: ./src/keymap.h
--- ./src/keymap.h Wed Apr 27 00:57:30 2011
+++ ./src/keymap.h Fri Apr 29 22:31:15 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/lastfile.c' 'xemacs-21.5.31/src/lastfile.c'
Index: ./src/lastfile.c
--- ./src/lastfile.c Wed Apr 27 00:57:30 2011
+++ ./src/lastfile.c Fri Apr 29 22:31:15 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/libinterface.c' 'xemacs-21.5.31/src/libinterface.c'
Index: ./src/libinterface.c
--- ./src/libinterface.c Wed Apr 27 00:57:30 2011
+++ ./src/libinterface.c Fri Apr 29 22:31:15 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/libinterface.h' 'xemacs-21.5.31/src/libinterface.h'
Index: ./src/libinterface.h
--- ./src/libinterface.h Wed Apr 27 00:57:30 2011
+++ ./src/libinterface.h Fri Apr 29 22:31:15 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/line-number.c' 'xemacs-21.5.31/src/line-number.c'
Index: ./src/line-number.c
--- ./src/line-number.c Wed Apr 27 00:57:30 2011
+++ ./src/line-number.c Fri Apr 29 22:31:16 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/line-number.h' 'xemacs-21.5.31/src/line-number.h'
Index: ./src/line-number.h
--- ./src/line-number.h Wed Apr 27 00:57:30 2011
+++ ./src/line-number.h Fri Apr 29 22:31:16 2011
@@ -2,10 +2,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -13,9 +13,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#ifndef INCLUDED_line_number_h_
#define INCLUDED_line_number_h_
diff --text -u 'xemacs-21.5.30/src/lisp-disunion.h' 'xemacs-21.5.31/src/lisp-disunion.h'
Index: ./src/lisp-disunion.h
--- ./src/lisp-disunion.h Wed Apr 27 00:57:30 2011
+++ ./src/lisp-disunion.h Fri Apr 29 22:31:16 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. Split out from lisp.h. */
/* This file has diverged greatly from FSF Emacs. Syncing is no
diff --text -u 'xemacs-21.5.30/src/lisp-union.h' 'xemacs-21.5.31/src/lisp-union.h'
Index: ./src/lisp-union.h
--- ./src/lisp-union.h Wed Apr 27 00:57:30 2011
+++ ./src/lisp-union.h Fri Apr 29 22:31:16 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Divergent from FSF. */
diff --text -u 'xemacs-21.5.30/src/lisp.h' 'xemacs-21.5.31/src/lisp.h'
Index: ./src/lisp.h
--- ./src/lisp.h Wed Apr 27 00:57:30 2011
+++ ./src/lisp.h Fri Apr 29 22:31:16 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/lread.c' 'xemacs-21.5.31/src/lread.c'
Index: ./src/lread.c
--- ./src/lread.c Wed Apr 27 00:57:30 2011
+++ ./src/lread.c Fri Apr 29 22:31:16 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.0, FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/lrecord.h' 'xemacs-21.5.31/src/lrecord.h'
Index: ./src/lrecord.h
--- ./src/lrecord.h Wed Apr 27 00:57:30 2011
+++ ./src/lrecord.h Fri Apr 29 22:31:16 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/lstream.c' 'xemacs-21.5.31/src/lstream.c'
Index: ./src/lstream.c
--- ./src/lstream.c Wed Apr 27 00:57:30 2011
+++ ./src/lstream.c Fri Apr 29 22:31:16 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/lstream.h' 'xemacs-21.5.31/src/lstream.h'
Index: ./src/lstream.h
--- ./src/lstream.h Wed Apr 27 00:57:30 2011
+++ ./src/lstream.h Fri Apr 29 22:31:16 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/m/alpha.h' 'xemacs-21.5.31/src/m/alpha.h'
Index: ./src/m/alpha.h
--- ./src/m/alpha.h Wed Apr 27 00:57:30 2011
+++ ./src/m/alpha.h Fri Apr 29 22:31:16 2011
@@ -3,20 +3,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#ifndef __ELF__
diff --text -u 'xemacs-21.5.30/src/m/arm.h' 'xemacs-21.5.31/src/m/arm.h'
Index: ./src/m/arm.h
--- ./src/m/arm.h Wed Apr 27 00:57:30 2011
+++ ./src/m/arm.h Fri Apr 29 22:31:16 2011
@@ -1,22 +1,20 @@
/* Machine description file for digital/intel arm/strongarm
Copyright (C) 1987 Free Software Foundation, Inc.
-This file is part of GNU Emacs.
+This file is part of XEmacs.
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.31. */
diff --text -u 'xemacs-21.5.30/src/m/hp800.h' 'xemacs-21.5.31/src/m/hp800.h'
Index: ./src/m/hp800.h
--- ./src/m/hp800.h Wed Apr 27 00:57:30 2011
+++ ./src/m/hp800.h Fri Apr 29 22:31:16 2011
@@ -1,22 +1,20 @@
/* machine description file for hp9000 series 800 machines.
Copyright (C) 1987 Free Software Foundation, Inc.
-This file is part of GNU Emacs.
+This file is part of XEmacs.
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.31. */
diff --text -u 'xemacs-21.5.30/src/m/ibmrs6000.h' 'xemacs-21.5.31/src/m/ibmrs6000.h'
Index: ./src/m/ibmrs6000.h
--- ./src/m/ibmrs6000.h Wed Apr 27 00:57:30 2011
+++ ./src/m/ibmrs6000.h Fri Apr 29 22:31:16 2011
@@ -1,22 +1,20 @@
/* R2 AIX machine/system dependent defines
Copyright (C) 1988 Free Software Foundation, Inc.
-This file is part of GNU Emacs.
+This file is part of XEmacs.
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.31. */
diff --text -u 'xemacs-21.5.30/src/m/intel386.h' 'xemacs-21.5.31/src/m/intel386.h'
Index: ./src/m/intel386.h
--- ./src/m/intel386.h Wed Apr 27 00:57:30 2011
+++ ./src/m/intel386.h Fri Apr 29 22:31:16 2011
@@ -1,22 +1,20 @@
/* Machine description file for intel 386.
Copyright (C) 1987 Free Software Foundation, Inc.
-This file is part of GNU Emacs.
+This file is part of XEmacs.
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.31. */
diff --text -u 'xemacs-21.5.30/src/m/m68k.h' 'xemacs-21.5.31/src/m/m68k.h'
Index: ./src/m/m68k.h
--- ./src/m/m68k.h Wed Apr 27 00:57:30 2011
+++ ./src/m/m68k.h Fri Apr 29 22:31:16 2011
@@ -1,22 +1,20 @@
/* Machine description file for generic Motorola 68k.
Copyright (C) 1985, 1995 Free Software Foundation, Inc.
-This file is part of GNU Emacs.
+This file is part of XEmacs.
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.31. */
diff --text -u 'xemacs-21.5.30/src/m/mips.h' 'xemacs-21.5.31/src/m/mips.h'
Index: ./src/m/mips.h
--- ./src/m/mips.h Wed Apr 27 00:57:30 2011
+++ ./src/m/mips.h Fri Apr 29 22:31:16 2011
@@ -1,22 +1,20 @@
/* m- file for Mips machines.
Copyright (C) 1987, 1992 Free Software Foundation, Inc.
-This file is part of GNU Emacs.
+This file is part of XEmacs.
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.31. */
diff --text -u 'xemacs-21.5.30/src/m/powerpc.h' 'xemacs-21.5.31/src/m/powerpc.h'
Index: ./src/m/powerpc.h
--- ./src/m/powerpc.h Wed Apr 27 00:57:30 2011
+++ ./src/m/powerpc.h Fri Apr 29 22:31:16 2011
@@ -4,20 +4,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* The following line tells the configuration script what sort of
operating system this machine is likely to run.
diff --text -u 'xemacs-21.5.30/src/m/sparc.h' 'xemacs-21.5.31/src/m/sparc.h'
Index: ./src/m/sparc.h
--- ./src/m/sparc.h Wed Apr 27 00:57:30 2011
+++ ./src/m/sparc.h Fri Apr 29 22:31:16 2011
@@ -1,22 +1,20 @@
/* machine description file for Sun 4 SPARC.
Copyright (C) 1987, 1994 Free Software Foundation, Inc.
-This file is part of GNU Emacs.
+This file is part of XEmacs.
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.31. */
diff --text -u 'xemacs-21.5.30/src/m/template.h' 'xemacs-21.5.31/src/m/template.h'
Index: ./src/m/template.h
--- ./src/m/template.h Wed Apr 27 00:57:30 2011
+++ ./src/m/template.h Fri Apr 29 22:31:16 2011
@@ -1,22 +1,20 @@
/* machine description file template.
Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-This file is part of GNU Emacs.
+This file is part of XEmacs.
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.31. */
diff --text -u 'xemacs-21.5.30/src/m/windowsnt.h' 'xemacs-21.5.31/src/m/windowsnt.h'
Index: ./src/m/windowsnt.h
--- ./src/m/windowsnt.h Wed Apr 27 00:57:30 2011
+++ ./src/m/windowsnt.h Fri Apr 29 22:31:16 2011
@@ -2,22 +2,20 @@
Copyright (C) 1993, 1994 Free Software Foundation, Inc.
-This file is part of GNU Emacs.
+This file is part of XEmacs.
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.31. */
diff --text -u 'xemacs-21.5.30/src/macros.c' 'xemacs-21.5.31/src/macros.c'
Index: ./src/macros.c
--- ./src/macros.c Wed Apr 27 00:57:30 2011
+++ ./src/macros.c Fri Apr 29 22:31:16 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/macros.h' 'xemacs-21.5.31/src/macros.h'
Index: ./src/macros.h
--- ./src/macros.h Wed Apr 27 00:57:30 2011
+++ ./src/macros.h Fri Apr 29 22:31:16 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/make-src-depend' 'xemacs-21.5.31/src/make-src-depend'
Index: ./src/make-src-depend
--- ./src/make-src-depend Wed Apr 27 00:57:30 2011
+++ ./src/make-src-depend Fri Apr 29 22:31:16 2011
@@ -10,20 +10,18 @@
## This file is part of XEmacs.
-## XEmacs is free software; you can redistribute it and/or modify it
-## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-
-## XEmacs is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
+## XEmacs is free software: you can redistribute it and/or modify it
+## under the terms of the GNU General Public License as published by the
+## Free Software Foundation, either version 3 of the License, or (at your
+## option) any later version.
+
+## XEmacs is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+## for more details.
## You should have received a copy of the GNU General Public License
-## along with XEmacs; see the file COPYING. If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
eval 'exec perl -w -S $0 ${1+"$@"}'
if 0;
diff --text -u 'xemacs-21.5.30/src/marker.c' 'xemacs-21.5.31/src/marker.c'
Index: ./src/marker.c
--- ./src/marker.c Wed Apr 27 00:57:30 2011
+++ ./src/marker.c Fri Apr 29 22:31:16 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/mc-alloc.c' 'xemacs-21.5.31/src/mc-alloc.c'
Index: ./src/mc-alloc.c
--- ./src/mc-alloc.c Wed Apr 27 00:57:30 2011
+++ ./src/mc-alloc.c Fri Apr 29 22:31:16 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/mc-alloc.h' 'xemacs-21.5.31/src/mc-alloc.h'
Index: ./src/mc-alloc.h
--- ./src/mc-alloc.h Wed Apr 27 00:57:30 2011
+++ ./src/mc-alloc.h Fri Apr 29 22:31:16 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/md5.c' 'xemacs-21.5.31/src/md5.c'
Index: ./src/md5.c
--- ./src/md5.c Wed Apr 27 00:57:30 2011
+++ ./src/md5.c Fri Apr 29 22:31:16 2011
@@ -5,20 +5,20 @@
NOTE: The canonical source of this file is maintained with the GNU C
Library. Bugs can be reported to bug-glibc@prep.ai.mit.edu.
- This program is free software; you can redistribute it and/or modify it
+ This file is part of XEmacs.
+
+ XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any
- later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
+ Free Software Foundation, either version 3 of the License, or (at your
+ option) any later version.
+
+ XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
+ along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */
/* XEmacs frontend written by Ben Wing, Jareth Hein and Hrvoje Niksic. */
diff --text -u 'xemacs-21.5.30/src/mem-limits.h' 'xemacs-21.5.31/src/mem-limits.h'
Index: ./src/mem-limits.h
--- ./src/mem-limits.h Wed Apr 27 00:57:30 2011
+++ ./src/mem-limits.h Fri Apr 29 22:31:16 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/menubar-gtk.c' 'xemacs-21.5.31/src/menubar-gtk.c'
Index: ./src/menubar-gtk.c
--- ./src/menubar-gtk.c Wed Apr 27 00:57:30 2011
+++ ./src/menubar-gtk.c Fri Apr 29 22:31:16 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/menubar-msw.c' 'xemacs-21.5.31/src/menubar-msw.c'
Index: ./src/menubar-msw.c
--- ./src/menubar-msw.c Wed Apr 27 00:57:30 2011
+++ ./src/menubar-msw.c Fri Apr 29 22:31:16 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/menubar-x.c' 'xemacs-21.5.31/src/menubar-x.c'
Index: ./src/menubar-x.c
--- ./src/menubar-x.c Wed Apr 27 00:57:30 2011
+++ ./src/menubar-x.c Fri Apr 29 22:31:16 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/menubar.c' 'xemacs-21.5.31/src/menubar.c'
Index: ./src/menubar.c
--- ./src/menubar.c Wed Apr 27 00:57:30 2011
+++ ./src/menubar.c Fri Apr 29 22:31:16 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/menubar.h' 'xemacs-21.5.31/src/menubar.h'
Index: ./src/menubar.h
--- ./src/menubar.h Wed Apr 27 00:57:30 2011
+++ ./src/menubar.h Fri Apr 29 22:31:16 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/minibuf.c' 'xemacs-21.5.31/src/minibuf.c'
Index: ./src/minibuf.c
--- ./src/minibuf.c Wed Apr 27 00:57:30 2011
+++ ./src/minibuf.c Fri Apr 29 22:31:16 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.0, FSF 19.28. Mule-ized except as noted.
Substantially different from FSF. */
diff --text -u 'xemacs-21.5.30/src/mule-ccl.c' 'xemacs-21.5.31/src/mule-ccl.c'
Index: ./src/mule-ccl.c
--- ./src/mule-ccl.c Wed Apr 27 00:57:30 2011
+++ ./src/mule-ccl.c Fri Apr 29 22:31:16 2011
@@ -5,20 +5,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with : FSF Emacs 21.0.90 except TranslateCharacter */
diff --text -u 'xemacs-21.5.30/src/mule-ccl.h' 'xemacs-21.5.31/src/mule-ccl.h'
Index: ./src/mule-ccl.h
--- ./src/mule-ccl.h Wed Apr 27 00:57:30 2011
+++ ./src/mule-ccl.h Fri Apr 29 22:31:16 2011
@@ -4,20 +4,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#ifndef INCLUDED_mule_ccl_h_
#define INCLUDED_mule_ccl_h_
diff --text -u 'xemacs-21.5.30/src/mule-charset.c' 'xemacs-21.5.31/src/mule-charset.c'
Index: ./src/mule-charset.c
--- ./src/mule-charset.c Wed Apr 27 00:57:30 2011
+++ ./src/mule-charset.c Fri Apr 29 22:31:16 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 20.3. Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/mule-coding.c' 'xemacs-21.5.31/src/mule-coding.c'
Index: ./src/mule-coding.c
--- ./src/mule-coding.c Wed Apr 27 00:57:30 2011
+++ ./src/mule-coding.c Fri Apr 29 22:31:16 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.3. Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/mule-wnnfns.c' 'xemacs-21.5.31/src/mule-wnnfns.c'
Index: ./src/mule-wnnfns.c
--- ./src/mule-wnnfns.c Wed Apr 27 00:57:30 2011
+++ ./src/mule-wnnfns.c Fri Apr 29 22:31:16 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Mule 2.3. Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/native-gtk-toolbar.c' 'xemacs-21.5.31/src/native-gtk-toolbar.c'
Index: ./src/native-gtk-toolbar.c
--- ./src/native-gtk-toolbar.c Wed Apr 27 00:57:30 2011
+++ ./src/native-gtk-toolbar.c Fri Apr 29 22:31:16 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/ndir.h' 'xemacs-21.5.31/src/ndir.h'
Index: ./src/ndir.h
--- ./src/ndir.h Wed Apr 27 00:57:30 2011
+++ ./src/ndir.h Fri Apr 29 22:31:16 2011
@@ -2,10 +2,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -13,9 +13,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/nt.c' 'xemacs-21.5.31/src/nt.c'
Index: ./src/nt.c
--- ./src/nt.c Wed Apr 27 00:57:30 2011
+++ ./src/nt.c Fri Apr 29 22:31:16 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,11 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
-
-*/
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Authorship:
diff --text -u 'xemacs-21.5.30/src/ntheap.c' 'xemacs-21.5.31/src/ntheap.c'
Index: ./src/ntheap.c
--- ./src/ntheap.c Wed Apr 27 00:57:30 2011
+++ ./src/ntheap.c Fri Apr 29 22:31:16 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,10 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
-
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
Geoff Voelker (voelker@cs.washington.edu) 7-29-94 */
/* Adapted for XEmacs by David Hobley <david@spook-le0.cia.com.au> */
diff --text -u 'xemacs-21.5.30/src/ntplay.c' 'xemacs-21.5.31/src/ntplay.c'
Index: ./src/ntplay.c
--- ./src/ntplay.c Wed Apr 27 00:57:30 2011
+++ ./src/ntplay.c Fri Apr 29 22:31:16 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.*/
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/number-gmp.c' 'xemacs-21.5.31/src/number-gmp.c'
Index: ./src/number-gmp.c
--- ./src/number-gmp.c Wed Apr 27 00:57:30 2011
+++ ./src/number-gmp.c Fri Apr 29 22:31:16 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/number-gmp.h' 'xemacs-21.5.31/src/number-gmp.h'
Index: ./src/number-gmp.h
--- ./src/number-gmp.h Wed Apr 27 00:57:30 2011
+++ ./src/number-gmp.h Fri Apr 29 22:31:16 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/number-mp.c' 'xemacs-21.5.31/src/number-mp.c'
Index: ./src/number-mp.c
--- ./src/number-mp.c Wed Apr 27 00:57:30 2011
+++ ./src/number-mp.c Fri Apr 29 22:31:16 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/number-mp.h' 'xemacs-21.5.31/src/number-mp.h'
Index: ./src/number-mp.h
--- ./src/number-mp.h Wed Apr 27 00:57:30 2011
+++ ./src/number-mp.h Fri Apr 29 22:31:16 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/number.c' 'xemacs-21.5.31/src/number.c'
Index: ./src/number.c
--- ./src/number.c Wed Apr 27 00:57:30 2011
+++ ./src/number.c Fri Apr 29 22:31:16 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/number.h' 'xemacs-21.5.31/src/number.h'
Index: ./src/number.h
--- ./src/number.h Wed Apr 27 00:57:30 2011
+++ ./src/number.h Fri Apr 29 22:31:16 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/opaque.c' 'xemacs-21.5.31/src/opaque.c'
Index: ./src/opaque.c
--- ./src/opaque.c Wed Apr 27 00:57:30 2011
+++ ./src/opaque.c Fri Apr 29 22:31:16 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/opaque.h' 'xemacs-21.5.31/src/opaque.h'
Index: ./src/opaque.h
--- ./src/opaque.h Wed Apr 27 00:57:30 2011
+++ ./src/opaque.h Fri Apr 29 22:31:16 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/pre-crt0.c' 'xemacs-21.5.31/src/pre-crt0.c'
Index: ./src/pre-crt0.c
--- ./src/pre-crt0.c Wed Apr 27 00:57:30 2011
+++ ./src/pre-crt0.c Fri Apr 29 22:31:16 2011
@@ -1,9 +1,9 @@
/* This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -11,9 +11,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/print.c' 'xemacs-21.5.31/src/print.c'
Index: ./src/print.c
--- ./src/print.c Wed Apr 27 00:57:30 2011
+++ ./src/print.c Fri Apr 29 22:31:16 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not synched with FSF. */
diff --text -u 'xemacs-21.5.30/src/process-nt.c' 'xemacs-21.5.31/src/process-nt.c'
Index: ./src/process-nt.c
--- ./src/process-nt.c Wed Apr 27 00:57:30 2011
+++ ./src/process-nt.c Fri Apr 29 22:31:16 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Written by Kirill M. Katsnelson <kkm@kis.ru>, April 1998 */
diff --text -u 'xemacs-21.5.30/src/process-slots.h' 'xemacs-21.5.31/src/process-slots.h'
Index: ./src/process-slots.h
--- ./src/process-slots.h Wed Apr 27 00:57:30 2011
+++ ./src/process-slots.h Fri Apr 29 22:31:16 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: ????. Split out of procimpl.h. */
diff --text -u 'xemacs-21.5.30/src/process-unix.c' 'xemacs-21.5.31/src/process-unix.c'
Index: ./src/process-unix.c
--- ./src/process-unix.c Wed Apr 27 00:57:30 2011
+++ ./src/process-unix.c Fri Apr 29 22:31:16 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Mule-ized as of 6-14-00 */
diff --text -u 'xemacs-21.5.30/src/process.c' 'xemacs-21.5.31/src/process.c'
Index: ./src/process.c
--- ./src/process.c Wed Apr 27 00:57:30 2011
+++ ./src/process.c Fri Apr 29 22:31:16 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* This file has been Mule-ized. */
diff --text -u 'xemacs-21.5.30/src/process.h' 'xemacs-21.5.31/src/process.h'
Index: ./src/process.h
--- ./src/process.h Wed Apr 27 00:57:30 2011
+++ ./src/process.h Fri Apr 29 22:31:16 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#ifndef INCLUDED_process_h_
#define INCLUDED_process_h_
diff --text -u 'xemacs-21.5.30/src/procimpl.h' 'xemacs-21.5.31/src/procimpl.h'
Index: ./src/procimpl.h
--- ./src/procimpl.h Wed Apr 27 00:57:30 2011
+++ ./src/procimpl.h Fri Apr 29 22:31:16 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: ????. Split out of process.h. */
diff --text -u 'xemacs-21.5.30/src/profile.c' 'xemacs-21.5.31/src/profile.c'
Index: ./src/profile.c
--- ./src/profile.c Wed Apr 27 00:57:30 2011
+++ ./src/profile.c Fri Apr 29 22:31:16 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include "lisp.h"
diff --text -u 'xemacs-21.5.30/src/profile.h' 'xemacs-21.5.31/src/profile.h'
Index: ./src/profile.h
--- ./src/profile.h Wed Apr 27 00:57:30 2011
+++ ./src/profile.h Fri Apr 29 22:31:16 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/ralloc.c' 'xemacs-21.5.31/src/ralloc.c'
Index: ./src/ralloc.c
--- ./src/ralloc.c Wed Apr 27 00:57:30 2011
+++ ./src/ralloc.c Fri Apr 29 22:31:16 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,10 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
-
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
Synched Up with: FSF 20.2 (non-mmap portion only)
*/
diff --text -u 'xemacs-21.5.30/src/rangetab.c' 'xemacs-21.5.31/src/rangetab.c'
Index: ./src/rangetab.c
--- ./src/rangetab.c Wed Apr 27 00:57:30 2011
+++ ./src/rangetab.c Fri Apr 29 22:31:16 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/rangetab.h' 'xemacs-21.5.31/src/rangetab.h'
Index: ./src/rangetab.h
--- ./src/rangetab.h Wed Apr 27 00:57:30 2011
+++ ./src/rangetab.h Fri Apr 29 22:31:16 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/realpath.c' 'xemacs-21.5.31/src/realpath.c'
Index: ./src/realpath.c
--- ./src/realpath.c Wed Apr 27 00:57:30 2011
+++ ./src/realpath.c Fri Apr 29 22:31:16 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/redisplay-gtk.c' 'xemacs-21.5.31/src/redisplay-gtk.c'
Index: ./src/redisplay-gtk.c
--- ./src/redisplay-gtk.c Wed Apr 27 00:57:30 2011
+++ ./src/redisplay-gtk.c Fri Apr 29 22:31:16 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/redisplay-msw.c' 'xemacs-21.5.31/src/redisplay-msw.c'
Index: ./src/redisplay-msw.c
--- ./src/redisplay-msw.c Wed Apr 27 00:57:30 2011
+++ ./src/redisplay-msw.c Fri Apr 29 22:31:16 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/redisplay-output.c' 'xemacs-21.5.31/src/redisplay-output.c'
Index: ./src/redisplay-output.c
--- ./src/redisplay-output.c Wed Apr 27 00:57:30 2011
+++ ./src/redisplay-output.c Fri Apr 29 22:31:16 2011
@@ -7,10 +7,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/redisplay-tty.c' 'xemacs-21.5.31/src/redisplay-tty.c'
Index: ./src/redisplay-tty.c
--- ./src/redisplay-tty.c Wed Apr 27 00:57:30 2011
+++ ./src/redisplay-tty.c Fri Apr 29 22:31:16 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not completely synched with FSF. Mostly divergent
from FSF. */
diff --text -u 'xemacs-21.5.30/src/redisplay-x.c' 'xemacs-21.5.31/src/redisplay-x.c'
Index: ./src/redisplay-x.c
--- ./src/redisplay-x.c Wed Apr 27 00:57:31 2011
+++ ./src/redisplay-x.c Fri Apr 29 22:31:16 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/redisplay-xlike-inc.c' 'xemacs-21.5.31/src/redisplay-xlike-inc.c'
Index: ./src/redisplay-xlike-inc.c
--- ./src/redisplay-xlike-inc.c Wed Apr 27 00:57:31 2011
+++ ./src/redisplay-xlike-inc.c Fri Apr 29 22:31:16 2011
@@ -7,10 +7,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/redisplay.c' 'xemacs-21.5.31/src/redisplay.c'
Index: ./src/redisplay.c
--- ./src/redisplay.c Wed Apr 27 00:57:31 2011
+++ ./src/redisplay.c Fri Apr 29 22:31:16 2011
@@ -7,10 +7,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/redisplay.h' 'xemacs-21.5.31/src/redisplay.h'
Index: ./src/redisplay.h
--- ./src/redisplay.h Wed Apr 27 00:57:31 2011
+++ ./src/redisplay.h Fri Apr 29 22:31:16 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/regex.c' 'xemacs-21.5.31/src/regex.c'
Index: ./src/regex.c
--- ./src/regex.c Wed Apr 27 00:57:31 2011
+++ ./src/regex.c Fri Apr 29 22:31:16 2011
@@ -7,21 +7,20 @@
Copyright (C) 1995 Sun Microsystems, Inc.
Copyright (C) 1995, 2001, 2002, 2003, 2010 Ben Wing.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
+ This file is part of XEmacs.
+
+ XEmacs is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation, either version 3 of the License, or (at your
+ option) any later version.
+
+ XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
You should have received a copy of the GNU General Public License
- along with this program; see the file COPYING. If not, write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
+ along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.29. */
#ifdef HAVE_CONFIG_H
diff --text -u 'xemacs-21.5.30/src/regex.h' 'xemacs-21.5.31/src/regex.h'
Index: ./src/regex.h
--- ./src/regex.h Wed Apr 27 00:57:31 2011
+++ ./src/regex.h Fri Apr 29 22:31:16 2011
@@ -4,21 +4,20 @@
Copyright (C) 1985, 89, 90, 91, 92, 93, 95 Free Software Foundation, Inc.
Copyright (C) 2002, 2010 Ben Wing.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
+ This file is part of XEmacs.
+
+ XEmacs is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation, either version 3 of the License, or (at your
+ option) any later version.
+
+ XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
You should have received a copy of the GNU General Public License
- along with this program; see the file COPYING. If not, write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
+ along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.29. */
#ifndef INCLUDED_regex_h_
diff --text -u 'xemacs-21.5.30/src/s/aix4-2.h' 'xemacs-21.5.31/src/s/aix4-2.h'
Index: ./src/s/aix4-2.h
--- ./src/s/aix4-2.h Wed Apr 27 00:57:31 2011
+++ ./src/s/aix4-2.h Fri Apr 29 22:31:16 2011
@@ -3,20 +3,18 @@
*
* This file is part of XEmacs.
*
- * XEmacs is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * XEmacs is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * XEmacs is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
* You should have received a copy of the GNU General Public License
- * along with XEmacs; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA. */
+ * along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.31. */
diff --text -u 'xemacs-21.5.30/src/s/bsd4-3.h' 'xemacs-21.5.31/src/s/bsd4-3.h'
Index: ./src/s/bsd4-3.h
--- ./src/s/bsd4-3.h Wed Apr 27 00:57:31 2011
+++ ./src/s/bsd4-3.h Fri Apr 29 22:31:16 2011
@@ -3,20 +3,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.31. */
diff --text -u 'xemacs-21.5.30/src/s/cygwin32.h' 'xemacs-21.5.31/src/s/cygwin32.h'
Index: ./src/s/cygwin32.h
--- ./src/s/cygwin32.h Wed Apr 27 00:57:31 2011
+++ ./src/s/cygwin32.h Fri Apr 29 22:31:16 2011
@@ -4,20 +4,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Building under cygwin
*
diff --text -u 'xemacs-21.5.30/src/s/gnu.h' 'xemacs-21.5.31/src/s/gnu.h'
Index: ./src/s/gnu.h
--- ./src/s/gnu.h Wed Apr 27 00:57:31 2011
+++ ./src/s/gnu.h Fri Apr 29 22:31:16 2011
@@ -3,20 +3,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.31. */
diff --text -u 'xemacs-21.5.30/src/s/hpux11-shr.h' 'xemacs-21.5.31/src/s/hpux11-shr.h'
Index: ./src/s/hpux11-shr.h
--- ./src/s/hpux11-shr.h Wed Apr 27 00:57:31 2011
+++ ./src/s/hpux11-shr.h Fri Apr 29 22:31:16 2011
@@ -3,20 +3,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.31. */
diff --text -u 'xemacs-21.5.30/src/s/hpux11.h' 'xemacs-21.5.31/src/s/hpux11.h'
Index: ./src/s/hpux11.h
--- ./src/s/hpux11.h Wed Apr 27 00:57:31 2011
+++ ./src/s/hpux11.h Fri Apr 29 22:31:16 2011
@@ -1,22 +1,20 @@
/* Definitions file for XEmacs running on HPUX release 11.0.
- * Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+ * Copyright (C) 1985, 1986 Free Software Foundation, Inc.
*
- * This file is part of XEmacs.
+ * This file is part of XEmacs.
*
- * XEmacs is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * XEmacs is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with XEmacs; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA. */
+ * XEmacs is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.31. */
diff --text -u 'xemacs-21.5.30/src/s/mach-bsd4-3.h' 'xemacs-21.5.31/src/s/mach-bsd4-3.h'
Index: ./src/s/mach-bsd4-3.h
--- ./src/s/mach-bsd4-3.h Wed Apr 27 00:57:31 2011
+++ ./src/s/mach-bsd4-3.h Fri Apr 29 22:31:16 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.31. */
diff --text -u 'xemacs-21.5.30/src/s/mingw32.h' 'xemacs-21.5.31/src/s/mingw32.h'
Index: ./src/s/mingw32.h
--- ./src/s/mingw32.h Wed Apr 27 00:57:31 2011
+++ ./src/s/mingw32.h Fri Apr 29 22:31:16 2011
@@ -4,20 +4,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* based on cygwin32.h by Andy Piper <andy@xemacs.org> */
diff --text -u 'xemacs-21.5.30/src/s/netbsd.h' 'xemacs-21.5.31/src/s/netbsd.h'
Index: ./src/s/netbsd.h
--- ./src/s/netbsd.h Wed Apr 27 00:57:31 2011
+++ ./src/s/netbsd.h Fri Apr 29 22:31:17 2011
@@ -1,6 +1,23 @@
/* Synched up with: FSF 19.31. */
-/* s/ file for netbsd system. */
+/* s/ file for netbsd system.
+ Copyright (C) 1997, 2000, 2001 Martin Buchholz
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
/* Get most of the stuff from bsd4.3 */
#include "bsd4-3.h"
diff --text -u 'xemacs-21.5.30/src/s/sco7.h' 'xemacs-21.5.31/src/s/sco7.h'
Index: ./src/s/sco7.h
--- ./src/s/sco7.h Wed Apr 27 00:57:31 2011
+++ ./src/s/sco7.h Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.31. */
diff --text -u 'xemacs-21.5.30/src/s/sol2.h' 'xemacs-21.5.31/src/s/sol2.h'
Index: ./src/s/sol2.h
--- ./src/s/sol2.h Wed Apr 27 00:57:31 2011
+++ ./src/s/sol2.h Fri Apr 29 22:31:17 2011
@@ -1,3 +1,21 @@
+/* Copyright (C) 2000, 2003 Martin Buchholz
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
+
+
/* Synched up with: Completely divergent from FSF. */
#define SOLARIS2 1
#define POSIX 1
diff --text -u 'xemacs-21.5.30/src/s/template.h' 'xemacs-21.5.31/src/s/template.h'
Index: ./src/s/template.h
--- ./src/s/template.h Wed Apr 27 00:57:31 2011
+++ ./src/s/template.h Fri Apr 29 22:31:17 2011
@@ -5,20 +5,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.31. */
diff --text -u 'xemacs-21.5.30/src/s/usg5-4.h' 'xemacs-21.5.31/src/s/usg5-4.h'
Index: ./src/s/usg5-4.h
--- ./src/s/usg5-4.h Wed Apr 27 00:57:31 2011
+++ ./src/s/usg5-4.h Fri Apr 29 22:31:17 2011
@@ -3,20 +3,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.31. */
diff --text -u 'xemacs-21.5.30/src/s/win32-common.h' 'xemacs-21.5.31/src/s/win32-common.h'
Index: ./src/s/win32-common.h
--- ./src/s/win32-common.h Wed Apr 27 00:57:31 2011
+++ ./src/s/win32-common.h Fri Apr 29 22:31:17 2011
@@ -4,20 +4,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* See win32.c for info about the different Windows files in XEmacs. */
diff --text -u 'xemacs-21.5.30/src/s/win32-native.h' 'xemacs-21.5.31/src/s/win32-native.h'
Index: ./src/s/win32-native.h
--- ./src/s/win32-native.h Wed Apr 27 00:57:31 2011
+++ ./src/s/win32-native.h Fri Apr 29 22:31:17 2011
@@ -4,20 +4,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* See win32.c for info about the different Windows files in XEmacs. */
diff --text -u 'xemacs-21.5.30/src/s/windowsnt.h' 'xemacs-21.5.31/src/s/windowsnt.h'
Index: ./src/s/windowsnt.h
--- ./src/s/windowsnt.h Wed Apr 27 00:57:31 2011
+++ ./src/s/windowsnt.h Fri Apr 29 22:31:17 2011
@@ -4,20 +4,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.31. */
diff --text -u 'xemacs-21.5.30/src/scrollbar-gtk.c' 'xemacs-21.5.31/src/scrollbar-gtk.c'
Index: ./src/scrollbar-gtk.c
--- ./src/scrollbar-gtk.c Wed Apr 27 00:57:31 2011
+++ ./src/scrollbar-gtk.c Fri Apr 29 22:31:17 2011
@@ -7,10 +7,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
/* Gtk version by William M. Perry */
diff --text -u 'xemacs-21.5.30/src/scrollbar-gtk.h' 'xemacs-21.5.31/src/scrollbar-gtk.h'
Index: ./src/scrollbar-gtk.h
--- ./src/scrollbar-gtk.h Wed Apr 27 00:57:31 2011
+++ ./src/scrollbar-gtk.h Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/scrollbar-msw.c' 'xemacs-21.5.31/src/scrollbar-msw.c'
Index: ./src/scrollbar-msw.c
--- ./src/scrollbar-msw.c Wed Apr 27 00:57:31 2011
+++ ./src/scrollbar-msw.c Fri Apr 29 22:31:17 2011
@@ -7,10 +7,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/scrollbar-msw.h' 'xemacs-21.5.31/src/scrollbar-msw.h'
Index: ./src/scrollbar-msw.h
--- ./src/scrollbar-msw.h Wed Apr 27 00:57:31 2011
+++ ./src/scrollbar-msw.h Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/scrollbar-x.c' 'xemacs-21.5.31/src/scrollbar-x.c'
Index: ./src/scrollbar-x.c
--- ./src/scrollbar-x.c Wed Apr 27 00:57:31 2011
+++ ./src/scrollbar-x.c Fri Apr 29 22:31:17 2011
@@ -7,10 +7,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/scrollbar-x.h' 'xemacs-21.5.31/src/scrollbar-x.h'
Index: ./src/scrollbar-x.h
--- ./src/scrollbar-x.h Wed Apr 27 00:57:31 2011
+++ ./src/scrollbar-x.h Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/scrollbar.c' 'xemacs-21.5.31/src/scrollbar.c'
Index: ./src/scrollbar.c
--- ./src/scrollbar.c Wed Apr 27 00:57:31 2011
+++ ./src/scrollbar.c Fri Apr 29 22:31:17 2011
@@ -7,10 +7,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/scrollbar.h' 'xemacs-21.5.31/src/scrollbar.h'
Index: ./src/scrollbar.h
--- ./src/scrollbar.h Wed Apr 27 00:57:31 2011
+++ ./src/scrollbar.h Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/search.c' 'xemacs-21.5.31/src/search.c'
Index: ./src/search.c
--- ./src/search.c Wed Apr 27 00:57:31 2011
+++ ./src/search.c Fri Apr 29 22:31:17 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.29, except for region-cache stuff. */
diff --text -u 'xemacs-21.5.30/src/select-gtk.c' 'xemacs-21.5.31/src/select-gtk.c'
Index: ./src/select-gtk.c
--- ./src/select-gtk.c Wed Apr 27 00:57:31 2011
+++ ./src/select-gtk.c Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not synched with FSF. */
diff --text -u 'xemacs-21.5.30/src/select-msw.c' 'xemacs-21.5.31/src/select-msw.c'
Index: ./src/select-msw.c
--- ./src/select-msw.c Wed Apr 27 00:57:31 2011
+++ ./src/select-msw.c Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not synched with FSF. */
diff --text -u 'xemacs-21.5.30/src/select-x.c' 'xemacs-21.5.31/src/select-x.c'
Index: ./src/select-x.c
--- ./src/select-x.c Wed Apr 27 00:57:31 2011
+++ ./src/select-x.c Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not synched with FSF. */
diff --text -u 'xemacs-21.5.30/src/select-xlike-inc.c' 'xemacs-21.5.31/src/select-xlike-inc.c'
Index: ./src/select-xlike-inc.c
--- ./src/select-xlike-inc.c Wed Apr 27 00:57:31 2011
+++ ./src/select-xlike-inc.c Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not synched with FSF. */
diff --text -u 'xemacs-21.5.30/src/select.c' 'xemacs-21.5.31/src/select.c'
Index: ./src/select.c
--- ./src/select.c Wed Apr 27 00:57:31 2011
+++ ./src/select.c Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not synched with FSF. */
diff --text -u 'xemacs-21.5.30/src/select.h' 'xemacs-21.5.31/src/select.h'
Index: ./src/select.h
--- ./src/select.h Wed Apr 27 00:57:31 2011
+++ ./src/select.h Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/sgiplay.c' 'xemacs-21.5.31/src/sgiplay.c'
Index: ./src/sgiplay.c
--- ./src/sgiplay.c Wed Apr 27 00:57:31 2011
+++ ./src/sgiplay.c Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/sheap.c' 'xemacs-21.5.31/src/sheap.c'
Index: ./src/sheap.c
--- ./src/sheap.c Wed Apr 27 00:57:31 2011
+++ ./src/sheap.c Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.*/
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include "lisp.h"
diff --text -u 'xemacs-21.5.30/src/signal.c' 'xemacs-21.5.31/src/signal.c'
Index: ./src/signal.c
--- ./src/signal.c Wed Apr 27 00:57:31 2011
+++ ./src/signal.c Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not synched with FSF. Split out of keyboard.c. */
diff --text -u 'xemacs-21.5.30/src/sound.c' 'xemacs-21.5.31/src/sound.c'
Index: ./src/sound.c
--- ./src/sound.c Wed Apr 27 00:57:31 2011
+++ ./src/sound.c Fri Apr 29 22:31:17 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/sound.h' 'xemacs-21.5.31/src/sound.h'
Index: ./src/sound.h
--- ./src/sound.h Wed Apr 27 00:57:31 2011
+++ ./src/sound.h Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/specifier.c' 'xemacs-21.5.31/src/specifier.c'
Index: ./src/specifier.c
--- ./src/specifier.c Wed Apr 27 00:57:31 2011
+++ ./src/specifier.c Fri Apr 29 22:31:17 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/specifier.h' 'xemacs-21.5.31/src/specifier.h'
Index: ./src/specifier.h
--- ./src/specifier.h Wed Apr 27 00:57:31 2011
+++ ./src/specifier.h Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/src-headers' 'xemacs-21.5.31/src/src-headers'
Index: ./src/src-headers
--- ./src/src-headers Wed Apr 27 00:57:31 2011
+++ ./src/src-headers Fri Apr 29 22:31:17 2011
@@ -2,21 +2,19 @@
# Copyright (C) 1998 Free Software Foundation, Inc.
# This file is part of XEmacs.
-#
-# XEmacs is free software; you can redistribute it and/or modify it
+#
+# XEmacs is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any
-# later version.
-#
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
# XEmacs is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
# Author: Martin Buchholz
eval 'exec perl -w -S $0 ${1+"$@"}'
diff --text -u 'xemacs-21.5.30/src/strcat.c' 'xemacs-21.5.31/src/strcat.c'
Index: ./src/strcat.c
--- ./src/strcat.c Wed Apr 27 00:57:31 2011
+++ ./src/strcat.c Fri Apr 29 22:31:17 2011
@@ -1,20 +1,18 @@
/* Copyright (C) 1991 Free Software Foundation, Inc.
This file is part of the GNU C Library.
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
+The GNU C Library is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with the GNU C Library. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/strftime.c' 'xemacs-21.5.31/src/strftime.c'
Index: ./src/strftime.c
--- ./src/strftime.c Wed Apr 27 00:57:31 2011
+++ ./src/strftime.c Fri Apr 29 22:31:17 2011
@@ -1,21 +1,20 @@
/* strftime - custom formatting of date and/or time
Copyright (C) 1989, 1991, 1992 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
+ This file is part of XEmacs.
+
+ XEmacs is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation, either version 3 of the License, or (at your
+ option) any later version.
+
+ XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
You should have received a copy of the GNU General Public License
- along with this program; see the file COPYING. If not, write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
+ along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
/* This file has been ... uhhhhh ... Mule-ized. Yeah.
diff --text -u 'xemacs-21.5.30/src/sunpro.c' 'xemacs-21.5.31/src/sunpro.c'
Index: ./src/sunpro.c
--- ./src/sunpro.c Wed Apr 27 00:57:31 2011
+++ ./src/sunpro.c Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/symbols.c' 'xemacs-21.5.31/src/symbols.c'
Index: ./src/symbols.c
--- ./src/symbols.c Wed Apr 27 00:57:31 2011
+++ ./src/symbols.c Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/symeval.h' 'xemacs-21.5.31/src/symeval.h'
Index: ./src/symeval.h
--- ./src/symeval.h Wed Apr 27 00:57:31 2011
+++ ./src/symeval.h Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/symsinit.h' 'xemacs-21.5.31/src/symsinit.h'
Index: ./src/symsinit.h
--- ./src/symsinit.h Wed Apr 27 00:57:31 2011
+++ ./src/symsinit.h Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/syntax.c' 'xemacs-21.5.31/src/syntax.c'
Index: ./src/syntax.c
--- ./src/syntax.c Wed Apr 27 00:57:31 2011
+++ ./src/syntax.c Fri Apr 29 22:31:17 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.28. */
diff --text -u 'xemacs-21.5.30/src/syntax.h' 'xemacs-21.5.31/src/syntax.h'
Index: ./src/syntax.h
--- ./src/syntax.h Wed Apr 27 00:57:31 2011
+++ ./src/syntax.h Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.28. */
diff --text -u 'xemacs-21.5.30/src/sysdep.c' 'xemacs-21.5.31/src/sysdep.c'
Index: ./src/sysdep.c
--- ./src/sysdep.c Wed Apr 27 00:57:31 2011
+++ ./src/sysdep.c Fri Apr 29 22:31:17 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30 except for some Windows-NT crap. */
diff --text -u 'xemacs-21.5.30/src/sysdep.h' 'xemacs-21.5.31/src/sysdep.h'
Index: ./src/sysdep.h
--- ./src/sysdep.h Wed Apr 27 00:57:31 2011
+++ ./src/sysdep.h Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. Split out of sysdep.c/emacs.c. */
diff --text -u 'xemacs-21.5.30/src/sysdir.h' 'xemacs-21.5.31/src/sysdir.h'
Index: ./src/sysdir.h
--- ./src/sysdir.h Wed Apr 27 00:57:31 2011
+++ ./src/sysdir.h Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not really in FSF. */
diff --text -u 'xemacs-21.5.30/src/sysdll.c' 'xemacs-21.5.31/src/sysdll.c'
Index: ./src/sysdll.c
--- ./src/sysdll.c Wed Apr 27 00:57:31 2011
+++ ./src/sysdll.c Fri Apr 29 22:31:17 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* This file has been Mule-ized, Ben Wing, 1-26-10. */
diff --text -u 'xemacs-21.5.30/src/sysdll.h' 'xemacs-21.5.31/src/sysdll.h'
Index: ./src/sysdll.h
--- ./src/sysdll.h Wed Apr 27 00:57:31 2011
+++ ./src/sysdll.h Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* This file has been Mule-ized, Ben Wing, 1-26-10. */
diff --text -u 'xemacs-21.5.30/src/sysfile.h' 'xemacs-21.5.31/src/sysfile.h'
Index: ./src/sysfile.h
--- ./src/sysfile.h Wed Apr 27 00:57:31 2011
+++ ./src/sysfile.h Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not really in FSF. */
diff --text -u 'xemacs-21.5.30/src/sysfloat.h' 'xemacs-21.5.31/src/sysfloat.h'
Index: ./src/sysfloat.h
--- ./src/sysfloat.h Wed Apr 27 00:57:31 2011
+++ ./src/sysfloat.h Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not really in FSF. */
diff --text -u 'xemacs-21.5.30/src/sysgdkx.h' 'xemacs-21.5.31/src/sysgdkx.h'
Index: ./src/sysgdkx.h
--- ./src/sysgdkx.h Wed Apr 27 00:57:31 2011
+++ ./src/sysgdkx.h Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/sysgtk.h' 'xemacs-21.5.31/src/sysgtk.h'
Index: ./src/sysgtk.h
--- ./src/sysgtk.h Wed Apr 27 00:57:31 2011
+++ ./src/sysgtk.h Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/sysproc.h' 'xemacs-21.5.31/src/sysproc.h'
Index: ./src/sysproc.h
--- ./src/sysproc.h Wed Apr 27 00:57:31 2011
+++ ./src/sysproc.h Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not really in FSF. */
diff --text -u 'xemacs-21.5.30/src/syspwd.h' 'xemacs-21.5.31/src/syspwd.h'
Index: ./src/syspwd.h
--- ./src/syspwd.h Wed Apr 27 00:57:31 2011
+++ ./src/syspwd.h Fri Apr 29 22:31:17 2011
@@ -2,10 +2,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -13,9 +13,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not really in FSF. */
diff --text -u 'xemacs-21.5.30/src/syssignal.h' 'xemacs-21.5.31/src/syssignal.h'
Index: ./src/syssignal.h
--- ./src/syssignal.h Wed Apr 27 00:57:31 2011
+++ ./src/syssignal.h Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/systime.h' 'xemacs-21.5.31/src/systime.h'
Index: ./src/systime.h
--- ./src/systime.h Wed Apr 27 00:57:31 2011
+++ ./src/systime.h Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/systty.h' 'xemacs-21.5.31/src/systty.h'
Index: ./src/systty.h
--- ./src/systty.h Wed Apr 27 00:57:31 2011
+++ ./src/systty.h Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/syswait.h' 'xemacs-21.5.31/src/syswait.h'
Index: ./src/syswait.h
--- ./src/syswait.h Wed Apr 27 00:57:31 2011
+++ ./src/syswait.h Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#ifndef INCLUDED_syswait_h_
#define INCLUDED_syswait_h_
diff --text -u 'xemacs-21.5.30/src/syswindows.h' 'xemacs-21.5.31/src/syswindows.h'
Index: ./src/syswindows.h
--- ./src/syswindows.h Wed Apr 27 00:57:31 2011
+++ ./src/syswindows.h Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/termcap.c' 'xemacs-21.5.31/src/termcap.c'
Index: ./src/termcap.c
--- ./src/termcap.c Wed Apr 27 00:57:31 2011
+++ ./src/termcap.c Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not synched with FSF. */
diff --text -u 'xemacs-21.5.30/src/terminfo.c' 'xemacs-21.5.31/src/terminfo.c'
Index: ./src/terminfo.c
--- ./src/terminfo.c Wed Apr 27 00:57:31 2011
+++ ./src/terminfo.c Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/tests.c' 'xemacs-21.5.31/src/tests.c'
Index: ./src/tests.c
--- ./src/tests.c Wed Apr 27 00:57:31 2011
+++ ./src/tests.c Fri Apr 29 22:31:17 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Author: Martin Buchholz
diff --text -u 'xemacs-21.5.30/src/text.c' 'xemacs-21.5.31/src/text.c'
Index: ./src/text.c
--- ./src/text.c Wed Apr 27 00:57:31 2011
+++ ./src/text.c Fri Apr 29 22:31:17 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/text.h' 'xemacs-21.5.31/src/text.h'
Index: ./src/text.h
--- ./src/text.h Wed Apr 27 00:57:31 2011
+++ ./src/text.h Fri Apr 29 22:31:17 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/toolbar-gtk.c' 'xemacs-21.5.31/src/toolbar-gtk.c'
Index: ./src/toolbar-gtk.c
--- ./src/toolbar-gtk.c Wed Apr 27 00:57:31 2011
+++ ./src/toolbar-gtk.c Fri Apr 29 22:31:17 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/toolbar-msw.c' 'xemacs-21.5.31/src/toolbar-msw.c'
Index: ./src/toolbar-msw.c
--- ./src/toolbar-msw.c Wed Apr 27 00:57:31 2011
+++ ./src/toolbar-msw.c Fri Apr 29 22:31:17 2011
@@ -7,10 +7,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* This implementation by Andy Piper <andy@xemacs.org>, with bits
borrowed from toolbar-x.c */
diff --text -u 'xemacs-21.5.30/src/toolbar-x.c' 'xemacs-21.5.31/src/toolbar-x.c'
Index: ./src/toolbar-x.c
--- ./src/toolbar-x.c Wed Apr 27 00:57:31 2011
+++ ./src/toolbar-x.c Fri Apr 29 22:31:17 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/toolbar-xlike.c' 'xemacs-21.5.31/src/toolbar-xlike.c'
Index: ./src/toolbar-xlike.c
--- ./src/toolbar-xlike.c Wed Apr 27 00:57:31 2011
+++ ./src/toolbar-xlike.c Fri Apr 29 22:31:17 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/toolbar-xlike.h' 'xemacs-21.5.31/src/toolbar-xlike.h'
Index: ./src/toolbar-xlike.h
--- ./src/toolbar-xlike.h Wed Apr 27 00:57:31 2011
+++ ./src/toolbar-xlike.h Fri Apr 29 22:31:17 2011
@@ -5,7 +5,20 @@
** Created by: William M. Perry
** Copyright (c) 2001 Free Software Foundation
**
-*/
+** This file is part of XEmacs.
+**
+** XEmacs is free software: you can redistribute it and/or modify it
+** under the terms of the GNU General Public License as published by the
+** Free Software Foundation, either version 3 of the License, or (at your
+** option) any later version.
+**
+** XEmacs is distributed in the hope that it will be useful, but WITHOUT
+** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+** FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+** for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#ifndef __TOOLBAR_XLIKE_H__
#define __TOOLBAR_XLIKE_H__
diff --text -u 'xemacs-21.5.30/src/toolbar.c' 'xemacs-21.5.31/src/toolbar.c'
Index: ./src/toolbar.c
--- ./src/toolbar.c Wed Apr 27 00:57:31 2011
+++ ./src/toolbar.c Fri Apr 29 22:31:17 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/toolbar.h' 'xemacs-21.5.31/src/toolbar.h'
Index: ./src/toolbar.h
--- ./src/toolbar.h Wed Apr 27 00:57:31 2011
+++ ./src/toolbar.h Fri Apr 29 22:31:17 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/tooltalk.c' 'xemacs-21.5.31/src/tooltalk.c'
Index: ./src/tooltalk.c
--- ./src/tooltalk.c Wed Apr 27 00:57:31 2011
+++ ./src/tooltalk.c Fri Apr 29 22:31:17 2011
@@ -5,10 +5,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/tooltalk.doc' 'xemacs-21.5.31/src/tooltalk.doc'
Index: ./src/tooltalk.doc
--- ./src/tooltalk.doc Wed Apr 27 00:57:31 2011
+++ ./src/tooltalk.doc Fri Apr 29 22:31:17 2011
@@ -1,3 +1,20 @@
+Copyright (C) 1993 Sun Microsystems, Inc.
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
Emacs Tooltalk API Summary
diff --text -u 'xemacs-21.5.30/src/tooltalk.h' 'xemacs-21.5.31/src/tooltalk.h'
Index: ./src/tooltalk.h
--- ./src/tooltalk.h Wed Apr 27 00:57:31 2011
+++ ./src/tooltalk.h Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,11 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
-
-*/
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/tparam.c' 'xemacs-21.5.31/src/tparam.c'
Index: ./src/tparam.c
--- ./src/tparam.c Wed Apr 27 00:57:31 2011
+++ ./src/tparam.c Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not synched with FSF. */
diff --text -u 'xemacs-21.5.30/src/ui-byhand.c' 'xemacs-21.5.31/src/ui-byhand.c'
Index: ./src/ui-byhand.c
--- ./src/ui-byhand.c Wed Apr 27 00:57:31 2011
+++ ./src/ui-byhand.c Fri Apr 29 22:31:17 2011
@@ -14,10 +14,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -25,10 +25,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-Boston, MA 02110-1301, USA.
-*/
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#include "gui.h"
diff --text -u 'xemacs-21.5.30/src/ui-gtk.c' 'xemacs-21.5.31/src/ui-gtk.c'
Index: ./src/ui-gtk.c
--- ./src/ui-gtk.c Wed Apr 27 00:57:31 2011
+++ ./src/ui-gtk.c Fri Apr 29 22:31:17 2011
@@ -8,20 +8,20 @@
**
** This file is part of XEmacs.
**
-** XEmacs is free software; you can redistribute it and/or modify it
-** under the terms of the GNU General Public License as published by the
-** Free Software Foundation; either version 2, or (at your option) any
-** later version.
+** This file is part of XEmacs.
**
+** XEmacs is free software: you can redistribute it and/or modify it
+** under the terms of the GNU General Public License as published by the
+** Free Software Foundation, either version 3 of the License, or (at your
+** option) any later version.
+**
** XEmacs is distributed in the hope that it will be useful, but WITHOUT
** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
** FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
** for more details.
-**
+**
** You should have received a copy of the GNU General Public License
-** along with XEmacs; see the file COPYING. If not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-** Boston, MA 02110-1301, USA. */
+** along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include "lisp.h"
diff --text -u 'xemacs-21.5.30/src/ui-gtk.h' 'xemacs-21.5.31/src/ui-gtk.h'
Index: ./src/ui-gtk.h
--- ./src/ui-gtk.h Wed Apr 27 00:57:31 2011
+++ ./src/ui-gtk.h Fri Apr 29 22:31:17 2011
@@ -7,20 +7,18 @@
**
** This file is part of XEmacs.
**
-** XEmacs is free software; you can redistribute it and/or modify it
+** XEmacs is free software: you can redistribute it and/or modify it
** under the terms of the GNU General Public License as published by the
-** Free Software Foundation; either version 2, or (at your option) any
-** later version.
-**
+** Free Software Foundation, either version 3 of the License, or (at your
+** option) any later version.
+**
** XEmacs is distributed in the hope that it will be useful, but WITHOUT
** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
** FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
** for more details.
-**
+**
** You should have received a copy of the GNU General Public License
-** along with XEmacs; see the file COPYING. If not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-** Boston, MA 02110-1301, USA. */
+** along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#ifndef __UI_GTK_H__
#define __UI_GTK_H__
diff --text -u 'xemacs-21.5.30/src/undo.c' 'xemacs-21.5.31/src/undo.c'
Index: ./src/undo.c
--- ./src/undo.c Wed Apr 27 00:57:31 2011
+++ ./src/undo.c Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.28. */
diff --text -u 'xemacs-21.5.30/src/unexaix.c' 'xemacs-21.5.31/src/unexaix.c'
Index: ./src/unexaix.c
--- ./src/unexaix.c Wed Apr 27 00:57:31 2011
+++ ./src/unexaix.c Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 20.2. */
diff --text -u 'xemacs-21.5.30/src/unexalpha.c' 'xemacs-21.5.31/src/unexalpha.c'
Index: ./src/unexalpha.c
--- ./src/unexalpha.c Wed Apr 27 00:57:31 2011
+++ ./src/unexalpha.c Fri Apr 29 22:31:17 2011
@@ -4,20 +4,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.31. */
diff --text -u 'xemacs-21.5.30/src/unexcw.c' 'xemacs-21.5.31/src/unexcw.c'
Index: ./src/unexcw.c
--- ./src/unexcw.c Wed Apr 27 00:57:31 2011
+++ ./src/unexcw.c Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,11 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
-
-*/
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* This is a complete rewrite, some code snarfed from unexnt.c and
unexec.c, Andy Piper (andy@xemacs.org) 13-1-98 */
diff --text -u 'xemacs-21.5.30/src/unexec.c' 'xemacs-21.5.31/src/unexec.c'
Index: ./src/unexec.c
--- ./src/unexec.c Wed Apr 27 00:57:31 2011
+++ ./src/unexec.c Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.31. */
diff --text -u 'xemacs-21.5.30/src/unexelf.c' 'xemacs-21.5.31/src/unexelf.c'
Index: ./src/unexelf.c
--- ./src/unexelf.c Wed Apr 27 00:57:31 2011
+++ ./src/unexelf.c Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 20.4. */
diff --text -u 'xemacs-21.5.30/src/unexhp9k800.c' 'xemacs-21.5.31/src/unexhp9k800.c'
Index: ./src/unexhp9k800.c
--- ./src/unexhp9k800.c Wed Apr 27 00:57:31 2011
+++ ./src/unexhp9k800.c Fri Apr 29 22:31:17 2011
@@ -1,12 +1,13 @@
/* Unexec for HP 9000 Series 800 machines.
- Bob Desinger <hpsemc!bd@hplabs.hp.com>
+
+Copyright 1996 Bob Desinger <hpsemc!bd@hplabs.hp.com>
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not synched with FSF. */
diff --text -u 'xemacs-21.5.30/src/unexnt.c' 'xemacs-21.5.31/src/unexnt.c'
Index: ./src/unexnt.c
--- ./src/unexnt.c Wed Apr 27 00:57:31 2011
+++ ./src/unexnt.c Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,10 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
-
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
Geoff Voelker (voelker@cs.washington.edu) 8-12-94 */
/* Adapted for XEmacs by David Hobley <david@spook-le0.cia.com.au> */
diff --text -u 'xemacs-21.5.30/src/unexsol2-6.c' 'xemacs-21.5.31/src/unexsol2-6.c'
Index: ./src/unexsol2-6.c
--- ./src/unexsol2-6.c Wed Apr 27 00:57:31 2011
+++ ./src/unexsol2-6.c Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/unicode.c' 'xemacs-21.5.31/src/unicode.c'
Index: ./src/unicode.c
--- ./src/unicode.c Wed Apr 27 00:57:31 2011
+++ ./src/unicode.c Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 20.3. Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/universe.h' 'xemacs-21.5.31/src/universe.h'
Index: ./src/universe.h
--- ./src/universe.h Wed Apr 27 00:57:31 2011
+++ ./src/universe.h Fri Apr 29 22:31:17 2011
@@ -2,10 +2,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -13,9 +13,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/vdb-fake.c' 'xemacs-21.5.31/src/vdb-fake.c'
Index: ./src/vdb-fake.c
--- ./src/vdb-fake.c Wed Apr 27 00:57:31 2011
+++ ./src/vdb-fake.c Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/vdb-mach.c' 'xemacs-21.5.31/src/vdb-mach.c'
Index: ./src/vdb-mach.c
--- ./src/vdb-mach.c Wed Apr 27 00:57:31 2011
+++ ./src/vdb-mach.c Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/vdb-posix.c' 'xemacs-21.5.31/src/vdb-posix.c'
Index: ./src/vdb-posix.c
--- ./src/vdb-posix.c Wed Apr 27 00:57:31 2011
+++ ./src/vdb-posix.c Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/vdb-win32.c' 'xemacs-21.5.31/src/vdb-win32.c'
Index: ./src/vdb-win32.c
--- ./src/vdb-win32.c Wed Apr 27 00:57:31 2011
+++ ./src/vdb-win32.c Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/vdb.c' 'xemacs-21.5.31/src/vdb.c'
Index: ./src/vdb.c
--- ./src/vdb.c Wed Apr 27 00:57:31 2011
+++ ./src/vdb.c Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,9 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/vdb.h' 'xemacs-21.5.31/src/vdb.h'
Index: ./src/vdb.h
--- ./src/vdb.h Wed Apr 27 00:57:31 2011
+++ ./src/vdb.h Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/vm-limit.c' 'xemacs-21.5.31/src/vm-limit.c'
Index: ./src/vm-limit.c
--- ./src/vm-limit.c Wed Apr 27 00:57:31 2011
+++ ./src/vm-limit.c Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/widget.c' 'xemacs-21.5.31/src/widget.c'
Index: ./src/widget.c
--- ./src/widget.c Wed Apr 27 00:57:31 2011
+++ ./src/widget.c Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/win32.c' 'xemacs-21.5.31/src/win32.c'
Index: ./src/win32.c
--- ./src/win32.c Wed Apr 27 00:57:31 2011
+++ ./src/win32.c Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include "lisp.h"
diff --text -u 'xemacs-21.5.30/src/window-impl.h' 'xemacs-21.5.31/src/window-impl.h'
Index: ./src/window-impl.h
--- ./src/window-impl.h Wed Apr 27 00:57:31 2011
+++ ./src/window-impl.h Fri Apr 29 22:31:17 2011
@@ -7,10 +7,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/window.c' 'xemacs-21.5.31/src/window.c'
Index: ./src/window.c
--- ./src/window.c Wed Apr 27 00:57:31 2011
+++ ./src/window.c Fri Apr 29 22:31:17 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
/* Beginning to diverge significantly. */
diff --text -u 'xemacs-21.5.30/src/window.h' 'xemacs-21.5.31/src/window.h'
Index: ./src/window.h
--- ./src/window.h Wed Apr 27 00:57:32 2011
+++ ./src/window.h Fri Apr 29 22:31:17 2011
@@ -7,10 +7,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: FSF 19.30. */
diff --text -u 'xemacs-21.5.30/src/winslots.h' 'xemacs-21.5.31/src/winslots.h'
Index: ./src/winslots.h
--- ./src/winslots.h Wed Apr 27 00:57:32 2011
+++ ./src/winslots.h Fri Apr 29 22:31:17 2011
@@ -6,10 +6,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,9 +17,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Split out of window.h and window.c
by Kirill Katsnelson <kkm@kis.ru>, May 1998 */
diff --text -u 'xemacs-21.5.30/src/xemacs.def.in.in' 'xemacs-21.5.31/src/xemacs.def.in.in'
Index: ./src/xemacs.def.in.in
--- ./src/xemacs.def.in.in Wed Apr 27 00:57:32 2011
+++ ./src/xemacs.def.in.in Fri Apr 29 22:31:17 2011
@@ -4,20 +4,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
-XEmacs is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* The symbol to import/export is on the left. If the symbol is not
meant to be used directly, but a macro or inline function in the
diff --text -u 'xemacs-21.5.30/src/xintrinsic.h' 'xemacs-21.5.31/src/xintrinsic.h'
Index: ./src/xintrinsic.h
--- ./src/xintrinsic.h Wed Apr 27 00:57:32 2011
+++ ./src/xintrinsic.h Fri Apr 29 22:31:17 2011
@@ -2,10 +2,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -13,9 +13,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/xintrinsicp.h' 'xemacs-21.5.31/src/xintrinsicp.h'
Index: ./src/xintrinsicp.h
--- ./src/xintrinsicp.h Wed Apr 27 00:57:32 2011
+++ ./src/xintrinsicp.h Fri Apr 29 22:31:17 2011
@@ -2,10 +2,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -13,9 +13,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/xmmanagerp.h' 'xemacs-21.5.31/src/xmmanagerp.h'
Index: ./src/xmmanagerp.h
--- ./src/xmmanagerp.h Wed Apr 27 00:57:32 2011
+++ ./src/xmmanagerp.h Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/xmotif.h' 'xemacs-21.5.31/src/xmotif.h'
Index: ./src/xmotif.h
--- ./src/xmotif.h Wed Apr 27 00:57:32 2011
+++ ./src/xmotif.h Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/src/xmprimitivep.h' 'xemacs-21.5.31/src/xmprimitivep.h'
Index: ./src/xmprimitivep.h
--- ./src/xmprimitivep.h Wed Apr 27 00:57:32 2011
+++ ./src/xmprimitivep.h Fri Apr 29 22:31:17 2011
@@ -3,10 +3,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,9 +14,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* Synched up with: Not in FSF. */
diff --text -u 'xemacs-21.5.30/tests/ChangeLog' 'xemacs-21.5.31/tests/ChangeLog'
Index: ./tests/ChangeLog
--- ./tests/ChangeLog Wed Apr 27 00:57:42 2011
+++ ./tests/ChangeLog Fri Apr 29 22:31:39 2011
@@ -1,3 +1,7 @@
+2011-04-29 Stephen J. Turnbull <stephen@xemacs.org>
+
+ * XEmacs 21.5.31 "ginger" is released.
+
2011-04-26 Stephen J. Turnbull <stephen@xemacs.org>
* XEmacs 21.5.30 "garlic" is released.
@@ -2065,3 +2069,22 @@
* ChangeLog: new file
+
+ChangeLog entries synched from GNU Emacs are the property of the FSF.
+Other ChangeLog entries are usually the property of the author of the
+change.
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
diff --text -u 'xemacs-21.5.30/tests/Dnd/droptest.el' 'xemacs-21.5.31/tests/Dnd/droptest.el'
Index: ./tests/Dnd/droptest.el
--- ./tests/Dnd/droptest.el Wed Apr 27 00:57:32 2011
+++ ./tests/Dnd/droptest.el Fri Apr 29 22:31:17 2011
@@ -1,6 +1,24 @@
;; a short example how to use the new Drag'n'Drop API in
;; combination with extents.
-;;
+
+;; Copyright (C) 1998 Oliver Graf <ograf@fga.de>
+
+;; This file is part of XEmacs.
+
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Synched up with: Not in FSF.
(defun dnd-drop-message (event object text)
(message "Dropped %s with :%s" text object)
diff --text -u 'xemacs-21.5.30/tests/Dnd/droptest.sh' 'xemacs-21.5.31/tests/Dnd/droptest.sh'
Index: ./tests/Dnd/droptest.sh
--- ./tests/Dnd/droptest.sh Wed Apr 27 00:57:32 2011
+++ ./tests/Dnd/droptest.sh Fri Apr 29 22:31:17 2011
@@ -1,5 +1,24 @@
#!/bin/sh
+# Copyright (C) 1998 Oliver Graf <ograf@fga.de>
+
+# This file is part of XEmacs.
+
+# XEmacs is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+
+# XEmacs is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
+# Synched up with: Not in FSF.
+
TEMPDIR=/tmp
cat README > $TEMPDIR/DropTest.txt
diff --text -u 'xemacs-21.5.30/tests/autoconf/regressiontest.pl' 'xemacs-21.5.31/tests/autoconf/regressiontest.pl'
Index: ./tests/autoconf/regressiontest.pl
--- ./tests/autoconf/regressiontest.pl Wed Apr 27 00:57:32 2011
+++ ./tests/autoconf/regressiontest.pl Fri Apr 29 22:31:17 2011
@@ -3,21 +3,19 @@
# Copyright 2005 Malcolm Purvis
#
# This file is part of XEmacs.
-#
-# XEmacs is free software; you can redistribute it and/or modify it
+#
+# XEmacs is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any
-# later version.
-#
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
# XEmacs is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
#
# Commentary
#
diff --text -u 'xemacs-21.5.30/tests/automated/base64-tests.el' 'xemacs-21.5.31/tests/automated/base64-tests.el'
Index: ./tests/automated/base64-tests.el
--- ./tests/automated/base64-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/base64-tests.el Fri Apr 29 22:31:17 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/automated/byte-compiler-tests.el' 'xemacs-21.5.31/tests/automated/byte-compiler-tests.el'
Index: ./tests/automated/byte-compiler-tests.el
--- ./tests/automated/byte-compiler-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/byte-compiler-tests.el Fri Apr 29 22:31:17 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/automated/c-tests.el' 'xemacs-21.5.31/tests/automated/c-tests.el'
Index: ./tests/automated/c-tests.el
--- ./tests/automated/c-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/c-tests.el Fri Apr 29 22:31:17 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/automated/case-tests.el' 'xemacs-21.5.31/tests/automated/case-tests.el'
Index: ./tests/automated/case-tests.el
--- ./tests/automated/case-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/case-tests.el Fri Apr 29 22:31:17 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/automated/ccl-tests.el' 'xemacs-21.5.31/tests/automated/ccl-tests.el'
Index: ./tests/automated/ccl-tests.el
--- ./tests/automated/ccl-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/ccl-tests.el Fri Apr 29 22:31:17 2011
@@ -4,20 +4,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation,59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Section 0. Useful functions to construct test suites.
diff --text -u 'xemacs-21.5.30/tests/automated/database-tests.el' 'xemacs-21.5.31/tests/automated/database-tests.el'
Index: ./tests/automated/database-tests.el
--- ./tests/automated/database-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/database-tests.el Fri Apr 29 22:31:17 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/automated/extent-tests.el' 'xemacs-21.5.31/tests/automated/extent-tests.el'
Index: ./tests/automated/extent-tests.el
--- ./tests/automated/extent-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/extent-tests.el Fri Apr 29 22:31:17 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/automated/file-tests.el' 'xemacs-21.5.31/tests/automated/file-tests.el'
Index: ./tests/automated/file-tests.el
--- ./tests/automated/file-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/file-tests.el Fri Apr 29 22:31:17 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/automated/hash-table-tests.el' 'xemacs-21.5.31/tests/automated/hash-table-tests.el'
Index: ./tests/automated/hash-table-tests.el
--- ./tests/automated/hash-table-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/hash-table-tests.el Fri Apr 29 22:31:17 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/automated/iso-ir-196-test.el' 'xemacs-21.5.31/tests/automated/iso-ir-196-test.el'
Index: ./tests/automated/iso-ir-196-test.el
--- ./tests/automated/iso-ir-196-test.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/iso-ir-196-test.el Fri Apr 29 22:31:17 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/automated/lisp-reader-tests.el' 'xemacs-21.5.31/tests/automated/lisp-reader-tests.el'
Index: ./tests/automated/lisp-reader-tests.el
--- ./tests/automated/lisp-reader-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/lisp-reader-tests.el Fri Apr 29 22:31:17 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/automated/lisp-tests.el' 'xemacs-21.5.31/tests/automated/lisp-tests.el'
Index: ./tests/automated/lisp-tests.el
--- ./tests/automated/lisp-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/lisp-tests.el Fri Apr 29 22:31:17 2011
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/automated/md5-tests.el' 'xemacs-21.5.31/tests/automated/md5-tests.el'
Index: ./tests/automated/md5-tests.el
--- ./tests/automated/md5-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/md5-tests.el Fri Apr 29 22:31:17 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/automated/mule-tests.el' 'xemacs-21.5.31/tests/automated/mule-tests.el'
Index: ./tests/automated/mule-tests.el
--- ./tests/automated/mule-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/mule-tests.el Fri Apr 29 22:31:17 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/automated/os-tests.el' 'xemacs-21.5.31/tests/automated/os-tests.el'
Index: ./tests/automated/os-tests.el
--- ./tests/automated/os-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/os-tests.el Fri Apr 29 22:31:17 2011
@@ -9,20 +9,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/automated/query-coding-tests.el' 'xemacs-21.5.31/tests/automated/query-coding-tests.el'
Index: ./tests/automated/query-coding-tests.el
--- ./tests/automated/query-coding-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/query-coding-tests.el Fri Apr 29 22:31:17 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/automated/regexp-tests.el' 'xemacs-21.5.31/tests/automated/regexp-tests.el'
Index: ./tests/automated/regexp-tests.el
--- ./tests/automated/regexp-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/regexp-tests.el Fri Apr 29 22:31:17 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/automated/region-tests.el' 'xemacs-21.5.31/tests/automated/region-tests.el'
Index: ./tests/automated/region-tests.el
--- ./tests/automated/region-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/region-tests.el Fri Apr 29 22:31:17 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/automated/search-tests.el' 'xemacs-21.5.31/tests/automated/search-tests.el'
Index: ./tests/automated/search-tests.el
--- ./tests/automated/search-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/search-tests.el Fri Apr 29 22:31:17 2011
@@ -10,20 +10,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/automated/symbol-tests.el' 'xemacs-21.5.31/tests/automated/symbol-tests.el'
Index: ./tests/automated/symbol-tests.el
--- ./tests/automated/symbol-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/symbol-tests.el Fri Apr 29 22:31:17 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/automated/syntax-tests.el' 'xemacs-21.5.31/tests/automated/syntax-tests.el'
Index: ./tests/automated/syntax-tests.el
--- ./tests/automated/syntax-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/syntax-tests.el Fri Apr 29 22:31:17 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/automated/tag-tests.el' 'xemacs-21.5.31/tests/automated/tag-tests.el'
Index: ./tests/automated/tag-tests.el
--- ./tests/automated/tag-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/tag-tests.el Fri Apr 29 22:31:17 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/automated/weak-tests.el' 'xemacs-21.5.31/tests/automated/weak-tests.el'
Index: ./tests/automated/weak-tests.el
--- ./tests/automated/weak-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/automated/weak-tests.el Fri Apr 29 22:31:17 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/frame.el' 'xemacs-21.5.31/tests/frame.el'
Index: ./tests/frame.el
--- ./tests/frame.el Wed Apr 27 00:57:32 2011
+++ ./tests/frame.el Fri Apr 29 22:31:17 2011
@@ -2,22 +2,20 @@
;;;
;;; Copyright (C) 1997 Martin Buchholz
;;;
-;;; This file is part of XEmacs.
-;;;
-;;; XEmacs is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2, or (at your
-;;; option) any later version.
-;;;
-;;; XEmacs is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;;; General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with XEmacs; see the file COPYING. If not, write to the Free
-;;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;;; Boston, MA 02110-1301, USA.
+;; This file is part of XEmacs.
+;;
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+;;
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
(defmacro check-frame-geometry (xx yy)
`(loop for frame in (list nil (selected-frame))
diff --text -u 'xemacs-21.5.30/tests/glyph-test.el' 'xemacs-21.5.31/tests/glyph-test.el'
Index: ./tests/glyph-test.el
--- ./tests/glyph-test.el Wed Apr 27 00:57:32 2011
+++ ./tests/glyph-test.el Fri Apr 29 22:31:17 2011
@@ -1,21 +1,19 @@
;;; Copyright (C) 1998 Andy Piper
-;;; This file is part of XEmacs.
-
-;;; XEmacs is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2, or (at your
-;;; option) any later version.
-
-;;; XEmacs is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;;; General Public License for more details.
-
-;;; You should have received a copy of the GNU General Public License
-;;; along with XEmacs; see the file COPYING. If not, write to the Free
-;;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;;; Boston, MA 02110-1301, USA.
+;; This file is part of XEmacs.
+;;
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+;;
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
(set-extent-begin-glyph
(make-extent (point) (point))
diff --text -u 'xemacs-21.5.30/tests/gtk/event-stream-tests.el' 'xemacs-21.5.31/tests/gtk/event-stream-tests.el'
Index: ./tests/gtk/event-stream-tests.el
--- ./tests/gtk/event-stream-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/gtk/event-stream-tests.el Fri Apr 29 22:31:17 2011
@@ -4,21 +4,19 @@
;; Seems to be based on the comment at the end of src/event-stream.c.
;;
;; This file is part of XEmacs.
-;;
-;; XEmacs is free software; you can redistribute it and/or modify it
+
+;; XEmacs is free software: you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by the
-;; Free Software Foundation; either version 2, or (at your option) any
-;; later version.
-;;
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
;; for more details.
-;;
+
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA. */
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;also do this: make two frames, one viewing "*scratch*", the other "foo".
;in *scratch*, type (sit-for 20)^J
diff --text -u 'xemacs-21.5.30/tests/gtk/gnome-test.el' 'xemacs-21.5.31/tests/gtk/gnome-test.el'
Index: ./tests/gtk/gnome-test.el
--- ./tests/gtk/gnome-test.el Wed Apr 27 00:57:32 2011
+++ ./tests/gtk/gnome-test.el Fri Apr 29 22:31:17 2011
@@ -3,21 +3,19 @@
;; Copyright 2000, 2001 William Perry
;;
;; This file is part of XEmacs.
-;;
-;; XEmacs is free software; you can redistribute it and/or modify it
+
+;; XEmacs is free software: you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by the
-;; Free Software Foundation; either version 2, or (at your option) any
-;; later version.
-;;
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
;; for more details.
-;;
+
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA. */
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
(require 'gnome)
diff --text -u 'xemacs-21.5.30/tests/gtk/gtk-embedded-test.el' 'xemacs-21.5.31/tests/gtk/gtk-embedded-test.el'
Index: ./tests/gtk/gtk-embedded-test.el
--- ./tests/gtk/gtk-embedded-test.el Wed Apr 27 00:57:32 2011
+++ ./tests/gtk/gtk-embedded-test.el Fri Apr 29 22:31:17 2011
@@ -3,21 +3,19 @@
;; Copyright 2000, 2001 William Perry
;;
;; This file is part of XEmacs.
-;;
-;; XEmacs is free software; you can redistribute it and/or modify it
+
+;; XEmacs is free software: you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by the
-;; Free Software Foundation; either version 2, or (at your option) any
-;; later version.
-;;
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
;; for more details.
-;;
+
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA. */
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
(gtk-define-test
"Embedded XEmacs frame" xemacs-frame t
diff --text -u 'xemacs-21.5.30/tests/gtk/gtk-extra-test.el' 'xemacs-21.5.31/tests/gtk/gtk-extra-test.el'
Index: ./tests/gtk/gtk-extra-test.el
--- ./tests/gtk/gtk-extra-test.el Wed Apr 27 00:57:32 2011
+++ ./tests/gtk/gtk-extra-test.el Fri Apr 29 22:31:17 2011
@@ -3,21 +3,19 @@
;; Copyright 2000, 2001 William Perry
;;
;; This file is part of XEmacs.
-;;
-;; XEmacs is free software; you can redistribute it and/or modify it
+
+;; XEmacs is free software: you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by the
-;; Free Software Foundation; either version 2, or (at your option) any
-;; later version.
-;;
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
;; for more details.
-;;
+
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA. */
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
(require 'gtk-extra)
diff --text -u 'xemacs-21.5.30/tests/gtk/gtk-test.el' 'xemacs-21.5.31/tests/gtk/gtk-test.el'
Index: ./tests/gtk/gtk-test.el
--- ./tests/gtk/gtk-test.el Wed Apr 27 00:57:32 2011
+++ ./tests/gtk/gtk-test.el Fri Apr 29 22:31:17 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff --text -u 'xemacs-21.5.30/tests/gtk/gtk-test.glade' 'xemacs-21.5.31/tests/gtk/gtk-test.glade'
Index: ./tests/gtk/gtk-test.glade
--- ./tests/gtk/gtk-test.glade Wed Apr 27 00:57:32 2011
+++ ./tests/gtk/gtk-test.glade Fri Apr 29 22:31:17 2011
@@ -1,4 +1,25 @@
<?xml version="1.0"?>
+
+<!--
+Copyright (C) 2000 Free Software Foundation
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
+-->
+
<GTK-Interface>
<project>
diff --text -u 'xemacs-21.5.30/tests/gtk/statusbar-test.el' 'xemacs-21.5.31/tests/gtk/statusbar-test.el'
Index: ./tests/gtk/statusbar-test.el
--- ./tests/gtk/statusbar-test.el Wed Apr 27 00:57:32 2011
+++ ./tests/gtk/statusbar-test.el Fri Apr 29 22:31:17 2011
@@ -3,21 +3,19 @@
;; Copyright 2000, 2001 William Perry
;;
;; This file is part of XEmacs.
-;;
-;; XEmacs is free software; you can redistribute it and/or modify it
+
+;; XEmacs is free software: you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by the
-;; Free Software Foundation; either version 2, or (at your option) any
-;; later version.
-;;
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
;; for more details.
-;;
+
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA. */
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
(defvar statusbar-hashtable (make-hashtable 29))
(defvar statusbar-gnome-p nil)
diff --text -u 'xemacs-21.5.30/tests/gtk/toolbar-test.el' 'xemacs-21.5.31/tests/gtk/toolbar-test.el'
Index: ./tests/gtk/toolbar-test.el
--- ./tests/gtk/toolbar-test.el Wed Apr 27 00:57:32 2011
+++ ./tests/gtk/toolbar-test.el Fri Apr 29 22:31:17 2011
@@ -3,21 +3,19 @@
;; Copyright 2000, 2001 William Perry
;;
;; This file is part of XEmacs.
-;;
-;; XEmacs is free software; you can redistribute it and/or modify it
+
+;; XEmacs is free software: you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by the
-;; Free Software Foundation; either version 2, or (at your option) any
-;; later version.
-;;
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
;; for more details.
-;;
+
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA. */
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
(require 'gtk-widgets)
(require 'gnome-widgets)
diff --text -u 'xemacs-21.5.30/tests/gtk/xemacs-toolbar.el' 'xemacs-21.5.31/tests/gtk/xemacs-toolbar.el'
Index: ./tests/gtk/xemacs-toolbar.el
--- ./tests/gtk/xemacs-toolbar.el Wed Apr 27 00:57:32 2011
+++ ./tests/gtk/xemacs-toolbar.el Fri Apr 29 22:31:17 2011
@@ -3,21 +3,19 @@
;; Copyright 2000, 2001 William Perry
;;
;; This file is part of XEmacs.
-;;
-;; XEmacs is free software; you can redistribute it and/or modify it
+
+;; XEmacs is free software: you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by the
-;; Free Software Foundation; either version 2, or (at your option) any
-;; later version.
-;;
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
;; for more details.
-;;
+
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA. */
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
(defvar gtk-torture-test-toolbar-open-active-p t)
diff --text -u 'xemacs-21.5.30/tests/gutter-test.el' 'xemacs-21.5.31/tests/gutter-test.el'
Index: ./tests/gutter-test.el
--- ./tests/gutter-test.el Wed Apr 27 00:57:32 2011
+++ ./tests/gutter-test.el Fri Apr 29 22:31:17 2011
@@ -1,21 +1,19 @@
;;; Copyright (C) 1998 Andy Piper
-;;; This file is part of XEmacs.
-
-;;; XEmacs is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2, or (at your
-;;; option) any later version.
-
-;;; XEmacs is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;;; General Public License for more details.
-
-;;; You should have received a copy of the GNU General Public License
-;;; along with XEmacs; see the file COPYING. If not, write to the Free
-;;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;;; Boston, MA 02110-1301, USA.
+;; This file is part of XEmacs.
+;;
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+;;
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
(setq str "Hello\nAgain")
(setq str-ext (make-extent 0 5 str))
diff --text -u 'xemacs-21.5.30/tests/mule/match.el' 'xemacs-21.5.31/tests/mule/match.el'
Index: ./tests/mule/match.el
--- ./tests/mule/match.el Wed Apr 27 00:57:32 2011
+++ ./tests/mule/match.el Fri Apr 29 22:31:17 2011
@@ -4,20 +4,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation,59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Just load the file to run the test.
diff --text -u 'xemacs-21.5.30/tests/redisplay-tests.el' 'xemacs-21.5.31/tests/redisplay-tests.el'
Index: ./tests/redisplay-tests.el
--- ./tests/redisplay-tests.el Wed Apr 27 00:57:32 2011
+++ ./tests/redisplay-tests.el Fri Apr 29 22:31:17 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/reproduce-crashes.el' 'xemacs-21.5.31/tests/reproduce-crashes.el'
Index: ./tests/reproduce-crashes.el
--- ./tests/reproduce-crashes.el Wed Apr 27 00:57:32 2011
+++ ./tests/reproduce-crashes.el Fri Apr 29 22:31:17 2011
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff --text -u 'xemacs-21.5.30/tests/sigpipe.c' 'xemacs-21.5.31/tests/sigpipe.c'
Index: ./tests/sigpipe.c
--- ./tests/sigpipe.c Wed Apr 27 00:57:32 2011
+++ ./tests/sigpipe.c Fri Apr 29 22:31:17 2011
@@ -4,10 +4,10 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,10 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to the Free
-Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.
-
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
Commentary:
Compile this file. Run it in the background giving it a command line
diff --text -u 'xemacs-21.5.30/tests/tooltalk/Makefile' 'xemacs-21.5.31/tests/tooltalk/Makefile'
Index: ./tests/tooltalk/Makefile
--- ./tests/tooltalk/Makefile Wed Apr 27 00:57:32 2011
+++ ./tests/tooltalk/Makefile Fri Apr 29 22:31:17 2011
@@ -7,6 +7,21 @@
# Copyright (C) 1995 Sun Microsystems, Inc
+# This file is part of XEmacs.
+
+# XEmacs is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+
+# XEmacs is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with XEmacs. If not, see <http://www.gnu.org/licenses/>
+
### Commentary:
# This is SPARCworks & Solaris 2.x-centric.
diff --text -u 'xemacs-21.5.30/tests/tooltalk/emacs-eval.c' 'xemacs-21.5.31/tests/tooltalk/emacs-eval.c'
Index: ./tests/tooltalk/emacs-eval.c
--- ./tests/tooltalk/emacs-eval.c Wed Apr 27 00:57:32 2011
+++ ./tests/tooltalk/emacs-eval.c Fri Apr 29 22:31:17 2011
@@ -1,4 +1,22 @@
-/* emacs-eval.c - send an s-expression to XEmacs for evaluation via ToolTalk */
+/* emacs-eval.c - send an s-expression to XEmacs for evaluation via ToolTalk
+ Copyright (C) 1995 Sun Microsystems, Inc
+
+ Author: Vladimir Ivanovic <vladimir@Eng.Sun.COM>
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* See `tooltalk-eval-handler' in the file lisp/tooltalk/tooltalk-init.el for
the receiver side. */
diff --text -u 'xemacs-21.5.30/tests/tooltalk/load-file.c' 'xemacs-21.5.31/tests/tooltalk/load-file.c'
Index: ./tests/tooltalk/load-file.c
--- ./tests/tooltalk/load-file.c Wed Apr 27 00:57:32 2011
+++ ./tests/tooltalk/load-file.c Fri Apr 29 22:31:17 2011
@@ -1,4 +1,22 @@
-/* load-file.c - load & execute an Emacs Lisp file in XEmacs using ToolTalk */
+/* load-file.c - load & execute an Emacs Lisp file in XEmacs using ToolTalk
+ Copyright (C) 1995 Sun Microsystems, Inc
+
+ Author: Vladimir Ivanovic <vladimir@Eng.Sun.COM>
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* See `tooltalk-load-file-handler' in the file lisp/tooltalk/tooltalk-init.el
for the receiver side. */
diff --text -u 'xemacs-21.5.30/tests/tooltalk/make-client-frame.c' 'xemacs-21.5.31/tests/tooltalk/make-client-frame.c'
Index: ./tests/tooltalk/make-client-frame.c
--- ./tests/tooltalk/make-client-frame.c Wed Apr 27 00:57:32 2011
+++ ./tests/tooltalk/make-client-frame.c Fri Apr 29 22:31:17 2011
@@ -1,4 +1,22 @@
-/* make-client-frame.c - create a new frame in XEmacs using ToolTalk */
+/* make-client-frame.c - create a new frame in XEmacs using ToolTalk
+ Copyright (C) 1995 Sun Microsystems, Inc
+
+ Author: Vladimir Ivanovic <vladimir@Eng.Sun.COM>
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
/* See `tooltalk-make-client-frame-handler' in the file
lisp/tooltalk/tooltalk-init.el for the receiver side. */
diff --text -u 'xemacs-21.5.30/tests/tooltalk/simple.el' 'xemacs-21.5.31/tests/tooltalk/simple.el'
Index: ./tests/tooltalk/simple.el
--- ./tests/tooltalk/simple.el Wed Apr 27 00:57:32 2011
+++ ./tests/tooltalk/simple.el Fri Apr 29 22:31:17 2011
@@ -1,5 +1,24 @@
;;; Example of Sending Messages
+;; Copyright (C) 1995 Sun Microsystems, Inc
+
+;; Author: Vladimir Ivanovic <vladimir@Eng.Sun.COM>
+
+;; This file is part of XEmacs.
+
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
(defun tooltalk-random-query-handler (msg pat)
(let ((state (get-tooltalk-message-attribute msg 'state)))
(cond
diff --text -u 'xemacs-21.5.30/version.sh.in' 'xemacs-21.5.31/version.sh.in'
Index: ./version.sh.in
--- ./version.sh.in Wed Apr 27 00:57:42 2011
+++ ./version.sh.in Fri Apr 29 22:31:39 2011
@@ -2,11 +2,11 @@
emacs_is_beta=t
emacs_major_version=21
emacs_minor_version=5
-emacs_beta_version=30
-xemacs_codename="garlic"
+emacs_beta_version=31
+xemacs_codename="ginger"
emacs_kit_version=
infodock_major_version=
infodock_minor_version=
infodock_build_version=
-xemacs_release_date="2011-04-27"
+xemacs_release_date="2011-04-29"
xemacs_extra_name=
\ No newline at end of file
#### End of Patch data ####
#### ApplyPatch data follows ####
# Data version : 1.0
# Date generated : Fri Apr 29 22:31:46 2011
# Generated by : makepatch 2.03
# Recurse directories : Yes
# Excluded files : (\A|/).*\~\Z
# (\A|/).*\.a\Z
# (\A|/).*\.bak\Z
# (\A|/).*\.BAK\Z
# (\A|/).*\.elc\Z
# (\A|/).*\.exe\Z
# (\A|/).*\.gz\Z
# (\A|/).*\.ln\Z
# (\A|/).*\.o\Z
# (\A|/).*\.obj\Z
# (\A|/).*\.olb\Z
# (\A|/).*\.old\Z
# (\A|/).*\.orig\Z
# (\A|/).*\.rej\Z
# (\A|/).*\.so\Z
# (\A|/).*\.Z\Z
# (\A|/)\.del\-.*\Z
# (\A|/)\.make\.state\Z
# (\A|/)\.nse_depinfo\Z
# (\A|/)core\Z
# (\A|/)tags\Z
# (\A|/)TAGS\Z
# (\A|/).*\~\Z
# (\A|/)\.cvsignore\Z
# (\A|/)CVS\Z
# (\A|/)MANIFEST\Z
# (\A|/)\.precious\Z
# (\A|/)TAGS\Z
# (\A|/)xemacs\-packages\Z
# (\A|/)mule\-packages\Z
# (\A|/)\.hg\Z
# (\A|/)\.git\Z
# (\A|/)autom4te\.cache\Z
# (\A|/)\+build\Z
# (\A|/).*\.gz\Z
# (\A|/)display\Z
# (\A|/)TUTORIAL\.ru\Z
# (\A|/)TUTORIAL\.th\Z
# (\A|/).*\.png\Z
# (\A|/).*\.bmp\Z
# (\A|/).*\.ico\Z
# (\A|/).*\.elc\Z
# (\A|/).*\.info.*\Z
# r './version.sh' 274 0
# r './nt/site.def' 3827 0
# r './nt/Win32.cf' 3480 0
# r './modules/auto-autoloads.el' 1822 0
# r './lisp/mule/custom-load.el' 3888 0
# r './lisp/mule/auto-autoloads.el' 52990 0
# r './lisp/finder-inf.el' 22477 0
# r './lisp/custom-load.el' 42178 0
# r './lisp/auto-autoloads.el' 151900 0
# r './etc/emacsstrs.sco' 2541 0
# r './etc/emacskeys.sco' 13447 0
# r './etc/editclient.sh' 235 0
# r './etc/PROBLEMS' 93777 0
# p './.hgtags' 12191 1304083865 0100644
# p './CHANGES-beta' 168185 1304083865 0100644
# p './COPYING' 18002 1304083865 0100644
# p './ChangeLog' 199625 1304083898 0100644
# p './Makefile.in.in' 28943 1304083865 0100644
# p './PROBLEMS' 93777 1304083865 0100644
# c './README.GPLv3' 0 1304083865 0100644
# p './aclocal.m4' 16411 1304083865 0100644
# c './autom4te.cache/output.0' 0 1304083897 0100644
# c './autom4te.cache/requests' 0 1304083898 0100644
# c './autom4te.cache/traces.0' 0 1304083897 0100644
# p './build-msw-release.sh' 4025 1304083865 0100644
# p './configure' 679160 1304083898 0100755
# p './configure.ac' 218132 1304083865 0100644
# p './etc/COPYING' 18063 1304083865 0100644
# p './etc/ChangeLog' 54522 1304083898 0100644
# p './etc/ETAGS.EBNF' 4213 1304083865 0100644
# p './etc/ETAGS.README' 2421 1304083865 0100644
# p './etc/Emacs.ad' 11574 1304083865 0100644
# p './etc/HELLO' 1623 1304083865 0100644
# p './etc/NEWS' 60235 1304083865 0100644
# p './etc/ONEWS' 41837 1304083865 0100644
# p './etc/OONEWS' 219367 1304083865 0100644
# p './etc/bundled-packages/README' 3435 1304083865 0100644
# p './etc/bundled-packages/test.sh' 3341 1304083865 0100644
# p './etc/custom/check0.xpm' 283 1304083865 0100644
# p './etc/custom/check1.xpm' 283 1304083865 0100644
# p './etc/custom/down-pushed.xpm' 256 1304083865 0100644
# p './etc/custom/down.xpm' 261 1304083865 0100644
# p './etc/custom/example-themes/europe-theme.el' 1272 1304083865 0100644
# p './etc/custom/example-themes/example-theme.el' 1189 1304083865 0100644
# p './etc/custom/face.xpm' 567 1304083865 0100644
# p './etc/custom/folder.xpm' 569 1304083865 0100644
# p './etc/custom/option.xpm' 569 1304083866 0100644
# p './etc/custom/radio0.xpm' 328 1304083866 0100644
# p './etc/custom/radio1.xpm' 328 1304083866 0100644
# p './etc/custom/right-pushed.xpm' 262 1304083866 0100644
# p './etc/custom/right.xpm' 262 1304083866 0100644
# p './etc/dbxrc.in' 13202 1304083866 0100644
# p './etc/eos/eos-build.xbm' 656 1304083866 0100644
# p './etc/eos/eos-clear-at.xbm' 656 1304083866 0100644
# p './etc/eos/eos-cont.xbm' 656 1304083866 0100644
# p './etc/eos/eos-dismiss.xbm' 656 1304083866 0100644
# p './etc/eos/eos-down.xbm' 656 1304083866 0100644
# p './etc/eos/eos-evaluate-star.xbm' 656 1304083866 0100644
# p './etc/eos/eos-evaluate.xbm' 656 1304083866 0100644
# p './etc/eos/eos-fix.xbm' 656 1304083866 0100644
# p './etc/eos/eos-intro.xbm' 656 1304083866 0100644
# p './etc/eos/eos-introB.xbm' 656 1304083866 0100644
# p './etc/eos/eos-introD.xbm' 656 1304083866 0100644
# p './etc/eos/eos-introDB.xbm' 656 1304083866 0100644
# p './etc/eos/eos-run.xbm' 656 1304083866 0100644
# p './etc/eos/eos-run2.xbm' 656 1304083866 0100644
# p './etc/eos/eos-step-into.xbm' 656 1304083866 0100644
# p './etc/eos/eos-step-over.xbm' 656 1304083866 0100644
# p './etc/eos/eos-stop-in.xbm' 656 1304083866 0100644
# p './etc/eos/eos-stop.xbm' 656 1304083866 0100644
# p './etc/eos/eos-type.xbm' 656 1304083866 0100644
# p './etc/eos/eos-up.xbm' 656 1304083866 0100644
# p './etc/gnuserv.1' 12103 1304083866 0100644
# p './etc/gnuserv.README' 4637 1304083866 0100644
# p './etc/gray1.xbm' 269 1304083866 0100644
# p './etc/gtkrc' 196 1304083866 0100644
# p './etc/recycle.xpm' 3144 1304083866 0100644
# p './etc/recycle2.xpm' 1388 1304083866 0100644
# p './etc/refcard.tex' 20260 1304083866 0100644
# p './etc/sample.Xresources' 12199 1304083866 0100644
# p './etc/sample.init.el' 59822 1304083866 0100644
# p './etc/tests/external-widget/Makefile' 1637 1304083866 0100644
# p './etc/tests/external-widget/test-ew-motif.c' 4406 1304083866 0100644
# p './etc/tests/external-widget/test-ew-xlib.c' 11205 1304083866 0100644
# p './etc/toolbar/compile-cap-up.xpm' 1426 1304083866 0100644
# p './etc/toolbar/compile-cap-xx.xpm' 1381 1304083866 0100644
# p './etc/toolbar/compile-dn.xbm' 656 1304083866 0100644
# p './etc/toolbar/compile-up.xbm' 656 1304083866 0100644
# p './etc/toolbar/compile-up.xpm' 1055 1304083866 0100644
# p './etc/toolbar/compile-xx.xbm' 656 1304083866 0100644
# p './etc/toolbar/compile-xx.xpm' 1056 1304083866 0100644
# p './etc/toolbar/copy-cap-up.xpm' 1395 1304083866 0100644
# p './etc/toolbar/copy-cap-xx.xpm' 1350 1304083866 0100644
# p './etc/toolbar/copy-dn.xbm' 656 1304083866 0100644
# p './etc/toolbar/copy-up.xbm' 656 1304083866 0100644
# p './etc/toolbar/copy-up.xpm' 1024 1304083866 0100644
# p './etc/toolbar/copy-xx.xbm' 656 1304083866 0100644
# p './etc/toolbar/copy-xx.xpm' 1025 1304083866 0100644
# p './etc/toolbar/cut-cap-up.xpm' 1373 1304083866 0100644
# p './etc/toolbar/cut-cap-xx.xpm' 1349 1304083866 0100644
# p './etc/toolbar/cut-dn.xbm' 656 1304083866 0100644
# p './etc/toolbar/cut-up.xbm' 656 1304083866 0100644
# p './etc/toolbar/cut-up.xpm' 1048 1304083866 0100644
# p './etc/toolbar/cut-xx.xbm' 656 1304083866 0100644
# p './etc/toolbar/cut-xx.xpm' 1024 1304083866 0100644
# p './etc/toolbar/debug-cap-up.xpm' 1426 1304083866 0100644
# p './etc/toolbar/debug-cap-xx.xpm' 1381 1304083866 0100644
# p './etc/toolbar/debug-dn.xbm' 656 1304083866 0100644
# p './etc/toolbar/debug-up.xbm' 656 1304083866 0100644
# p './etc/toolbar/debug-up.xpm' 1055 1304083866 0100644
# p './etc/toolbar/debug-xx.xbm' 656 1304083866 0100644
# p './etc/toolbar/debug-xx.xpm' 1056 1304083866 0100644
# p './etc/toolbar/disk-cap-up.xpm' 1410 1304083866 0100644
# p './etc/toolbar/disk-cap-xx.xpm' 1365 1304083866 0100644
# p './etc/toolbar/disk-dn.xbm' 656 1304083866 0100644
# p './etc/toolbar/disk-up.xbm' 656 1304083866 0100644
# p './etc/toolbar/disk-up.xpm' 1039 1304083866 0100644
# p './etc/toolbar/disk-xx.xbm' 656 1304083866 0100644
# p './etc/toolbar/disk-xx.xpm' 1040 1304083866 0100644
# p './etc/toolbar/file-cap-up.xpm' 1395 1304083866 0100644
# p './etc/toolbar/file-cap-xx.xpm' 1350 1304083866 0100644
# p './etc/toolbar/file-dn.xbm' 656 1304083866 0100644
# p './etc/toolbar/file-up.xbm' 656 1304083866 0100644
# p './etc/toolbar/file-up.xpm' 1024 1304083866 0100644
# p './etc/toolbar/file-xx.xbm' 656 1304083866 0100644
# p './etc/toolbar/file-xx.xpm' 1025 1304083866 0100644
# p './etc/toolbar/folder-cap-up.xpm' 1397 1304083866 0100644
# p './etc/toolbar/folder-cap-xx.xpm' 1352 1304083866 0100644
# p './etc/toolbar/folder-dn.xbm' 656 1304083866 0100644
# p './etc/toolbar/folder-up.xbm' 656 1304083866 0100644
# p './etc/toolbar/folder-up.xpm' 1026 1304083866 0100644
# p './etc/toolbar/folder-xx.xbm' 656 1304083866 0100644
# p './etc/toolbar/folder-xx.xpm' 1027 1304083866 0100644
# p './etc/toolbar/info-def-cap-up.xpm' 1347 1304083866 0100644
# p './etc/toolbar/info-def-cap-xx.xpm' 1323 1304083866 0100644
# p './etc/toolbar/info-def-dn.xbm' 656 1304083866 0100644
# p './etc/toolbar/info-def-up.xbm' 656 1304083866 0100644
# p './etc/toolbar/info-def-up.xpm' 1022 1304083866 0100644
# p './etc/toolbar/info-def-xx.xbm' 656 1304083866 0100644
# p './etc/toolbar/info-def-xx.xpm' 998 1304083866 0100644
# p './etc/toolbar/info-exit-cap-up.xpm' 1365 1304083866 0100644
# p './etc/toolbar/info-exit-cap-xx.xpm' 1365 1304083866 0100644
# p './etc/toolbar/info-exit-dn.xbm' 738 1304083866 0100644
# p './etc/toolbar/info-exit-up.xbm' 738 1304083866 0100644
# p './etc/toolbar/info-exit-up.xpm' 1365 1304083866 0100644
# p './etc/toolbar/info-exit-xx.xbm' 738 1304083866 0100644
# p './etc/toolbar/info-exit-xx.xpm' 1365 1304083866 0100644
# p './etc/toolbar/info-exit.xbm' 738 1304083866 0100644
# p './etc/toolbar/info-exit.xpm' 1365 1304083866 0100644
# p './etc/toolbar/info-next-cap-up.xpm' 1083 1304083866 0100644
# p './etc/toolbar/info-next-cap-xx.xpm' 1083 1304083866 0100644
# p './etc/toolbar/info-next-dn.xbm' 656 1304083866 0100644
# p './etc/toolbar/info-next-up.xbm' 656 1304083866 0100644
# p './etc/toolbar/info-next-up.xpm' 1083 1304083866 0100644
# p './etc/toolbar/info-next-xx.xbm' 656 1304083866 0100644
# p './etc/toolbar/info-next-xx.xpm' 1083 1304083866 0100644
# p './etc/toolbar/info-next.xbm' 656 1304083866 0100644
# p './etc/toolbar/info-next.xpm' 1083 1304083866 0100644
# p './etc/toolbar/info-prev-cap-up.xpm' 1067 1304083866 0100644
# p './etc/toolbar/info-prev-cap-xx.xpm' 1067 1304083866 0100644
# p './etc/toolbar/info-prev-dn.xbm' 656 1304083866 0100644
# p './etc/toolbar/info-prev-up.xbm' 656 1304083866 0100644
# p './etc/toolbar/info-prev-up.xpm' 1067 1304083866 0100644
# p './etc/toolbar/info-prev-xx.xbm' 656 1304083866 0100644
# p './etc/toolbar/info-prev-xx.xpm' 1067 1304083866 0100644
# p './etc/toolbar/info-prev.xbm' 656 1304083866 0100644
# p './etc/toolbar/info-prev.xpm' 1067 1304083866 0100644
# p './etc/toolbar/info-up-cap-up.xpm' 1065 1304083866 0100644
# p './etc/toolbar/info-up-cap-xx.xpm' 1065 1304083866 0100644
# p './etc/toolbar/info-up-dn.xbm' 656 1304083866 0100644
# p './etc/toolbar/info-up-up.xbm' 656 1304083866 0100644
# p './etc/toolbar/info-up-up.xpm' 1065 1304083866 0100644
# p './etc/toolbar/info-up-xx.xbm' 656 1304083866 0100644
# p './etc/toolbar/info-up-xx.xpm' 1065 1304083866 0100644
# p './etc/toolbar/info-up.xbm' 656 1304083866 0100644
# p './etc/toolbar/info-up.xpm' 1065 1304083866 0100644
# p './etc/toolbar/last-win-cap-up.xpm' 1396 1304083866 0100644
# p './etc/toolbar/last-win-cap-xx.xpm' 1397 1304083866 0100644
# p './etc/toolbar/last-win-dn.xbm' 656 1304083866 0100644
# p './etc/toolbar/last-win-up.xbm' 656 1304083866 0100644
# p './etc/toolbar/last-win-up.xpm' 1071 1304083866 0100644
# p './etc/toolbar/last-win-xx.xbm' 656 1304083866 0100644
# p './etc/toolbar/last-win-xx.xpm' 1072 1304083866 0100644
# p './etc/toolbar/mail-cap-up.xpm' 1409 1304083866 0100644
# p './etc/toolbar/mail-cap-xx.xpm' 1364 1304083866 0100644
# p './etc/toolbar/mail-dn.xbm' 656 1304083867 0100644
# p './etc/toolbar/mail-up.xbm' 656 1304083867 0100644
# p './etc/toolbar/mail-up.xpm' 1038 1304083867 0100644
# p './etc/toolbar/mail-xx.xbm' 656 1304083867 0100644
# p './etc/toolbar/mail-xx.xpm' 1039 1304083867 0100644
# p './etc/toolbar/news-cap-up.xpm' 1411 1304083867 0100644
# p './etc/toolbar/news-cap-xx.xpm' 1366 1304083867 0100644
# p './etc/toolbar/news-dn.xbm' 656 1304083867 0100644
# p './etc/toolbar/news-up.xbm' 656 1304083867 0100644
# p './etc/toolbar/news-up.xpm' 1040 1304083867 0100644
# p './etc/toolbar/news-xx.xbm' 656 1304083867 0100644
# p './etc/toolbar/news-xx.xpm' 1041 1304083867 0100644
# p './etc/toolbar/next-win-cap-up.xpm' 1396 1304083867 0100644
# p './etc/toolbar/next-win-cap-xx.xpm' 1397 1304083867 0100644
# p './etc/toolbar/next-win-dn.xbm' 656 1304083867 0100644
# p './etc/toolbar/next-win-up.xbm' 656 1304083867 0100644
# p './etc/toolbar/next-win-up.xpm' 1073 1304083867 0100644
# p './etc/toolbar/next-win-xx.xbm' 656 1304083867 0100644
# p './etc/toolbar/next-win-xx.xpm' 1074 1304083867 0100644
# p './etc/toolbar/paste-cap-up.xpm' 1410 1304083867 0100644
# p './etc/toolbar/paste-cap-xx.xpm' 1365 1304083867 0100644
# p './etc/toolbar/paste-dn.xbm' 656 1304083867 0100644
# p './etc/toolbar/paste-up.xbm' 656 1304083867 0100644
# p './etc/toolbar/paste-up.xpm' 1039 1304083867 0100644
# p './etc/toolbar/paste-xx.xbm' 656 1304083867 0100644
# p './etc/toolbar/paste-xx.xpm' 1040 1304083867 0100644
# p './etc/toolbar/printer-cap-up.xpm' 1426 1304083867 0100644
# p './etc/toolbar/printer-cap-xx.xpm' 1381 1304083867 0100644
# p './etc/toolbar/printer-dn.xbm' 656 1304083867 0100644
# p './etc/toolbar/printer-up.xbm' 656 1304083867 0100644
# p './etc/toolbar/printer-up.xpm' 1055 1304083867 0100644
# p './etc/toolbar/printer-xx.xbm' 656 1304083867 0100644
# p './etc/toolbar/printer-xx.xpm' 1056 1304083867 0100644
# p './etc/toolbar/replace-cap-up.xpm' 1350 1304083867 0100644
# p './etc/toolbar/replace-cap-xx.xpm' 1326 1304083867 0100644
# p './etc/toolbar/replace-dn.xbm' 656 1304083867 0100644
# p './etc/toolbar/replace-up.xbm' 656 1304083867 0100644
# p './etc/toolbar/replace-up.xpm' 1025 1304083867 0100644
# p './etc/toolbar/replace-xx.xbm' 656 1304083867 0100644
# p './etc/toolbar/replace-xx.xpm' 1001 1304083867 0100644
# p './etc/toolbar/spell-cap-up.xpm' 1423 1304083867 0100644
# p './etc/toolbar/spell-cap-xx.xpm' 1378 1304083867 0100644
# p './etc/toolbar/spell-dn.xbm' 656 1304083867 0100644
# p './etc/toolbar/spell-up.xbm' 656 1304083867 0100644
# p './etc/toolbar/spell-up.xpm' 1052 1304083867 0100644
# p './etc/toolbar/spell-xx.xbm' 656 1304083867 0100644
# p './etc/toolbar/spell-xx.xpm' 1053 1304083867 0100644
# p './etc/toolbar/undo-cap-up.xpm' 1409 1304083867 0100644
# p './etc/toolbar/undo-cap-xx.xpm' 1364 1304083867 0100644
# p './etc/toolbar/undo-dn.xbm' 656 1304083867 0100644
# p './etc/toolbar/undo-up.xbm' 656 1304083867 0100644
# p './etc/toolbar/undo-up.xpm' 1038 1304083867 0100644
# p './etc/toolbar/undo-xx.xbm' 656 1304083867 0100644
# p './etc/toolbar/undo-xx.xpm' 1039 1304083867 0100644
# p './etc/toolbar/workshop-cap-up.xpm' 1528 1304083867 0100644
# p './etc/toolbar/workshop-cap-xx.xpm' 1485 1304083867 0100644
# p './etc/toolbar/workshop-up.xpm' 1153 1304083867 0100644
# p './etc/toolbar/workshop-xx.xpm' 1156 1304083867 0100644
# p './etc/trash.xpm' 1938 1304083867 0100644
# c './etc/unicode/COPYING' 0 1304083867 0100644
# c './etc/unicode/ibm/COPYING' 0 1304083867 0100644
# p './etc/unicode/other/lao.txt' 2310 1304083867 0100644
# p './etc/unicode/unicode-consortium/COPYING' 2778 1304083867 0100644
# p './etc/xemacs-beta.xpm' 57346 1304083868 0100644
# p './etc/xemacs-fe.sh' 10029 1304083868 0100644
# p './etc/xemacs-icon.xpm' 2981 1304083868 0100644
# p './etc/xemacs-icon2.xbm' 1878 1304083868 0100644
# p './etc/xemacs-icon2.xpm' 2976 1304083868 0100644
# p './etc/xemacs-icon3.xpm' 2791 1304083868 0100644
# p './etc/xemacs.1' 23490 1304083868 0100644
# p './etc/xemacs.xbm' 10738 1304083868 0100644
# p './etc/xemacs.xpm' 57342 1304083868 0100644
# p './lib-src/ChangeLog' 62788 1304083899 0100644
# p './lib-src/Makefile.in.in' 12932 1304083868 0100644
# p './lib-src/ad2c' 1562 1304083868 0100755
# p './lib-src/add-big-package.sh' 2143 1304083868 0100644
# p './lib-src/b2m.c' 5481 1304083868 0100644
# p './lib-src/config.values.sh' 3358 1304083868 0100644
# p './lib-src/cvtmail.c' 3693 1304083868 0100644
# p './lib-src/digest-doc.c' 1007 1304083868 0100644
# p './lib-src/ellcc.c' 19000 1304083868 0100644
# p './lib-src/ellcc.h.in' 1191 1304083868 0100644
# p './lib-src/etags.c' 182614 1304083868 0100644
# p './lib-src/fakemail.c' 15781 1304083868 0100644
# p './lib-src/fix-perms.sh' 2547 1304083868 0100644
# p './lib-src/getopt.c' 29722 1304083868 0100644
# p './lib-src/getopt.h' 4435 1304083868 0100644
# p './lib-src/getopt1.c' 4193 1304083868 0100644
# p './lib-src/gnuattach' 849 1304083868 0100755
# p './lib-src/gnuclient.c' 18770 1304083868 0100644
# p './lib-src/gnudoit' 1039 1304083868 0100755
# p './lib-src/gnuserv.c' 22551 1304083868 0100644
# p './lib-src/gnuserv.h' 6593 1304083868 0100644
# p './lib-src/gnuslib.c' 12488 1304083868 0100644
# p './lib-src/gzip-el.sh' 1199 1304083868 0100644
# p './lib-src/hexl.c' 4196 1304083868 0100644
# p './lib-src/i.c' 7714 1304083868 0100644
# p './lib-src/installexe.sh' 1078 1304083868 0100644
# p './lib-src/make-docfile.c' 34438 1304083868 0100644
# p './lib-src/make-dump-id.c' 2139 1304083868 0100644
# p './lib-src/make-msgfile.lex' 15170 1304083868 0100644
# p './lib-src/make-mswin-unicode.pl' 15265 1304083868 0100644
# p './lib-src/make-path.c' 2247 1304083868 0100644
# p './lib-src/movemail.c' 23116 1304083868 0100644
# p './lib-src/ootags.c' 132848 1304083868 0100644
# p './lib-src/pop.c' 36845 1304083868 0100644
# p './lib-src/pop.h' 2900 1304083868 0100644
# p './lib-src/profile.c' 2955 1304083868 0100644
# p './lib-src/qsort.c' 8524 1304083868 0100644
# p './lib-src/rcs2log' 19208 1304083868 0100755
# p './lib-src/sorted-doc.c' 5843 1304083868 0100644
# p './lib-src/tcp.c' 5417 1304083868 0100644
# p './lib-src/update-autoloads.sh' 3784 1304083868 0100644
# p './lib-src/update-custom.sh' 2703 1304083868 0100644
# p './lib-src/vcdiff' 1784 1304083868 0100755
# p './lib-src/winclient.c' 11425 1304083868 0100644
# p './lisp/ChangeLog' 1028792 1304083899 0100644
# p './lisp/ChangeLog.GTK' 9071 1304083869 0100644
# p './lisp/abbrev.el' 22417 1304083869 0100644
# p './lisp/about.el' 97029 1304083869 0100644
# p './lisp/alist.el' 3090 1304083869 0100644
# p './lisp/apropos.el' 24238 1304083869 0100644
# p './lisp/auto-save.el' 22632 1304083869 0100644
# p './lisp/auto-show.el' 6974 1304083869 0100644
# p './lisp/autoload.el' 47018 1304083869 0100644
# p './lisp/backquote.el' 10190 1304083869 0100644
# p './lisp/behavior-defs.el' 1682 1304083869 0100644
# p './lisp/behavior.el' 22187 1304083869 0100644
# p './lisp/blessmail.el' 2536 1304083869 0100644
# p './lisp/buff-menu.el' 33588 1304083869 0100644
# p './lisp/buffer.el' 4406 1304083869 0100644
# p './lisp/build-report.el' 21273 1304083869 0100644
# p './lisp/byte-optimize.el' 76751 1304083869 0100644
# p './lisp/bytecomp-runtime.el' 26223 1304083869 0100644
# p './lisp/bytecomp.el' 192618 1304083869 0100644
# p './lisp/callers-of-rpt.el' 4142 1304083869 0100644
# p './lisp/check-features.el' 1881 1304083869 0100644
# p './lisp/cl-compat.el' 4513 1304083869 0100644
# p './lisp/cl-extra.el' 32552 1304083869 0100644
# p './lisp/cl-macs.el' 152111 1304083869 0100644
# p './lisp/cl-seq.el' 14555 1304083869 0100644
# p './lisp/cl.el' 23431 1304083869 0100644
# p './lisp/cmdloop.el' 29728 1304083869 0100644
# p './lisp/code-cmds.el' 21842 1304083869 0100644
# p './lisp/code-files.el' 28126 1304083869 0100644
# p './lisp/code-init.el' 15638 1304083869 0100644
# p './lisp/code-process.el' 16941 1304083869 0100644
# p './lisp/coding.el' 21556 1304083869 0100644
# p './lisp/compat.el' 24936 1304083869 0100644
# p './lisp/config.el' 2243 1304083869 0100644
# p './lisp/console.el' 1639 1304083869 0100644
# p './lisp/cus-dep.el' 9059 1304083869 0100644
# p './lisp/cus-edit.el' 135514 1304083869 0100644
# p './lisp/cus-face.el' 13798 1304083869 0100644
# p './lisp/cus-file.el' 1957 1304083869 0100644
# p './lisp/cus-load.el' 2070 1304083869 0100644
# p './lisp/cus-start.el' 7885 1304083869 0100644
# p './lisp/custom.el' 41195 1304083869 0100644
# p './lisp/derived.el' 17219 1304083869 0100644
# p './lisp/descr-text.el' 55413 1304083869 0100644
# p './lisp/device.el' 6324 1304083869 0100644
# p './lisp/diagnose.el' 19443 1304083869 0100644
# p './lisp/dialog-gtk.el' 11291 1304083869 0100644
# p './lisp/dialog-items.el' 3776 1304083869 0100644
# p './lisp/dialog.el' 27658 1304083869 0100644
# p './lisp/disass.el' 8891 1304083869 0100644
# p './lisp/disp-table.el' 8919 1304083869 0100644
# p './lisp/dragdrop.el' 14881 1304083869 0100644
# p './lisp/dumped-lisp.el' 9422 1304083869 0100644
# p './lisp/easy-mmode.el' 22283 1304083869 0100644
# p './lisp/easymenu.el' 11762 1304083869 0100644
# p './lisp/etags.el' 49808 1304083869 0100644
# p './lisp/events.el' 5959 1304083869 0100644
# p './lisp/extents.el' 4848 1304083869 0100644
# p './lisp/faces.el' 92969 1304083869 0100644
# p './lisp/files.el' 182524 1304083869 0100644
# p './lisp/fill.el' 40919 1304083869 0100644
# p './lisp/find-paths.el' 13497 1304083869 0100644
# p './lisp/finder.el' 14797 1304083869 0100644
# p './lisp/float-sup.el' 2237 1304083869 0100644
# p './lisp/font-lock.el' 131378 1304083869 0100644
# p './lisp/font-menu.el' 18363 1304083869 0100644
# p './lisp/font-mgr.el' 10310 1304083869 0100644
# p './lisp/font.el' 48147 1304083869 0100644
# p './lisp/fontcolor.el' 10360 1304083869 0100644
# p './lisp/fontconfig.el' 21751 1304083869 0100644
# p './lisp/fontl-hooks.el' 3529 1304083869 0100644
# p './lisp/format.el' 37693 1304083869 0100644
# p './lisp/frame.el' 81246 1304083869 0100644
# p './lisp/gdk.el' 5239 1304083869 0100644
# p './lisp/generic-widgets.el' 11844 1304083869 0100644
# p './lisp/glade.el' 2414 1304083869 0100644
# p './lisp/glyphs.el' 60108 1304083869 0100644
# p './lisp/gnome-widgets.el' 37298 1304083869 0100644
# p './lisp/gnome.el' 1542 1304083869 0100644
# p './lisp/gnuserv.el' 30061 1304083869 0100644
# p './lisp/gpm.el' 3222 1304083869 0100644
# p './lisp/gtk-compose.el' 906 1304083869 0100644
# p './lisp/gtk-extra.el' 3867 1304083869 0100644
# p './lisp/gtk-faces.el' 11225 1304083869 0100644
# p './lisp/gtk-ffi.el' 3653 1304083869 0100644
# p './lisp/gtk-file-dialog.el' 10398 1304083869 0100644
# p './lisp/gtk-font-menu.el' 10027 1304083869 0100644
# p './lisp/gtk-glyphs.el' 2723 1304083869 0100644
# p './lisp/gtk-init.el' 11525 1304083869 0100644
# p './lisp/gtk-marshal.el' 10622 1304083869 0100644
# p './lisp/gtk-mouse.el' 2482 1304083869 0100644
# p './lisp/gtk-package.el' 1211 1304083869 0100644
# p './lisp/gtk-password-dialog.el' 4374 1304083869 0100644
# p './lisp/gtk-select.el' 2483 1304083869 0100644
# p './lisp/gtk-widget-accessors.el' 8734 1304083869 0100644
# p './lisp/gtk-widgets.el' 85793 1304083869 0100644
# p './lisp/gtk.el' 1644 1304083869 0100644
# p './lisp/gui.el' 4540 1304083869 0100644
# p './lisp/gutter-items.el' 28573 1304083869 0100644
# p './lisp/gutter.el' 7810 1304083869 0100644
# p './lisp/hash-table.el' 1936 1304083869 0100644
# p './lisp/help-macro.el' 6874 1304083869 0100644
# p './lisp/help.el' 71717 1304083869 0100644
# p './lisp/hyper-apropos.el' 50158 1304083869 0100644
# p './lisp/indent.el' 19310 1304083869 0100644
# p './lisp/info.el' 119447 1304083869 0100644
# p './lisp/isearch-mode.el' 78484 1304083869 0100644
# p './lisp/iso8859-1.el' 3549 1304083869 0100644
# p './lisp/itimer-autosave.el' 4459 1304083869 0100644
# p './lisp/itimer.el' 32991 1304083869 0100644
# p './lisp/keydefs.el' 28261 1304083869 0100644
# p './lisp/keymap.el' 21455 1304083869 0100644
# p './lisp/ldap.el' 22574 1304083869 0100644
# p './lisp/lib-complete.el' 14038 1304083869 0100644
# p './lisp/lisp-mnt.el' 21660 1304083869 0100644
# p './lisp/lisp-mode.el' 48653 1304083869 0100644
# p './lisp/lisp.el' 14253 1304083869 0100644
# p './lisp/list-mode.el' 27535 1304083869 0100644
# p './lisp/loaddefs.el' 6398 1304083869 0100644
# p './lisp/loadhist.el' 7973 1304083869 0100644
# p './lisp/loadup-el.el' 943 1304083869 0100644
# p './lisp/loadup.el' 11571 1304083869 0100644
# p './lisp/make-docfile.el' 9512 1304083869 0100644
# p './lisp/map-ynp.el' 10161 1304083869 0100644
# p './lisp/menubar-items.el' 73409 1304083869 0100644
# p './lisp/menubar.el' 34024 1304083869 0100644
# p './lisp/minibuf.el' 93874 1304083869 0100644
# p './lisp/misc.el' 2302 1304083869 0100644
# p './lisp/mode-motion.el' 5854 1304083869 0100644
# p './lisp/modeline.el' 34046 1304083869 0100644
# p './lisp/mouse.el' 69087 1304083869 0100644
# p './lisp/movemail.el' 1981 1304083869 0100644
# p './lisp/msw-faces.el' 13145 1304083869 0100644
# p './lisp/msw-font-menu.el' 8105 1304083869 0100644
# p './lisp/msw-glyphs.el' 3926 1304083869 0100644
# p './lisp/msw-init.el' 2161 1304083869 0100644
# p './lisp/msw-mouse.el' 1809 1304083869 0100644
# p './lisp/msw-select.el' 1728 1304083869 0100644
# p './lisp/mule/arabic.el' 10220 1304083870 0100644
# p './lisp/mule/canna-leim.el' 2678 1304083870 0100644
# p './lisp/mule/ccl.el' 50592 1304083870 0100644
# p './lisp/mule/china-util.el' 5072 1304083870 0100644
# p './lisp/mule/chinese.el' 11908 1304083870 0100644
# p './lisp/mule/cyrillic.el' 67454 1304083870 0100644
# p './lisp/mule/devan-util.el' 44523 1304083870 0100644
# p './lisp/mule/devanagari.el' 14817 1304083870 0100644
# p './lisp/mule/english.el' 1774 1304083870 0100644
# p './lisp/mule/ethio-util.el' 71574 1304083870 0100644
# p './lisp/mule/ethiopic.el' 2653 1304083870 0100644
# p './lisp/mule/general-late.el' 4469 1304083870 0100644
# p './lisp/mule/greek.el' 16132 1304083870 0100644
# p './lisp/mule/hebrew.el' 5704 1304083870 0100644
# p './lisp/mule/indian.el' 10443 1304083870 0100644
# p './lisp/mule/iso-with-esc.el' 3750 1304083870 0100644
# p './lisp/mule/japan-util.el' 15520 1304083870 0100644
# p './lisp/mule/japanese.el' 18177 1304083870 0100644
# p './lisp/mule/kinsoku.el' 11705 1304083870 0100644
# p './lisp/mule/korea-util.el' 4809 1304083870 0100644
# p './lisp/mule/korean.el' 4738 1304083870 0100644
# p './lisp/mule/lao-util.el' 17682 1304083870 0100644
# p './lisp/mule/lao.el' 2354 1304083870 0100644
# p './lisp/mule/latin.el' 87673 1304083870 0100644
# p './lisp/mule/make-coding-system.el' 41876 1304083870 0100644
# p './lisp/mule/misc-lang.el' 1491 1304083870 0100644
# p './lisp/mule/mule-category.el' 12332 1304083870 0100644
# p './lisp/mule/mule-charset.el' 34071 1304083870 0100644
# p './lisp/mule/mule-cmds.el' 67592 1304083870 0100644
# p './lisp/mule/mule-coding.el' 7534 1304083870 0100644
# p './lisp/mule/mule-composite-stub.el' 3695 1304083870 0100644
# p './lisp/mule/mule-composite.el' 14846 1304083870 0100644
# p './lisp/mule/mule-msw-init-late.el' 3385 1304083870 0100644
# p './lisp/mule/mule-tty-init.el' 1643 1304083870 0100644
# p './lisp/mule/mule-win32-init.el' 7811 1304083870 0100644
# p './lisp/mule/mule-x-init.el' 2523 1304083870 0100644
# p './lisp/mule/thai.el' 10936 1304083870 0100644
# p './lisp/mule/tibet-util.el' 12605 1304083870 0100644
# p './lisp/mule/tibetan.el' 25420 1304083870 0100644
# p './lisp/mule/viet-util.el' 9901 1304083870 0100644
# p './lisp/mule/vietnamese.el' 10321 1304083870 0100644
# p './lisp/multicast.el' 5589 1304083870 0100644
# p './lisp/mwheel.el' 5091 1304083870 0100644
# p './lisp/newcomment.el' 43971 1304083870 0100644
# p './lisp/next-error.el' 11816 1304083870 0100644
# p './lisp/obsolete.el' 18374 1304083870 0100644
# p './lisp/occur.el' 19647 1304083870 0100644
# p './lisp/package-admin.el' 19675 1304083870 0100644
# p './lisp/package-get.el' 52658 1304083870 0100644
# p './lisp/package-info.el' 4281 1304083870 0100644
# p './lisp/package-net.el' 7291 1304083870 0100644
# p './lisp/package-ui.el' 24967 1304083870 0100644
# p './lisp/packages.el' 19984 1304083870 0100644
# p './lisp/page.el' 5620 1304083870 0100644
# p './lisp/paragraphs.el' 18080 1304083870 0100644
# p './lisp/paths.el' 9943 1304083870 0100644
# p './lisp/picture.el' 26013 1304083870 0100644
# p './lisp/post-gc.el' 2243 1304083870 0100644
# p './lisp/printer.el' 18173 1304083870 0100644
# p './lisp/process.el' 27801 1304083870 0100644
# p './lisp/raw-process.el' 1326 1304083870 0100644
# p './lisp/rect.el' 11957 1304083870 0100644
# p './lisp/regexp-opt.el' 11142 1304083870 0100644
# p './lisp/register.el' 12366 1304083870 0100644
# p './lisp/replace.el' 29652 1304083870 0100644
# p './lisp/resize-minibuffer.el' 9140 1304083870 0100644
# p './lisp/scrollbar.el' 5107 1304083870 0100644
# p './lisp/select.el' 37243 1304083870 0100644
# p './lisp/setup-paths.el' 13410 1304083870 0100644
# p './lisp/shadow.el' 8881 1304083870 0100644
# p './lisp/simple.el' 186629 1304083870 0100644
# p './lisp/site-load.el' 3144 1304083870 0100644
# p './lisp/sound.el' 7104 1304083870 0100644
# p './lisp/specifier.el' 43383 1304083870 0100644
# p './lisp/startup.el' 66566 1304083870 0100644
# p './lisp/subr.el' 70637 1304083870 0100644
# p './lisp/symbol-syntax.el' 4007 1304083870 0100644
# p './lisp/symbols.el' 5779 1304083870 0100644
# p './lisp/syntax.el' 17011 1304083870 0100644
# p './lisp/term/AT386.el' 2253 1304083870 0100644
# p './lisp/term/README' 8428 1304083870 0100644
# p './lisp/term/apollo.el' 904 1304083870 0100644
# p './lisp/term/bg-mouse.el' 11824 1304083870 0100644
# p './lisp/term/cygwin.el' 974 1304083870 0100644
# p './lisp/term/keyswap.el' 1078 1304083870 0100644
# p './lisp/term/linux.el' 5081 1304083870 0100644
# p './lisp/term/lk201.el' 3803 1304083870 0100644
# p './lisp/term/news.el' 2797 1304083870 0100644
# p './lisp/term/scoansi.el' 6367 1304083870 0100644
# p './lisp/term/sup-mouse.el' 6105 1304083870 0100644
# p './lisp/term/tvi970.el' 4330 1304083870 0100644
# p './lisp/term/vt-control.el' 3360 1304083870 0100644
# p './lisp/term/vt100-led.el' 1952 1304083870 0100644
# p './lisp/term/vt100.el' 2131 1304083870 0100644
# p './lisp/term/wyse50.el' 4865 1304083870 0100644
# p './lisp/term/xterm.el' 4886 1304083870 0100644
# p './lisp/test-harness.el' 30726 1304083870 0100644
# p './lisp/text-mode.el' 6498 1304083870 0100644
# p './lisp/text-props.el' 18409 1304083870 0100644
# p './lisp/toolbar-items.el' 19429 1304083870 0100644
# p './lisp/toolbar.el' 8824 1304083870 0100644
# p './lisp/tty-init.el' 4020 1304083870 0100644
# p './lisp/undo-stack.el' 9808 1304083870 0100644
# p './lisp/unicode.el' 26874 1304083870 0100644
# p './lisp/update-elc-2.el' 7766 1304083870 0100644
# p './lisp/update-elc.el' 15328 1304083870 0100644
# p './lisp/userlock.el' 8625 1304083870 0100644
# p './lisp/version.el' 6338 1304083870 0100644
# p './lisp/view-less.el' 15033 1304083870 0100644
# p './lisp/wid-browse.el' 9114 1304083870 0100644
# p './lisp/wid-edit.el' 141553 1304083870 0100644
# p './lisp/widget.el' 2436 1304083870 0100644
# p './lisp/widgets-gtk.el' 5276 1304083870 0100644
# p './lisp/win32-native.el' 13986 1304083870 0100644
# p './lisp/window-xemacs.el' 42100 1304083870 0100644
# p './lisp/window.el' 24524 1304083870 0100644
# p './lisp/x-compose.el' 43596 1304083870 0100644
# p './lisp/x-faces.el' 41208 1304083870 0100644
# p './lisp/x-font-menu.el' 14919 1304083870 0100644
# p './lisp/x-init.el' 13709 1304083870 0100644
# p './lisp/x-misc.el' 3500 1304083870 0100644
# p './lisp/x-mouse.el' 5715 1304083870 0100644
# p './lisp/x-scrollbar.el' 4153 1304083870 0100644
# p './lisp/x-select.el' 5365 1304083870 0100644
# p './lisp/x-win-sun.el' 9826 1304083870 0100644
# p './lisp/x-win-xfree86.el' 4190 1304083870 0100644
# p './lwlib/ChangeLog' 40782 1304083899 0100644
# p './lwlib/Makefile.in.in' 3625 1304083870 0100644
# p './lwlib/config.h.in' 1403 1304083870 0100644
# p './lwlib/lwlib-Xaw.c' 26936 1304083870 0100644
# p './lwlib/lwlib-Xaw.h' 730 1304083870 0100644
# p './lwlib/lwlib-Xlw.c' 18155 1304083870 0100644
# p './lwlib/lwlib-Xlw.h' 636 1304083870 0100644
# p './lwlib/lwlib-Xm.c' 64323 1304083870 0100644
# p './lwlib/lwlib-Xm.h' 825 1304083870 0100644
# p './lwlib/lwlib-colors.c' 11103 1304083870 0100644
# p './lwlib/lwlib-colors.h' 1884 1304083870 0100644
# p './lwlib/lwlib-fonts.c' 3626 1304083870 0100644
# p './lwlib/lwlib-fonts.h' 1778 1304083870 0100644
# p './lwlib/lwlib-internal.h' 2926 1304083870 0100644
# p './lwlib/lwlib-utils.c' 4863 1304083870 0100644
# p './lwlib/lwlib-utils.h' 714 1304083870 0100644
# p './lwlib/lwlib.c' 36211 1304083870 0100644
# p './lwlib/lwlib.h' 7740 1304083870 0100644
# p './lwlib/xlwcheckbox.c' 11162 1304083870 0100644
# p './lwlib/xlwcheckbox.h' 2985 1304083870 0100644
# p './lwlib/xlwcheckboxP.h' 2422 1304083870 0100644
# p './lwlib/xlwgauge.c' 28050 1304083870 0100644
# p './lwlib/xlwgauge.h' 4888 1304083870 0100644
# p './lwlib/xlwgaugeP.h' 2915 1304083870 0100644
# p './lwlib/xlwgcs.c' 14469 1304083871 0100644
# p './lwlib/xlwgcs.h' 4324 1304083871 0100644
# p './lwlib/xlwmenu.c' 105888 1304083871 0100644
# p './lwlib/xlwmenu.h' 3034 1304083871 0100644
# p './lwlib/xlwmenuP.h' 2827 1304083871 0100644
# p './lwlib/xlwradio.c' 15824 1304083871 0100644
# p './lwlib/xlwradio.h' 2852 1304083871 0100644
# p './lwlib/xlwradioP.h' 2998 1304083871 0100644
# p './lwlib/xlwscrollbar.c' 51229 1304083871 0100644
# p './lwlib/xlwscrollbar.h' 4562 1304083871 0100644
# p './lwlib/xlwscrollbarP.h' 2720 1304083871 0100644
# p './lwlib/xlwtabs.c' 71438 1304083871 0100644
# p './lwlib/xlwtabs.h' 6224 1304083871 0100644
# p './lwlib/xlwtabsP.h' 4074 1304083871 0100644
# p './lwlib/xt-wrappers.h' 4100 1304083871 0100644
# p './man/ChangeLog' 228749 1304083899 0100644
# p './man/Makefile' 10616 1304083871 0100644
# p './man/beta.texi' 36094 1304083871 0100644
# p './man/lispref/packaging.texi' 54745 1304083871 0100644
# p './man/texinfo.tex' 200195 1304083872 0100644
# p './modules/ChangeLog' 20769 1304083899 0100644
# p './modules/README' 1526 1304083872 0100644
# p './modules/base64/Makefile' 988 1304083872 0100644
# p './modules/base64/base64.c' 11958 1304083872 0100644
# p './modules/canna/Makefile.in.in' 1388 1304083872 0100644
# p './modules/canna/canna_api.c' 47397 1304083872 0100644
# p './modules/canna/configure' 134527 1304083872 0100755
# p './modules/canna/configure.ac' 2967 1304083872 0100644
# p './modules/common/Makefile.common' 3013 1304083872 0100644
# p './modules/common/configure-post.ac' 534 1304083872 0100644
# p './modules/common/configure-pre.ac' 243 1304083872 0100644
# p './modules/ldap/Makefile.in.in' 1095 1304083872 0100644
# p './modules/ldap/configure' 118548 1304083872 0100644
# p './modules/ldap/configure.ac' 1915 1304083872 0100644
# p './modules/ldap/eldap.c' 24555 1304083872 0100644
# p './modules/ldap/eldap.h' 3088 1304083872 0100644
# p './modules/postgresql/Makefile.in.in' 1123 1304083873 0100644
# p './modules/postgresql/configure' 114343 1304083873 0100644
# p './modules/postgresql/configure.ac' 2128 1304083873 0100644
# p './modules/postgresql/postgresql.c' 52203 1304083873 0100644
# p './modules/postgresql/postgresql.h' 1767 1304083873 0100644
# p './modules/sample/external/Makefile.in.in' 1463 1304083873 0100644
# p './modules/sample/external/configure.ac' 989 1304083873 0100644
# p './modules/sample/external/sample.c' 3919 1304083873 0100644
# p './modules/sample/internal/Makefile.in.in' 2397 1304083873 0100644
# p './modules/sample/internal/configure.ac' 2071 1304083873 0100644
# p './modules/sample/internal/sample.c' 3919 1304083873 0100644
# p './modules/zlib/Makefile' 1024 1304083873 0100644
# p './modules/zlib/zlib.c' 2346 1304083873 0100644
# p './nt/ChangeLog' 74037 1304083899 0100644
# p './nt/Emacs.ad.h' 3927 1304083873 0100644
# p './nt/Xpm.def' 1468 1304083873 0100644
# p './nt/compface.mak' 1401 1304083873 0100644
# p './nt/config.inc.samp' 12132 1304083873 0100644
# p './nt/make-build-dir' 2265 1304083873 0100644
# p './nt/make-nt-depend' 2261 1304083873 0100644
# p './nt/tiff.mak' 4549 1304083873 0100644
# p './nt/xemacs.dsp' 23320 1304083873 0100644
# p './nt/xemacs.mak' 56192 1304083873 0100644
# p './nt/xemacs.rc' 906 1304083873 0100644
# p './nt/xpm.mak' 1819 1304083873 0100644
# p './src/.gdbinit.in.in' 13542 1304083873 0100644
# p './src/ChangeLog' 1969359 1304083899 0100644
# p './src/ChangeLog.GTK' 34488 1304083874 0100644
# p './src/EmacsFrame.c' 22679 1304083874 0100644
# p './src/EmacsFrame.h' 8442 1304083874 0100644
# p './src/EmacsFrameP.h' 4759 1304083874 0100644
# p './src/EmacsManager.c' 9033 1304083874 0100644
# p './src/EmacsManager.h' 1766 1304083874 0100644
# p './src/EmacsManagerP.h' 2038 1304083874 0100644
# p './src/EmacsShell-sub.c' 13893 1304083874 0100644
# p './src/EmacsShell.c' 4711 1304083874 0100644
# p './src/EmacsShell.h' 2230 1304083874 0100644
# p './src/EmacsShellP.h' 3183 1304083874 0100644
# p './src/ExternalClient-Xlib.c' 4213 1304083874 0100644
# p './src/ExternalClient.c' 18330 1304083874 0100644
# p './src/ExternalClient.h' 2093 1304083874 0100644
# p './src/ExternalClientP.h' 2148 1304083874 0100644
# p './src/ExternalShell.c' 22651 1304083874 0100644
# p './src/ExternalShell.h' 1753 1304083874 0100644
# p './src/ExternalShellP.h' 2015 1304083874 0100644
# p './src/Makefile.in.in' 33108 1304083874 0100644
# p './src/README.global-renaming' 6204 1304083874 0100644
# p './src/abbrev.c' 18562 1304083874 0100644
# p './src/alloc.c' 172135 1304083874 0100644
# p './src/alloca.s' 2482 1304083874 0100644
# p './src/alsaplay.c' 11482 1304083874 0100644
# p './src/array.c' 31989 1304083874 0100644
# p './src/array.h' 26917 1304083874 0100644
# p './src/backtrace.h' 15256 1304083874 0100644
# p './src/balloon-x.c' 3595 1304083874 0100644
# p './src/balloon_help.c' 15753 1304083874 0100644
# p './src/balloon_help.h' 1214 1304083874 0100644
# p './src/bitmaps.h' 5467 1304083874 0100644
# p './src/blocktype.c' 2758 1304083874 0100644
# p './src/blocktype.h' 1508 1304083874 0100644
# p './src/buffer.c' 99671 1304083874 0100644
# p './src/buffer.h' 41755 1304083874 0100644
# p './src/bufslots.h' 8843 1304083874 0100644
# p './src/bytecode-ops.h' 5686 1304083874 0100644
# p './src/bytecode.c' 76494 1304083874 0100644
# p './src/bytecode.h' 7139 1304083874 0100644
# p './src/callint.c' 33438 1304083874 0100644
# p './src/casefiddle.c' 11040 1304083874 0100644
# p './src/casetab.c' 18131 1304083874 0100644
# p './src/casetab.h' 3369 1304083874 0100644
# p './src/charset.h' 21740 1304083874 0100644
# p './src/chartab.c' 55500 1304083874 0100644
# p './src/chartab.h' 8263 1304083874 0100644
# p './src/cm.c' 11900 1304083874 0100644
# p './src/cm.h' 5878 1304083874 0100644
# p './src/cmdloop.c' 22970 1304083874 0100644
# p './src/cmds.c' 16700 1304083874 0100644
# p './src/coding-system-slots.h' 4893 1304083874 0100644
# p './src/commands.h' 4244 1304083874 0100644
# p './src/compiler.h' 11347 1304083874 0100644
# p './src/config.h.in' 36149 1304083874 0100644
# p './src/conslots.h' 4143 1304083874 0100644
# p './src/console-gtk-impl.h' 9119 1304083874 0100644
# p './src/console-gtk.c' 5682 1304083874 0100644
# p './src/console-gtk.h' 4022 1304083874 0100644
# p './src/console-impl.h' 24092 1304083874 0100644
# p './src/console-msw-impl.h' 10304 1304083874 0100644
# p './src/console-msw.c' 20919 1304083874 0100644
# p './src/console-msw.h' 7129 1304083874 0100644
# p './src/console-stream-impl.h' 1795 1304083874 0100644
# p './src/console-stream.c' 11288 1304083874 0100644
# p './src/console-stream.h' 1684 1304083874 0100644
# p './src/console-tty-impl.h' 9426 1304083874 0100644
# p './src/console-tty.c' 15221 1304083874 0100644
# p './src/console-tty.h' 3225 1304083874 0100644
# p './src/console-x-impl.h' 15737 1304083874 0100644
# p './src/console-x.c' 12055 1304083874 0100644
# p './src/console-x.h' 6803 1304083874 0100644
# p './src/console-xlike-inc.h' 13011 1304083874 0100644
# p './src/console.c' 48635 1304083874 0100644
# p './src/console.h' 5706 1304083874 0100644
# p './src/data.c' 100886 1304083874 0100644
# p './src/database.c' 21983 1304083874 0100644
# p './src/database.h' 1055 1304083874 0100644
# p './src/debug.c' 6030 1304083874 0100644
# p './src/debug.h' 2161 1304083874 0100644
# p './src/device-gtk.c' 21820 1304083874 0100644
# p './src/device-impl.h' 11866 1304083874 0100644
# p './src/device-msw.c' 42402 1304083874 0100644
# p './src/device-tty.c' 6636 1304083874 0100644
# p './src/device-x.c' 68122 1304083874 0100644
# p './src/device.c' 44005 1304083874 0100644
# p './src/device.h' 4430 1304083874 0100644
# p './src/devslots.h' 5181 1304083874 0100644
# p './src/dialog-gtk.c' 1751 1304083874 0100644
# p './src/dialog-msw.c' 24926 1304083874 0100644
# p './src/dialog-x.c' 8862 1304083874 0100644
# p './src/dialog.c' 2058 1304083875 0100644
# p './src/dired-msw.c' 17798 1304083875 0100644
# p './src/dired.c' 29285 1304083875 0100644
# p './src/doc.c' 36916 1304083875 0100644
# p './src/doprnt.c' 31029 1304083875 0100644
# p './src/dragdrop.c' 4152 1304083875 0100644
# p './src/dragdrop.h' 1326 1304083875 0100644
# p './src/dump-data.c' 1809 1304083875 0100644
# p './src/dump-data.h' 1188 1304083875 0100644
# p './src/dumper.c' 79968 1304083875 0100644
# p './src/dumper.h' 1219 1304083875 0100644
# p './src/ecrt0.c' 7884 1304083875 0100644
# p './src/editfns.c' 80187 1304083875 0100644
# p './src/elhash.c' 72306 1304083875 0100644
# p './src/elhash.h' 4892 1304083875 0100644
# p './src/emacs.c' 150152 1304083875 0100644
# p './src/emodules.c' 21746 1304083875 0100644
# p './src/emodules.h' 4321 1304083875 0100644
# p './src/esd.c' 3829 1304083875 0100644
# p './src/eval.c' 226094 1304083875 0100644
# p './src/event-Xt.c' 104870 1304083875 0100644
# p './src/event-gtk.c' 60884 1304083875 0100644
# p './src/event-msw.c' 148321 1304083875 0100644
# p './src/event-stream.c' 175408 1304083875 0100644
# p './src/event-tty.c' 10077 1304083875 0100644
# p './src/event-unixoid.c' 12233 1304083875 0100644
# p './src/event-xlike-inc.c' 27945 1304083875 0100644
# p './src/events.c' 78917 1304083875 0100644
# p './src/events.h' 45800 1304083875 0100644
# p './src/extents-impl.h' 12141 1304083875 0100644
# p './src/extents.c' 229765 1304083875 0100644
# p './src/extents.h' 8008 1304083875 0100644
# p './src/extw-Xlib.c' 2495 1304083875 0100644
# p './src/extw-Xlib.h' 1522 1304083875 0100644
# p './src/extw-Xt.c' 6138 1304083875 0100644
# p './src/extw-Xt.h' 1471 1304083875 0100644
# p './src/faces.c' 81592 1304083875 0100644
# p './src/faces.h' 17586 1304083875 0100644
# p './src/file-coding.c' 156431 1304083875 0100644
# p './src/file-coding.h' 46090 1304083875 0100644
# p './src/fileio.c' 138502 1304083875 0100644
# p './src/filelock.c' 14927 1304083875 0100644
# p './src/filemode.c' 4782 1304083875 0100644
# p './src/floatfns.c' 68815 1304083875 0100644
# p './src/fns.c' 342339 1304083875 0100644
# p './src/font-lock.c' 27029 1304083875 0100644
# p './src/font-mgr.c' 48079 1304083875 0100644
# p './src/font-mgr.h' 6000 1304083875 0100644
# p './src/fontcolor-gtk-impl.h' 2241 1304083875 0100644
# p './src/fontcolor-gtk.c' 14129 1304083875 0100644
# p './src/fontcolor-gtk.h' 1707 1304083875 0100644
# p './src/fontcolor-impl.h' 7850 1304083875 0100644
# p './src/fontcolor-msw-impl.h' 2560 1304083875 0100644
# p './src/fontcolor-msw.c' 80692 1304083875 0100644
# p './src/fontcolor-msw.h' 1394 1304083875 0100644
# p './src/fontcolor-tty-impl.h' 2796 1304083875 0100644
# p './src/fontcolor-tty.c' 11731 1304083875 0100644
# p './src/fontcolor-tty.h' 1101 1304083875 0100644
# p './src/fontcolor-x-impl.h' 2949 1304083875 0100644
# p './src/fontcolor-x.c' 32841 1304083875 0100644
# p './src/fontcolor-x.h' 1355 1304083875 0100644
# p './src/fontcolor-xlike-inc.c' 28354 1304083875 0100644
# p './src/fontcolor.c' 43414 1304083875 0100644
# p './src/fontcolor.h' 3541 1304083875 0100644
# p './src/frame-gtk.c' 44218 1304083875 0100644
# p './src/frame-impl.h' 28126 1304083875 0100644
# p './src/frame-msw.c' 41599 1304083875 0100644
# p './src/frame-tty.c' 6179 1304083875 0100644
# p './src/frame-x.c' 85829 1304083875 0100644
# p './src/frame.c' 152222 1304083875 0100644
# p './src/frame.h' 6911 1304083875 0100644
# p './src/frameslots.h' 6310 1304083875 0100644
# p './src/free-hook.c' 15609 1304083875 0100644
# p './src/gc.c' 75683 1304083875 0100644
# p './src/gc.h' 5693 1304083875 0100644
# p './src/gccache-gtk.c' 8105 1304083875 0100644
# p './src/gccache-gtk.h' 1200 1304083875 0100644
# p './src/gccache-x.c' 10504 1304083875 0100644
# p './src/gccache-x.h' 1569 1304083875 0100644
# p './src/general-slots.h' 7670 1304083875 0100644
# p './src/general.c' 1821 1304083875 0100644
# p './src/getloadavg.c' 15000 1304083875 0100644
# p './src/getpagesize.h' 1693 1304083875 0100644
# p './src/glade.c' 3991 1304083875 0100644
# p './src/glyphs-eimage.c' 43748 1304083875 0100644
# p './src/glyphs-gtk.c' 88330 1304083875 0100644
# p './src/glyphs-gtk.h' 5873 1304083875 0100644
# p './src/glyphs-msw.c' 92494 1304083875 0100644
# p './src/glyphs-msw.h' 4089 1304083875 0100644
# p './src/glyphs-shared.c' 9060 1304083875 0100644
# p './src/glyphs-widget.c' 67458 1304083875 0100644
# p './src/glyphs-x.c' 91889 1304083875 0100644
# p './src/glyphs-x.h' 5746 1304083875 0100644
# p './src/glyphs.c' 174766 1304083875 0100644
# p './src/glyphs.h' 47040 1304083875 0100644
# p './src/gmalloc.c' 40162 1304083875 0100644
# p './src/gpmevent.c' 16900 1304083875 0100644
# p './src/gpmevent.h' 1059 1304083875 0100644
# p './src/gtk-glue.c' 7697 1304083875 0100644
# p './src/gtk-xemacs.c' 13354 1304083875 0100644
# p './src/gtk-xemacs.h' 1630 1304083875 0100644
# p './src/gui-gtk.c' 2665 1304083875 0100644
# p './src/gui-msw.c' 5200 1304083875 0100644
# p './src/gui-x.c' 19666 1304083875 0100644
# p './src/gui.c' 21025 1304083875 0100644
# p './src/gui.h' 4064 1304083875 0100644
# p './src/gutter.c' 51418 1304083875 0100644
# p './src/gutter.h' 4623 1304083875 0100644
# p './src/hash.c' 10582 1304083875 0100644
# p './src/hash.h' 3252 1304083875 0100644
# p './src/hpplay.c' 7729 1304083875 0100644
# p './src/imgproc.c' 14403 1304083875 0100644
# p './src/imgproc.h' 2034 1304083875 0100644
# p './src/indent.c' 26808 1304083875 0100644
# p './src/inline.c' 3908 1304083875 0100644
# p './src/input-method-motif.c' 4104 1304083875 0100644
# p './src/input-method-xlib.c' 34072 1304083875 0100644
# p './src/insdel.c' 57615 1304083875 0100644
# p './src/insdel.h' 6111 1304083875 0100644
# p './src/intl-encap-win32.c' 81343 1304083875 0100644
# p './src/intl-win32.c' 61865 1304083875 0100644
# p './src/intl-x.c' 2045 1304083875 0100644
# p './src/intl.c' 6234 1304083875 0100644
# p './src/keymap-buttons.h' 1580 1304083875 0100644
# p './src/keymap-slots.h' 2688 1304083875 0100644
# p './src/keymap.c' 138213 1304083875 0100644
# p './src/keymap.h' 2315 1304083875 0100644
# p './src/lastfile.c' 1733 1304083875 0100644
# p './src/libinterface.c' 4593 1304083875 0100644
# p './src/libinterface.h' 4163 1304083875 0100644
# p './src/line-number.c' 11059 1304083876 0100644
# p './src/line-number.h' 1192 1304083876 0100644
# p './src/lisp-disunion.h' 5214 1304083876 0100644
# p './src/lisp-union.h' 4359 1304083876 0100644
# p './src/lisp.h' 234429 1304083876 0100644
# p './src/lread.c' 97083 1304083876 0100644
# p './src/lrecord.h' 89913 1304083876 0100644
# p './src/lstream.c' 52768 1304083876 0100644
# p './src/lstream.h' 19989 1304083876 0100644
# p './src/m/alpha.h' 1042 1304083876 0100644
# p './src/m/arm.h' 2474 1304083876 0100644
# p './src/m/hp800.h' 3120 1304083876 0100644
# p './src/m/ibmrs6000.h' 2701 1304083876 0100644
# p './src/m/intel386.h' 3118 1304083876 0100644
# p './src/m/m68k.h' 1122 1304083876 0100644
# p './src/m/mips.h' 3572 1304083876 0100644
# p './src/m/powerpc.h' 2483 1304083876 0100644
# p './src/m/sparc.h' 2218 1304083876 0100644
# p './src/m/template.h' 2164 1304083876 0100644
# p './src/m/windowsnt.h' 1180 1304083876 0100644
# p './src/macros.c' 9338 1304083876 0100644
# p './src/macros.h' 1259 1304083876 0100644
# p './src/make-src-depend' 4809 1304083876 0100644
# p './src/marker.c' 14806 1304083876 0100644
# p './src/mc-alloc.c' 64615 1304083876 0100644
# p './src/mc-alloc.h' 5676 1304083876 0100644
# p './src/md5.c' 17992 1304083876 0100644
# p './src/mem-limits.h' 3648 1304083876 0100644
# p './src/menubar-gtk.c' 41365 1304083876 0100644
# p './src/menubar-msw.c' 26984 1304083876 0100644
# p './src/menubar-x.c' 37590 1304083876 0100644
# p './src/menubar.c' 28716 1304083876 0100644
# p './src/menubar.h' 2421 1304083876 0100644
# p './src/minibuf.c' 27580 1304083876 0100644
# p './src/mule-ccl.c' 71404 1304083876 0100644
# p './src/mule-ccl.h' 4300 1304083876 0100644
# p './src/mule-charset.c' 45458 1304083876 0100644
# p './src/mule-coding.c' 121530 1304083876 0100644
# p './src/mule-wnnfns.c' 59133 1304083876 0100644
# p './src/native-gtk-toolbar.c' 6141 1304083876 0100644
# p './src/ndir.h' 2088 1304083876 0100644
# p './src/nt.c' 61579 1304083876 0100644
# p './src/ntheap.c' 10652 1304083876 0100644
# p './src/ntplay.c' 2805 1304083876 0100644
# p './src/number-gmp.c' 3702 1304083876 0100644
# p './src/number-gmp.h' 10649 1304083876 0100644
# p './src/number-mp.c' 12463 1304083876 0100644
# p './src/number-mp.h' 5873 1304083876 0100644
# p './src/number.c' 22288 1304083876 0100644
# p './src/number.h' 12735 1304083876 0100644
# p './src/opaque.c' 5621 1304083876 0100644
# p './src/opaque.h' 2380 1304083876 0100644
# p './src/pre-crt0.c' 1138 1304083876 0100644
# p './src/print.c' 78054 1304083876 0100644
# p './src/process-nt.c' 45268 1304083876 0100644
# p './src/process-slots.h' 2886 1304083876 0100644
# p './src/process-unix.c' 65660 1304083876 0100644
# p './src/process.c' 82528 1304083876 0100644
# p './src/process.h' 4261 1304083876 0100644
# p './src/procimpl.h' 5596 1304083876 0100644
# p './src/profile.c' 21689 1304083876 0100644
# p './src/profile.h' 4802 1304083876 0100644
# p './src/ralloc.c' 58611 1304083876 0100644
# p './src/rangetab.c' 31842 1304083876 0100644
# p './src/rangetab.h' 2106 1304083876 0100644
# p './src/realpath.c' 11370 1304083876 0100644
# p './src/redisplay-gtk.c' 5523 1304083876 0100644
# p './src/redisplay-msw.c' 40544 1304083876 0100644
# p './src/redisplay-output.c' 85621 1304083876 0100644
# p './src/redisplay-tty.c' 43261 1304083876 0100644
# p './src/redisplay-x.c' 12327 1304083876 0100644
# p './src/redisplay-xlike-inc.c' 71087 1304083876 0100644
# p './src/redisplay.c' 298577 1304083876 0100644
# p './src/redisplay.h' 29618 1304083876 0100644
# p './src/regex.c' 226465 1304083876 0100644
# p './src/regex.h' 21294 1304083876 0100644
# p './src/s/aix4-2.h' 5302 1304083876 0100644
# p './src/s/bsd4-3.h' 1646 1304083876 0100644
# p './src/s/cygwin32.h' 3025 1304083876 0100644
# p './src/s/gnu.h' 1409 1304083876 0100644
# p './src/s/hpux11-shr.h' 1298 1304083876 0100644
# p './src/s/hpux11.h' 4735 1304083876 0100644
# p './src/s/mach-bsd4-3.h' 1869 1304083876 0100644
# p './src/s/mingw32.h' 2845 1304083876 0100644
# p './src/s/netbsd.h' 1904 1304083877 0100644
# p './src/s/sco7.h' 1058 1304083877 0100644
# p './src/s/sol2.h' 4118 1304083877 0100644
# p './src/s/template.h' 2868 1304083877 0100644
# p './src/s/usg5-4.h' 5009 1304083877 0100644
# p './src/s/win32-common.h' 1255 1304083877 0100644
# p './src/s/win32-native.h' 1508 1304083877 0100644
# p './src/s/windowsnt.h' 4839 1304083877 0100644
# p './src/scrollbar-gtk.c' 16340 1304083877 0100644
# p './src/scrollbar-gtk.h' 2641 1304083877 0100644
# p './src/scrollbar-msw.c' 15942 1304083877 0100644
# p './src/scrollbar-msw.h' 2247 1304083877 0100644
# p './src/scrollbar-x.c' 22643 1304083877 0100644
# p './src/scrollbar-x.h' 2591 1304083877 0100644
# p './src/scrollbar.c' 32861 1304083877 0100644
# p './src/scrollbar.h' 3272 1304083877 0100644
# p './src/search.c' 109345 1304083877 0100644
# p './src/select-gtk.c' 14679 1304083877 0100644
# p './src/select-msw.c' 17480 1304083877 0100644
# p './src/select-x.c' 50706 1304083877 0100644
# p './src/select-xlike-inc.c' 10550 1304083877 0100644
# p './src/select.c' 31075 1304083877 0100644
# p './src/select.h' 2420 1304083877 0100644
# p './src/sgiplay.c' 18464 1304083877 0100644
# p './src/sheap.c' 4513 1304083877 0100644
# p './src/signal.c' 29574 1304083877 0100644
# p './src/sound.c' 21983 1304083877 0100644
# p './src/sound.h' 1649 1304083877 0100644
# p './src/specifier.c' 126549 1304083877 0100644
# p './src/specifier.h' 22192 1304083877 0100644
# p './src/src-headers' 5910 1304083877 0100644
# p './src/strcat.c' 1686 1304083877 0100644
# p './src/strftime.c' 18080 1304083877 0100644
# p './src/sunpro.c' 3083 1304083877 0100644
# p './src/symbols.c' 128071 1304083877 0100644
# p './src/symeval.h' 22828 1304083877 0100644
# p './src/symsinit.h' 20752 1304083877 0100644
# p './src/syntax.c' 73150 1304083877 0100644
# p './src/syntax.h' 18324 1304083877 0100644
# p './src/sysdep.c' 105589 1304083877 0100644
# p './src/sysdep.h' 4659 1304083877 0100644
# p './src/sysdir.h' 2483 1304083877 0100644
# p './src/sysdll.c' 11853 1304083877 0100644
# p './src/sysdll.h' 1353 1304083877 0100644
# p './src/sysfile.h' 16213 1304083877 0100644
# p './src/sysfloat.h' 1948 1304083877 0100644
# p './src/sysgdkx.h' 1164 1304083877 0100644
# p './src/sysgtk.h' 1100 1304083877 0100644
# p './src/sysproc.h' 6384 1304083877 0100644
# p './src/syspwd.h' 1365 1304083877 0100644
# p './src/syssignal.h' 10218 1304083877 0100644
# p './src/systime.h' 10623 1304083877 0100644
# p './src/systty.h' 10663 1304083877 0100644
# p './src/syswait.h' 1819 1304083877 0100644
# p './src/syswindows.h' 45134 1304083877 0100644
# p './src/termcap.c' 14092 1304083877 0100644
# p './src/terminfo.c' 3006 1304083877 0100644
# p './src/tests.c' 25379 1304083877 0100644
# p './src/text.c' 166095 1304083877 0100644
# p './src/text.h' 117836 1304083877 0100644
# p './src/toolbar-gtk.c' 2465 1304083877 0100644
# p './src/toolbar-msw.c' 17080 1304083877 0100644
# p './src/toolbar-x.c' 2894 1304083877 0100644
# p './src/toolbar-xlike.c' 18761 1304083877 0100644
# p './src/toolbar-xlike.h' 590 1304083877 0100644
# p './src/toolbar.c' 62451 1304083877 0100644
# p './src/toolbar.h' 3848 1304083877 0100644
# p './src/tooltalk.c' 42411 1304083877 0100644
# p './src/tooltalk.doc' 11845 1304083877 0100644
# p './src/tooltalk.h' 2223 1304083877 0100644
# p './src/tparam.c' 6851 1304083877 0100644
# p './src/ui-byhand.c' 19774 1304083877 0100644
# p './src/ui-gtk.c' 53820 1304083877 0100644
# p './src/ui-gtk.h' 2731 1304083877 0100644
# p './src/undo.c' 15108 1304083877 0100644
# p './src/unexaix.c' 17225 1304083877 0100644
# p './src/unexalpha.c' 12024 1304083877 0100644
# p './src/unexcw.c' 16251 1304083877 0100644
# p './src/unexec.c' 27311 1304083877 0100644
# p './src/unexelf.c' 41029 1304083877 0100644
# p './src/unexhp9k800.c' 11369 1304083877 0100644
# p './src/unexnt.c' 18690 1304083877 0100644
# p './src/unexsol2-6.c' 1361 1304083877 0100644
# p './src/unicode.c' 101553 1304083877 0100644
# p './src/universe.h' 927 1304083877 0100644
# p './src/vdb-fake.c' 1304 1304083877 0100644
# p './src/vdb-mach.c' 7814 1304083877 0100644
# p './src/vdb-posix.c' 4148 1304083877 0100644
# p './src/vdb-win32.c' 2576 1304083877 0100644
# p './src/vdb.c' 4492 1304083877 0100644
# p './src/vdb.h' 2399 1304083877 0100644
# p './src/vm-limit.c' 4172 1304083877 0100644
# p './src/widget.c' 3121 1304083877 0100644
# p './src/win32.c' 25619 1304083877 0100644
# p './src/window-impl.h' 10949 1304083877 0100644
# p './src/window.c' 177028 1304083877 0100644
# p './src/window.h' 6835 1304083877 0100644
# p './src/winslots.h' 12229 1304083877 0100644
# p './src/xemacs.def.in.in' 8082 1304083877 0100644
# p './src/xintrinsic.h' 900 1304083877 0100644
# p './src/xintrinsicp.h' 1072 1304083877 0100644
# p './src/xmmanagerp.h' 1177 1304083877 0100644
# p './src/xmotif.h' 1041 1304083877 0100644
# p './src/xmprimitivep.h' 1258 1304083877 0100644
# p './tests/ChangeLog' 66593 1304083899 0100644
# p './tests/Dnd/droptest.el' 5339 1304083877 0100644
# p './tests/Dnd/droptest.sh' 4791 1304083877 0100644
# p './tests/autoconf/regressiontest.pl' 6271 1304083877 0100644
# p './tests/automated/base64-tests.el' 8921 1304083877 0100644
# p './tests/automated/byte-compiler-tests.el' 6855 1304083877 0100644
# p './tests/automated/c-tests.el' 1688 1304083877 0100644
# p './tests/automated/case-tests.el' 85573 1304083877 0100644
# p './tests/automated/ccl-tests.el' 18892 1304083877 0100644
# p './tests/automated/database-tests.el' 2044 1304083877 0100644
# p './tests/automated/extent-tests.el' 10029 1304083877 0100644
# p './tests/automated/file-tests.el' 1533 1304083877 0100644
# p './tests/automated/hash-table-tests.el' 14865 1304083877 0100644
# p './tests/automated/iso-ir-196-test.el' 1287 1304083877 0100644
# p './tests/automated/lisp-reader-tests.el' 3302 1304083877 0100644
# p './tests/automated/lisp-tests.el' 129680 1304083877 0100644
# p './tests/automated/md5-tests.el' 3233 1304083877 0100644
# p './tests/automated/mule-tests.el' 34631 1304083877 0100644
# p './tests/automated/os-tests.el' 3256 1304083877 0100644
# p './tests/automated/query-coding-tests.el' 23451 1304083877 0100644
# p './tests/automated/regexp-tests.el' 22037 1304083877 0100644
# p './tests/automated/region-tests.el' 2861 1304083877 0100644
# p './tests/automated/search-tests.el' 8923 1304083877 0100644
# p './tests/automated/symbol-tests.el' 11952 1304083877 0100644
# p './tests/automated/syntax-tests.el' 8677 1304083877 0100644
# p './tests/automated/tag-tests.el' 2556 1304083877 0100644
# p './tests/automated/weak-tests.el' 8641 1304083877 0100644
# p './tests/frame.el' 1790 1304083877 0100644
# p './tests/glyph-test.el' 6282 1304083877 0100644
# p './tests/gtk/event-stream-tests.el' 3223 1304083877 0100644
# p './tests/gtk/gnome-test.el' 9929 1304083877 0100644
# p './tests/gtk/gtk-embedded-test.el' 1939 1304083877 0100644
# p './tests/gtk/gtk-extra-test.el' 1589 1304083877 0100644
# p './tests/gtk/gtk-test.el' 74442 1304083877 0100644
# p './tests/gtk/gtk-test.glade' 3489 1304083877 0100644
# p './tests/gtk/statusbar-test.el' 3562 1304083877 0100644
# p './tests/gtk/toolbar-test.el' 1919 1304083877 0100644
# p './tests/gtk/xemacs-toolbar.el' 1667 1304083877 0100644
# p './tests/gutter-test.el' 1981 1304083877 0100644
# p './tests/mule/match.el' 1972 1304083877 0100644
# p './tests/redisplay-tests.el' 1386 1304083877 0100644
# p './tests/reproduce-crashes.el' 11328 1304083877 0100644
# p './tests/sigpipe.c' 2272 1304083877 0100644
# p './tests/tooltalk/Makefile' 614 1304083877 0100644
# p './tests/tooltalk/emacs-eval.c' 2005 1304083877 0100644
# p './tests/tooltalk/load-file.c' 1990 1304083877 0100644
# p './tests/tooltalk/make-client-frame.c' 2213 1304083877 0100644
# p './tests/tooltalk/simple.el' 1133 1304083877 0100644
# p './version.sh.in' 260 1304083899 0100644
# C './autom4te.cache' 0 1304083897 040755
#### End of ApplyPatch data ####
#### End of Patch kit [created: Fri Apr 29 22:31:46 2011] ####
#### Patch checksum: 62430 2460731 39209 ####
#### Checksum: 62485 2462616 64252 ####