Fix license text printed by programs.

Since source files are now licensed under LGPL, it doesn't make much
sense for the programs to indicate they are still under GPL.
Follow-up to I1c507b3, which seems to have missed this.

Part of #818.

Change-Id: I44ffcf75f4840326d09f924249619077ea5a1013

diff --git a/include/copyrite.h b/include/copyrite.h
index 994734fb533a9de1b7a1dbad384192e6b1045ebf..ab10fa9947144ef6336d9cf122ae1d8cdb81ff2e 100644 (file)
--- a/include/copyrite.h
+++ b/include/copyrite.h
@@ -70,10 +70,10 @@ CopyrightText[] = {
 };
 
 static const char *
-GPLText[] = {
+LicenseText[] = {
   "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",
+  "modify it under the terms of the GNU Lesser General Public License",
+  "as published by the Free Software Foundation; either version 2.1",
   "of the License, or (at your option) any later version."
 };
 

diff --git a/src/gmxlib/copyrite.c b/src/gmxlib/copyrite.c
index 574dcee2f7a475255003a94e841ba10c67a78ba2..f67f28d7d53481aae7001fd752bf1845d99998e1 100644 (file)
--- a/src/gmxlib/copyrite.c
+++ b/src/gmxlib/copyrite.c
@@ -237,10 +237,11 @@ void CopyRight(FILE *out,const char *szProgram)
    * name of a file. Otherwise, we won't be able to find the library dir.
    */
 #define NCR (int)asize(CopyrightText)
+/* TODO: Is this exception still needed? */
 #ifdef GMX_FAHCORE
-#define NGPL 0 /*FAH has an exception permission from GPL to allow digital signatures in Gromacs*/
+#define NLICENSE 0 /*FAH has an exception permission from GPL to allow digital signatures in Gromacs*/
 #else
-#define NGPL (int)asize(GPLText)
+#define NLICENSE (int)asize(LicenseText)
 #endif
 
   char buf[256],tmpstr[1024];
@@ -270,8 +271,8 @@ void CopyRight(FILE *out,const char *szProgram)
 
   for(i=0; (i<NCR); i++) 
     sp_print(out,CopyrightText[i]);
-  for(i=0; (i<NGPL); i++)
-    sp_print(out,GPLText[i]);
+  for(i=0; (i<NLICENSE); i++)
+    sp_print(out,LicenseText[i]);
 
   fprintf(out,"\n");