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

[ion3.git] / utils / ion-statusd / ion-statusd.c

diff --git a/utils/ion-statusd/ion-statusd.c b/utils/ion-statusd/ion-statusd.c
index 640274629ac778e5395043b07bafe27f0b5c4302..5aa02c068ff6687cb4ad155c8ee97b0dffdf1fea 100644 (file)
--- a/utils/ion-statusd/ion-statusd.c
+++ b/utils/ion-statusd/ion-statusd.c
@@ -3,10 +3,7 @@
  *
  * Copyright (c) Tuomo Valkonen 2004-2008.
  *
- * Ion is free software; you can redistribute it and/or 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.
+ * See the included file LICENSE for details.
  */
 
 #include <string.h>
@@ -69,15 +66,15 @@ static const char statusd_copy[]=
 
 
 static const char statusd_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 licensed under the GNU Lesser General Public License\n"
+    "(LGPL), version 2.1, extended with terms applying to the use of the name\n"
+    "of the project, Ion(tm), unless otherwise indicated in components taken\n"
+    "from elsewhere. For details, see the file LICENSE that you should have\n"
+    "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"); 
 
 
 /* new_informs=TRUE because we should always print period when 
@@ -161,8 +158,8 @@ int main(int argc, char*argv[])
     
     libtu_init(argv[0]);
 
-#ifdef STATUSD_LOCATION
-    prefix_set(argv[0], STATUSD_LOCATION);
+#ifdef CF_RELOCATABLE_BIN_LOCATION
+    prefix_set(argv[0], CF_RELOCATABLE_BIN_LOCATION);
 #endif
 
     extl_init();
@@ -300,6 +297,7 @@ EXTL_EXPORT
 ExtlTab statusd_getloadavg()
 {
     ExtlTab t=extl_create_table();
+#ifndef CF_NO_GETLOADAVG
     double l[3];
     int n;
     
@@ -311,7 +309,7 @@ ExtlTab statusd_getloadavg()
         extl_table_sets_d(t, "5min", l[1]);
     if(n>=3)
         extl_table_sets_d(t, "15min", l[2]);
-        
+#endif
     return t;
 }