summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Dyer <cdyer@cs.cmu.edu>2012-11-17 17:46:06 -0500
committerChris Dyer <cdyer@cs.cmu.edu>2012-11-17 17:46:06 -0500
commitc401956e25295bdb97dd633817ff9a4f1dcf8c4c (patch)
tree11200380cbd4f7d46cadf4fcda6eae77aa73527b
parent2f482858e63dc7f62ac3be5b7ed7e0644b63353e (diff)
remove some old stuff
-rw-r--r--configure.ac45
-rw-r--r--decoder/Makefile.am4
2 files changed, 0 insertions, 49 deletions
diff --git a/configure.ac b/configure.ac
index 233009ca..5f18beaa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,25 +68,6 @@ then
AM_CONDITIONAL([HAVE_CMPH], true)
fi
-AM_CONDITIONAL([HAVE_EIGEN], false)
-AC_ARG_WITH(eigen,
- [AC_HELP_STRING([--with-eigen=PATH], [(optional) path to Eigen linear algebra library])],
- [with_eigen=$withval],
- [with_eigen=no]
- )
-
-if test "x$with_eigen" != 'xno'
-then
- SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -I${with_eigen}"
-
- AC_CHECK_HEADER(Eigen/Dense,
- [AC_DEFINE([HAVE_EIGEN], [1], [flag for Eigen linear algebra library])],
- [AC_MSG_ERROR([Cannot find Eigen!])])
-
- AM_CONDITIONAL([HAVE_EIGEN], true)
-fi
-
#BOOST_THREADS
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
LDFLAGS="$LDFLAGS $BOOST_PROGRAM_OPTIONS_LDFLAGS $BOOST_SYSTEM_LDFLAGS"
@@ -99,32 +80,6 @@ AC_CHECK_HEADER(google/dense_hash_map,
AC_PROG_INSTALL
-AM_CONDITIONAL([GLC], false)
-AC_ARG_WITH(glc,
- [AC_HELP_STRING([--with-glc=PATH], [(optional) path to Global Lexical Coherence package (Context CRF)])],
- [with_glc=$withval],
- [with_glc=no]
- )
-FF_GLC=""
-
-if test "x$with_glc" != 'xno'
-then
- SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -I${with_glc} -I${with_glc}/cdec"
-
- #AC_CHECK_HEADER(ff_glc.h,
- # [AC_DEFINE([HAVE_GLC], [], [flag for GLC])],
- # [AC_MSG_ERROR([Cannot find GLC!])])
-
- AC_DEFINE([HAVE_GLC], [], [flag for GLC])
- #LIB_RANDLM="-lrandlm"
- #LDFLAGS="$LDFLAGS -L${with_glc}/lib"
- #LIBS="$LIBS $LIB_RANDLM"
- #FMTLIBS="$FMTLIBS libglc.a"
- AC_SUBST(FF_GLC,"${with_glc}/cdec/ff_glc.cc")
- AM_CONDITIONAL([GLC], true)
-fi
-
CPPFLAGS="-DPIC -fPIC $CPPFLAGS -DHAVE_CONFIG_H"
AC_CONFIG_FILES([Makefile])
diff --git a/decoder/Makefile.am b/decoder/Makefile.am
index f8f427d3..6914fa0f 100644
--- a/decoder/Makefile.am
+++ b/decoder/Makefile.am
@@ -83,7 +83,3 @@ libcdec_a_SOURCES = \
json_parse.cc \
grammar.cc
-if GLC
- # Until we build GLC as a library...
- libcdec_a_SOURCES += ff_glc.cc string_util.cc feature-factory.cc
-endif