Группа :: Система/Библиотеки
Пакет: manatee-open
навигация по пакетам
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: manatee-open-2.214.1-alt1.patch
Скачать
Скачать
.gear/rules | 2 +
.../tags/01f4f3cea680e2ff43e783fbebd1753bbbac1a70 | 22 +++++
.../tags/12d4e25781a1046be81fcdf112220be14f8d90a1 | 13 +++
.../tags/2d61f72ff3cc3581781f4f9791e53708a0a27b40 | 6 ++
.../tags/4cfef83e60c4d0bd1cd9a6df25412be200aecb60 | 22 +++++
.../tags/6770728331a244b775938c836f14cbf3773858a7 | 12 +++
.../tags/7748db5bd021d95e7b8bcff726162e37e533e383 | 6 ++
.../tags/7975faf3f3f79c68be1ff130a7c532fb151aec99 | 6 ++
.../tags/7d1783971a546ed5eee07f678b54a22d2d485c4a | 22 +++++
.../tags/abf0e0e1223d24e6b7389867788ea9745788cfa8 | 22 +++++
.../tags/cb79039adecde7345ad940837ee397afebc6c3d2 | 6 ++
.../tags/f3eb2a46b609a8eac1eed40f5d8218b90822b168 | 13 +++
.gear/tags/list | 11 +++
Makefile.in | 22 +----
api/Makefile.in | 18 ----
api/concinfo | 4 +-
api/corpconfcheck | 3 +-
api/corpdatacheck | 4 +-
api/corpquery | 4 +-
api/decodevert | 4 +-
api/dumpalign | 4 +-
api/freqs | 4 +-
api/lslexarf | 2 +-
api/lsslex | 2 +-
api/manatee.i | 6 +-
api/mkstats | 2 +-
api/mksubc | 2 +-
api/par2tokens | 2 +-
api/tokens2dict | 2 +-
api/vertfork | 2 +-
concord/Makefile.in | 18 ----
concord/conccrit.cc | 16 ++--
config.hh.in | 15 ----
config/libtool.m4 | 49 ++++++----
config/ltmain.sh | 78 +++++++++-------
corp/Makefile.in | 18 ----
corp/virtcorp.cc | 1 +
finlib/Makefile.in | 18 ----
finlib/regpref.cc | 12 +--
finlib/regpref.hh | 2 +-
finlib/writelex.cc | 2 +-
fsa3/Makefile.in | 18 ----
manatee-open.spec | 100 +++++++++++++++++++++
query/Makefile.in | 18 ----
src/Makefile.am | 4 +-
src/Makefile.in | 26 ++----
46 files changed, 388 insertions(+), 257 deletions(-)
diff --git a/.gear/rules b/.gear/rules
new file mode 100644
index 0000000..4b0460c
--- /dev/null
+++ b/.gear/rules
@@ -0,0 +1,2 @@
+tar: v@version@:.
+diff: v@version@:. .
diff --git a/.gear/tags/01f4f3cea680e2ff43e783fbebd1753bbbac1a70 b/.gear/tags/01f4f3cea680e2ff43e783fbebd1753bbbac1a70
new file mode 100644
index 0000000..6f4eba1
--- /dev/null
+++ b/.gear/tags/01f4f3cea680e2ff43e783fbebd1753bbbac1a70
@@ -0,0 +1,22 @@
+object 057fbe29cad13b8c93565a8f6098684031a1e991
+type commit
+tag v2.208
+tagger Kirill Maslinsky <kirill@altlinux.org> 1661784847 +0200
+
+manatee-open v2.208
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCAAGBQJjDNMYAAoJENt3rqRo+aQ7hnYP/jtAbN0S95os/oBLSAseUDMw
+mPwea0pDcRoBhsHskmm+GLd9vFckoA0J4srVk+DJEJWIHIpwlr7bH3Md8rV5DEsD
+kJVvH0GnyEViO6ifH7p+IiUKjgfgHWFR7LPf1BE+xhtHw4KosBF8kH+sciePQe77
+sEuE++uPJU/8N1Les2saOWqKaFitro+0LfYh1sjsw3GMixvCo3kUT0BBGTH4dx6W
+WPWnrl9/EzYpP7ONrvLycgOAsQ6nJfWyp3psGZVE13csDPYIy9fnE4w+Dgi8Kg4W
+R6ud6WeRJQGOA6BuCTb7hGNI5oQecaxYmqyYBK+tClnUXIR+B/k5mTzNjebM77gx
+fyqgBbNBN1Hx8ZTRFeBuAc0n/q0S2OqdqjgYSVovTJ12w0XAqUUE5u4TnmA8AFEl
+xs1Bn/vTic0ykz9wdYt5naFOCdBLbCmRFiqbVQZO/uFiQzgjNzJf9i1R9CzDb1rP
+X99frgMK70KwUbh0gZMas4QdmGFNbxOa2A3z/f/QQO5HWIGW30UI/WPaesN60LFq
+IxhAkTEP3MoiUwiV5kuT3rDmxz1GoO4Vlv12DgPVosvW2pgyUfUrtuOu3+MdM1Hf
+ntAP2063YVc/mduDJNZNPMfgF4vV7tgvOu0cawEPy0wNi+jWUwwteFSZa1H9Ohnt
+dYGfzPsaWKgrUmu7x/Ve
+=7+qC
+-----END PGP SIGNATURE-----
diff --git a/.gear/tags/12d4e25781a1046be81fcdf112220be14f8d90a1 b/.gear/tags/12d4e25781a1046be81fcdf112220be14f8d90a1
new file mode 100644
index 0000000..942624e
--- /dev/null
+++ b/.gear/tags/12d4e25781a1046be81fcdf112220be14f8d90a1
@@ -0,0 +1,13 @@
+object 5c31f7fe3adf86af07c9a76e6c16a6ef52da14c4
+type commit
+tag v2.107.1
+tagger Kirill Maslinsky <kirill@altlinux.org> 1426701456 +0300
+
+manatee-open v2.107.1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.15 (GNU/Linux)
+
+iEYEABECAAYFAlUJvJAACgkQeeVvD8eBBvvpZwCdHE00Hob//FTv+Ht8+npZ4QlA
+U1YAn3fpCkiYoZyx8DSTnwVxAswUTnMC
+=6asf
+-----END PGP SIGNATURE-----
diff --git a/.gear/tags/2d61f72ff3cc3581781f4f9791e53708a0a27b40 b/.gear/tags/2d61f72ff3cc3581781f4f9791e53708a0a27b40
new file mode 100644
index 0000000..bdc4cd6
--- /dev/null
+++ b/.gear/tags/2d61f72ff3cc3581781f4f9791e53708a0a27b40
@@ -0,0 +1,6 @@
+object 92adf75d41f6e7ae580b699152e0e4e3c7538dfe
+type commit
+tag v2.151.5
+tagger Kirill Maslinsky <kirill@altlinux.org> 1517411545 +0300
+
+manatee-open 2.151.5
diff --git a/.gear/tags/4cfef83e60c4d0bd1cd9a6df25412be200aecb60 b/.gear/tags/4cfef83e60c4d0bd1cd9a6df25412be200aecb60
new file mode 100644
index 0000000..e086e26
--- /dev/null
+++ b/.gear/tags/4cfef83e60c4d0bd1cd9a6df25412be200aecb60
@@ -0,0 +1,22 @@
+object 9c8539ae2d09b9d351946a7afd065a4e754c0384
+type commit
+tag 2.158.8
+tagger Kirill Maslinsky <kirill@altlinux.org> 1546419947 +0300
+
+manatee-open 2.158.8
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABAgAGBQJcLH71AAoJEHjJ2Ys3jDYZc2kQALs2PLeC6hgqF8olx2Sygfo3
+GUS/uTCiHc3e2/nOi0ejvdR1eqvZdeK9eOhjKTa/+MzakMfXnB4xyGDA40ln3GzQ
+2eTGsC3uN1R6uCQefn+qmTe9g4dZ9v9zKEqpkasqtAzy6SpC+YnNSKoWJKEEdJlE
+sYk0sWNkfSTRPM+6XJ9cXdz9MtIPTl/WTXd1JjGMLufRFwFAETIKWnTdWADcu9uT
+Mq60EWgL/c4RFbOJgYf1kxcWc7U1aZ2GzzBPFoZDDwzxM3eBlima6CoLu/uOHm6W
+AIMGmwD0MOeLUi7sXvMZziAoWeSxhSYl4DLeCudw0frSqarabpD2X70O9PL66XRF
+BRQ63xRgNf3HpXIuXO5Yj24t6MIGXHu8ZSvaiND0FrDtQxh6UowObadoo+hu7+uA
+hbN3Ro6iyADFlTEOZorbFvM1comcmvFQ/iS1IwzP8hnvVtGaaRUTt2m4Eon1072s
+G+SylJsYSojnE6SuI0F0ITbiFeDV4iB3w6095CFDXJY/3vrC5DVoCaXy/f8RHFEV
+4GIgb3ftkaHKa8RCWDtqsNEU3/F3OTzIWduotrsJ+EKBfcvOrs2Zyu8Vrc27KZeX
+/k6Rc0df5cdtudfB+KgbY923/AJGZI0u98pjTSbFS/+KEdv7HNFzzMvzN1cYNByR
+CesIsrNm9miUkpB+kyit
+=/3qm
+-----END PGP SIGNATURE-----
diff --git a/.gear/tags/6770728331a244b775938c836f14cbf3773858a7 b/.gear/tags/6770728331a244b775938c836f14cbf3773858a7
new file mode 100644
index 0000000..a1729ea
--- /dev/null
+++ b/.gear/tags/6770728331a244b775938c836f14cbf3773858a7
@@ -0,0 +1,12 @@
+object d7f49b40aba275475bf99e4964c17d4745a03af1
+type commit
+tag v2.139.3
+tagger Kirill Maslinsky <kirill@altlinux.org> 1476888044 -0500
+
+manatee-open 2.139.3
+-----BEGIN PGP SIGNATURE-----
+
+iEYEABECAAYFAlgHhfUACgkQeeVvD8eBBvsZswCfb/H26SL9NFWBPtpi5mNLgvGu
+reQAn1oWAiP1kLJ0V3oboUOQOaY/k8R0
+=vAps
+-----END PGP SIGNATURE-----
diff --git a/.gear/tags/7748db5bd021d95e7b8bcff726162e37e533e383 b/.gear/tags/7748db5bd021d95e7b8bcff726162e37e533e383
new file mode 100644
index 0000000..3fe49cf
--- /dev/null
+++ b/.gear/tags/7748db5bd021d95e7b8bcff726162e37e533e383
@@ -0,0 +1,6 @@
+object 884d8bae70e021f6a0cb6997547cb0a6d37e154f
+type commit
+tag v2.59.1
+tagger Kirill Maslinsky <kirill@altlinux.org> 1380722026 +0400
+
+manatee-open 2.59.1
diff --git a/.gear/tags/7975faf3f3f79c68be1ff130a7c532fb151aec99 b/.gear/tags/7975faf3f3f79c68be1ff130a7c532fb151aec99
new file mode 100644
index 0000000..f4ec513
--- /dev/null
+++ b/.gear/tags/7975faf3f3f79c68be1ff130a7c532fb151aec99
@@ -0,0 +1,6 @@
+object 68ae3d877598a0df4fa46e0aa2a79292efed45b3
+type commit
+tag v2.33.1
+tagger Kirill Maslinsky <kirill@altlinux.org> 1334052188 +0400
+
+manatee-open 2.33.1
diff --git a/.gear/tags/7d1783971a546ed5eee07f678b54a22d2d485c4a b/.gear/tags/7d1783971a546ed5eee07f678b54a22d2d485c4a
new file mode 100644
index 0000000..7aecc95
--- /dev/null
+++ b/.gear/tags/7d1783971a546ed5eee07f678b54a22d2d485c4a
@@ -0,0 +1,22 @@
+object 93ebf20cd856f4863ed6f9fa13b1f23c34c70a88
+type commit
+tag v2.214.1
+tagger Kirill Maslinsky <kirill@altlinux.org> 1672825291 +0100
+
+manatee-open 2.214.1
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCAAGBQJjtUnUAAoJENt3rqRo+aQ7hiYQAJ1v3UmDaJwRLjhjZUrOTQtk
+lh5Zz32dZrKWG7ajZXh3xy3R5izaKXSlW5Z0T27tcSPR8uAZsjqpNYedIRSDEYxB
+Qhf6j5lORvhyahgqLVX0cBOltTT+8Euc/DTPMuwXfCYbmVXcmfNgDfrjLAE+4H8t
+BBhEL3GUepSX9uoS+q8lASJ8ngwcr+yXinY8lCISGwHVZGpiJQBsPJV5Hr+F44Ou
+PWwYSIPy1UAgXYqYOi9hmeDwxW4HXfqqpMzHDKz0u6hrQtxb9wgE13BFzxmxiir7
+7PaDZPkQEWTtMlqmVgu/cIE+rt+giA10TYVzP4iQ6ymHaHSFYZ6p/EmIBLmaGwG9
+JLDpuJR02lm6j4Y4uNAli5aQBv7M/zRKTPBEH5Dnx4m3CRZed+tO3TKBtaF+0tC6
+nWSk7ue+2hP/7GOdTKIZGhlFcEC1fVpoqkxWhzkq8tXhkj+N7zW5/jiMZLCS12WY
+bYWtUNwiU0r4CiNo34Bci0aK2W98x1yKvyMVa6LiClAUK5mM2t9T9elncGvXy/rt
+P21RO1BIchXH/hWfvLuWykeNV2fbL0WGO99VCcGBom1GH9onxHOUuqPAlPAdIhX+
+sYDxIWEwUGWm6thw2Q/09cx8arZubz1CWdOMy6eWYyy6Aacovb7vh/PxzY8wsheC
+O6Dc97deojA2rSsEYN+o
+=r7ah
+-----END PGP SIGNATURE-----
diff --git a/.gear/tags/abf0e0e1223d24e6b7389867788ea9745788cfa8 b/.gear/tags/abf0e0e1223d24e6b7389867788ea9745788cfa8
new file mode 100644
index 0000000..dec8a14
--- /dev/null
+++ b/.gear/tags/abf0e0e1223d24e6b7389867788ea9745788cfa8
@@ -0,0 +1,22 @@
+object 9c8539ae2d09b9d351946a7afd065a4e754c0384
+type commit
+tag v2.158.8
+tagger Kirill Maslinsky <kirill@altlinux.org> 1546420189 +0300
+
+manatee-open 2.158.8
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABAgAGBQJcLH/lAAoJEHjJ2Ys3jDYZEKUP/R08tKMFSOwWxy3LYPYGBzdZ
+xzL55nVaeIDxjHPYTze9eNTKtMiUdm3m3AIw93xe5/jSVJtJe9mdRMzAUJnnEtTx
+o3uFPToLOrFmhQVxUKeAXJsB7eyovQBtprFKruyq6yrJLvYrxBlX8wg12z/hTvX9
+DZ9bnhG1plmFUtglw1xy3YgPmLCYmmaQXQSINBozU9w8ymcre1CcDwS6Ie0OYaP6
+oKNgimVM5KZ+H1T7DOLFNRnPKMUvS1VO+DFVMdEQ5mEoYJjeNOkoxUlpcJvLns5L
+2iFwllMwpe4hpDB6lZ66y/tVVoGwV9X6PjUD6ET0fbAgAB4LBPMqohagWU829a/h
+yvn7CbvUWQvAZRL1yHjQ8jLt92FKf58+zLupQdY77IcXZdmwT9KX/Xd6DOA+Sh9p
+2g1ipOM9kvZ1MY11ECa3Tix4pgob83CQAOc4j9o3bautBEWLClxI7Rz/SWY/Ffnn
+YHJXWMWzlKZJ/F0u6OVotryUvx3Jk3Ea3SqOGJi5DjuwDwud3R7BOt5KSLeWyZ2e
+XfotU9MdaTVXo1plvfOPopKHK1A784+w7BPkTfWZ+qwBtNBN6XcFFe2v+il1QcXa
+wj4XpZkhiQunDxSDX0PiTvOCOttX/GUpYJosQIfCN9ItwTU/OeHMT4pE3yYEHu1Z
+BCqQva6Bv1mSAcclxtm5
+=rjN4
+-----END PGP SIGNATURE-----
diff --git a/.gear/tags/cb79039adecde7345ad940837ee397afebc6c3d2 b/.gear/tags/cb79039adecde7345ad940837ee397afebc6c3d2
new file mode 100644
index 0000000..7a96adf
--- /dev/null
+++ b/.gear/tags/cb79039adecde7345ad940837ee397afebc6c3d2
@@ -0,0 +1,6 @@
+object 57e4374470941bc6ac5b29b472dba8341ba7b2cb
+type commit
+tag v2.167.10
+tagger Kirill Maslinsky <kirill@altlinux.org> 1584031002 +0100
+
+manate-open 2.167.10
diff --git a/.gear/tags/f3eb2a46b609a8eac1eed40f5d8218b90822b168 b/.gear/tags/f3eb2a46b609a8eac1eed40f5d8218b90822b168
new file mode 100644
index 0000000..9155cb2
--- /dev/null
+++ b/.gear/tags/f3eb2a46b609a8eac1eed40f5d8218b90822b168
@@ -0,0 +1,13 @@
+object f9345be3f44b8895ea0979e29f940e3f0fc5d078
+type commit
+tag v2.130.6
+tagger Kirill Maslinsky <kirill@altlinux.org> 1449347243 +0300
+
+manatee-open 2.130.6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iEYEABECAAYFAlZjSKsACgkQeeVvD8eBBvuuQQCdFgDLcinajAS5nwIxeBBzH+tK
+zyAAn0Ny3DQjMZQ4cNkulXVOHZLtVATI
+=5jJ9
+-----END PGP SIGNATURE-----
diff --git a/.gear/tags/list b/.gear/tags/list
new file mode 100644
index 0000000..10b8148
--- /dev/null
+++ b/.gear/tags/list
@@ -0,0 +1,11 @@
+7975faf3f3f79c68be1ff130a7c532fb151aec99 v2.33.1
+7748db5bd021d95e7b8bcff726162e37e533e383 v2.59.1
+12d4e25781a1046be81fcdf112220be14f8d90a1 v2.107.1
+f3eb2a46b609a8eac1eed40f5d8218b90822b168 v2.130.6
+6770728331a244b775938c836f14cbf3773858a7 v2.139.3
+2d61f72ff3cc3581781f4f9791e53708a0a27b40 v2.151.5
+4cfef83e60c4d0bd1cd9a6df25412be200aecb60 2.158.8
+abf0e0e1223d24e6b7389867788ea9745788cfa8 v2.158.8
+cb79039adecde7345ad940837ee397afebc6c3d2 v2.167.10
+01f4f3cea680e2ff43e783fbebd1753bbbac1a70 v2.208
+7d1783971a546ed5eee07f678b54a22d2d485c4a v2.214.1
diff --git a/Makefile.in b/Makefile.in
index e9a8efa..b235bdc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -166,8 +166,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.hh.in \
$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
$(top_srcdir)/config/missing AUTHORS COPYING ChangeLog INSTALL \
NEWS README config/compile config/config.guess \
- config/config.sub config/install-sh config/ltmain.sh \
- config/missing config/py-compile
+ config/config.sub config/depcomp config/install-sh \
+ config/ltmain.sh config/missing config/py-compile
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -222,8 +222,6 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@
-AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -249,7 +247,6 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
FILECMD = @FILECMD@
GREP = @GREP@
-HAVE_CXX11 = @HAVE_CXX11@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -284,37 +281,22 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE_SUBDIRS = @PCRE_SUBDIRS@
-PERL = @PERL@
PERL_CPPFLAGS = @PERL_CPPFLAGS@
PERL_SITE_PKG = @PERL_SITE_PKG@
PTHREAD_LIBS = @PTHREAD_LIBS@
PYTHON = @PYTHON@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
-RUBY = @RUBY@
-RUBY_CPPFLAGS = @RUBY_CPPFLAGS@
-RUBY_EXTRA_LIBS = @RUBY_EXTRA_LIBS@
-RUBY_LDFLAGS = @RUBY_LDFLAGS@
-RUBY_SITE_PKG = @RUBY_SITE_PKG@
-RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SWIG = @SWIG@
-SWIG_LIB = @SWIG_LIB@
VERSION = @VERSION@
YACC = @YACC@
-_ACJNI_JAVAC = @_ACJNI_JAVAC@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/api/Makefile.in b/api/Makefile.in
index e9fd299..d3c5560 100644
--- a/api/Makefile.in
+++ b/api/Makefile.in
@@ -263,8 +263,6 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@
-AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -290,7 +288,6 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
FILECMD = @FILECMD@
GREP = @GREP@
-HAVE_CXX11 = @HAVE_CXX11@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,37 +322,22 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE_SUBDIRS = @PCRE_SUBDIRS@
-PERL = @PERL@
PERL_CPPFLAGS = @PERL_CPPFLAGS@
PERL_SITE_PKG = @PERL_SITE_PKG@
PTHREAD_LIBS = @PTHREAD_LIBS@
PYTHON = @PYTHON@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
-RUBY = @RUBY@
-RUBY_CPPFLAGS = @RUBY_CPPFLAGS@
-RUBY_EXTRA_LIBS = @RUBY_EXTRA_LIBS@
-RUBY_LDFLAGS = @RUBY_LDFLAGS@
-RUBY_SITE_PKG = @RUBY_SITE_PKG@
-RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SWIG = @SWIG@
-SWIG_LIB = @SWIG_LIB@
VERSION = @VERSION@
YACC = @YACC@
-_ACJNI_JAVAC = @_ACJNI_JAVAC@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/api/concinfo b/api/concinfo
index e557539..1ffd0ec 100755
--- a/api/concinfo
+++ b/api/concinfo
@@ -1,7 +1,5 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
# Copyright (c) 2006-2009 Pavel Rychly
-from __future__ import print_function
-from __future__ import unicode_literals
"""
Prints concordance info:
diff --git a/api/corpconfcheck b/api/corpconfcheck
index d6a1ca4..e1bfaa0 100755
--- a/api/corpconfcheck
+++ b/api/corpconfcheck
@@ -1,4 +1,5 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
+
import sys
import re
import os
diff --git a/api/corpdatacheck b/api/corpdatacheck
index f9ac949..b876984 100755
--- a/api/corpdatacheck
+++ b/api/corpdatacheck
@@ -1,6 +1,4 @@
-#!/usr/bin/python3
-from __future__ import print_function
-from __future__ import unicode_literals
+#!/usr/bin/env python3
import sys
import os
diff --git a/api/corpquery b/api/corpquery
index b552b5a..7db66f4 100755
--- a/api/corpquery
+++ b/api/corpquery
@@ -1,7 +1,5 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
# Copyright 2007-2016 Pavel Rychly, Milos Jakubicek
-from __future__ import unicode_literals
-from __future__ import print_function
import sys
diff --git a/api/decodevert b/api/decodevert
index fda856b..2ecebdc 100755
--- a/api/decodevert
+++ b/api/decodevert
@@ -1,7 +1,5 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
# Copyright (c) 2014 Pavel Rychly
-from __future__ import print_function
-from __future__ import unicode_literals
"""Decode a corpus -- creates a vertical file from encoded data
"""
diff --git a/api/dumpalign b/api/dumpalign
index 30336f8..3d658a2 100755
--- a/api/dumpalign
+++ b/api/dumpalign
@@ -1,7 +1,5 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
# Copyright (c) 2014-2016 Milos Jakubicek
-from __future__ import print_function
-from __future__ import unicode_literals
import sys
from os.path import basename
diff --git a/api/freqs b/api/freqs
index 45cf636..f7ec8e2 100755
--- a/api/freqs
+++ b/api/freqs
@@ -1,7 +1,5 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
# Copyright (c) 2010-2015 Pavel Rychly
-from __future__ import print_function
-from __future__ import unicode_literals
import manatee, os, sys
diff --git a/api/lslexarf b/api/lslexarf
index 86c2274..c42c44c 100755
--- a/api/lslexarf
+++ b/api/lslexarf
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
# Copyright 2007-2015 Pavel Rychly
from __future__ import print_function
from __future__ import unicode_literals
diff --git a/api/lsslex b/api/lsslex
index cd554a6..bafe115 100755
--- a/api/lsslex
+++ b/api/lsslex
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
# Copyright 2007-2020 Pavel Rychly
import manatee
diff --git a/api/manatee.i b/api/manatee.i
index 01c2f7c..f0d6f21 100644
--- a/api/manatee.i
+++ b/api/manatee.i
@@ -773,7 +773,7 @@ void find_subcorpora (const char *subcdir, std::vector<std::string> &scs)
*/
bool create_subcorpus (const char *subcpath, DisownRangeStream *r,
Structure *s)
- throw (FileAccessError, EvalQueryException);
+ /* throw (FileAccessError, EvalQueryException) */;
/** Creates new subcorpus from a CQL query filtering a structure
* @param[in] subcpath Path where the subcorpus should be saved to
* @param[in] corp Corpus object
@@ -783,7 +783,7 @@ bool create_subcorpus (const char *subcpath, DisownRangeStream *r,
*/
bool create_subcorpus (const char *subcpath, Corpus *corp,
const char *structname, const char *query)
- throw (FileAccessError, AttrNotFound, CorpInfoNotFound, EvalQueryException);
+ /* throw (FileAccessError, AttrNotFound, CorpInfoNotFound, EvalQueryException) */;
%{bool create_subcorpus_from_query (const char *subcpath, Corpus *corp,
@@ -800,7 +800,7 @@ bool create_subcorpus (const char *subcpath, Corpus *corp,
*/
bool create_subcorpus_from_query (const char *subcpath, Corpus *corp,
const char *structname, const char *query)
-throw (FileAccessError, AttrNotFound, CorpInfoNotFound, EvalQueryException);
+/* throw (FileAccessError, AttrNotFound, CorpInfoNotFound, EvalQueryException) */;
/** Retrieve list of available subcorpora
* @param[in] subcdir Subcorpus directory
diff --git a/api/mkstats b/api/mkstats
index 5cdda47..3e80e6c 100755
--- a/api/mkstats
+++ b/api/mkstats
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
# Copyright (c) 2008-2020 Pavel Rychly, Milos Jakubicek
import sys, os, array, manatee, subprocess
diff --git a/api/mksubc b/api/mksubc
index 903349a..765f25f 100755
--- a/api/mksubc
+++ b/api/mksubc
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
# Copyright (c) 2008-2015 Pavel Rychly, Milos Jakubicek, Vit Baisa
from __future__ import print_function
from __future__ import unicode_literals
diff --git a/api/par2tokens b/api/par2tokens
index 0447cd1..e8a5a7b 100755
--- a/api/par2tokens
+++ b/api/par2tokens
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
# Copyright (c) 2015-2016 Milos Jakubicek
from __future__ import print_function
from __future__ import unicode_literals
diff --git a/api/tokens2dict b/api/tokens2dict
index 051be46..b3c09bf 100755
--- a/api/tokens2dict
+++ b/api/tokens2dict
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
# Copyright (c) 2015 Vojtech Kovar, Milos Jakubicek
from __future__ import print_function
from __future__ import unicode_literals
diff --git a/api/vertfork b/api/vertfork
index d3f8f14..7629f34 100755
--- a/api/vertfork
+++ b/api/vertfork
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# Copyright 2012-2017 Vц╜t Suchomel, Miloе║ Jakubц╜д█ek
from __future__ import unicode_literals
diff --git a/concord/Makefile.in b/concord/Makefile.in
index b47cf15..661cab1 100644
--- a/concord/Makefile.in
+++ b/concord/Makefile.in
@@ -250,8 +250,6 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@
-AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -277,7 +275,6 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
FILECMD = @FILECMD@
GREP = @GREP@
-HAVE_CXX11 = @HAVE_CXX11@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -312,37 +309,22 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE_SUBDIRS = @PCRE_SUBDIRS@
-PERL = @PERL@
PERL_CPPFLAGS = @PERL_CPPFLAGS@
PERL_SITE_PKG = @PERL_SITE_PKG@
PTHREAD_LIBS = @PTHREAD_LIBS@
PYTHON = @PYTHON@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
-RUBY = @RUBY@
-RUBY_CPPFLAGS = @RUBY_CPPFLAGS@
-RUBY_EXTRA_LIBS = @RUBY_EXTRA_LIBS@
-RUBY_LDFLAGS = @RUBY_LDFLAGS@
-RUBY_SITE_PKG = @RUBY_SITE_PKG@
-RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SWIG = @SWIG@
-SWIG_LIB = @SWIG_LIB@
VERSION = @VERSION@
YACC = @YACC@
-_ACJNI_JAVAC = @_ACJNI_JAVAC@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/concord/conccrit.cc b/concord/conccrit.cc
index e215006..c9bf9fc 100644
--- a/concord/conccrit.cc
+++ b/concord/conccrit.cc
@@ -35,8 +35,8 @@ static const char *str2lower (const char *str, const char *locale,
// viz ~/inst/icu.old/data/convrtrs.txt
UErrorCode err = U_ZERO_ERROR;
UConverter *conv = ucnv_open (encoding, &err);
- const Locale loc(locale);
- UnicodeString us (str, -1, conv, err);
+ const icu::Locale loc(locale);
+ icu::UnicodeString us (str, -1, conv, err);
//XXX if (U_FAILURE (err)) ...
us.toLower (loc);
static char *cbuff = NULL;
@@ -108,7 +108,7 @@ static char *str2retro (const char *str, const char *encoding)
{UErrorCode err = U_ZERO_ERROR;
UConverter *conv = ucnv_open (encoding, &err);
- UnicodeString us (str, -1, conv, err);
+ icu::UnicodeString us (str, -1, conv, err);
//XXX if (U_FAILURE (err)) ...
us.reverse();
@@ -151,13 +151,13 @@ static const char *str2locale (const char *str, const char *locale,
{UErrorCode status = U_ZERO_ERROR;
UConverter *conv = ucnv_open (encoding, &status);
- const Locale loc(locale);
- UnicodeString us (str, -1, conv, status);
+ const icu::Locale loc(locale);
+ icu::UnicodeString us (str, -1, conv, status);
- Collator* coll = Collator::createInstance(loc, status);
+ icu::Collator* coll = icu::Collator::createInstance(loc, status);
if (U_FAILURE(status)) return "xx1";
- coll->setStrength(Collator::PRIMARY);
- CollationKey key;
+ coll->setStrength(icu::Collator::PRIMARY);
+ icu::CollationKey key;
coll->getCollationKey (us, key, status);
if (U_FAILURE(status)) return "xx2";
diff --git a/config.hh.in b/config.hh.in
index 5f1aedc..c964879 100644
--- a/config.hh.in
+++ b/config.hh.in
@@ -9,9 +9,6 @@
/* enable assertions */
#undef DEBUG
-/* define if the compiler supports basic C++11 syntax */
-#undef HAVE_CXX11
-
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
@@ -45,9 +42,6 @@
/* Define to 1 if you have the pthread library */
#undef HAVE_PTHREAD
-/* If available, contains the Python version number currently in use. */
-#undef HAVE_PYTHON
-
/* Define to 1 if you have the `setlocale' function. */
#undef HAVE_SETLOCALE
@@ -94,15 +88,6 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
-/* Define to 1 if the system has the `__builtin_clzll' built-in function */
-#undef HAVE___BUILTIN_CLZLL
-
-/* Define to 1 if the system has the `__builtin_ctzll' built-in function */
-#undef HAVE___BUILTIN_CTZLL
-
-/* Define to 1 if the system has the `__builtin_expect' built-in function */
-#undef HAVE___BUILTIN_EXPECT
-
/* "Use FSA3 automata for lexicons" */
#undef LEXICON_USE_FSA3
diff --git a/config/libtool.m4 b/config/libtool.m4
index e3adeda..7946983 100644
--- a/config/libtool.m4
+++ b/config/libtool.m4
@@ -730,7 +730,7 @@ _LT_CONFIG_SAVE_COMMANDS([
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
# Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# Libtool was configured as follows:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services.
@@ -1346,6 +1346,7 @@ mips64*-*linux*)
emul="${emul}32";;
*64-bit*)
+ libsuff=64
emul="${emul}64";;
esac
@@ -1359,6 +1360,7 @@ mips64*-*linux*)
esac
case `$FILECMD conftest.$ac_objext` in
*N32*)
+ libsuff=n32
emul="${emul}n32";;
esac
@@ -1367,8 +1369,8 @@ mips64*-*linux*)
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+aarch64*-*linux*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+riscv64*-*linux*|s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out what ABI is being produced by ac_compile, and set linker
# options accordingly. Note that the listed cases only cover the
# situations where additional linker options are needed (such as when
@@ -1383,6 +1385,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
x86_64-*kfreebsd*-gnu)
LD="${LD-ld} -m elf_i386_fbsd";;
+ x86_64-*linux*-gnux32)
+ libsuff=x32
+ LD="${LD-ld} -m elf32_x86_64"+ ;;
x86_64-*linux*)
case `$FILECMD conftest.o` in
*x86-64*)
@@ -1408,6 +1414,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
esac
;;
*64-bit*)
+ libsuff=64
case $host in
x86_64-*kfreebsd*-gnu)
LD="${LD-ld} -m elf_x86_64_fbsd"@@ -2377,7 +2384,7 @@ BEGIN {RS = " "; FS = "/|\n";} {esac
sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_search_path_spec="/lib$libsuff /usr/lib$libsuff /usr/local/lib$libsuff"
fi])
library_names_spec=
libname_spec='lib$name'
@@ -2391,7 +2398,7 @@ shlibpath_var=
shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib$libsuff /usr/lib$libsuff"
need_lib_prefix=unknown
hardcode_into_libs=no
@@ -2887,9 +2894,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
# before this can be enabled.
hardcode_into_libs=yes
- # Add ABI-specific directories to the system library path.
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
# Ideally, we could use ldconfig to report *all* directores which are
# searched for libraries, however this is still not possible. Aside from not
# being certain /sbin/ldconfig is available, command
@@ -4959,6 +4963,9 @@ m4_if([$1], [CXX], [
;;
esac
;;
+ linux* | k*bsd*-gnu)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -5021,6 +5028,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
openbsd* | bitrig*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -5251,6 +5261,7 @@ _LT_EOF
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
echo "local: *; };" >> $output_objdir/$libname.ver~
+ if test -r $libname-altlinux.ver; then cp $libname-altlinux.ver $output_objdir/$libname.ver; fi~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
@@ -6312,13 +6323,21 @@ m4_defun([_LT_LANG_CXX_CONFIG],
[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-if test -n "$CXX" && ( test no != "$CXX" &&
- ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
- (test g++ != "$CXX"))); then
- AC_PROG_CXXCPP
-else
- _lt_caught_CXX_error=yes
-fi
+case "$CXX" in
+ "" | no)
+ _lt_caught_CXX_error=yes
+ ;;
+ g++* | *-g++*)
+ if $CXX -v >/dev/null 2>&1; then
+ AC_PROG_CXXCPP
+ else
+ _lt_caught_CXX_error=yes
+ fi
+ ;;
+ *)
+ AC_PROG_CXXCPP
+ ;;
+esac
AC_LANG_PUSH(C++)
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
diff --git a/config/ltmain.sh b/config/ltmain.sh
index 49fcad1..f484935 100644
--- a/config/ltmain.sh
+++ b/config/ltmain.sh
@@ -934,31 +934,16 @@ func_mktempdir ()
{$debug_cmd
- _G_template=${TMPDIR-/tmp}/${1-$progname}-
if test : = "$opt_dry_run"; then
# Return a directory name, but don't create it in dry-run mode
- _G_tmpdir=$_G_template-$$
+ _G_mktemp='mktemp -dtu'
else
-
- # If mktemp works, use that first and foremost
- _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
-
- if test ! -d "$_G_tmpdir"; then
- # Failing that, at least try and use $RANDOM to avoid a race
- _G_tmpdir=$_G_template-${RANDOM-0}$$-
- func_mktempdir_umask=`umask`
- umask 0077
- $MKDIR "$_G_tmpdir"
- umask $func_mktempdir_umask
- fi
-
- # If we're not in dry-run mode, bomb out on failure
- test -d "$_G_tmpdir" || \
- func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
+ _G_mktemp='mktemp -dt'
fi
+ _G_tmpdir=`$_G_mktemp "${1-$progname}-XXXXXXXX"` || \+ func_fatal_error "cannot create temporary directory"
+
$ECHO "$_G_tmpdir"
}
@@ -2311,7 +2296,7 @@ include the following information:
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
Report bugs to <bug-libtool@gnu.org>.
-GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+GNU libtool home page: <http://www.gnu.org/s/libtool/>.
General help using GNU software: <http://www.gnu.org/gethelp/>."
exit 0
}
@@ -4456,6 +4441,8 @@ func_mode_install ()
func_dirname_and_basename "$dest" "" "."
destdir=$func_dirname_result
destname=$func_basename_result
+ func_stripname '' '/' "$destdir"
+ destdir=$func_stripname_result
# Not a directory, so check to see that there is only one file specified.
set dummy $files; shift
@@ -4463,7 +4450,10 @@ func_mode_install ()
func_fatal_help "'$dest' is not a directory"
fi
case $destdir in
- [\\/]* | [A-Za-z]:[\\/]*) ;;
+ [\\/]* | [A-Za-z]:[\\/]*)
+ func_normal_abspath "$destdir"
+ destdir="$func_normal_abspath_result"
+ ;;
*)
for file in $files; do
case $file in
@@ -6756,6 +6746,11 @@ func_mode_link ()
# that all symbols are satisfied, otherwise we get a static library.
allow_undefined=yes
;;
+ *-*-linux*)
+ if test "$link_all_deplibs" = unknown; then
+ link_all_deplibs=no
+ fi
+ ;;
*)
allow_undefined=yes
;;
@@ -7075,6 +7070,8 @@ func_mode_link ()
func_fatal_error "only absolute run-paths are allowed"
;;
esac
+ func_normal_abspath "$arg"
+ arg="$func_normal_abspath_result"
if test rpath = "$prev"; then
case "$rpath " in
*" $arg "*) ;;
@@ -7847,7 +7844,11 @@ func_mode_link ()
case $pass in
dlopen) libs=$dlfiles ;;
dlpreopen) libs=$dlprefiles ;;
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ link)
+ libs="$deplibs %DEPLIBS%"
+ test "X$link_all_deplibs" = Xno ||
+ func_append libs " $dependency_libs"
+ ;;
esac
fi
if test lib,dlpreopen = "$linkmode,$pass"; then
@@ -8166,19 +8167,19 @@ func_mode_link ()
# It is a libtool convenience library, so add in its objects.
func_append convenience " $ladir/$objdir/$old_library"
func_append old_convenience " $ladir/$objdir/$old_library"
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if $opt_duplicate_deps; then
+ case "$tmp_libs " in
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ esac
+ fi
+ func_append tmp_libs " $deplib"
+ done
elif test prog != "$linkmode" && test lib != "$linkmode"; then
func_fatal_error "'$lib' is not a convenience library"
fi
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if $opt_preserve_dup_deps; then
- case "$tmp_libs " in
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
- esac
- fi
- func_append tmp_libs " $deplib"
- done
continue
fi # $pass = conv
@@ -9102,6 +9103,9 @@ func_mode_link ()
revision=$number_minor
lt_irix_increment=no
;;
+ *)
+ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+ ;;
esac
;;
no)
@@ -9356,6 +9360,10 @@ func_mode_link ()
# If the user specified any rpath flags, then add them.
temp_xrpath=
for libdir in $xrpath; do
+ # Skip directories that are in the system default run-time search path.
+ case " $sys_lib_dlsearch_path " in
+ *" $libdir "*) continue ;;
+ esac
func_replace_sysroot "$libdir"
func_append temp_xrpath " -R$func_replace_sysroot_result"
case "$finalize_rpath " in
@@ -10538,6 +10546,10 @@ EOF
if test -n "$rpath$xrpath"; then
# If the user specified any rpath flags, then add them.
for libdir in $rpath $xrpath; do
+ # Skip directories that are in the system default run-time search path.
+ case " $sys_lib_dlsearch_path " in
+ *" $libdir "*) continue ;;
+ esac
# This is the magic to use -rpath.
case "$finalize_rpath " in
*" $libdir "*) ;;
diff --git a/corp/Makefile.in b/corp/Makefile.in
index b006df0..02f8681 100644
--- a/corp/Makefile.in
+++ b/corp/Makefile.in
@@ -261,8 +261,6 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@
-AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -288,7 +286,6 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
FILECMD = @FILECMD@
GREP = @GREP@
-HAVE_CXX11 = @HAVE_CXX11@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -323,37 +320,22 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE_SUBDIRS = @PCRE_SUBDIRS@
-PERL = @PERL@
PERL_CPPFLAGS = @PERL_CPPFLAGS@
PERL_SITE_PKG = @PERL_SITE_PKG@
PTHREAD_LIBS = @PTHREAD_LIBS@
PYTHON = @PYTHON@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
-RUBY = @RUBY@
-RUBY_CPPFLAGS = @RUBY_CPPFLAGS@
-RUBY_EXTRA_LIBS = @RUBY_EXTRA_LIBS@
-RUBY_LDFLAGS = @RUBY_LDFLAGS@
-RUBY_SITE_PKG = @RUBY_SITE_PKG@
-RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SWIG = @SWIG@
-SWIG_LIB = @SWIG_LIB@
VERSION = @VERSION@
YACC = @YACC@
-_ACJNI_JAVAC = @_ACJNI_JAVAC@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/corp/virtcorp.cc b/corp/virtcorp.cc
index c5b9362..578d0ba 100644
--- a/corp/virtcorp.cc
+++ b/corp/virtcorp.cc
@@ -7,6 +7,7 @@
#include "log.hh"
#include <fstream>
#include <iostream>
+#include <cstdlib>
using namespace std;
diff --git a/finlib/Makefile.in b/finlib/Makefile.in
index 0b0f943..cc04d85 100644
--- a/finlib/Makefile.in
+++ b/finlib/Makefile.in
@@ -224,8 +224,6 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@
-AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -251,7 +249,6 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
FILECMD = @FILECMD@
GREP = @GREP@
-HAVE_CXX11 = @HAVE_CXX11@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -286,37 +283,22 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE_SUBDIRS = @PCRE_SUBDIRS@
-PERL = @PERL@
PERL_CPPFLAGS = @PERL_CPPFLAGS@
PERL_SITE_PKG = @PERL_SITE_PKG@
PTHREAD_LIBS = @PTHREAD_LIBS@
PYTHON = @PYTHON@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
-RUBY = @RUBY@
-RUBY_CPPFLAGS = @RUBY_CPPFLAGS@
-RUBY_EXTRA_LIBS = @RUBY_EXTRA_LIBS@
-RUBY_LDFLAGS = @RUBY_LDFLAGS@
-RUBY_SITE_PKG = @RUBY_SITE_PKG@
-RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SWIG = @SWIG@
-SWIG_LIB = @SWIG_LIB@
VERSION = @VERSION@
YACC = @YACC@
-_ACJNI_JAVAC = @_ACJNI_JAVAC@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/finlib/regpref.cc b/finlib/regpref.cc
index 18659f5..b558025 100644
--- a/finlib/regpref.cc
+++ b/finlib/regpref.cc
@@ -261,8 +261,8 @@ bool regexp_pattern::compile()
return comp == NULL;
#elif defined USE_ICU
UErrorCode err = U_ZERO_ERROR;
- UnicodeString uspat (pat, -1, conv, err);
- comp = RegexPattern::compile (uspat, options, err);
+ icu::UnicodeString uspat (pat, -1, conv, err);
+ comp = icu::RegexPattern::compile (uspat, options, err);
if (U_FAILURE (err))
cerr << "regexp_pattern::compile: " << u_errorName(err) << endl;
return U_FAILURE (err);
@@ -303,19 +303,19 @@ bool regexp_pattern::match (const char *str)
return pcre_exec (comp, NULL, str, strlen (str), 0, 0, NULL, 0) >= 0;
#elif defined USE_ICU
UErrorCode err = U_ZERO_ERROR;
- UnicodeString us (str, -1, conv, err);
+ icu::UnicodeString us (str, -1, conv, err);
if (U_FAILURE (err)) {cerr << "Conversion error: " << u_errorName(err) << endl;
return false;
}
- RegexMatcher *rex = comp->matcher (us, err);
+ icu::RegexMatcher *rex = comp->matcher (us, err);
if (U_FAILURE (err)) {- cerr << "RegexPattern::matcher " << u_errorName(err) << endl;
+ cerr << "icu::RegexPattern::matcher " << u_errorName(err) << endl;
return false;
}
bool ret = rex->matches (err);
if (U_FAILURE (err)) {- cerr << "RegexMatcher::matches " << u_errorName(err) << endl;
+ cerr << "icu::RegexMatcher::matches " << u_errorName(err) << endl;
return false;
}
delete rex;
diff --git a/finlib/regpref.hh b/finlib/regpref.hh
index 7610f1d..1fba4c2 100644
--- a/finlib/regpref.hh
+++ b/finlib/regpref.hh
@@ -28,7 +28,7 @@ protected:
pcre *comp;
#elif defined USE_ICU
UConverter *conv;
- RegexPattern *comp;
+ icu::RegexPattern *comp;
#endif
const char *locale;
const char *encoding;
diff --git a/finlib/writelex.cc b/finlib/writelex.cc
index 599ccb9..7e37cf1 100644
--- a/finlib/writelex.cc
+++ b/finlib/writelex.cc
@@ -371,7 +371,7 @@ write_fsalex::~write_fsalex ()
int write_fsalex::str2id (const char *str)
{size_t len = strlen (str) + 1;
- len = min (len, 32767UL); // hat-trie cannot store keys longer than 32767, details at https://github.com/dcjones/hat-trie/issues/30
+ len = min (static_cast<unsigned long>(len), 32767UL); // hat-trie cannot store keys longer than 32767, details at https://github.com/dcjones/hat-trie/issues/30
if (oldlex) {int id = oldlex->str2id(str);
if (id != -1) return id;
diff --git a/fsa3/Makefile.in b/fsa3/Makefile.in
index 3f95eff..510ecda 100644
--- a/fsa3/Makefile.in
+++ b/fsa3/Makefile.in
@@ -270,8 +270,6 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@
-AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -297,7 +295,6 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
FILECMD = @FILECMD@
GREP = @GREP@
-HAVE_CXX11 = @HAVE_CXX11@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -332,37 +329,22 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE_SUBDIRS = @PCRE_SUBDIRS@
-PERL = @PERL@
PERL_CPPFLAGS = @PERL_CPPFLAGS@
PERL_SITE_PKG = @PERL_SITE_PKG@
PTHREAD_LIBS = @PTHREAD_LIBS@
PYTHON = @PYTHON@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
-RUBY = @RUBY@
-RUBY_CPPFLAGS = @RUBY_CPPFLAGS@
-RUBY_EXTRA_LIBS = @RUBY_EXTRA_LIBS@
-RUBY_LDFLAGS = @RUBY_LDFLAGS@
-RUBY_SITE_PKG = @RUBY_SITE_PKG@
-RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SWIG = @SWIG@
-SWIG_LIB = @SWIG_LIB@
VERSION = @VERSION@
YACC = @YACC@
-_ACJNI_JAVAC = @_ACJNI_JAVAC@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/manatee-open.spec b/manatee-open.spec
new file mode 100644
index 0000000..de5df4a
--- /dev/null
+++ b/manatee-open.spec
@@ -0,0 +1,100 @@
+Name: manatee-open
+Version: 2.214.1
+Release: alt1
+
+Summary: Manatee is a corpus management tool
+License: LGPLv2+
+Group: System/Libraries
+Url: https://nlp.fi.muni.cz/trac/noske
+Packager: Kirill Maslinsky <kirill@altlinux.org>
+BuildRequires: gcc-c++ libpcre-devel perl-devel python3-module-setuptools libicu-devel libltdl7-devel swig autoconf-archive
+Conflicts: finlib
+Obsoletes: finlib finlib-devel
+
+
+Source: %name-%version.tar
+Patch: %name-%version-%release.patch
+
+%description
+Manatee is a corpus management tool including corpus building and indexing,
+fast querying and providing basic statistical measures. It utilitates a fast
+indexing library called Finlib.
+
+%prep
+%setup
+%patch -p1
+
+%build
+#export MANATEE_REGISTRY=%_localstatedir/manatee
+autoreconf -iv
+%configure PYTHON=python3 --with-icu --disable-static
+%make_build
+
+%install
+%makeinstall_std
+
+%files
+%_libdir/*.so.*
+%_bindir/*
+%python3_sitelibdir/*.py*
+%python3_sitelibdir/_manatee.so
+%doc doc/*
+
+%changelog
+* Wed Jan 04 2023 Kirill Maslinsky <kirill@altlinux.org> 2.214.1-alt1
+- version 2.214.1
+
+* Mon Aug 29 2022 Kirill Maslinsky <kirill@altlinux.org> 2.208-alt1
+- update to version 2.208 (upstream moved to python3)
+
+* Wed Dec 15 2021 Grigory Ustinov <grenka@altlinux.org> 2.167.10-alt6
+- fixed build with python3.10.
+
+* Sun Nov 14 2021 Kirill Maslinsky <kirill@altlinux.org> 2.167.10-alt5
+- fix build
+ - disable static library build to avoid LTO problem
+ - update code to avoid C++17 errors
+
+* Tue Feb 16 2021 Kirill Maslinsky <kirill@altlinux.org> 2.167.10-alt4
+- fix build with python3.9 SWIG API
+
+* Mon Apr 06 2020 Kirill Maslinsky <kirill@altlinux.org> 2.167.10-alt3
+- remove ExclusiveArch: x86_64 (build on i586 fixed)
+
+* Mon Apr 06 2020 Kirill Maslinsky <kirill@altlinux.org> 2.167.10-alt2
+- fix typo in python shebangs
+
+* Thu Mar 12 2020 Kirill Maslinsky <kirill@altlinux.org> 2.167.10-alt1
+- 2.167.10
+- built with python3
+- drop java and ruby API, as apparently dropped upstream
+
+* Wed Jan 02 2019 Kirill Maslinsky <kirill@altlinux.org> 2.158.8-alt1
+- 2.158.8
+- fix build with libicu >= 6.1
+- drop dependency on finlib-devel
+
+* Wed Jan 31 2018 Kirill Maslinsky <kirill@altlinux.org> 2.151.5-alt1
+- 2.151.5
+
+* Wed Oct 26 2016 Kirill Maslinsky <kirill@altlinux.org> 2.139.3-alt3
+- build only for x86_64 (i586 unsupported upstream)
+
+* Wed Oct 19 2016 Kirill Maslinsky <kirill@altlinux.org> 2.139.3-alt2
+- fix build
+
+* Wed Oct 19 2016 Kirill Maslinsky <kirill@altlinux.org> 2.139.3-alt1
+- 2.139.3
+
+* Sat Dec 05 2015 Kirill Maslinsky <kirill@altlinux.org> 2.130.6-alt1
+- 2.130.6
+
+* Wed Mar 18 2015 Kirill Maslinsky <kirill@altlinux.org> 2.107.1-alt1
+- 2.107.1
+
+* Wed Oct 02 2013 Kirill Maslinsky <kirill@altlinux.org> 2.59.1-alt1
+- 2.59.1
+
+* Tue Apr 10 2012 Kirill Maslinsky <kirill@altlinux.org> 2.33.1-alt1
+- Initial build for Sisyphus
+
diff --git a/query/Makefile.in b/query/Makefile.in
index 2bc320c..d94df64 100644
--- a/query/Makefile.in
+++ b/query/Makefile.in
@@ -242,8 +242,6 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@
-AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -269,7 +267,6 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
FILECMD = @FILECMD@
GREP = @GREP@
-HAVE_CXX11 = @HAVE_CXX11@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -304,37 +301,22 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE_SUBDIRS = @PCRE_SUBDIRS@
-PERL = @PERL@
PERL_CPPFLAGS = @PERL_CPPFLAGS@
PERL_SITE_PKG = @PERL_SITE_PKG@
PTHREAD_LIBS = @PTHREAD_LIBS@
PYTHON = @PYTHON@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
-RUBY = @RUBY@
-RUBY_CPPFLAGS = @RUBY_CPPFLAGS@
-RUBY_EXTRA_LIBS = @RUBY_EXTRA_LIBS@
-RUBY_LDFLAGS = @RUBY_LDFLAGS@
-RUBY_SITE_PKG = @RUBY_SITE_PKG@
-RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SWIG = @SWIG@
-SWIG_LIB = @SWIG_LIB@
VERSION = @VERSION@
YACC = @YACC@
-_ACJNI_JAVAC = @_ACJNI_JAVAC@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/src/Makefile.am b/src/Makefile.am
index 1c6c680..d3b62b7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,9 @@ lib_LTLIBRARIES = libmanatee.la
libmanatee_la_SOURCES =
libmanatee_la_LIBADD = $(top_builddir)/concord/libconcord.la \
$(top_builddir)/query/libquery.la $(top_builddir)/corp/libcorp.la \
- $(top_builddir)/finlib/libfin.la $(REGEX_LDFLAG)
+ $(top_builddir)/finlib/libfin.la $(REGEX_LDFLAG) \
+ $(top_builddir)/fsa3/libfsa3.la \
+ $(top_builddir)/hat-trie/src/libhat-trie.la
noinst_LTLIBRARIES = libbuiltinmanatee.la
libbuiltinmanatee_la_SOURCES =
diff --git a/src/Makefile.in b/src/Makefile.in
index 629789e..8983b6b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -170,7 +170,9 @@ am__v_lt_1 =
libmanatee_la_DEPENDENCIES = $(top_builddir)/concord/libconcord.la \
$(top_builddir)/query/libquery.la \
$(top_builddir)/corp/libcorp.la \
- $(top_builddir)/finlib/libfin.la
+ $(top_builddir)/finlib/libfin.la \
+ $(top_builddir)/fsa3/libfsa3.la \
+ $(top_builddir)/hat-trie/src/libhat-trie.la
am_libmanatee_la_OBJECTS =
libmanatee_la_OBJECTS = $(am_libmanatee_la_OBJECTS)
cfreqs_SOURCES = cfreqs.cc
@@ -460,8 +462,6 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@
-AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -487,7 +487,6 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
FILECMD = @FILECMD@
GREP = @GREP@
-HAVE_CXX11 = @HAVE_CXX11@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -522,37 +521,22 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE_SUBDIRS = @PCRE_SUBDIRS@
-PERL = @PERL@
PERL_CPPFLAGS = @PERL_CPPFLAGS@
PERL_SITE_PKG = @PERL_SITE_PKG@
PTHREAD_LIBS = @PTHREAD_LIBS@
PYTHON = @PYTHON@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
-PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
-PYTHON_LIBS = @PYTHON_LIBS@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
-RUBY = @RUBY@
-RUBY_CPPFLAGS = @RUBY_CPPFLAGS@
-RUBY_EXTRA_LIBS = @RUBY_EXTRA_LIBS@
-RUBY_LDFLAGS = @RUBY_LDFLAGS@
-RUBY_SITE_PKG = @RUBY_SITE_PKG@
-RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SWIG = @SWIG@
-SWIG_LIB = @SWIG_LIB@
VERSION = @VERSION@
YACC = @YACC@
-_ACJNI_JAVAC = @_ACJNI_JAVAC@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -631,7 +615,9 @@ lib_LTLIBRARIES = libmanatee.la
libmanatee_la_SOURCES =
libmanatee_la_LIBADD = $(top_builddir)/concord/libconcord.la \
$(top_builddir)/query/libquery.la $(top_builddir)/corp/libcorp.la \
- $(top_builddir)/finlib/libfin.la $(REGEX_LDFLAG)
+ $(top_builddir)/finlib/libfin.la $(REGEX_LDFLAG) \
+ $(top_builddir)/fsa3/libfsa3.la \
+ $(top_builddir)/hat-trie/src/libhat-trie.la
noinst_LTLIBRARIES = libbuiltinmanatee.la
libbuiltinmanatee_la_SOURCES =