Merge branch 'master' of git://github.com/redpony/cdec

1 files changed, 9 insertions, 8 deletions

diff --git a/mteval/ns.cc b/mteval/ns.cc
index f3a82ce0..7d73061c 100644
--- a/mteval/ns.cc
+++ b/mteval/ns.cc
@@ -19,6 +19,8 @@ using namespace std;
 
 map<string, EvaluationMetric*> EvaluationMetric::instances_;
 
+extern const char* meteor_jar_path;
+
 SegmentEvaluator::~SegmentEvaluator() {}
 EvaluationMetric::~EvaluationMetric() {}
 
@@ -235,13 +237,7 @@ struct BleuMetric : public EvaluationMetric {
 
 EvaluationMetric* EvaluationMetric::Instance(const string& imetric_id) {
   static bool is_first = true;
-  static string meteor_jar_path = "/cab0/tools/meteor-1.3/meteor-1.3.jar";
   if (is_first) {
-    const char* ppath = getenv("METEOR_JAR");
-    if (ppath) {
-      cerr << "METEOR_JAR environment variable set to " << ppath << endl;
-      meteor_jar_path = ppath;
-    }
     instances_["NULL"] = NULL;
     is_first = false;
   }
@@ -259,11 +255,16 @@ EvaluationMetric* EvaluationMetric::Instance(const string& imetric_id) {
     } else if (metric_id == "TER") {
       m = new TERMetric;
     } else if (metric_id == "METEOR") {
+#if HAVE_METEOR
       if (!FileExists(meteor_jar_path)) {
-        cerr << meteor_jar_path << " not found. Set METEOR_JAR environment variable.\n";
+        cerr << meteor_jar_path << " not found!\n";
         abort();
       }
-      m = new ExternalMetric("METEOR", "java -Xmx1536m -jar " + meteor_jar_path + " - - -mira -lower -t tune -l en");
+      m = new ExternalMetric("METEOR", string("java -Xmx1536m -jar ") + meteor_jar_path + " - - -mira -lower -t tune -l en");
+#else
+      cerr << "cdec was not built with the --with-meteor option." << endl;
+      abort();
+#endif
     } else if (metric_id.find("COMB:") == 0) {
       m = new CombinationMetric(metric_id);
     } else if (metric_id == "CER") {