improved handling of libintl issues

[rrdtool-all.git] / program / src / rrd_tool.c

diff --git a/program/src/rrd_tool.c b/program/src/rrd_tool.c
index b16a1942a585ac5b95bbccdcda5da9481c4bd6fb..54cf12b55c24d6e6062f36f26c0683cde1a68c4e 100644 (file)
--- a/program/src/rrd_tool.c
+++ b/program/src/rrd_tool.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.99907080300  Copyright by Tobi Oetiker, 1997-2007
+ * RRDtool 1.3rc3  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_tool.c  Startup wrapper
  *****************************************************************************/
@@ -387,7 +387,8 @@ int main(
 #ifdef HAVE_LOCALE_H
     setlocale(LC_ALL, "");
 #endif
-#ifdef HAVE_LIBINTL_H
+
+#if defined(HAVE_LIBINTL_H) && defined(BUILD_LIBINTL)
     bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
     bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
     textdomain(GETTEXT_PACKAGE);
@@ -803,7 +804,8 @@ int HandleInputLine(
 
     } else if (strcmp("graphv", argv[1]) == 0) {
         info_t   *grinfo = NULL;    /* 1 to distinguish it from the NULL that rrd_graph sends in */
-        if (grinfo = rrd_graph_v(argc - 1, &argv[1])) {
+        grinfo = rrd_graph_v(argc - 1, &argv[1]);
+        if (grinfo) {
             info_print(grinfo);
             info_free(grinfo);
         }