hfst/system-foma.diff

73 lines
2.5 KiB
Diff
Raw Normal View History

---
back-ends/Makefile.am | 2 +-
configure.ac | 1 -
libhfst/src/Makefile.am | 2 +-
libhfst/src/implementations/ConvertFomaTransducer.cc | 3 ++-
libhfst/src/implementations/FomaTransducer.cc | 3 ++-
5 files changed, 6 insertions(+), 5 deletions(-)
Index: hfst-3.15.5/back-ends/Makefile.am
===================================================================
--- hfst-3.15.5.orig/back-ends/Makefile.am
+++ hfst-3.15.5/back-ends/Makefile.am
@@ -15,5 +15,5 @@
## You should have received a copy of the GNU General Public License
## along with this program. If not, see <http://www.gnu.org/licenses/>.
-SUBDIRS=openfst openfstwin dlfcn sfst foma
+SUBDIRS=openfst openfstwin dlfcn sfst
AUTOMAKE_OPTIONS=subdir-objects
Index: hfst-3.15.5/configure.ac
===================================================================
--- hfst-3.15.5.orig/configure.ac
+++ hfst-3.15.5/configure.ac
@@ -812,7 +812,6 @@ AC_CONFIG_FILES([Makefile doc/Makefile t
back-ends/openfst/Makefile
back-ends/openfst/src/Makefile
back-ends/openfst/src/lib/Makefile
- back-ends/foma/Makefile
back-ends/sfst/Makefile
man/Makefile
scripts/Makefile])
Index: hfst-3.15.5/libhfst/src/Makefile.am
===================================================================
--- hfst-3.15.5.orig/libhfst/src/Makefile.am
+++ hfst-3.15.5/libhfst/src/Makefile.am
@@ -41,7 +41,7 @@ endif
endif
if WANT_FOMA
- libhfst_la_LIBADD += $(top_builddir)/back-ends/foma/libfoma.la
+ libhfst_la_LIBADD += -lfoma
endif
if WANT_MINGW
Index: hfst-3.15.5/libhfst/src/implementations/ConvertFomaTransducer.cc
===================================================================
--- hfst-3.15.5.orig/libhfst/src/implementations/ConvertFomaTransducer.cc
+++ hfst-3.15.5/libhfst/src/implementations/ConvertFomaTransducer.cc
@@ -17,7 +17,8 @@
#ifndef _FOMALIB_H_
#define _FOMALIB_H_
- #include "back-ends/foma/fomalib.h"
+ #include <stdbool.h>
+ #include <fomalib.h>
#endif
#include "ConvertTransducerFormat.h"
Index: hfst-3.15.5/libhfst/src/implementations/FomaTransducer.cc
===================================================================
--- hfst-3.15.5.orig/libhfst/src/implementations/FomaTransducer.cc
+++ hfst-3.15.5/libhfst/src/implementations/FomaTransducer.cc
@@ -17,7 +17,8 @@
#ifndef _FOMALIB_H_
#define _FOMALIB_H_
-#include "back-ends/foma/fomalib.h"
+#include <stdbool.h>
+#include <fomalib.h>
#endif
#include "FomaTransducer.h"