1.1 --- a/gmyth/COPYING Tue Nov 28 15:14:16 2006 +0000
1.2 +++ b/gmyth/COPYING Tue Nov 28 21:04:14 2006 +0000
1.3 @@ -1,397 +1,221 @@
1.4 - GNU LESSER GENERAL PUBLIC LICENSE
1.5 - Version 2.1, February 1999
1.6 + GNU GENERAL PUBLIC LICENSE
1.7 + Version 2, June 1991
1.8
1.9 - Copyright (C) 1991, 1999 Free Software Foundation, Inc.
1.10 - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1.11 + Copyright (C) 1989, 1991 Free Software Foundation, Inc.
1.12 + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1.13 Everyone is permitted to copy and distribute verbatim copies
1.14 of this license document, but changing it is not allowed.
1.15
1.16 -[This is the first released version of the Lesser GPL. It also counts
1.17 - as the successor of the GNU Library Public License, version 2, hence
1.18 - the version number 2.1.]
1.19 -
1.20 Preamble
1.21
1.22 The licenses for most software are designed to take away your
1.23 freedom to share and change it. By contrast, the GNU General Public
1.24 -Licenses are intended to guarantee your freedom to share and change
1.25 -free software--to make sure the software is free for all its users.
1.26 +License is intended to guarantee your freedom to share and change free
1.27 +software--to make sure the software is free for all its users. This
1.28 +General Public License applies to most of the Free Software
1.29 +Foundation's software and to any other program whose authors commit to
1.30 +using it. (Some other Free Software Foundation software is covered by
1.31 +the GNU Library General Public License instead.) You can apply it to
1.32 +your programs, too.
1.33
1.34 - This license, the Lesser General Public License, applies to some
1.35 -specially designated software packages--typically libraries--of the
1.36 -Free Software Foundation and other authors who decide to use it. You
1.37 -can use it too, but we suggest you first think carefully about whether
1.38 -this license or the ordinary General Public License is the better
1.39 -strategy to use in any particular case, based on the explanations below.
1.40 -
1.41 - When we speak of free software, we are referring to freedom of use,
1.42 -not price. Our General Public Licenses are designed to make sure that
1.43 -you have the freedom to distribute copies of free software (and charge
1.44 -for this service if you wish); that you receive source code or can get
1.45 -it if you want it; that you can change the software and use pieces of
1.46 -it in new free programs; and that you are informed that you can do
1.47 -these things.
1.48 + When we speak of free software, we are referring to freedom, not
1.49 +price. Our General Public Licenses are designed to make sure that you
1.50 +have the freedom to distribute copies of free software (and charge for
1.51 +this service if you wish), that you receive source code or can get it
1.52 +if you want it, that you can change the software or use pieces of it
1.53 +in new free programs; and that you know you can do these things.
1.54
1.55 To protect your rights, we need to make restrictions that forbid
1.56 -distributors to deny you these rights or to ask you to surrender these
1.57 -rights. These restrictions translate to certain responsibilities for
1.58 -you if you distribute copies of the library or if you modify it.
1.59 +anyone to deny you these rights or to ask you to surrender the rights.
1.60 +These restrictions translate to certain responsibilities for you if you
1.61 +distribute copies of the software, or if you modify it.
1.62
1.63 - For example, if you distribute copies of the library, whether gratis
1.64 -or for a fee, you must give the recipients all the rights that we gave
1.65 -you. You must make sure that they, too, receive or can get the source
1.66 -code. If you link other code with the library, you must provide
1.67 -complete object files to the recipients, so that they can relink them
1.68 -with the library after making changes to the library and recompiling
1.69 -it. And you must show them these terms so they know their rights.
1.70 + For example, if you distribute copies of such a program, whether
1.71 +gratis or for a fee, you must give the recipients all the rights that
1.72 +you have. You must make sure that they, too, receive or can get the
1.73 +source code. And you must show them these terms so they know their
1.74 +rights.
1.75
1.76 - We protect your rights with a two-step method: (1) we copyright the
1.77 -library, and (2) we offer you this license, which gives you legal
1.78 -permission to copy, distribute and/or modify the library.
1.79 + We protect your rights with two steps: (1) copyright the software, and
1.80 +(2) offer you this license which gives you legal permission to copy,
1.81 +distribute and/or modify the software.
1.82
1.83 - To protect each distributor, we want to make it very clear that
1.84 -there is no warranty for the free library. Also, if the library is
1.85 -modified by someone else and passed on, the recipients should know
1.86 -that what they have is not the original version, so that the original
1.87 -author's reputation will not be affected by problems that might be
1.88 -introduced by others.
1.89 + Also, for each author's protection and ours, we want to make certain
1.90 +that everyone understands that there is no warranty for this free
1.91 +software. If the software is modified by someone else and passed on, we
1.92 +want its recipients to know that what they have is not the original, so
1.93 +that any problems introduced by others will not reflect on the original
1.94 +authors' reputations.
1.95
1.96 - Finally, software patents pose a constant threat to the existence of
1.97 -any free program. We wish to make sure that a company cannot
1.98 -effectively restrict the users of a free program by obtaining a
1.99 -restrictive license from a patent holder. Therefore, we insist that
1.100 -any patent license obtained for a version of the library must be
1.101 -consistent with the full freedom of use specified in this license.
1.102 -
1.103 - Most GNU software, including some libraries, is covered by the
1.104 -ordinary GNU General Public License. This license, the GNU Lesser
1.105 -General Public License, applies to certain designated libraries, and
1.106 -is quite different from the ordinary General Public License. We use
1.107 -this license for certain libraries in order to permit linking those
1.108 -libraries into non-free programs.
1.109 -
1.110 - When a program is linked with a library, whether statically or using
1.111 -a shared library, the combination of the two is legally speaking a
1.112 -combined work, a derivative of the original library. The ordinary
1.113 -General Public License therefore permits such linking only if the
1.114 -entire combination fits its criteria of freedom. The Lesser General
1.115 -Public License permits more lax criteria for linking other code with
1.116 -the library.
1.117 -
1.118 - We call this license the "Lesser" General Public License because it
1.119 -does Less to protect the user's freedom than the ordinary General
1.120 -Public License. It also provides other free software developers Less
1.121 -of an advantage over competing non-free programs. These disadvantages
1.122 -are the reason we use the ordinary General Public License for many
1.123 -libraries. However, the Lesser license provides advantages in certain
1.124 -special circumstances.
1.125 -
1.126 - For example, on rare occasions, there may be a special need to
1.127 -encourage the widest possible use of a certain library, so that it becomes
1.128 -a de-facto standard. To achieve this, non-free programs must be
1.129 -allowed to use the library. A more frequent case is that a free
1.130 -library does the same job as widely used non-free libraries. In this
1.131 -case, there is little to gain by limiting the free library to free
1.132 -software only, so we use the Lesser General Public License.
1.133 -
1.134 - In other cases, permission to use a particular library in non-free
1.135 -programs enables a greater number of people to use a large body of
1.136 -free software. For example, permission to use the GNU C Library in
1.137 -non-free programs enables many more people to use the whole GNU
1.138 -operating system, as well as its variant, the GNU/Linux operating
1.139 -system.
1.140 -
1.141 - Although the Lesser General Public License is Less protective of the
1.142 -users' freedom, it does ensure that the user of a program that is
1.143 -linked with the Library has the freedom and the wherewithal to run
1.144 -that program using a modified version of the Library.
1.145 + Finally, any free program is threatened constantly by software
1.146 +patents. We wish to avoid the danger that redistributors of a free
1.147 +program will individually obtain patent licenses, in effect making the
1.148 +program proprietary. To prevent this, we have made it clear that any
1.149 +patent must be licensed for everyone's free use or not licensed at all.
1.150
1.151 The precise terms and conditions for copying, distribution and
1.152 -modification follow. Pay close attention to the difference between a
1.153 -"work based on the library" and a "work that uses the library". The
1.154 -former contains code derived from the library, whereas the latter must
1.155 -be combined with the library in order to run.
1.156 -
1.157 - GNU LESSER GENERAL PUBLIC LICENSE
1.158 +modification follow.
1.159 +
1.160 + GNU GENERAL PUBLIC LICENSE
1.161 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
1.162
1.163 - 0. This License Agreement applies to any software library or other
1.164 -program which contains a notice placed by the copyright holder or
1.165 -other authorized party saying it may be distributed under the terms of
1.166 -this Lesser General Public License (also called "this License").
1.167 -Each licensee is addressed as "you".
1.168 + 0. This License applies to any program or other work which contains
1.169 +a notice placed by the copyright holder saying it may be distributed
1.170 +under the terms of this General Public License. The "Program", below,
1.171 +refers to any such program or work, and a "work based on the Program"
1.172 +means either the Program or any derivative work under copyright law:
1.173 +that is to say, a work containing the Program or a portion of it,
1.174 +either verbatim or with modifications and/or translated into another
1.175 +language. (Hereinafter, translation is included without limitation in
1.176 +the term "modification".) Each licensee is addressed as "you".
1.177
1.178 - A "library" means a collection of software functions and/or data
1.179 -prepared so as to be conveniently linked with application programs
1.180 -(which use some of those functions and data) to form executables.
1.181 +Activities other than copying, distribution and modification are not
1.182 +covered by this License; they are outside its scope. The act of
1.183 +running the Program is not restricted, and the output from the Program
1.184 +is covered only if its contents constitute a work based on the
1.185 +Program (independent of having been made by running the Program).
1.186 +Whether that is true depends on what the Program does.
1.187
1.188 - The "Library", below, refers to any such software library or work
1.189 -which has been distributed under these terms. A "work based on the
1.190 -Library" means either the Library or any derivative work under
1.191 -copyright law: that is to say, a work containing the Library or a
1.192 -portion of it, either verbatim or with modifications and/or translated
1.193 -straightforwardly into another language. (Hereinafter, translation is
1.194 -included without limitation in the term "modification".)
1.195 + 1. You may copy and distribute verbatim copies of the Program's
1.196 +source code as you receive it, in any medium, provided that you
1.197 +conspicuously and appropriately publish on each copy an appropriate
1.198 +copyright notice and disclaimer of warranty; keep intact all the
1.199 +notices that refer to this License and to the absence of any warranty;
1.200 +and give any other recipients of the Program a copy of this License
1.201 +along with the Program.
1.202
1.203 - "Source code" for a work means the preferred form of the work for
1.204 -making modifications to it. For a library, complete source code means
1.205 -all the source code for all modules it contains, plus any associated
1.206 -interface definition files, plus the scripts used to control compilation
1.207 -and installation of the library.
1.208 +You may charge a fee for the physical act of transferring a copy, and
1.209 +you may at your option offer warranty protection in exchange for a fee.
1.210
1.211 - Activities other than copying, distribution and modification are not
1.212 -covered by this License; they are outside its scope. The act of
1.213 -running a program using the Library is not restricted, and output from
1.214 -such a program is covered only if its contents constitute a work based
1.215 -on the Library (independent of the use of the Library in a tool for
1.216 -writing it). Whether that is true depends on what the Library does
1.217 -and what the program that uses the Library does.
1.218 -
1.219 - 1. You may copy and distribute verbatim copies of the Library's
1.220 -complete source code as you receive it, in any medium, provided that
1.221 -you conspicuously and appropriately publish on each copy an
1.222 -appropriate copyright notice and disclaimer of warranty; keep intact
1.223 -all the notices that refer to this License and to the absence of any
1.224 -warranty; and distribute a copy of this License along with the
1.225 -Library.
1.226 -
1.227 - You may charge a fee for the physical act of transferring a copy,
1.228 -and you may at your option offer warranty protection in exchange for a
1.229 -fee.
1.230 -
1.231 - 2. You may modify your copy or copies of the Library or any portion
1.232 -of it, thus forming a work based on the Library, and copy and
1.233 + 2. You may modify your copy or copies of the Program or any portion
1.234 +of it, thus forming a work based on the Program, and copy and
1.235 distribute such modifications or work under the terms of Section 1
1.236 above, provided that you also meet all of these conditions:
1.237
1.238 - a) The modified work must itself be a software library.
1.239 -
1.240 - b) You must cause the files modified to carry prominent notices
1.241 + a) You must cause the modified files to carry prominent notices
1.242 stating that you changed the files and the date of any change.
1.243
1.244 - c) You must cause the whole of the work to be licensed at no
1.245 - charge to all third parties under the terms of this License.
1.246 + b) You must cause any work that you distribute or publish, that in
1.247 + whole or in part contains or is derived from the Program or any
1.248 + part thereof, to be licensed as a whole at no charge to all third
1.249 + parties under the terms of this License.
1.250
1.251 - d) If a facility in the modified Library refers to a function or a
1.252 - table of data to be supplied by an application program that uses
1.253 - the facility, other than as an argument passed when the facility
1.254 - is invoked, then you must make a good faith effort to ensure that,
1.255 - in the event an application does not supply such function or
1.256 - table, the facility still operates, and performs whatever part of
1.257 - its purpose remains meaningful.
1.258 -
1.259 - (For example, a function in a library to compute square roots has
1.260 - a purpose that is entirely well-defined independent of the
1.261 - application. Therefore, Subsection 2d requires that any
1.262 - application-supplied function or table used by this function must
1.263 - be optional: if the application does not supply it, the square
1.264 - root function must still compute square roots.)
1.265 -
1.266 + c) If the modified program normally reads commands interactively
1.267 + when run, you must cause it, when started running for such
1.268 + interactive use in the most ordinary way, to print or display an
1.269 + announcement including an appropriate copyright notice and a
1.270 + notice that there is no warranty (or else, saying that you provide
1.271 + a warranty) and that users may redistribute the program under
1.272 + these conditions, and telling the user how to view a copy of this
1.273 + License. (Exception: if the Program itself is interactive but
1.274 + does not normally print such an announcement, your work based on
1.275 + the Program is not required to print an announcement.)
1.276 +
1.277 These requirements apply to the modified work as a whole. If
1.278 -identifiable sections of that work are not derived from the Library,
1.279 +identifiable sections of that work are not derived from the Program,
1.280 and can be reasonably considered independent and separate works in
1.281 themselves, then this License, and its terms, do not apply to those
1.282 sections when you distribute them as separate works. But when you
1.283 distribute the same sections as part of a whole which is a work based
1.284 -on the Library, the distribution of the whole must be on the terms of
1.285 +on the Program, the distribution of the whole must be on the terms of
1.286 this License, whose permissions for other licensees extend to the
1.287 -entire whole, and thus to each and every part regardless of who wrote
1.288 -it.
1.289 +entire whole, and thus to each and every part regardless of who wrote it.
1.290
1.291 Thus, it is not the intent of this section to claim rights or contest
1.292 your rights to work written entirely by you; rather, the intent is to
1.293 exercise the right to control the distribution of derivative or
1.294 -collective works based on the Library.
1.295 +collective works based on the Program.
1.296
1.297 -In addition, mere aggregation of another work not based on the Library
1.298 -with the Library (or with a work based on the Library) on a volume of
1.299 +In addition, mere aggregation of another work not based on the Program
1.300 +with the Program (or with a work based on the Program) on a volume of
1.301 a storage or distribution medium does not bring the other work under
1.302 the scope of this License.
1.303
1.304 - 3. You may opt to apply the terms of the ordinary GNU General Public
1.305 -License instead of this License to a given copy of the Library. To do
1.306 -this, you must alter all the notices that refer to this License, so
1.307 -that they refer to the ordinary GNU General Public License, version 2,
1.308 -instead of to this License. (If a newer version than version 2 of the
1.309 -ordinary GNU General Public License has appeared, then you can specify
1.310 -that version instead if you wish.) Do not make any other change in
1.311 -these notices.
1.312 + 3. You may copy and distribute the Program (or a work based on it,
1.313 +under Section 2) in object code or executable form under the terms of
1.314 +Sections 1 and 2 above provided that you also do one of the following:
1.315
1.316 - Once this change is made in a given copy, it is irreversible for
1.317 -that copy, so the ordinary GNU General Public License applies to all
1.318 -subsequent copies and derivative works made from that copy.
1.319 + a) Accompany it with the complete corresponding machine-readable
1.320 + source code, which must be distributed under the terms of Sections
1.321 + 1 and 2 above on a medium customarily used for software interchange; or,
1.322
1.323 - This option is useful when you wish to copy part of the code of
1.324 -the Library into a program that is not a library.
1.325 + b) Accompany it with a written offer, valid for at least three
1.326 + years, to give any third party, for a charge no more than your
1.327 + cost of physically performing source distribution, a complete
1.328 + machine-readable copy of the corresponding source code, to be
1.329 + distributed under the terms of Sections 1 and 2 above on a medium
1.330 + customarily used for software interchange; or,
1.331
1.332 - 4. You may copy and distribute the Library (or a portion or
1.333 -derivative of it, under Section 2) in object code or executable form
1.334 -under the terms of Sections 1 and 2 above provided that you accompany
1.335 -it with the complete corresponding machine-readable source code, which
1.336 -must be distributed under the terms of Sections 1 and 2 above on a
1.337 -medium customarily used for software interchange.
1.338 + c) Accompany it with the information you received as to the offer
1.339 + to distribute corresponding source code. (This alternative is
1.340 + allowed only for noncommercial distribution and only if you
1.341 + received the program in object code or executable form with such
1.342 + an offer, in accord with Subsection b above.)
1.343
1.344 - If distribution of object code is made by offering access to copy
1.345 -from a designated place, then offering equivalent access to copy the
1.346 -source code from the same place satisfies the requirement to
1.347 -distribute the source code, even though third parties are not
1.348 +The source code for a work means the preferred form of the work for
1.349 +making modifications to it. For an executable work, complete source
1.350 +code means all the source code for all modules it contains, plus any
1.351 +associated interface definition files, plus the scripts used to
1.352 +control compilation and installation of the executable. However, as a
1.353 +special exception, the source code distributed need not include
1.354 +anything that is normally distributed (in either source or binary
1.355 +form) with the major components (compiler, kernel, and so on) of the
1.356 +operating system on which the executable runs, unless that component
1.357 +itself accompanies the executable.
1.358 +
1.359 +If distribution of executable or object code is made by offering
1.360 +access to copy from a designated place, then offering equivalent
1.361 +access to copy the source code from the same place counts as
1.362 +distribution of the source code, even though third parties are not
1.363 compelled to copy the source along with the object code.
1.364 +
1.365 + 4. You may not copy, modify, sublicense, or distribute the Program
1.366 +except as expressly provided under this License. Any attempt
1.367 +otherwise to copy, modify, sublicense or distribute the Program is
1.368 +void, and will automatically terminate your rights under this License.
1.369 +However, parties who have received copies, or rights, from you under
1.370 +this License will not have their licenses terminated so long as such
1.371 +parties remain in full compliance.
1.372
1.373 - 5. A program that contains no derivative of any portion of the
1.374 -Library, but is designed to work with the Library by being compiled or
1.375 -linked with it, is called a "work that uses the Library". Such a
1.376 -work, in isolation, is not a derivative work of the Library, and
1.377 -therefore falls outside the scope of this License.
1.378 + 5. You are not required to accept this License, since you have not
1.379 +signed it. However, nothing else grants you permission to modify or
1.380 +distribute the Program or its derivative works. These actions are
1.381 +prohibited by law if you do not accept this License. Therefore, by
1.382 +modifying or distributing the Program (or any work based on the
1.383 +Program), you indicate your acceptance of this License to do so, and
1.384 +all its terms and conditions for copying, distributing or modifying
1.385 +the Program or works based on it.
1.386
1.387 - However, linking a "work that uses the Library" with the Library
1.388 -creates an executable that is a derivative of the Library (because it
1.389 -contains portions of the Library), rather than a "work that uses the
1.390 -library". The executable is therefore covered by this License.
1.391 -Section 6 states terms for distribution of such executables.
1.392 -
1.393 - When a "work that uses the Library" uses material from a header file
1.394 -that is part of the Library, the object code for the work may be a
1.395 -derivative work of the Library even though the source code is not.
1.396 -Whether this is true is especially significant if the work can be
1.397 -linked without the Library, or if the work is itself a library. The
1.398 -threshold for this to be true is not precisely defined by law.
1.399 -
1.400 - If such an object file uses only numerical parameters, data
1.401 -structure layouts and accessors, and small macros and small inline
1.402 -functions (ten lines or less in length), then the use of the object
1.403 -file is unrestricted, regardless of whether it is legally a derivative
1.404 -work. (Executables containing this object code plus portions of the
1.405 -Library will still fall under Section 6.)
1.406 -
1.407 - Otherwise, if the work is a derivative of the Library, you may
1.408 -distribute the object code for the work under the terms of Section 6.
1.409 -Any executables containing that work also fall under Section 6,
1.410 -whether or not they are linked directly with the Library itself.
1.411 -
1.412 - 6. As an exception to the Sections above, you may also combine or
1.413 -link a "work that uses the Library" with the Library to produce a
1.414 -work containing portions of the Library, and distribute that work
1.415 -under terms of your choice, provided that the terms permit
1.416 -modification of the work for the customer's own use and reverse
1.417 -engineering for debugging such modifications.
1.418 -
1.419 - You must give prominent notice with each copy of the work that the
1.420 -Library is used in it and that the Library and its use are covered by
1.421 -this License. You must supply a copy of this License. If the work
1.422 -during execution displays copyright notices, you must include the
1.423 -copyright notice for the Library among them, as well as a reference
1.424 -directing the user to the copy of this License. Also, you must do one
1.425 -of these things:
1.426 -
1.427 - a) Accompany the work with the complete corresponding
1.428 - machine-readable source code for the Library including whatever
1.429 - changes were used in the work (which must be distributed under
1.430 - Sections 1 and 2 above); and, if the work is an executable linked
1.431 - with the Library, with the complete machine-readable "work that
1.432 - uses the Library", as object code and/or source code, so that the
1.433 - user can modify the Library and then relink to produce a modified
1.434 - executable containing the modified Library. (It is understood
1.435 - that the user who changes the contents of definitions files in the
1.436 - Library will not necessarily be able to recompile the application
1.437 - to use the modified definitions.)
1.438 -
1.439 - b) Use a suitable shared library mechanism for linking with the
1.440 - Library. A suitable mechanism is one that (1) uses at run time a
1.441 - copy of the library already present on the user's computer system,
1.442 - rather than copying library functions into the executable, and (2)
1.443 - will operate properly with a modified version of the library, if
1.444 - the user installs one, as long as the modified version is
1.445 - interface-compatible with the version that the work was made with.
1.446 -
1.447 - c) Accompany the work with a written offer, valid for at
1.448 - least three years, to give the same user the materials
1.449 - specified in Subsection 6a, above, for a charge no more
1.450 - than the cost of performing this distribution.
1.451 -
1.452 - d) If distribution of the work is made by offering access to copy
1.453 - from a designated place, offer equivalent access to copy the above
1.454 - specified materials from the same place.
1.455 -
1.456 - e) Verify that the user has already received a copy of these
1.457 - materials or that you have already sent this user a copy.
1.458 -
1.459 - For an executable, the required form of the "work that uses the
1.460 -Library" must include any data and utility programs needed for
1.461 -reproducing the executable from it. However, as a special exception,
1.462 -the materials to be distributed need not include anything that is
1.463 -normally distributed (in either source or binary form) with the major
1.464 -components (compiler, kernel, and so on) of the operating system on
1.465 -which the executable runs, unless that component itself accompanies
1.466 -the executable.
1.467 -
1.468 - It may happen that this requirement contradicts the license
1.469 -restrictions of other proprietary libraries that do not normally
1.470 -accompany the operating system. Such a contradiction means you cannot
1.471 -use both them and the Library together in an executable that you
1.472 -distribute.
1.473 -
1.474 - 7. You may place library facilities that are a work based on the
1.475 -Library side-by-side in a single library together with other library
1.476 -facilities not covered by this License, and distribute such a combined
1.477 -library, provided that the separate distribution of the work based on
1.478 -the Library and of the other library facilities is otherwise
1.479 -permitted, and provided that you do these two things:
1.480 -
1.481 - a) Accompany the combined library with a copy of the same work
1.482 - based on the Library, uncombined with any other library
1.483 - facilities. This must be distributed under the terms of the
1.484 - Sections above.
1.485 -
1.486 - b) Give prominent notice with the combined library of the fact
1.487 - that part of it is a work based on the Library, and explaining
1.488 - where to find the accompanying uncombined form of the same work.
1.489 -
1.490 - 8. You may not copy, modify, sublicense, link with, or distribute
1.491 -the Library except as expressly provided under this License. Any
1.492 -attempt otherwise to copy, modify, sublicense, link with, or
1.493 -distribute the Library is void, and will automatically terminate your
1.494 -rights under this License. However, parties who have received copies,
1.495 -or rights, from you under this License will not have their licenses
1.496 -terminated so long as such parties remain in full compliance.
1.497 -
1.498 - 9. You are not required to accept this License, since you have not
1.499 -signed it. However, nothing else grants you permission to modify or
1.500 -distribute the Library or its derivative works. These actions are
1.501 -prohibited by law if you do not accept this License. Therefore, by
1.502 -modifying or distributing the Library (or any work based on the
1.503 -Library), you indicate your acceptance of this License to do so, and
1.504 -all its terms and conditions for copying, distributing or modifying
1.505 -the Library or works based on it.
1.506 -
1.507 - 10. Each time you redistribute the Library (or any work based on the
1.508 -Library), the recipient automatically receives a license from the
1.509 -original licensor to copy, distribute, link with or modify the Library
1.510 -subject to these terms and conditions. You may not impose any further
1.511 + 6. Each time you redistribute the Program (or any work based on the
1.512 +Program), the recipient automatically receives a license from the
1.513 +original licensor to copy, distribute or modify the Program subject to
1.514 +these terms and conditions. You may not impose any further
1.515 restrictions on the recipients' exercise of the rights granted herein.
1.516 -You are not responsible for enforcing compliance by third parties with
1.517 +You are not responsible for enforcing compliance by third parties to
1.518 this License.
1.519
1.520 - 11. If, as a consequence of a court judgment or allegation of patent
1.521 + 7. If, as a consequence of a court judgment or allegation of patent
1.522 infringement or for any other reason (not limited to patent issues),
1.523 conditions are imposed on you (whether by court order, agreement or
1.524 otherwise) that contradict the conditions of this License, they do not
1.525 excuse you from the conditions of this License. If you cannot
1.526 distribute so as to satisfy simultaneously your obligations under this
1.527 License and any other pertinent obligations, then as a consequence you
1.528 -may not distribute the Library at all. For example, if a patent
1.529 -license would not permit royalty-free redistribution of the Library by
1.530 +may not distribute the Program at all. For example, if a patent
1.531 +license would not permit royalty-free redistribution of the Program by
1.532 all those who receive copies directly or indirectly through you, then
1.533 the only way you could satisfy both it and this License would be to
1.534 -refrain entirely from distribution of the Library.
1.535 +refrain entirely from distribution of the Program.
1.536
1.537 -If any portion of this section is held invalid or unenforceable under any
1.538 -particular circumstance, the balance of the section is intended to apply,
1.539 -and the section as a whole is intended to apply in other circumstances.
1.540 +If any portion of this section is held invalid or unenforceable under
1.541 +any particular circumstance, the balance of the section is intended to
1.542 +apply and the section as a whole is intended to apply in other
1.543 +circumstances.
1.544
1.545 It is not the purpose of this section to induce you to infringe any
1.546 patents or other property right claims or to contest validity of any
1.547 such claims; this section has the sole purpose of protecting the
1.548 -integrity of the free software distribution system which is
1.549 +integrity of the free software distribution system, which is
1.550 implemented by public license practices. Many people have made
1.551 generous contributions to the wide range of software distributed
1.552 through that system in reliance on consistent application of that
1.553 @@ -401,104 +225,116 @@
1.554
1.555 This section is intended to make thoroughly clear what is believed to
1.556 be a consequence of the rest of this License.
1.557 +
1.558 + 8. If the distribution and/or use of the Program is restricted in
1.559 +certain countries either by patents or by copyrighted interfaces, the
1.560 +original copyright holder who places the Program under this License
1.561 +may add an explicit geographical distribution limitation excluding
1.562 +those countries, so that distribution is permitted only in or among
1.563 +countries not thus excluded. In such case, this License incorporates
1.564 +the limitation as if written in the body of this License.
1.565
1.566 - 12. If the distribution and/or use of the Library is restricted in
1.567 -certain countries either by patents or by copyrighted interfaces, the
1.568 -original copyright holder who places the Library under this License may add
1.569 -an explicit geographical distribution limitation excluding those countries,
1.570 -so that distribution is permitted only in or among countries not thus
1.571 -excluded. In such case, this License incorporates the limitation as if
1.572 -written in the body of this License.
1.573 + 9. The Free Software Foundation may publish revised and/or new versions
1.574 +of the General Public License from time to time. Such new versions will
1.575 +be similar in spirit to the present version, but may differ in detail to
1.576 +address new problems or concerns.
1.577
1.578 - 13. The Free Software Foundation may publish revised and/or new
1.579 -versions of the Lesser General Public License from time to time.
1.580 -Such new versions will be similar in spirit to the present version,
1.581 -but may differ in detail to address new problems or concerns.
1.582 +Each version is given a distinguishing version number. If the Program
1.583 +specifies a version number of this License which applies to it and "any
1.584 +later version", you have the option of following the terms and conditions
1.585 +either of that version or of any later version published by the Free
1.586 +Software Foundation. If the Program does not specify a version number of
1.587 +this License, you may choose any version ever published by the Free Software
1.588 +Foundation.
1.589
1.590 -Each version is given a distinguishing version number. If the Library
1.591 -specifies a version number of this License which applies to it and
1.592 -"any later version", you have the option of following the terms and
1.593 -conditions either of that version or of any later version published by
1.594 -the Free Software Foundation. If the Library does not specify a
1.595 -license version number, you may choose any version ever published by
1.596 -the Free Software Foundation.
1.597 -
1.598 - 14. If you wish to incorporate parts of the Library into other free
1.599 -programs whose distribution conditions are incompatible with these,
1.600 -write to the author to ask for permission. For software which is
1.601 -copyrighted by the Free Software Foundation, write to the Free
1.602 -Software Foundation; we sometimes make exceptions for this. Our
1.603 -decision will be guided by the two goals of preserving the free status
1.604 -of all derivatives of our free software and of promoting the sharing
1.605 -and reuse of software generally.
1.606 + 10. If you wish to incorporate parts of the Program into other free
1.607 +programs whose distribution conditions are different, write to the author
1.608 +to ask for permission. For software which is copyrighted by the Free
1.609 +Software Foundation, write to the Free Software Foundation; we sometimes
1.610 +make exceptions for this. Our decision will be guided by the two goals
1.611 +of preserving the free status of all derivatives of our free software and
1.612 +of promoting the sharing and reuse of software generally.
1.613
1.614 NO WARRANTY
1.615
1.616 - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
1.617 -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
1.618 -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
1.619 -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
1.620 -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
1.621 -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
1.622 -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
1.623 -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
1.624 -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
1.625 + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
1.626 +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
1.627 +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
1.628 +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
1.629 +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
1.630 +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
1.631 +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
1.632 +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
1.633 +REPAIR OR CORRECTION.
1.634
1.635 - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
1.636 -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
1.637 -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
1.638 -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
1.639 -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
1.640 -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
1.641 -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
1.642 -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
1.643 -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
1.644 -DAMAGES.
1.645 + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
1.646 +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
1.647 +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
1.648 +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
1.649 +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
1.650 +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
1.651 +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
1.652 +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
1.653 +POSSIBILITY OF SUCH DAMAGES.
1.654
1.655 END OF TERMS AND CONDITIONS
1.656 +
1.657 + How to Apply These Terms to Your New Programs
1.658
1.659 - How to Apply These Terms to Your New Libraries
1.660 + If you develop a new program, and you want it to be of the greatest
1.661 +possible use to the public, the best way to achieve this is to make it
1.662 +free software which everyone can redistribute and change under these terms.
1.663
1.664 - If you develop a new library, and you want it to be of the greatest
1.665 -possible use to the public, we recommend making it free software that
1.666 -everyone can redistribute and change. You can do so by permitting
1.667 -redistribution under these terms (or, alternatively, under the terms of the
1.668 -ordinary General Public License).
1.669 + To do so, attach the following notices to the program. It is safest
1.670 +to attach them to the start of each source file to most effectively
1.671 +convey the exclusion of warranty; and each file should have at least
1.672 +the "copyright" line and a pointer to where the full notice is found.
1.673
1.674 - To apply these terms, attach the following notices to the library. It is
1.675 -safest to attach them to the start of each source file to most effectively
1.676 -convey the exclusion of warranty; and each file should have at least the
1.677 -"copyright" line and a pointer to where the full notice is found.
1.678 -
1.679 - <one line to give the library's name and a brief idea of what it does.>
1.680 + <one line to give the program's name and a brief idea of what it does.>
1.681 Copyright (C) <year> <name of author>
1.682
1.683 - This library is free software; you can redistribute it and/or
1.684 - modify it under the terms of the GNU Lesser General Public
1.685 - License as published by the Free Software Foundation; either
1.686 - version 2.1 of the License, or (at your option) any later version.
1.687 + This program is free software; you can redistribute it and/or modify
1.688 + it under the terms of the GNU General Public License as published by
1.689 + the Free Software Foundation; either version 2 of the License, or
1.690 + (at your option) any later version.
1.691
1.692 - This library is distributed in the hope that it will be useful,
1.693 + This program is distributed in the hope that it will be useful,
1.694 but WITHOUT ANY WARRANTY; without even the implied warranty of
1.695 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1.696 - Lesser General Public License for more details.
1.697 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1.698 + GNU General Public License for more details.
1.699
1.700 - You should have received a copy of the GNU Lesser General Public
1.701 - License along with this library; if not, write to the Free Software
1.702 - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1.703 + You should have received a copy of the GNU General Public License
1.704 + along with this program; if not, write to the Free Software
1.705 + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1.706 +
1.707
1.708 Also add information on how to contact you by electronic and paper mail.
1.709
1.710 +If the program is interactive, make it output a short notice like this
1.711 +when it starts in an interactive mode:
1.712 +
1.713 + Gnomovision version 69, Copyright (C) year name of author
1.714 + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
1.715 + This is free software, and you are welcome to redistribute it
1.716 + under certain conditions; type `show c' for details.
1.717 +
1.718 +The hypothetical commands `show w' and `show c' should show the appropriate
1.719 +parts of the General Public License. Of course, the commands you use may
1.720 +be called something other than `show w' and `show c'; they could even be
1.721 +mouse-clicks or menu items--whatever suits your program.
1.722 +
1.723 You should also get your employer (if you work as a programmer) or your
1.724 -school, if any, to sign a "copyright disclaimer" for the library, if
1.725 +school, if any, to sign a "copyright disclaimer" for the program, if
1.726 necessary. Here is a sample; alter the names:
1.727
1.728 - Yoyodyne, Inc., hereby disclaims all copyright interest in the
1.729 - library `Frob' (a library for tweaking knobs) written by James Random Hacker.
1.730 + Yoyodyne, Inc., hereby disclaims all copyright interest in the program
1.731 + `Gnomovision' (which makes passes at compilers) written by James Hacker.
1.732
1.733 - <signature of Ty Coon>, 1 April 1990
1.734 + <signature of Ty Coon>, 1 April 1989
1.735 Ty Coon, President of Vice
1.736
1.737 -That's all there is to it!
1.738 -
1.739 -
1.740 +This General Public License does not permit incorporating your program into
1.741 +proprietary programs. If your program is a subroutine library, you may
1.742 +consider it more useful to permit linking proprietary applications with the
1.743 +library. If this is what you want to do, use the GNU Library General
1.744 +Public License instead of this License.
2.1 --- a/gmyth/INSTALL Tue Nov 28 15:14:16 2006 +0000
2.2 +++ b/gmyth/INSTALL Tue Nov 28 21:04:14 2006 +0000
2.3 @@ -1,3 +1,9 @@
2.4 +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
2.5 +Foundation, Inc.
2.6 +
2.7 + This file is free documentation; the Free Software Foundation gives
2.8 +unlimited permission to copy, distribute and modify it.
2.9 +
2.10 Basic Installation
2.11 ==================
2.12
2.13 @@ -8,20 +14,27 @@
2.14 those values to create a `Makefile' in each directory of the package.
2.15 It may also create one or more `.h' files containing system-dependent
2.16 definitions. Finally, it creates a shell script `config.status' that
2.17 -you can run in the future to recreate the current configuration, a file
2.18 -`config.cache' that saves the results of its tests to speed up
2.19 -reconfiguring, and a file `config.log' containing compiler output
2.20 -(useful mainly for debugging `configure').
2.21 +you can run in the future to recreate the current configuration, and a
2.22 +file `config.log' containing compiler output (useful mainly for
2.23 +debugging `configure').
2.24 +
2.25 + It can also use an optional file (typically called `config.cache'
2.26 +and enabled with `--cache-file=config.cache' or simply `-C') that saves
2.27 +the results of its tests to speed up reconfiguring. (Caching is
2.28 +disabled by default to prevent problems with accidental use of stale
2.29 +cache files.)
2.30
2.31 If you need to do unusual things to compile the package, please try
2.32 to figure out how `configure' could check whether to do them, and mail
2.33 diffs or instructions to the address given in the `README' so they can
2.34 -be considered for the next release. If at some point `config.cache'
2.35 -contains results you don't want to keep, you may remove or edit it.
2.36 +be considered for the next release. If you are using the cache, and at
2.37 +some point `config.cache' contains results you don't want to keep, you
2.38 +may remove or edit it.
2.39
2.40 - The file `configure.in' is used to create `configure' by a program
2.41 -called `autoconf'. You only need `configure.in' if you want to change
2.42 -it or regenerate `configure' using a newer version of `autoconf'.
2.43 + The file `configure.ac' (or `configure.in') is used to create
2.44 +`configure' by a program called `autoconf'. You only need
2.45 +`configure.ac' if you want to change it or regenerate `configure' using
2.46 +a newer version of `autoconf'.
2.47
2.48 The simplest way to compile this package is:
2.49
2.50 @@ -55,14 +68,16 @@
2.51 =====================
2.52
2.53 Some systems require unusual options for compilation or linking that
2.54 -the `configure' script does not know about. You can give `configure'
2.55 -initial values for variables by setting them in the environment. Using
2.56 -a Bourne-compatible shell, you can do that on the command line like
2.57 -this:
2.58 - CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
2.59 +the `configure' script does not know about. Run `./configure --help'
2.60 +for details on some of the pertinent environment variables.
2.61
2.62 -Or on systems that have the `env' program, you can do it like this:
2.63 - env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
2.64 + You can give `configure' initial values for configuration parameters
2.65 +by setting variables in the command line or in the environment. Here
2.66 +is an example:
2.67 +
2.68 + ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
2.69 +
2.70 + *Note Defining Variables::, for more details.
2.71
2.72 Compiling For Multiple Architectures
2.73 ====================================
2.74 @@ -75,11 +90,11 @@
2.75 the `configure' script. `configure' automatically checks for the
2.76 source code in the directory that `configure' is in and in `..'.
2.77
2.78 - If you have to use a `make' that does not supports the `VPATH'
2.79 -variable, you have to compile the package for one architecture at a time
2.80 -in the source code directory. After you have installed the package for
2.81 -one architecture, use `make distclean' before reconfiguring for another
2.82 -architecture.
2.83 + If you have to use a `make' that does not support the `VPATH'
2.84 +variable, you have to compile the package for one architecture at a
2.85 +time in the source code directory. After you have installed the
2.86 +package for one architecture, use `make distclean' before reconfiguring
2.87 +for another architecture.
2.88
2.89 Installation Names
2.90 ==================
2.91 @@ -122,22 +137,32 @@
2.92 Specifying the System Type
2.93 ==========================
2.94
2.95 - There may be some features `configure' can not figure out
2.96 -automatically, but needs to determine by the type of host the package
2.97 -will run on. Usually `configure' can figure that out, but if it prints
2.98 -a message saying it can not guess the host type, give it the
2.99 -`--host=TYPE' option. TYPE can either be a short name for the system
2.100 -type, such as `sun4', or a canonical name with three fields:
2.101 + There may be some features `configure' cannot figure out
2.102 +automatically, but needs to determine by the type of machine the package
2.103 +will run on. Usually, assuming the package is built to be run on the
2.104 +_same_ architectures, `configure' can figure that out, but if it prints
2.105 +a message saying it cannot guess the machine type, give it the
2.106 +`--build=TYPE' option. TYPE can either be a short name for the system
2.107 +type, such as `sun4', or a canonical name which has the form:
2.108 +
2.109 CPU-COMPANY-SYSTEM
2.110
2.111 -See the file `config.sub' for the possible values of each field. If
2.112 +where SYSTEM can have one of these forms:
2.113 +
2.114 + OS KERNEL-OS
2.115 +
2.116 + See the file `config.sub' for the possible values of each field. If
2.117 `config.sub' isn't included in this package, then this package doesn't
2.118 -need to know the host type.
2.119 +need to know the machine type.
2.120
2.121 - If you are building compiler tools for cross-compiling, you can also
2.122 + If you are _building_ compiler tools for cross-compiling, you should
2.123 use the `--target=TYPE' option to select the type of system they will
2.124 -produce code for and the `--build=TYPE' option to select the type of
2.125 -system on which you are compiling the package.
2.126 +produce code for.
2.127 +
2.128 + If you want to _use_ a cross compiler, that generates code for a
2.129 +platform different from the build platform, you should specify the
2.130 +"host" platform (i.e., that on which the generated programs will
2.131 +eventually be run) with `--host=TYPE'.
2.132
2.133 Sharing Defaults
2.134 ================
2.135 @@ -150,19 +175,43 @@
2.136 `CONFIG_SITE' environment variable to the location of the site script.
2.137 A warning: not all `configure' scripts look for a site script.
2.138
2.139 -Operation Controls
2.140 +Defining Variables
2.141 ==================
2.142
2.143 + Variables not defined in a site shell script can be set in the
2.144 +environment passed to `configure'. However, some packages may run
2.145 +configure again during the build, and the customized values of these
2.146 +variables may be lost. In order to avoid this problem, you should set
2.147 +them in the `configure' command line, using `VAR=value'. For example:
2.148 +
2.149 + ./configure CC=/usr/local2/bin/gcc
2.150 +
2.151 +will cause the specified gcc to be used as the C compiler (unless it is
2.152 +overridden in the site shell script).
2.153 +
2.154 +`configure' Invocation
2.155 +======================
2.156 +
2.157 `configure' recognizes the following options to control how it
2.158 operates.
2.159
2.160 +`--help'
2.161 +`-h'
2.162 + Print a summary of the options to `configure', and exit.
2.163 +
2.164 +`--version'
2.165 +`-V'
2.166 + Print the version of Autoconf used to generate the `configure'
2.167 + script, and exit.
2.168 +
2.169 `--cache-file=FILE'
2.170 - Use and save the results of the tests in FILE instead of
2.171 - `./config.cache'. Set FILE to `/dev/null' to disable caching, for
2.172 - debugging `configure'.
2.173 + Enable the cache: use and save the results of the tests in FILE,
2.174 + traditionally `config.cache'. FILE defaults to `/dev/null' to
2.175 + disable caching.
2.176
2.177 -`--help'
2.178 - Print a summary of the options to `configure', and exit.
2.179 +`--config-cache'
2.180 +`-C'
2.181 + Alias for `--cache-file=config.cache'.
2.182
2.183 `--quiet'
2.184 `--silent'
2.185 @@ -175,8 +224,6 @@
2.186 Look for the package's source code in directory DIR. Usually
2.187 `configure' can determine that directory automatically.
2.188
2.189 -`--version'
2.190 - Print the version of Autoconf used to generate the `configure'
2.191 - script, and exit.
2.192 +`configure' also accepts some other, not widely useful, options. Run
2.193 +`configure --help' for more details.
2.194
2.195 -`configure' also accepts some other, not widely useful, options.
3.1 --- a/gmyth/autogen.sh Tue Nov 28 15:14:16 2006 +0000
3.2 +++ b/gmyth/autogen.sh Tue Nov 28 21:04:14 2006 +0000
3.3 @@ -49,7 +49,7 @@
3.4 if test -z "$*"; then
3.5 echo "+ checking for autogen.sh options"
3.6 echo " This autogen script will automatically run ./configure as:"
3.7 - echo " ./configure $CONFIGURE_DEF_OPT"
3.8 + echo " ./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT"
3.9 echo " To pass any additional options, please specify them on the $0"
3.10 echo " command line."
3.11 fi
4.1 --- a/gmyth/configure.ac Tue Nov 28 15:14:16 2006 +0000
4.2 +++ b/gmyth/configure.ac Tue Nov 28 21:04:14 2006 +0000
4.3 @@ -10,11 +10,9 @@
4.4
4.5 dnl when going to/from release please set the nano (fourth number) right !
4.6 dnl releases only do Wall, SVN and prerelease does Werror too
4.7 -AS_VERSION(gmyth, GMYTH, 0, 1, 0, 3, GMYTH_SVN="no", GMYTH_SVN="yes")
4.8 -
4.9 -GMYTH_MAJORMINOR=$GMYTH_MAJOR_VERSION.$GMYTH_MINOR_VERSION
4.10 -
4.11 -AC_SUBST(GMYTH_MAJORMINOR)
4.12 +dnl AS_VERSION(gmyth, GMYTH, 0, 1, 0, 3, GMYTH_SVN="no", GMYTH_SVN="yes")
4.13 +dnl GMYTH_MAJORMINOR=$GMYTH_MAJOR_VERSION.$GMYTH_MINOR_VERSION
4.14 +dnl AC_SUBST(GMYTH_MAJORMINOR)
4.15
4.16 dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode
4.17 AM_MAINTAINER_MODE
4.18 @@ -65,19 +63,13 @@
4.19
4.20 dnl Test if --disable-debug given
4.21 AC_ARG_ENABLE(debug,
4.22 - [AC_HELP_STRING([--disable-debug], [disable debugging mode])],
4.23 - enable_debug="$enableval",
4.24 - enable_debug=yes)
4.25 -
4.26 -if test "x$enable_debug" = "xyes" ; then
4.27 - CFLAGS="$CFLAGS -g"
4.28 + AC_HELP_STRING([--disable-debug], [enable debugging mode]))
4.29 +if test x"$enable_debug" != xno; then
4.30 + CFLAGS="$CFLAGS -g -DGMYTH_USE_DEBUG"
4.31 else
4.32 - AC_DEFINE( NDEBUG, 1, [disable debug messages] )
4.33 - CFLAGS="$CFLAGS -O2 -DG_DISABLE_CHECKS -DNDEBUG"
4.34 + CFLAGS="$CFLAGS -O2 -DG_DISABLE_CHECKS"
4.35 fi
4.36
4.37 -AM_CONDITIONAL( NDEBUG, test "x$enable_debug" = "xyes" )
4.38 -
4.39 # Check for pkgconfig
4.40 AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
4.41 # Give error and exit if we don't have pkgconfig
4.42 @@ -213,7 +205,14 @@
4.43 #dnl Enable gtk-doc
4.44 #GTK_DOC_CHECK(1.4)
4.45
4.46 -AC_CONFIG_FILES([Makefile
4.47 - src/Makefile
4.48 - gmyth.pc])
4.49 -AC_OUTPUT
4.50 +AC_OUTPUT([
4.51 +Makefile
4.52 +src/Makefile
4.53 +gmyth.pc])
4.54 +
4.55 +if test x"$enable_debug" != xno; then
4.56 + AC_MSG_NOTICE([Debug: Enabled])
4.57 +else
4.58 + AC_MSG_NOTICE([Debug: Disabled])
4.59 +fi
4.60 +
5.1 --- a/gmyth/src/Makefile.am Tue Nov 28 15:14:16 2006 +0000
5.2 +++ b/gmyth/src/Makefile.am Tue Nov 28 21:04:14 2006 +0000
5.3 @@ -4,6 +4,7 @@
5.4
5.5 libgmyth_la_SOURCES = \
5.6 gmyth_common.c \
5.7 + gmyth_debug.c \
5.8 gmyth_epg.c \
5.9 gmyth_recorder.c \
5.10 gmyth_remote_util.c \
5.11 @@ -44,8 +45,9 @@
5.12
5.13 libgmyth_include_HEADERS = \
5.14 gmyth_common.h \
5.15 + gmyth_debug.h \
5.16 gmyth_epg.h \
5.17 - gmyth_recorder.h \
5.18 + gmyth_recorder.h \
5.19 gmyth_scheduler.h \
5.20 gmyth_tvchain.h \
5.21 gmyth_util.h \
5.22 @@ -53,7 +55,7 @@
5.23 gmyth_socket.h \
5.24 gmyth_remote_util.h \
5.25 gmyth_stringlist.h \
5.26 - gmyth_file_transfer.h \
5.27 + gmyth_file_transfer.h \
5.28 gmyth_livetv.h \
5.29 gmyth_backendinfo.h \
5.30 gmyth_programinfo.h \
6.1 --- a/gmyth/src/gmyth_backendinfo.c Tue Nov 28 15:14:16 2006 +0000
6.2 +++ b/gmyth/src/gmyth_backendinfo.c Tue Nov 28 21:04:14 2006 +0000
6.3 @@ -26,6 +26,7 @@
6.4
6.5 #include "gmyth_backendinfo.h"
6.6 #include "gmyth_uri.h"
6.7 +#include "gmyth_debug.h"
6.8
6.9 static void gmyth_backend_info_class_init (GMythBackendInfoClass *klass);
6.10 static void gmyth_backend_info_init (GMythBackendInfo *object);
7.1 --- a/gmyth/src/gmyth_common.c Tue Nov 28 15:14:16 2006 +0000
7.2 +++ b/gmyth/src/gmyth_common.c Tue Nov 28 21:04:14 2006 +0000
7.3 @@ -26,6 +26,7 @@
7.4 */
7.5
7.6 #include "gmyth_common.h"
7.7 +#include "gmyth_debug.h"
7.8
7.9 static void free_channel_data(gpointer data, gpointer user_data);
7.10 static void free_program_data(gpointer data, gpointer user_data);
8.1 --- a/gmyth/src/gmyth_epg.c Tue Nov 28 15:14:16 2006 +0000
8.2 +++ b/gmyth/src/gmyth_epg.c Tue Nov 28 21:04:14 2006 +0000
8.3 @@ -33,6 +33,7 @@
8.4
8.5 #include "gmyth_epg.h"
8.6 #include "gmyth_util.h"
8.7 +#include "gmyth_debug.h"
8.8
8.9 static void gmyth_epg_class_init (GMythEPGClass *klass);
8.10 static void gmyth_epg_init (GMythEPG *object);
8.11 @@ -100,7 +101,7 @@
8.12 assert(gmyth_epg);
8.13
8.14 if (gmyth_epg->sqlquery == NULL) {
8.15 - g_debug ("[%s] Creating gmyth_query", __FUNCTION__);
8.16 + gmyth_debug ("[%s] Creating gmyth_query", __FUNCTION__);
8.17 gmyth_epg->sqlquery = gmyth_query_new ( );
8.18 }
8.19
9.1 --- a/gmyth/src/gmyth_file_transfer.c Tue Nov 28 15:14:16 2006 +0000
9.2 +++ b/gmyth/src/gmyth_file_transfer.c Tue Nov 28 21:04:14 2006 +0000
9.3 @@ -38,6 +38,7 @@
9.4 #include "gmyth_util.h"
9.5 #include "gmyth_socket.h"
9.6 #include "gmyth_stringlist.h"
9.7 +#include "gmyth_debug.h"
9.8
9.9 #include <unistd.h>
9.10 #include <glib.h>
9.11 @@ -178,8 +179,8 @@
9.12 transfer->hostname = g_string_new( gmyth_uri_get_host(transfer->uri) );
9.13 transfer->port = gmyth_uri_get_port( transfer->uri );
9.14
9.15 - g_debug ("[%s] URI: %s\n", __FUNCTION__, uri_str->str);
9.16 - g_debug ("hostname: %s, port %d\n", transfer->hostname->str, transfer->port);
9.17 + gmyth_debug ("[%s] URI: %s\n", __FUNCTION__, uri_str->str);
9.18 + gmyth_debug ("hostname: %s, port %d\n", transfer->hostname->str, transfer->port);
9.19
9.20 /* configure the control socket */
9.21 if (transfer->control_sock == NULL) {
9.22 @@ -215,7 +216,7 @@
9.23 ret = FALSE;
9.24 goto clean_up;
9.25 }
9.26 - g_debug ("Listening on Monitor socket...!\n");
9.27 + gmyth_debug ("Listening on Monitor socket...!\n");
9.28
9.29 //condition = g_io_channel_get_buffer_condition( io_channel );
9.30
9.31 @@ -228,7 +229,7 @@
9.32
9.33 gsize len = 0;
9.34 if (condition & G_IO_HUP) {
9.35 - g_debug ("Read end of pipe died!\n");
9.36 + gmyth_debug ("Read end of pipe died!\n");
9.37 ret = FALSE;
9.38 goto clean_up;
9.39 }
9.40 @@ -242,7 +243,7 @@
9.41 io_status = g_io_channel_read_chars( io_channel, trash + recv,
9.42 GMYTHTV_BUFFER_SIZE, &len, &error);
9.43
9.44 - g_debug ( "[%s] Received data buffer from IO binary channel... %d bytes gone!\n",
9.45 + gmyth_debug ( "[%s] Received data buffer from IO binary channel... %d bytes gone!\n",
9.46 __FUNCTION__, len );
9.47
9.48 recv += len;
9.49 @@ -258,10 +259,10 @@
9.50 }
9.51 //ret = g_io_channel_read_chars ( source, &msg, &len, NULL, &err);
9.52 if ( io_status == G_IO_STATUS_ERROR ) {
9.53 - g_debug ("[%s] Error reading: %s\n", __FUNCTION__, error != NULL ? error->message : "" );
9.54 + gmyth_debug ("[%s] Error reading: %s\n", __FUNCTION__, error != NULL ? error->message : "" );
9.55 ret = FALSE;
9.56 }
9.57 - g_debug ("\n[%s]\tEVENT: Read %d bytes: %s\n\n", __FUNCTION__, len, trash != NULL ? trash : "[no event data]" );
9.58 + gmyth_debug ("\n[%s]\tEVENT: Read %d bytes: %s\n\n", __FUNCTION__, len, trash != NULL ? trash : "[no event data]" );
9.59
9.60 //g_cond_signal( io_watcher_cond );
9.61
9.62 @@ -285,7 +286,7 @@
9.63
9.64 gmyth_socket_send_command( transfer->event_sock, base_str );
9.65 GString *resp = gmyth_socket_receive_response( transfer->event_sock );
9.66 - g_debug ( "[%s] Got Monitor response from %s: %s\n", __FUNCTION__, base_str->str, resp->str );
9.67 + gmyth_debug ( "[%s] Got Monitor response from %s: %s\n", __FUNCTION__, base_str->str, resp->str );
9.68 //g_thread_create( (GThreadFunc)myth_control_sock_listener, transfer->event_sock->sd_io_ch, TRUE, NULL );
9.69 io_watcher_context = g_main_context_default();
9.70 //GMainLoop *loop = g_main_loop_new( NULL, TRUE );
9.71 @@ -310,7 +311,7 @@
9.72 goto cleanup;
9.73 }
9.74 */
9.75 - g_debug ( "[%s]\tOK! Starting listener on the MONITOR event socket...\n", __FUNCTION__ );
9.76 + gmyth_debug ( "[%s]\tOK! Starting listener on the MONITOR event socket...\n", __FUNCTION__ );
9.77
9.78 //g_main_loop_run( loop );
9.79
9.80 @@ -318,7 +319,7 @@
9.81 //if ( source != NULL )
9.82 // g_source_unref( source );
9.83
9.84 - g_debug( "[%s] Watch listener function over the IO control channel? %s!!!\n",
9.85 + gmyth_debug( "[%s] Watch listener function over the IO control channel? %s!!!\n",
9.86 __FUNCTION__, ( ret == TRUE ? "YES" : "NO" ) );
9.87
9.88 return ret;
9.89 @@ -357,7 +358,7 @@
9.90
9.91 strlist = gmyth_string_list_new();
9.92 hostname = gmyth_socket_get_local_hostname();
9.93 - g_debug( "[%s] MythTV version (from backend) = %d.\n", __FUNCTION__, transfer->control_sock->mythtv_version );
9.94 + gmyth_debug( "[%s] MythTV version (from backend) = %d.\n", __FUNCTION__, transfer->control_sock->mythtv_version );
9.95 if ( transfer->control_sock->mythtv_version > 26 )
9.96 g_string_printf( base_str, "ANN FileTransfer %s 1 -1", hostname->str);
9.97 else
9.98 @@ -375,11 +376,11 @@
9.99 /* Myth URI stream file size - decoded using two 8-bytes sequences (64 bits/long long types) */
9.100 transfer->filesize = gmyth_util_decode_long_long( strlist, 2 );
9.101
9.102 - g_debug ( "[%s] ***** Received: recordernum = %d, filesize = %" G_GUINT64_FORMAT "\n", __FUNCTION__,
9.103 + gmyth_debug ( "[%s] ***** Received: recordernum = %d, filesize = %" G_GUINT64_FORMAT "\n", __FUNCTION__,
9.104 transfer->file_id, transfer->filesize );
9.105
9.106 if (transfer->filesize < 0 ) {
9.107 - g_debug ( "[%s] Got filesize equals to %llu is lesser than 0 [invalid stream file]\n", __FUNCTION__, transfer->filesize );
9.108 + gmyth_debug ( "[%s] Got filesize equals to %llu is lesser than 0 [invalid stream file]\n", __FUNCTION__, transfer->filesize );
9.109 g_object_unref(transfer->sock);
9.110 transfer->sock = NULL;
9.111 return FALSE;
9.112 @@ -486,7 +487,7 @@
9.113
9.114 gint64 retval = gmyth_string_list_get_int64(strlist, 0);
9.115 transfer->readposition = retval;
9.116 - g_debug ( "[%s] got reading position pointer from the streaming = %lld\n",
9.117 + gmyth_debug ( "[%s] got reading position pointer from the streaming = %lld\n",
9.118 __FUNCTION__, retval );
9.119
9.120 myth_control_release_context( );
9.121 @@ -571,7 +572,7 @@
9.122
9.123 io_status = g_io_channel_set_encoding( io_channel, NULL, &error );
9.124 if ( io_status == G_IO_STATUS_NORMAL )
9.125 - g_debug ( "[%s] Setting encoding to binary data socket).\n", __FUNCTION__ );
9.126 + gmyth_debug ( "[%s] Setting encoding to binary data socket).\n", __FUNCTION__ );
9.127
9.128 io_cond = g_io_channel_get_buffer_condition( io_channel );
9.129
9.130 @@ -590,7 +591,7 @@
9.131
9.132 query = g_string_new (GMYTHTV_QUERY_HEADER);
9.133 g_string_append_printf ( query, "%d", transfer->file_id );
9.134 - g_debug ("[%s] Transfer_query = %s\n", __FUNCTION__, query->str );
9.135 + gmyth_debug ("[%s] Transfer_query = %s\n", __FUNCTION__, query->str );
9.136
9.137 while (total_read == 0) {
9.138
9.139 @@ -609,7 +610,7 @@
9.140 if ( strlist != NULL && gmyth_string_list_length( strlist ) > 0 ) {
9.141 bytes_sent = gmyth_string_list_get_int( strlist, 0 ); // -1 on backend error
9.142
9.143 - g_debug ( "[%s] got SENT buffer message = %d\n", __FUNCTION__, bytes_sent );
9.144 + gmyth_debug ( "[%s] got SENT buffer message = %d\n", __FUNCTION__, bytes_sent );
9.145 if ( bytes_sent != 0 ) {
9.146
9.147 data_buffer = g_new0( gchar, bytes_sent );
10.1 --- a/gmyth/src/gmyth_livetv.c Tue Nov 28 15:14:16 2006 +0000
10.2 +++ b/gmyth/src/gmyth_livetv.c Tue Nov 28 21:04:14 2006 +0000
10.3 @@ -28,6 +28,7 @@
10.4 #include "gmyth_remote_util.h"
10.5 #include "gmyth_tvchain.h"
10.6 #include "gmyth_socket.h"
10.7 +#include "gmyth_debug.h"
10.8
10.9 #include "gmyth_livetv.h"
10.10 #include "gmyth_file_transfer.h"
10.11 @@ -82,7 +83,7 @@
10.12
10.13 GMythLiveTV *livetv = GMYTH_LIVETV (object);
10.14
10.15 - g_debug ("[%s] Finalizing livetv", __FUNCTION__);
10.16 + gmyth_debug ("[%s] Finalizing livetv", __FUNCTION__);
10.17
10.18 if ( livetv->recorder != NULL ) {
10.19 g_object_unref (livetv->recorder);
10.20 @@ -205,7 +206,7 @@
10.21 res = FALSE;
10.22 goto error;
10.23 } else {
10.24 - g_debug ("[%s] GMythLiveTV: All requests to backend to start TV were OK.\n", __FUNCTION__ );
10.25 + gmyth_debug ("[%s] GMythLiveTV: All requests to backend to start TV were OK.\n", __FUNCTION__ );
10.26 }
10.27
10.28 return res;
10.29 @@ -261,7 +262,7 @@
10.30 res = FALSE;
10.31 goto error;
10.32 } else {
10.33 - g_debug ("[%s] GMythLiveTV: All requests to backend to start TV were OK, TV chain changed.\n", __FUNCTION__ );
10.34 + gmyth_debug ("[%s] GMythLiveTV: All requests to backend to start TV were OK, TV chain changed.\n", __FUNCTION__ );
10.35 }
10.36
10.37 return res;
10.38 @@ -301,7 +302,7 @@
10.39 void
10.40 gmyth_livetv_stop_playing (GMythLiveTV *livetv)
10.41 {
10.42 - g_debug ("[%s] Stopping the LiveTV...\n", __FUNCTION__);
10.43 + gmyth_debug ("[%s] Stopping the LiveTV...\n", __FUNCTION__);
10.44
10.45 if (livetv->is_livetv) {
10.46 if (!gmyth_recorder_stop_livetv (livetv->recorder)) {
10.47 @@ -319,7 +320,7 @@
10.48 GMythStringList *str_list = gmyth_string_list_new ();
10.49 GString *message = g_string_new ("");
10.50
10.51 - g_debug ( "[%s]\n", __FUNCTION__ );
10.52 + gmyth_debug ( "[%s]\n", __FUNCTION__ );
10.53 //g_static_mutex_lock (&mutex);
10.54 //
10.55 g_string_printf( message, "%s %d", GMYTHTV_RECORDER_HEADER,
11.1 --- a/gmyth/src/gmyth_query.c Tue Nov 28 15:14:16 2006 +0000
11.2 +++ b/gmyth/src/gmyth_query.c Tue Nov 28 21:04:14 2006 +0000
11.3 @@ -31,6 +31,7 @@
11.4 #include <assert.h>
11.5
11.6 #include "gmyth_query.h"
11.7 +#include "gmyth_debug.h"
11.8
11.9 static void gmyth_query_class_init (GMythQueryClass *klass);
11.10 static void gmyth_query_init (GMythQuery *object);
11.11 @@ -135,7 +136,7 @@
11.12 return FALSE;
11.13 }
11.14
11.15 - g_debug ("[%s] Connection to Mysql server succeeded! (host = %s, user = %s, "\
11.16 + gmyth_debug ("[%s] Connection to Mysql server succeeded! (host = %s, user = %s, "\
11.17 "password = %s, db name = %s)", __FUNCTION__,
11.18 gmyth_query->backend_info->hostname, gmyth_query->backend_info->username,
11.19 gmyth_query->backend_info->password, gmyth_query->backend_info->db_name );
11.20 @@ -154,7 +155,7 @@
11.21 assert(gmyth_query);
11.22
11.23 /* TODO: Check how to return error */
11.24 - g_debug ("[%s] Closing gmyth_query->conn", __FUNCTION__);
11.25 + gmyth_debug ("[%s] Closing gmyth_query->conn", __FUNCTION__);
11.26 mysql_close (gmyth_query->conn);
11.27
11.28 return TRUE;
11.29 @@ -193,7 +194,7 @@
11.30
11.31 assert(gmyth_query);
11.32
11.33 - g_debug ("[%s] Running mysql query %s", __FUNCTION__, stmt_str);
11.34 + gmyth_debug ("[%s] Running mysql query %s", __FUNCTION__, stmt_str);
11.35
11.36 if (gmyth_query == NULL)
11.37 return NULL;
11.38 @@ -209,7 +210,7 @@
11.39 if (res_set) {
11.40 return res_set;
11.41 } else if (mysql_field_count (gmyth_query->conn) == 0) {
11.42 - g_debug ("%lu rows affected\n",
11.43 + gmyth_debug ("%lu rows affected\n",
11.44 (unsigned long) mysql_affected_rows (gmyth_query->conn));
11.45 } else {
11.46 gmyth_query_print_error (gmyth_query->conn, "Could not retrieve result set");
12.1 --- a/gmyth/src/gmyth_recorder.c Tue Nov 28 15:14:16 2006 +0000
12.2 +++ b/gmyth/src/gmyth_recorder.c Tue Nov 28 21:04:14 2006 +0000
12.3 @@ -33,6 +33,7 @@
12.4
12.5 #include "gmyth_stringlist.h"
12.6 #include "gmyth_util.h"
12.7 +#include "gmyth_debug.h"
12.8
12.9 #define GMYTHTV_RECORDER_HEADER "QUERY_RECORDER"
12.10
12.11 @@ -76,7 +77,7 @@
12.12
12.13 GMythRecorder *recorder = GMYTH_RECORDER(object);
12.14
12.15 - g_debug ("[%s] Closing control socket", __FUNCTION__);
12.16 + gmyth_debug ("[%s] Closing control socket", __FUNCTION__);
12.17 gmyth_socket_close_connection(recorder->myth_socket);
12.18 g_object_unref (recorder->myth_socket);
12.19
12.20 @@ -109,7 +110,7 @@
12.21 gmyth_recorder_setup (GMythRecorder *recorder)
12.22 {
12.23 assert (recorder);
12.24 - g_debug ("[%s] Creating socket and connecting to backend", __FUNCTION__);
12.25 + gmyth_debug ("[%s] Creating socket and connecting to backend", __FUNCTION__);
12.26
12.27 if (recorder->myth_socket == NULL) {
12.28
12.29 @@ -141,7 +142,7 @@
12.30 GMythStringList *str_list;
12.31 GString *tmp_str = g_string_new( GMYTHTV_RECORDER_HEADER );
12.32
12.33 - g_debug ("[%s] Spawntv with tvchain_id = %s", __FUNCTION__, tvchain_id->str);
12.34 + gmyth_debug ("[%s] Spawntv with tvchain_id = %s", __FUNCTION__, tvchain_id->str);
12.35
12.36 str_list = gmyth_string_list_new ();
12.37
12.38 @@ -184,7 +185,7 @@
12.39 GMythStringList *str_list;
12.40 GString *tmp_str = g_string_new( GMYTHTV_RECORDER_HEADER );
12.41
12.42 - g_debug ("[%s]", __FUNCTION__);
12.43 + gmyth_debug ("[%s]", __FUNCTION__);
12.44
12.45 str_list = gmyth_string_list_new ();
12.46
12.47 @@ -219,7 +220,7 @@
12.48 GMythStringList *str_list;
12.49 GString *tmp_str = g_string_new( GMYTHTV_RECORDER_HEADER );
12.50
12.51 - g_debug ( "[%s] FRONTEND_READY with recorder id = %d", __FUNCTION__, recorder->recorder_num );
12.52 + gmyth_debug ( "[%s] FRONTEND_READY with recorder id = %d", __FUNCTION__, recorder->recorder_num );
12.53
12.54 str_list = gmyth_string_list_new ();
12.55
12.56 @@ -262,7 +263,7 @@
12.57 GMythStringList *str_list;
12.58 GString *tmp_str = g_string_new( GMYTHTV_RECORDER_HEADER );
12.59
12.60 - g_debug ("[%s] SET_CHANNEL with channel = %d", __FUNCTION__, channel);
12.61 + gmyth_debug ("[%s] SET_CHANNEL with channel = %d", __FUNCTION__, channel);
12.62
12.63 str_list = gmyth_string_list_new ();
12.64
12.65 @@ -306,7 +307,7 @@
12.66 GMythStringList *str_list;
12.67 GString *tmp_str = g_string_new( GMYTHTV_RECORDER_HEADER );
12.68
12.69 - g_debug ("[%s] SET_CHANNEL with channel = %d", __FUNCTION__, channel);
12.70 + gmyth_debug ("[%s] SET_CHANNEL with channel = %d", __FUNCTION__, channel);
12.71
12.72 str_list = gmyth_string_list_new ();
12.73
13.1 --- a/gmyth/src/gmyth_remote_util.c Tue Nov 28 15:14:16 2006 +0000
13.2 +++ b/gmyth/src/gmyth_remote_util.c Tue Nov 28 21:04:14 2006 +0000
13.3 @@ -29,6 +29,7 @@
13.4
13.5 #include "gmyth_recorder.h"
13.6 #include "gmyth_stringlist.h"
13.7 +#include "gmyth_debug.h"
13.8
13.9 /** Requests the Mythtv backend for a free remote recorder.
13.10 *
13.11 @@ -44,7 +45,7 @@
13.12
13.13 GMythStringList *strlist = gmyth_string_list_new();
13.14
13.15 - g_debug ("[%s] Request next free recorder in the backend", __FUNCTION__);
13.16 + gmyth_debug ("[%s] Request next free recorder in the backend", __FUNCTION__);
13.17
13.18 gmyth_string_list_append_char_array (strlist, "GET_NEXT_FREE_RECORDER");
13.19 gmyth_string_list_append_int (strlist, curr);
13.20 @@ -61,7 +62,7 @@
13.21 if ( num < 0 || port < 0 )
13.22 goto clean_up;
13.23
13.24 - g_debug ("[%s] Free recorder info received: num: %d, hostname: %s, port: %d",
13.25 + gmyth_debug ("[%s] Free recorder info received: num: %d, hostname: %s, port: %d",
13.26 __FUNCTION__, num, hostname->str, port);
13.27
13.28 recorder = gmyth_recorder_new (num, hostname, port);
14.1 --- a/gmyth/src/gmyth_scheduler.c Tue Nov 28 15:14:16 2006 +0000
14.2 +++ b/gmyth/src/gmyth_scheduler.c Tue Nov 28 21:04:14 2006 +0000
14.3 @@ -33,6 +33,7 @@
14.4 #include "gmyth_util.h"
14.5 #include "gmyth_query.h"
14.6 #include "gmyth_socket.h"
14.7 +#include "gmyth_debug.h"
14.8
14.9 static void gmyth_scheduler_class_init (GMythSchedulerClass *klass);
14.10 static void gmyth_scheduler_init (GMythScheduler *object);
14.11 @@ -570,7 +571,7 @@
14.12
14.13 proginfo->pathname = g_string_new (msql_row[25]);
14.14
14.15 - g_debug ("One program info loaded from mysql database\n");
14.16 + gmyth_debug ("One program info loaded from mysql database\n");
14.17 }
14.18 }
14.19
15.1 --- a/gmyth/src/gmyth_socket.c Tue Nov 28 15:14:16 2006 +0000
15.2 +++ b/gmyth/src/gmyth_socket.c Tue Nov 28 21:04:14 2006 +0000
15.3 @@ -59,6 +59,7 @@
15.4 #include "gmyth_socket.h"
15.5 #include "gmyth_stringlist.h"
15.6 #include "gmyth_uri.h"
15.7 +#include "gmyth_debug.h"
15.8
15.9 #define BUFLEN 512
15.10 #define MYTH_SEPARATOR "[]:[]"
15.11 @@ -117,7 +118,7 @@
15.12 else
15.13 portStr = NULL;
15.14
15.15 - g_debug( "[%s] Address: %s, port: %s\n", __FUNCTION__, addr, portStr );
15.16 + gmyth_debug ("Address: %s, port: %s\n", addr, portStr);
15.17 if ( ( errorn = getaddrinfo(addr, portStr, &hints, addrInfo) ) != 0 ) {
15.18 g_printerr( "[%s] Socket ERROR: %s\n", __FUNCTION__, gai_strerror(errorn) );
15.19 }
15.20 @@ -172,7 +173,7 @@
15.21
15.22 ifname = i->ifa_name;
15.23 ifIdx = if_nametoindex(ifname);
15.24 - /* g_debug( "[%s] Interface name: %s, index: %d, address: %s\n", __FUNCTION__, ifname, ifIdx, addr ); */
15.25 + /* gmyth_debug( "[%s] Interface name: %s, index: %d, address: %s\n", __FUNCTION__, ifname, ifIdx, addr ); */
15.26 if ( current_connections == NULL || ( current_connections != NULL &&
15.27 g_list_find_custom( current_connections, (gchar *)addr,
15.28 (GCompareFunc)gmyth_socket_find_match_address_uri ) == NULL ) )
15.29 @@ -238,7 +239,7 @@
15.30 g_strlcpy( ifaddr, inet_ntoa(((struct sockaddr_in*)&req.ifr_addr)->sin_addr), sizeof(struct ifaddr)-1 );
15.31 local_addrs = g_list_append( local_addrs, g_strdup( ifaddr ) );
15.32
15.33 - g_debug( "[%s] ( from the /proc/net/dev) Interface name: %s, address: %s\n", __FUNCTION__,
15.34 + gmyth_debug( "[%s] ( from the /proc/net/dev) Interface name: %s, address: %s\n", __FUNCTION__,
15.35 ifname, ifaddr );
15.36 }
15.37 fclose(fd);
15.38 @@ -505,7 +506,7 @@
15.39 if ( gmyth_socket->sd < 0 )
15.40 continue;
15.41
15.42 - g_debug( "[%s] hostname = %s, sock_fd = %d, addr = %s, addr_len = %d, "\
15.43 + gmyth_debug( "[%s] hostname = %s, sock_fd = %d, addr = %s, addr_len = %d, "\
15.44 "ai_family = %d, ai_protocol = %d\n",
15.45 __FUNCTION__, hostname, gmyth_socket->sd, inet_ntoa( sa->sin_addr ),
15.46 addr_info0->ai_addrlen, addr_info0->ai_family, addr_info0->ai_protocol );
15.47 @@ -627,7 +628,7 @@
15.48 }
15.49
15.50 g_static_mutex_lock( &mutex );
15.51 - g_debug ("[%s] Sending command to backend: %s\n", __FUNCTION__, command->str);
15.52 + gmyth_debug ("[%s] Sending command to backend: %s\n", __FUNCTION__, command->str);
15.53
15.54 /*
15.55 io_cond = g_io_channel_get_buffer_condition( gmyth_socket->sd_io_ch );
15.56 @@ -641,11 +642,11 @@
15.57
15.58 buffer = g_strnfill( BUFLEN, ' ' );
15.59 snprintf( buffer, MYTH_PROTOCOL_FIELD_SIZE+1, "%-8d", command->len);
15.60 - g_debug ( "[%s] buffer = [%s]\n", __FUNCTION__, buffer );
15.61 + gmyth_debug ( "[%s] buffer = [%s]\n", __FUNCTION__, buffer );
15.62
15.63 command = g_string_prepend(command, buffer);
15.64
15.65 - g_debug ( "[%s] command = [%s]\n", __FUNCTION__, command->str );
15.66 + gmyth_debug ( "[%s] command = [%s]\n", __FUNCTION__, command->str );
15.67
15.68 /* write bytes to socket */
15.69 io_status = g_io_channel_write_chars( gmyth_socket->sd_io_ch, command->str,
15.70 @@ -714,13 +715,13 @@
15.71 (blocking_client ? "Playback" : "Monitor"),
15.72 hostname->str);
15.73
15.74 - g_debug ("[%s] Connection command sent to backend: %s", __FUNCTION__, base_str->str);
15.75 + gmyth_debug ("[%s] Connection command sent to backend: %s", __FUNCTION__, base_str->str);
15.76
15.77 gmyth_socket_send_command (gmyth_socket, base_str);
15.78 result = gmyth_socket_receive_response(gmyth_socket);
15.79
15.80 if (result != NULL) {
15.81 - g_debug ("[%s] Response received from backend: %s", __FUNCTION__, result->str);
15.82 + gmyth_debug ("[%s] Response received from backend: %s", __FUNCTION__, result->str);
15.83 g_string_free (result, TRUE);
15.84 }
15.85
15.86 @@ -786,7 +787,7 @@
15.87 if (new_version!=NULL) {
15.88 ++new_version; /* skip ']' character */
15.89 if ( new_version != NULL ) {
15.90 - g_debug ( "[%s] got MythTV version = %s.\n", __FUNCTION__, new_version );
15.91 + gmyth_debug ( "[%s] got MythTV version = %s.\n", __FUNCTION__, new_version );
15.92 mythtv_version = (gint)g_ascii_strtoull( g_strdup( new_version ), NULL, 10 );
15.93 /* do reconnection to the socket (socket is closed if the MythTV version was wrong) */
15.94 gmyth_socket_connect( gmyth_socket, gmyth_socket->hostname, gmyth_socket->port );
15.95 @@ -870,7 +871,7 @@
15.96 /* verify if the input (read) buffer is ready to receive data */
15.97 io_cond = g_io_channel_get_buffer_condition( gmyth_socket->sd_io_ch );
15.98
15.99 - g_debug ( "[%s] Bytes read = %d\n", __FUNCTION__, bytes_read );
15.100 + gmyth_debug ( "[%s] Bytes read = %d\n", __FUNCTION__, bytes_read );
15.101
15.102 if( (io_status == G_IO_STATUS_ERROR) || (bytes_read <= 0) ) {
15.103 g_warning ("[%s] Error in mythprotocol response from backend\n", __FUNCTION__);
15.104 @@ -885,7 +886,7 @@
15.105 if ( ( io_cond & G_IO_IN ) != 0 ) {
15.106
15.107 snprintf( buffer, MYTH_PROTOCOL_FIELD_SIZE+1, "%-8s", g_strdup(buffer));
15.108 - g_debug ( "[%s] buffer = [%s]\n", __FUNCTION__, buffer );
15.109 + gmyth_debug ( "[%s] buffer = [%s]\n", __FUNCTION__, buffer );
15.110
15.111 /* removes trailing whitespace */
15.112 buffer = g_strstrip( buffer );
15.113 @@ -900,7 +901,7 @@
15.114
15.115 g_static_mutex_unlock( &mutex );
15.116
15.117 - g_debug ("[%s] Response received from backend: {%s}\n", __FUNCTION__, buffer);
15.118 + gmyth_debug ("[%s] Response received from backend: {%s}\n", __FUNCTION__, buffer);
15.119
15.120 if ( ( bytes_read != len ) || ( io_status == G_IO_STATUS_ERROR ) )
15.121 str = NULL;
15.122 @@ -937,7 +938,7 @@
15.123
15.124 ptr_array = g_ptr_array_sized_new(g_list_length(str_list->glist));
15.125
15.126 - g_debug ( "[%s] Number of parameters = %d\n", __FUNCTION__, g_list_length(str_list->glist) );
15.127 + gmyth_debug ( "[%s] Number of parameters = %d\n", __FUNCTION__, g_list_length(str_list->glist) );
15.128
15.129 // FIXME: change this implementation!
15.130 tmp_list = str_list->glist;
15.131 @@ -954,7 +955,7 @@
15.132
15.133 g_static_mutex_unlock( &mutex );
15.134
15.135 - g_debug ( "[%s]\t\tSending the String list = %s\n", __FUNCTION__, str_array );
15.136 + gmyth_debug ( "[%s]\t\tSending the String list = %s\n", __FUNCTION__, str_array );
15.137
15.138 // Sends message to backend
15.139 // TODO: implement looping to send remaining data, and add timeout testing!
16.1 --- a/gmyth/src/gmyth_stringlist.c Tue Nov 28 15:14:16 2006 +0000
16.2 +++ b/gmyth/src/gmyth_stringlist.c Tue Nov 28 21:04:14 2006 +0000
16.3 @@ -27,6 +27,7 @@
16.4 */
16.5
16.6 #include "gmyth_stringlist.h"
16.7 +#include "gmyth_debug.h"
16.8
16.9 static void gmyth_string_list_class_init (GMythStringListClass *klass);
16.10 static void gmyth_string_list_init (GMythStringList *object);
16.11 @@ -124,7 +125,7 @@
16.12 /* high order part of guint64 value */
16.13 g_string_printf (tmp_str1, "%lu", l1);
16.14
16.15 - g_debug( "[%s] uint64 (high) = %s\n", __FUNCTION__, tmp_str1->str );
16.16 + gmyth_debug( "[%s] uint64 (high) = %s\n", __FUNCTION__, tmp_str1->str );
16.17
16.18 //gmyth_string_list_append_string (strlist, tmp_str1);
16.19 strlist->glist = g_list_append( strlist->glist, tmp_str1 );
16.20 @@ -132,7 +133,7 @@
16.21 /* low order part of guint64 value */
16.22 g_string_printf (tmp_str2, "%lu", l2);
16.23
16.24 - g_debug( "[%s] uint64 (low) = %s\n", __FUNCTION__, tmp_str2->str );
16.25 + gmyth_debug( "[%s] uint64 (low) = %s\n", __FUNCTION__, tmp_str2->str );
16.26
16.27 strlist->glist = g_list_append( strlist->glist, tmp_str2 );
16.28
16.29 @@ -161,7 +162,7 @@
16.30 /* high order part of gint64 value */
16.31 g_string_printf (tmp_str1, "%ld", l1);
16.32
16.33 - g_debug( "[%s] int64 (high) = %s\n", __FUNCTION__, tmp_str1->str );
16.34 + gmyth_debug( "[%s] int64 (high) = %s\n", __FUNCTION__, tmp_str1->str );
16.35
16.36 //gmyth_string_list_append_string (strlist, tmp_str1);
16.37 strlist->glist = g_list_append( strlist->glist, tmp_str1 );
16.38 @@ -169,7 +170,7 @@
16.39 /* low order part of gint64 value */
16.40 g_string_printf (tmp_str2, "%ld", l2);
16.41
16.42 - g_debug( "[%s] int64 (low) = %s\n", __FUNCTION__, tmp_str2->str );
16.43 + gmyth_debug( "[%s] int64 (low) = %s\n", __FUNCTION__, tmp_str2->str );
16.44
16.45 strlist->glist = g_list_append( strlist->glist, tmp_str2 );
16.46
16.47 @@ -277,7 +278,7 @@
16.48
16.49 ret_value = ((guint64)(l2) /*& 0xffffffff*/) | ((guint64)l1 << 32);
16.50
16.51 - g_debug( "[%s] returning uint64 value = %llu\n", __FUNCTION__, ret_value );
16.52 + gmyth_debug( "[%s] returning uint64 value = %llu\n", __FUNCTION__, ret_value );
16.53
16.54 return ret_value;
16.55 }
16.56 @@ -322,7 +323,7 @@
16.57
16.58 ret_value = ((gint64)(l2) /*& 0xffffffff*/) | ((gint64)l1 << 32);
16.59
16.60 - g_debug( "[%s] returning int64 value = %lld\n", __FUNCTION__, ret_value );
16.61 + gmyth_debug( "[%s] returning int64 value = %lld\n", __FUNCTION__, ret_value );
16.62
16.63 return ret_value;
16.64 }
17.1 --- a/gmyth/src/gmyth_tvchain.c Tue Nov 28 15:14:16 2006 +0000
17.2 +++ b/gmyth/src/gmyth_tvchain.c Tue Nov 28 21:04:14 2006 +0000
17.3 @@ -37,6 +37,7 @@
17.4 #include "gmyth_util.h"
17.5 #include "gmyth_query.h"
17.6 #include "gmyth_scheduler.h"
17.7 +#include "gmyth_debug.h"
17.8
17.9 static void gmyth_tvchain_class_init (GMythTVChainClass *klass);
17.10 static void gmyth_tvchain_init (GMythTVChain *object);
17.11 @@ -134,7 +135,7 @@
17.12 g_string_printf(tvchain->tvchain_id,
17.13 "live-%s-%s", hostname, isodate->str);
17.14
17.15 - g_debug ("[%s] tv_chain_id: %s", __FUNCTION__, tvchain->tvchain_id->str);
17.16 + gmyth_debug ("[%s] tv_chain_id: %s", __FUNCTION__, tvchain->tvchain_id->str);
17.17
17.18 g_string_free(isodate, TRUE);
17.19 } else {
17.20 @@ -177,7 +178,7 @@
17.21 /* gets the initial size of the TVChain entries list */
17.22 guint prev_size = g_list_length (tvchain->tvchain_list);
17.23
17.24 - g_debug ("[%s] chainid: %s", __FUNCTION__, tvchain->tvchain_id->str);
17.25 + gmyth_debug ("[%s] chainid: %s", __FUNCTION__, tvchain->tvchain_id->str);
17.26
17.27 if ( tvchain != NULL && tvchain->tvchain_list != NULL ) {
17.28 g_list_free (tvchain->tvchain_list);
17.29 @@ -247,7 +248,7 @@
17.30 // m_switchid = ProgramIsAt(m_switchentry.chanid,m_switchentry.starttime);
17.31
17.32 if (prev_size != g_list_length (tvchain->tvchain_list)) {
17.33 - g_debug ("[%s] Added new recording", __FUNCTION__);
17.34 + gmyth_debug ("[%s] Added new recording", __FUNCTION__);
17.35 }
17.36
17.37 done:
17.38 @@ -338,7 +339,7 @@
17.39 g_static_mutex_unlock( &mutex );
17.40
17.41 if ( chain_entry != NULL ) {
17.42 - g_debug ("[%s] Got TV Chain entry at %d.\n", __FUNCTION__, new_index );
17.43 + gmyth_debug ("[%s] Got TV Chain entry at %d.\n", __FUNCTION__, new_index );
17.44
17.45 } else {
17.46 g_warning ("[%s] failed to get entry at index %d", __FUNCTION__, index);
18.1 --- a/gmyth/src/gmyth_uri.c Tue Nov 28 15:14:16 2006 +0000
18.2 +++ b/gmyth/src/gmyth_uri.c Tue Nov 28 21:04:14 2006 +0000
18.3 @@ -8,11 +8,13 @@
18.4 *
18.5 */
18.6
18.7 -#include "gmyth_uri.h"
18.8 #include <glib.h>
18.9 #include <string.h>
18.10 #include <stdlib.h>
18.11
18.12 +#include "gmyth_uri.h"
18.13 +#include "gmyth_debug.h"
18.14 +
18.15 static gint
18.16 gmyth_strstr( const gchar *haystack, const gchar *needle )
18.17 {
19.1 --- a/gmyth/src/gmyth_util.c Tue Nov 28 15:14:16 2006 +0000
19.2 +++ b/gmyth/src/gmyth_util.c Tue Nov 28 21:04:14 2006 +0000
19.3 @@ -34,6 +34,7 @@
19.4 #include "gmyth_socket.h"
19.5 #include "gmyth_programinfo.h"
19.6 #include "gmyth_common.h"
19.7 +#include "gmyth_debug.h"
19.8
19.9
19.10 /** Converts a time_t struct in a GString at ISO standard format
19.11 @@ -94,7 +95,7 @@
19.12 int year, month, day, hour, min, sec;
19.13
19.14 #if 0
19.15 - g_debug( "[%s] time_str = %s.\n", __FUNCTION__, time_str != NULL ? time_str->str : "[time string is NULL!]" );
19.16 + gmyth_debug( "[%s] time_str = %s.\n", __FUNCTION__, time_str != NULL ? time_str->str : "[time string is NULL!]" );
19.17 #endif
19.18
19.19 if (sscanf (time_str->str, "%04d-%02d-%02d %02d:%02d:%02d",