[svn-upgrade] Integrating new upstream version, ion3 (20070708)

[ion3.git] / ioncore / ioncore.c

diff --git a/ioncore/ioncore.c b/ioncore/ioncore.c
index 0f1744c640636f82f8d828e754197288a56ee147..9f9bcfce0603281725c5fdde65b0ac6af649932a 100644 (file)
--- a/ioncore/ioncore.c
+++ b/ioncore/ioncore.c
@@ -18,6 +18,8 @@
 #ifndef CF_NO_LOCALE
 #include <locale.h>
 #include <langinfo.h>
+#endif
+#ifndef CF_NO_GETTEXT
 #include <libintl.h>
 #endif
 
@@ -74,15 +76,15 @@ static const char ioncore_copy[]=
     "Ion " ION_VERSION ", copyright (c) Tuomo Valkonen 1999-2007.";
 
 static const char ioncore_license[]=DUMMY_TR(
-    "This program is free software; you can redistribute it and/or\n"
-    "modify it under the terms of the GNU Lesser General Public\n"
-    "License as published by the Free Software Foundation; either\n"
-    "version 2.1 of the License, or (at your option) any later version.\n"
+    "This software is essentially licensed under the GNU Lesser General\n"
+    "Public License (LGPL), version 2.1, unless otherwise indicated in\n"
+    "components taken from elsewhere. Additional terms apply to the use\n"
+    "of the name of the project, Ion(tm). For details, see the file\n"
+    "LICENSE that you should have received with this software.\n"
     "\n"
     "This program is distributed in the hope that it will be useful,\n"
     "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-    "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
-    "Lesser General Public License for more details.\n");
+    "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"); 
 
 static const char *ioncore_about=NULL;
 
@@ -229,6 +231,10 @@ static bool init_locale()
     return FALSE;
 }
 
+#endif
+
+#ifndef CF_NO_GETTEXT
+
 #define TEXTDOMAIN "ion3"
 
 static bool init_messages(const char *localedir)
@@ -384,6 +390,8 @@ bool ioncore_init(const char *prog, int argc, char *argv[],
 
 #ifndef CF_NO_LOCALE    
     init_locale();
+#endif
+#ifndef CF_NO_GETTEXT
     init_messages(localedir);
 #endif