summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Clark <jon.h.clark@gmail.com>2011-03-10 06:54:31 -0500
committerJonathan Clark <jon.h.clark@gmail.com>2011-03-10 06:54:31 -0500
commit8c8ff6c6915ebc5ce30156e3f05bf8d1966ec0a1 (patch)
treea0f6766525751826800386fbc5dce35c3697c04e
parent6c923d45f2aaf960806429d36ca58a41b3a39740 (diff)
glc hacking
-rw-r--r--decoder/Makefile.am2
-rw-r--r--environment/LocalConfig.pm2
-rw-r--r--klm/util/string_piece.hh5
3 files changed, 6 insertions, 3 deletions
diff --git a/decoder/Makefile.am b/decoder/Makefile.am
index 9cf4c3c4..f43e6894 100644
--- a/decoder/Makefile.am
+++ b/decoder/Makefile.am
@@ -82,5 +82,5 @@ libcdec_a_SOURCES = \
if GLC
# Until we build GLC as a library...
- libcdec_a_SOURCES += ff_glc.cc
+ libcdec_a_SOURCES += ff_glc.cc feature-factory.cc string_util.cc
endif
diff --git a/environment/LocalConfig.pm b/environment/LocalConfig.pm
index 10933f36..f365319c 100644
--- a/environment/LocalConfig.pm
+++ b/environment/LocalConfig.pm
@@ -33,7 +33,7 @@ my $CCONFIG = {
'HOST_REGEXP' => qr/^(thor|tyr)\.inf\.ed\.ac\.uk$/,
},
'Blacklight' => {
- 'HOST_REGEXP' => qr/^(blacklight.psc.edu|bl1.psc.teragrid.org|bl0.psc.teragrid.org)$/,
+ 'HOST_REGEXP' => qr/^(tg-login1.blacklight.psc.teragrid.org|blacklight.psc.edu|bl1.psc.teragrid.org|bl0.psc.teragrid.org)$/,
'QSubMemFlag' => '-l pmem=',
},
'LOCAL' => {
diff --git a/klm/util/string_piece.hh b/klm/util/string_piece.hh
index e48ce3d9..2583db5e 100644
--- a/klm/util/string_piece.hh
+++ b/klm/util/string_piece.hh
@@ -48,7 +48,10 @@
#ifndef BASE_STRING_PIECE_H__
#define BASE_STRING_PIECE_H__
-#include "util/have.hh"
+//Uncomment this line if you use ICU in your code.
+//#define HAVE_ICU
+//Uncomment this line if you want boost hashing for your StringPieces.
+//#define HAVE_BOOST
#ifdef HAVE_BOOST
#include <boost/functional/hash/hash.hpp>