Changeset 743 for trunk

Timestamp:

Dec 20, 2008, 12:04:54 AM (12 years ago)

Author:

Peter Johansson

Message:

removed usage of envar HOME in Gnuplot.cc

Location:

trunk

Files:

• configure.ac (modified) (2 diffs)
• lib/Gnuplot.cc (modified) (3 diffs)

trunk/configure.ac

@@ -82 +82 @@
 AC_PATH_PROG([HELP2MAN], [help2man], [no])
 AM_CONDITIONAL([HAVE_HELP2MAN], [test x$HELP2MAN != xno])
-AC_CHECK_PROG([GNUPLOT],[gnuplot],[ok])
+AC_PATH_PROG([GNUPLOT],[gnuplot],[no])
+AC_DEFINE_UNQUOTED([GNUPLOT_PATH], ["$GNUPLOT"], 
+                   [defined to gnuplot path (or no if gnuplot was not found)])
 
 # Save FLAGS
@@ -273 +275 @@
 
 # Failure to locate gnuplot is not considered fatal
-if (test "$GNUPLOT" != "ok") ; then
+if (test "x$GNUPLOT" = "xno") ; then
   AC_MSG_WARN([Gnuplot was not found. svndigest will compile
   without gnuplot but will throw an exception at run-time. Please

trunk/lib/Gnuplot.cc

@@ -4 +4 @@
   Copyright (C) 2006 Jari Häkkinen, Peter Johansson
   Copyright (C) 2007 Peter Johansson
-  Copyright (C) 2008 Jari Häkkinen
+  Copyright (C) 2008 Jari Häkkinen, Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -21 +21 @@
   along with svndigest. If not, see <http://www.gnu.org/licenses/>.
 */
+
+#include <config.h>
 
 #include "Gnuplot.h"
@@ -58 +60 @@
   void Gnuplot::acquire_program_path(const std::string& progname)
   {
-    char* env_path=getenv("PATH");
-    if (!env_path)
-      throw GnuplotException("Environment variable PATH is not set");
-
-    std::list<std::string> paths;
-    tokenizer(env_path,paths);
-    for (std::list<std::string>::const_iterator i=paths.begin();
-         i!=paths.end(); ++i) {
-      std::string tmp((*i) + '/' + progname);
-      if (!access(tmp.c_str(),X_OK)) {
-        gnuplot_binary_=tmp;
-        break;
-      }
+    std::string tmp = GNUPLOT_PATH;
+    if (tmp=="no")
+      throw GnuplotException("no gnuplot binary available");
+    if (!access(tmp.c_str(),X_OK)) {
+      gnuplot_binary_=tmp;
     }
 
     if (gnuplot_binary_.empty())
-      throw GnuplotException("Cannot find '" + progname + "' in PATH");
+      throw GnuplotException("Cannot find '" + tmp);
   }