Skip to content

Fix inclusion of OpenFST in build #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brendon-boldt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix inclusion of OpenFST in build #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ AC_ARG_WITH(openfst,
[openfst_dir="${withval}"], [openfst_dir=''])
if test "x$openfst_dir" != "x"; then
OPENFST_CPPFLAGS="-I${openfst_dir}/src/include"
OPENFST_LDFLAGS="-L${openfst_dir}/src/lib -lfst"
OPENFST_LDFLAGS="-L${openfst_dir}/src/lib"
else
AS_ERROR("Must specify --with-openfst=[OPENFST_DIR]")
fi
Expand All @@ -54,6 +54,8 @@ AC_LANG([C++])
AC_CHECK_HEADERS([tr1/unordered_map])
AC_CHECK_HEADERS([ext/hash_map])
CXXFLAGS="$CXXFLAGS -std=c++17"
CPPFLAGS="$CPPFLAGS $OPENFST_CPPFLAGS"
LDFLAGS="$LDFLAGS $OPENFST_LDFLAGS"

# Check if we have rt/boost
AX_BOOST_BASE([1.49], , AC_MSG_ERROR([Boost 1.49 or later is required]))
Expand Down
5 changes: 2 additions & 3 deletions src/latticelm/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ LIBCPP = \
sampgen.cc


# AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(OPENFST_CPPFLAGS) -I$(srcdir)/..
AM_CXXFLAGS = $(BOOST_CPPFLAGS) -I$(srcdir)/.. -I/home/oadams/tools/openfst-1.6.2/src/include
AM_CXXFLAGS = $(BOOST_CPPFLAGS) -I$(srcdir)/..

lib_LTLIBRARIES = liblatticelm.la

Expand All @@ -23,7 +22,7 @@ liblatticelm_la_LDFLAGS = -version-info 0:0:0
####### Binary info

LDADD=liblatticelm.la \
-L/home/oadams/tools/openfst-1.6.2/src/lib -lfst \
-lfst \
$(BOOST_LDFLAGS) \
$(BOOST_SYSTEM_LIB) \
$(BOOST_PROGRAM_OPTIONS_LIB) \
Expand Down